From a51ad7ee88600b80a63563b9c37b72b32b3aa796 Mon Sep 17 00:00:00 2001
From: Max Baker <>
Date: Wed, 28 Jan 2004 06:06:03 +0000
Subject: [PATCH] added Cisco 2970 to l3:c6500 class

---
 ChangeLog | 1 +
 Info.pm   | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7a95e0e1..b16f6010 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ version 0.8 ()
     + Added C3500XL devices to the Layer2::C2900 class
     + Added Cisco 3750 (37xxstack) to Layer3::C6500 class
     + Added Cisco Catalyst 4000 to Layer3::C6500 class
+    + Added Cisco Catalyst 2970 to Layer3::C6500 Class
     * Fixed warning about uninitialized value in CiscoStats line 92
     * Fixed warning in Layer2::Bay about non numeric port line 199
     Contributions from Dmitry Sergienko:
diff --git a/Info.pm b/Info.pm
index 533d0e12..5ccb04a7 100644
--- a/Info.pm
+++ b/Info.pm
@@ -673,6 +673,9 @@ sub device_type {
         #   Catalyst 3550 / 3548 Layer2 only switches
         $objtype = 'SNMP::Info::Layer3::C3550' if ($desc =~ /C3550/);
 
+        #   Cisco 2970  
+        $objtype = 'SNMP::Info::Layer3::C6500' if ($desc =~ /C2970/);
+
         #   HP
         $objtype = 'SNMP::Info::Layer2::HP' if ($desc =~ /HP.*ProCurve/); 
     
@@ -680,10 +683,10 @@ sub device_type {
         $objtype = 'SNMP::Info::Layer2::Bay' if ($desc =~ /BayStack/);
 
         #  Aironet - IOS
-        $objtype = 'SNMP::Info::Layer2::Aironet' if ($desc =~ /C1100/);
+        $objtype = 'SNMP::Info::Layer2::Aironet' if ($desc =~ /(C1100|AP1200)/);
 
-        # Aironet
-        $objtype = 'SNMP::Info::Layer2::Aironet' if ($desc =~ /Cisco/ and $desc =~ /\D(BR500|AP1200)\D/) ;
+        # Aironet - non IOS
+        $objtype = 'SNMP::Info::Layer3::Aironet' if ($desc =~ /Cisco/ and $desc =~ /\D(BR500)\D/) ;
 	
     } elsif ($info->has_layer(1)) {
         $objtype = 'SNMP::Info::Layer1';