2.01 update

Add CiscoConfig, remove dangling CiscoVTP
Add cd11_rateset

COPYRIGHT

@@ -1,5 +1,5 @@
 All code from version 0.7 on
-Copyright (c) 2003,2004 Max Baker
+Copyright (c) 2003-2009 Max Baker and SNMP::Info Developers
 All rights reserved.
 
 Original Code

ChangeLog

@@ -1,7 +1,36 @@
 SNMP::Info - Friendly OO-style interface to Network devices using SNMP.
 ChangeLog $Id$
 
-version 1.09  (07/22/08) - Beta/developer release
+version 2.01 (06/12/09)
+    + Added CiscoStpExtensions Class (Carlos Vicente)
+    + Added Layer3::Arista (fenner)
+    + [2020353] Added L3::Altiga for Cisco (Altiga) VPN3000 Concentrators
+                (Jeroen van Ingen)
+
+    * Fixed RFC1213-MIB vs IF-MIB collision in ifOperStatus
+    * Updated test_class.pl for better debug info and relative path
+    * Add cisco vendor detection by OID in Layer3.pm (Sam Stickland)
+    * Fix CaSe of EtherLike-MIB in EtherLike.pm (Alexander Hartmaier)
+    * Added Cisco FWSM to L3::Cisco
+    * Added s222_rp to L3::C6500
+    * Added CIGESM to L2::C2900
+    * Added Airespace WLC to L2::Airespace
+    * Updated POD and DeviceMatrix quite a bit
+    * Added ENTITY-MIB to CiscoStats for better model handling above
+    * Fix networkaddress handling in LLDP-MIB
+    * Added CiscoConfig to L2::Aironet, L3::C3550  classes
+    * Better SSID capabilities for L2::Aironet
+    * Fix CDP vs LLDP in c_id() for HP Class
+    * test_class.pl improvements
+
+version 2.00 (08/01/08)
+    + Support for Alcatel-Lucent OmniSwitch via L3::AlcatelLucent
+    + Support for Alcatel-Lucent Service Router via L3::Timetra
+    + Support for Alcatel-Lucent OmniAccess via L2::Aruba
+
+    * Silence warnings in MAU due to uninitialized variables 
+
+version 1.09 (07/22/08) - Beta/developer release
     + Added support for HP ProCurve Foundry OEM switches, such as the 9300
       series, in new class L3::HP9300 (contributions from Douglas McKeown and
       Ivan Auger)

DeviceMatrix.txt

@@ -6,7 +6,9 @@
 
 # $Id$
 
+#
 # Airespace (pre-Cisco)
+#
 device-vendor: Airespace
 cdp:no
 arpnip: no
@@ -16,14 +18,33 @@ duplex: both
 vlan: yes
 modules: yes
 class: Layer2::Airespace
+
+device-family: Airespace Wireless Controllers
 note: Uses proprietary MIBs to provide MAC to port mapping.  APs appear as switch ports.
 note: Device will only communicate with SNMP version configured in the controller.
 
-device-family: Airespace Wireless Controllers
-
 device: 3500, 4101, 4102
 
+#
+# Alcatel-Lucent
+#
+device-vendor: Alcatel-Lucent
+
+device-family: L3
+class: Layer3::AlcatelLucent
+device: All
+
+device-family: Timetra
+class: Layer3::Timetra
+device: All
+
+device-family: AOS
+class: Layer2::Aruba
+device: All
+
+#
 # Allied
+#
 device-vendor: Allied Telesyn
 cdp:no
 class: Layer1::Allied
@@ -40,21 +61,41 @@ device-family: AT-8000 Switches
 class: Layer2::Allied
 ver: 2
 macsuck: yes
+device: All
 
+#
+# Altiga
+#
+device-vendor: Altiga
+class: Layer3::Altiga
+note: See Cisco/Altiga
+
+#
+# Arista
+#
+device-vendor: Arista
+class: Layer3::Arista
+device-family: All
+device: All
+
+#
 # Aruba
+#
 device-vendor: Aruba
 arpnip: no
 macsuck: yes
 portmac: yes
 duplex: no
 class: Layer2::Aruba
-note: Uses proprietary MIBs to provide MAC to port mapping.  APs appear as switch ports.
 
 device-family: Aruba Wireless Controllers
+note: Uses proprietary MIBs to provide MAC to port mapping.  APs appear as switch ports.
 
 device: 5000
 
+#
 # Asante
+#
 device-vendor: Asante
 class: Layer1::Asante
 ver: 1
@@ -66,16 +107,19 @@ device-family: Asante Hubs
 
 device: 1012
 
+#
 # Bay
+#
 device-vendor: Bay
 note: See Nortel
 
+#
 # CISCO
+#
 device-vendor: Cisco
 cdp: yes
 ver: 2
 modules: yes
-note: Error in CISCO-TC-MIB. See README for how to patch.
 
 device-family: Aironet
 note: IOS and Aironet OS versions
@@ -91,6 +135,12 @@ note: Aironet based device
 device: AP350, AP340, CAP350, CAP340, 1200, AP4800
 note: Aironet based device
 
+device-family: Altiga
+class: Layer3::Altiga
+
+device: VPN3000
+note: The Cisco 3000 device can return duplicate interface names, while Netdisco expects unique interface names.  To ensure unique device names I append numbers only when an interface name would not be unique without one. Interfaces with unique names keep their ifDescr name.
+
 device-family: 1000
 duplex: no
 ver: 1
@@ -121,11 +171,7 @@ arpnip: yes
 macsuck: yes
 class: Layer3::Cisco
 
-device:2610,2610XM,2611,2620,2620XM,2621,2621XM
-
-device:2651XM
-
-device:2691
+device:2610, 2610XM, 2611, 2620, 2620XM, 2621, 2621XM, 2651XM, 2691
 
 device-family: 2800
 duplex: link
@@ -145,14 +191,15 @@ duplex: no
 
 device-family:7200
 class: Layer3::Cisco
-note: !"When scanning my network with netdisco I would find that my 7200 series router running Cisco IOS Software Release 12.2(1) would reboot when scanning for CDP neighbours, to solve the issue I upgraded to Cisco IOS Software Release  Version 12.2(37)"
+device:all
+#note: Unconfirmed problem : "When scanning my network with netdisco I would find that my 7200 series router running Cisco IOS Software Release 12.2(1) would reboot when scanning for CDP neighbours, to solve the issue I upgraded to Cisco IOS Software Release  Version 12.2(37)"
 
 device-family: 7500
 class: Layer3::Cisco
 
 device: 7507
 duplex: no
-note: !Duplex settings are falsely reported in older IOS versions
+note: !Duplex settings are falsely reported in ancient IOS versions
 
 device-family: AS5000
 duplex: no
@@ -171,11 +218,7 @@ duplex: both
 vlan: write
 class: Layer2::C1900
 
-device: wsc1900c
-device-family: Catalyst 1900
-
-device: wsc1900
-device-family: Catalyst 1900
+device: wsc1900c,  wsc1900
 
 device-family: Catalyst 2900
 note: IOS
@@ -186,18 +229,14 @@ class: Layer2::C2900
 portmac: yes
 note: !Pre IOS 11.2 (8) SA3 - PortMAC shows up in CAM table.
 
+device: 2912MfXL, 2924CXL, 2924CXLv
+
 device: 2908xl
 note: !Pre IOS 11.2 (8.6) some features (duplex...) aren't present.
 
-device: 2912MfXL
-
 device: 2924MXL
 ver: 1
 
-device: 2924CXL
-
-device: 2924CXLv
-
 device-family: Catalyst 2940
 note: IOS
 macsuck: vlan
@@ -236,11 +275,7 @@ note: L2 only IOS devices - Just like Catalyst 2900 series from SNMP
 note: IOS Version 12.0(5)XP is buggy and doesn't do VLAN Community indexing correctly.
 class: Layer2::C2900
 
-device: 3508GXL
-
-device: 3524XL
-
-device: 3548XL
+device: 3508GXL, 3524XL, 3548XL
 
 device-family: Catalyst 3550
 macsuck: vlan
@@ -256,11 +291,9 @@ device: 3550-12T
 
 device: 3400 w/ MetroBase Image
 
-device: 3550
+device: 3550, 3560, 3550-24, 3550-48
 note: L2/L3 Switch
 arpnip: yes
-
-device: 3550-24, 3550-48
 macsuck: vlan
 
 device-family: Catalyst 3750
@@ -274,13 +307,10 @@ macsuck: vlan
 vlan: write
 class: Layer2::Catalyst
 note: Comes in IOS and CatOS versions like the 6k series.
-note: CatOS versions like L2::Catalyst just fine.
-note: !Reported problems with SNMP taking up all the CPU.  Requests take significantly longer.
+note: !Reported problems with SNMP taking up all the CPU on older SW.  Requests take significantly longer.
 note: !IOS Version 12.1.8a reported not to respond to BRIDGE-MIB calls.
 
-device: wsc4003, wsc4006
-
-device: wsc4503, wsc4506
+device: wsc4003, wsc4006, wsc4503, wsc4506
 
 device: wsc4912g
 note: Dedicated 12 port gig-e switch
@@ -297,26 +327,19 @@ class: Layer3::C4000
 note: !Has serious slowdown/timeout problems with SNMP
 note: !IOS Software Release 12.2(20)EW or higher required for duplex support
 
-
 device-family: Catalyst 5000
 duplex: write
 vlan: write
 class: Layer2::Catalyst
-note: Port info in CISCO-STACK-MIB
 
 device: wsc2926
 note: !Can give false information over SNMP at times.
 
-device: wsc2948g
-
-device: wsc2980g
-note: !Macsuck not working?
+device: wsc2948g, wsc2980g, wsc5500, wsc5505, wsc5509
 
 device: wsc5000
 note: !Has nasty tendency to not give you all SNMP data ,flaky for some older Catalyst versions.
 
-device: wsc5500,wsc5505,wsc5509
-
 device: wsx5302
 arpnip: yes
 class: Layer3
@@ -333,17 +356,9 @@ note: Native Mode (IOS) versions seem to have SNMP problems with L2 data.
 note: !Problem with IOS 12.2.17d-SXB ... upgrade to -SXB1 or higher.
 note: !Sup720-3B and NativeIOS 12.2 (17d)SXB10 may report 127.0.0.51 as CDP neighbor address.
 
-device: 6503
-macsuck:no
-note: !Macsuck failing even under vlan mode
+device: 6503, 6509, sp72033, s3223, s32p3, s222
 note: Native mode (IOS) reports L2+L3
 
-device: 6509
-duplex: link
-macsuck:no
-note: Native mode (IOS) reports L2+L3
-note: !Macsuck failing even under vlan mode
-
 device: wsc6509
 duplex: write
 class: Layer2::Catalyst
@@ -379,7 +394,23 @@ note: Device will only communicate with SNMP version configured in the controlle
 
 device: 2006, 4112, 4124, 4136, 4402, 4404
 
+device-family: Firewall
+class: Layer3::Cisco
+device: PIX Security Appliance
+device: Adaptive Security Applicance
+device: Firewall Services Moduels (FWSM)
+
+#
+# Cyclades
+#
+device-vendor: Cyclades
+class: Layer1::Cyclades
+device-family: All
+device: All
+
+#
 # Dell
+#
 device-vendor: Dell
 arpnip: no
 macsuck: yes
@@ -399,7 +430,15 @@ device: 5324
 device-family: Dell PowerConnect 3000 Series
 device: 3348, 3448P, 3424, 3424P
 
+device-family: IBM BladeCenter Ethernet Switch
+device: All
+
+device-family: Linksys 2048
+device: All
+
+#
 # Enterasys
+#
 device-vendor: Enterasys Networks
 arpnip: yes
 macsuck: yes
@@ -411,14 +450,15 @@ class: Layer3::Enterasys
 
 device-family: SuperStack C-Series
 
-device: C3G124-24, C3G124-48
-device: C2G124-24, C2G124-48
+device: C3G124-24, C3G124-48, C2G124-24, C2G124-48
 
 device-family: Matrix
 
 device: Matrix N-Series DFE
 
+#
 # Extreme
+#
 device-vendor: Extreme Networks
 arpnip: yes
 macsuck: yes
@@ -433,9 +473,10 @@ device-family: Alpine and Summit
 device: Alpine 3808
 device: Summit 7i, 48si
 
+#
 # Foundry
+#
 device-vendor: Foundry Networks
-note: CDP --> FDP.
 vlan: yes
 modules: no
 
@@ -467,9 +508,12 @@ device: FWSX424
 device: ServerIronGT
 device: FLS624, FLS648
 
+#
 # HP
+#
 device-vendor: HP
 class:  Layer2::HP
+note: HP Devices are very widely supported.
 ver: 2
 modules: yes
 
@@ -479,40 +523,75 @@ macsuck: yes
 arpnip: no
 cdp: yes
 vlan: write
-note: CDP only available with newer ROM versions. 
+note: CDP and LLDP support are very firmware version dependent
+note: This list hasn't been updated since 2003
 
-device: 2512
+device: 2512, 2524
 ver: 1
 
-device: 2524
-ver: 1
-
-device: 4000
-note: duplex issues?
-
-device: 4104GL
+device: 4000,4104GL
 duplex: link
+note: duplex issues?
 
 device: 4108GL,8000,2626,2650,8000
 note: VLAN info in Q-BRIDGE-MIB
 
+#
 # Juniper
+#
 device-vendor: Juniper
 arpnip: yes
 
 device-family: M-series router
 class: Layer3::Juniper
-device: M-series router
+device: All
 
 device-family: NetScreen
 class: Layer3::Netscreen
-device:  Netscreen
+device: All
 
+#
+# Linksys
+#
+device-vendor: Linksys
+device-family: Generic L2 Device
+class: Layer2
+device: Some
+
+device-family: Generic L3 Device
+class: Layer3
+device: Some
+
+device-family: 2048
+class: Layer3::Dell
+device: All
+
+
+#
+# Microsoft
+#
+device-vendor: Microsoft
+device-family: Windows
+class: Layer3::Microsoft
+device: Windows Router
+
+#
+# Netgear
+#
+device-vendor: NetGear
+device-family: Switches
+class: Layer2::Netgear
+device: All
+
+#
 # NetScreen
+#
 device-vendor: NetScreen
 note: See Juniper
 
+#
 # Net-SNMP
+#
 device-vendor: Net-SNMP
 class: Layer3
 ver: 2
@@ -524,11 +603,13 @@ device:  Linux routers
 device-family: BSD
 device:  BSD routers
 
+#
 # NORTEL
+#
 device-vendor: Nortel
 macsuck: yes
 cdp: proprietary
-note: CDP --> SONMP.
+note: SONMP Discovery Protocol Supported
 
 device-family: BayStack Hub
 duplex: both
@@ -549,23 +630,13 @@ vlan: write
 modules: yes
 class: Layer2::Baystack
 
-device: 303,304
-
-device: 350
-
-device: 380
-
-device: 410
-
-device: 420,425
+device: 303, 304, 350, 380, 410, 420, 425, 460, 470
 
 device: 450
 note: !Some versions > 4.X in stacked configuration have SNMP timeout issues. 
 note: Labels full duplex as 20Mbit connection.
 
-device: 460,470
-
-device: BPS
+device: Business Policy Switch (BPS)
 
 device-family: Ethernet Routing Switch/Baystack Switch
 arpnip: yes
@@ -597,13 +668,8 @@ vlan: yes
 class: Layer2::Centillion
 note: !Must be on version 4.x or 5.x (VLAN based) software.
 
-device: 5000BH
-
-device: 5005BH
-
-device: C100
-
-device: C50
+device: 5000BH, 5005BH
+device: C50,C100
 
 device-family: AP222x
 duplex: both
@@ -671,11 +737,7 @@ class: Layer3::Passport
 note: !8600 Code versions < 3.2 vlan based mac-suck and are unsupported.  Upgrade code.
 note: !8600 3.2 code versions < 3.2.2.2 have Bridge MIB loop.  Upgrade code.
 
-device: 8603,8606,8610
-
-device: 8610co
-
-device: 8106,8110
+device: 8603,8606,8610, 8610co, 8106, 8110
 
 device: 1050,1100,1150,1200
 
@@ -726,7 +788,9 @@ note: Uses proprietary MIBs to provide MAC to port mapping.  APs appear as switc
 
 device: 2270
 
+#
 # Proxim
+#
 device-vendor: Proxim
 macsuck: yes
 duplex: no
@@ -739,7 +803,9 @@ device: AP-1000,AP-2000,AP-4000
 
 device: WavePOINT-II
 
+#
 # Sun
+#
 device-vendor: Sun
 class: Layer3::Sun
 
@@ -747,11 +813,15 @@ device-family: Sun routers
 
 device: Sun routers
 
+#
 # Synoptics
+#
 device-vendor: Synoptics
 note: See Nortel
 
+#
 # Zyxel
+#
 device-vendor: Zyxel
 class: Layer2::ZyXEL_DSLAM
 note: Doesn't report sysServices (layers)

Info.pm

@@ -1,8 +1,8 @@
-# SNMP::Info - Max Baker
-# $Id$
+# SNMP::Info
 #
-# Copyright (c) 2003-2008 Max Baker
+# Copyright (c) 2003-2009 Max Baker and SNMP::Info Developers
 # All rights reserved.
+#
 # Portions Copyright (c) 2002-2003, Regents of the University of California
 # All rights reserved.
 #
@@ -20,10 +20,11 @@ use Math::BigInt;
 @SNMP::Info::EXPORT_OK = qw//;
 
 use vars
-    qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG %SPEED_MAP
+    qw/$VERSION $VERSION_CVS %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG %SPEED_MAP
     $NOSUCH $BIGINT $REPEATERS/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
+$VERSION_CVS = '$Id$';
 
 =head1 NAME
 
@@ -31,15 +32,22 @@ SNMP::Info - Object Oriented Perl5 Interface to Network devices and MIBs through
 
 =head1 VERSION
 
-SNMP::Info - Version 1.09
+SNMP::Info - Version 2.01
 
 =head1 AUTHOR
 
-SNMP::Info was created at UCSC for the netdisco project (www.netdisco.org)
-and was originally written by Max Baker.
+SNMP::Info is maintained by team of Open Source authors headed by Eric Miller
+and Bill Fenner.
 
-Currently being maintained by team of Open Source authors headed by
-Eric Miller and Bill Fenner. 
+Please visit L<http://sourceforge.net/projects/snmp-info/> for most up-to-date
+list of developers.
+
+SNMP::Info was originally created at UCSC for the Netdisco project L<http://netdisco.org>
+by Max Baker.
+
+=head1 DEVICES SUPPORTED
+
+See L<http://netdisco.org/doc/DeviceMatrix.html> or L<DeviceMatrix.txt> for more details.
 
 =head1 SYNOPSIS
 
@@ -107,9 +115,6 @@ Mailing List at <http://lists.sourceforge.net/lists/listinfo/snmp-info-users>.
 SNMP::Info gives an object oriented interface to information obtained through
 SNMP.
 
-This module lives at http://snmp-info.sourceforge.net  Check for newest
-version and documentation.
-
 This module is geared towards network devices.  Subclasses exist for a number
 of network devices and common MIBs. 
 
@@ -150,12 +155,9 @@ distribution.
 
 Net-SNMP can be found at http://net-snmp.sourceforge.net
 
-Version 5.1.2 or greater is recommended.
+Version 5.3.2 or greater is recommended.
 
-Various version 4's and 5.0 and 5.1 series will work. 5.0.1 is kinda flaky
-on the Perl side.
-
-Versions 5.0301 and 5.0203 have issues with bulkwalk, turn off bulkwalk.
+Versions 5.0.1, 5.0301 and 5.0203 have issues with bulkwalk and are not supported.
 
 B<Redhat Users>: Some versions that come with certain versions of
 Redhat/Fedora don't have the Perl library installed.  Uninstall the RPM and
@@ -166,9 +168,7 @@ install by hand.
 SNMP::Info operates on textual descriptors found in MIBs.
 
 If you are using SNMP::Info separate from Netdisco, 
-download the Netdisco MIB package at
-
- http://sourceforge.net/project/showfiles.php?group_id=80033&package_id=135517
+download the Netdisco MIB package at L<http://sourceforge.net/project/showfiles.php?group_id=80033&package_id=135517>
 
 Make sure that your snmp.conf is updated to point to your MIB directory
 and that the MIBs are world-readable.
@@ -267,6 +267,12 @@ F<CISCO-PORT-SECURITY-MIB> and F<CISCO-PAE-MIB>.
 
 See documentation in L<SNMP::Info::CiscoPortSecurity> for details.
 
+=item SNMP::Info::CiscoPower
+
+F<CISCO-POWER-ETHERNET-EXT-MIB>.
+
+See documentation in L<SNMP::Info::CiscoPower> for details.
+
 =item SNMP::Info::CiscoQOS
 
 F<CISCO-CLASS-BASED-QOS-MIB>. A collection of OIDs providing information about
@@ -287,6 +293,12 @@ F<CISCO-STACK-MIB>.
 
 See documentation in L<SNMP::Info::CiscoStack> for details.
 
+=item SNMP::Info::CiscoStpExtensions
+
+F<CISCO-STP-EXTENSIONS-MIB>
+
+See documentation in L<SNMP::Info::CiscoStpExtensions> for details.
+
 =item SNMP::Info::CiscoStats
 
 F<OLD-CISCO-CPU-MIB>, F<CISCO-PROCESS-MIB>, and F<CISCO-MEMORY-POOL-MIB>.
@@ -310,7 +322,7 @@ See documentation in L<SNMP::Info::Entity> for details.
 
 =item SNMP::Info::EtherLike
 
-F<ETHERLIKE-MIB> (RFC1398) - Some Layer3 devices implement this MIB, as well
+F<EtherLike-MIB> (RFC1398) - Some Layer3 devices implement this MIB, as well
 as some Aironet Layer 2 devices (non Cisco).
 
 See documentation in L<SNMP::Info::EtherLike> for details.
@@ -348,6 +360,12 @@ F<S5-AGENT-MIB>, F<S5-CHASSIS-MIB>.
 
 See documentation in L<SNMP::Info::NortelStack> for details.
 
+=item SNMP::Info::PowerEthernet
+
+F<POWER-ETHERNET-MIB>
+
+See documentation in L<SNMP::Info::PowerEthernet> for details.
+
 =item SNMP::Info::RapidCity
 
 F<RAPID-CITY>.  Inherited by Nortel switches for duplex and VLAN information.
@@ -523,6 +541,12 @@ Subclass for Nortel 222x series wireless access points.
 
 See documentation in L<SNMP::Info::Layer2::NAP222x> for details.
 
+=item SNMP::Info::Layer2::Netgear
+
+Subclass for Netgear switches
+
+See documentation in L<SNMP::Info::Layer2::Netgear> for details.
+
 =item SNMP::Info::Layer2::Orinoco
 
 Subclass for Orinoco/Proxim wireless access points.
@@ -556,6 +580,12 @@ Note Layer2::Aironet
 
 See documentation in L<SNMP::Info::Layer3::Aironet> for details.
 
+=item SNMP::Info::Layer3::AlcatelLucent
+
+Alcatel-Lucent OmniSwitch Class.
+
+See documentation in L<SNMP::Info::Layer3::AlcatelLucent> for details.
+
 =item SNMP::Info::Layer3::AlteonAD
 
 Subclass for Nortel Alteon Series Layer 2-7 load balancing switches
@@ -563,6 +593,14 @@ and Nortel BladeCenter Layer2-3 GbE Switch Modules.
 
 See documentation in L<SNMP::Info::Layer3::AlteonAD> for details.
 
+=item SNMP::Info::Layer3::Altiga
+
+See documentation in L<SNMP::Info::Layer3::Altiga> for details.
+
+=item SNMP::Info::Layer3::Arista
+
+See documentation in L<SNMP::Info::Layer3::Arista> for details.
+
 =item SNMP::Info::Layer3::BayRS
 
 Subclass for Nortel Multiprotocol/BayRS routers.  This includes BCN, BLN, ASN,
@@ -677,6 +715,12 @@ Subclass for Generic Sun Routers running SunOS.
 
 See documentation in L<SNMP::Info::Layer3::Sun> for details.
 
+=item SNMP::Info::Layer3::Timetra
+
+Alcatel-Lucent SR Class.
+
+See documentation in L<SNMP::Info::Layer3::Timetra> for details.
+
 =back
 
 =back
@@ -1097,68 +1141,8 @@ SNMP::Info::Layer3 subclasses.
 If the device still can be connected to via SNMP::Info, then 
 SNMP::Info is returned.  
 
-Algorithm for Subclass Detection:
-
-        Layer3 Support                     -> SNMP::Info::Layer3
-            Aironet (BR500,AP340,350,1200) -> SNMP::Info::Layer3::Aironet
-                     AP4800... All Non IOS
-            Catalyst 3550,3548,3560        -> SNMP::Info::Layer3::C3550
-            Catalyst 4000,4500             -> SNMP::Info::Layer3::C4000
-            Catalyst 6500,3750             -> SNMP::Info::Layer3::C6500
-            Cisco Generic L3 IOS device    -> SNMP::Info::Layer3::Cisco
-            Cyclades terminal server       -> SNMP::Info::Layer1::Cyclades
-            Dell PowerConnect              -> SNMP::Info::Layer3::Dell
-            D-Link                         -> SNMP::Info::Layer3::Dell
-            Enterasys                      -> SNMP::Info::Layer3::Enterasys
-            Extreme                        -> SNMP::Info::Layer3::Extreme
-            Foundry                        -> SNMP::Info::Layer3::Foundry
-            HP Procurve                    -> SNMP::Info::Layer2::HP
-            HP Procurve 9300 series        -> SNMP::Info::Layer3::HP9300
-            Juniper                        -> SNMP::Info::Layer3::Juniper
-            Microsoft                      -> SNMP::Info::Layer3::Microsoft
-            Net-SNMP                       -> SNMP::Info::Layer3::NetSNMP
-            Nortel Passport/Accelar LAN    -> SNMP::Info::Layer3::Passport
-            Nortel/Bay Baystack            -> SNMP::Info::Layer2::Baystack
-            Alteon Ace Director            -> SNMP::Info::Layer3::AlteonAD
-            Nortel Contivity               -> SNMP::Info::Layer3::Contivity
-            Nortel BayRS Router            -> SNMP::Info::Layer3::BayRS
-            Sun Router                     -> SNMP::Info::Layer3::Sun
-         Elsif Layer2 (no Layer3)          -> SNMP::Info::Layer2
-            Aironet - IOS Devices          -> SNMP::Info::Layer2::Aironet
-            Catalyst 1900                  -> SNMP::Info::Layer2::C1900
-            Catalyst 2900XL,2940,2950,
-                     3500XL                -> SNMP::Info::Layer2::C2900
-            Catalyst 2960, 2970            -> SNMP::Info::Layer3::C6500
-            Catalyst 3550/3548             -> SNMP::Info::Layer3::C3550
-            Cisco 3400 w/ MetroBase        -> SNMP::Info::Layer3::C3550
-            Catalyst WS-C 2926,5xxx        -> SNMP::Info::Layer2::Catalyst
-            Cisco (Airespace) Wireless     -> SNMP::Info::Layer2::Airespace
-            Cisco (not covered by above)   -> SNMP::Info::Layer2::Cisco
-            Cyclades terminal server       -> SNMP::Info::Layer1::Cyclades
-            Dell PowerConnect              -> SNMP::Info::Layer3::Dell
-            D-Link                         -> SNMP::Info::Layer3::Dell
-            Enterasys                      -> SNMP::Info::Layer3::Enterasys
-            Extreme                        -> SNMP::Info::Layer3::Extreme
-            Foundry                        -> SNMP::Info::Layer3::Foundry
-            HP Procurve                    -> SNMP::Info::Layer2::HP
-            HP Procurve 9300 series        -> SNMP::Info::Layer3::HP9300
-            IBM BladeCenter GbESM          -> SNMP::Info::Layer3::Dell
-            Nortel/Bay Centillion ATM      -> SNMP::Info::Layer2::Centillion
-            Nortel/Bay Baystack            -> SNMP::Info::Layer2::Baystack
-            Nortel Business Ethernet Switch-> SNMP::Info::Layer2::Baystack
-            Nortel Passport/Accelar 8100   -> SNMP::Info::Layer3::Passport
-            Nortel AP 222x                 -> SNMP::Info::Layer2::NAP222x
-            Orinco AP                      -> SNMP::Info::Layer2::Orinoco
-            Nortel 2270 WSS                -> SNMP::Info::Layer2::N2270
-        Elsif Layer1 Support               -> SNMP::Info::Layer1
-            Allied                         -> SNMP::Info::Layer1::Allied
-            Asante                         -> SNMP::Info::Layer1::Asante
-            Nortel/Bay Hub                 -> SNMP::Info::Layer1::Bayhub
-            Bay/Synoptics Hub              -> SNMP::Info::Layer1::S3000
-        Else                               -> SNMP::Info
-            ZyXEL_DSLAM                    -> SNMP::Info::Layer2::ZyXEL_DSLAM
-            Aruba wireless                 -> SNMP::Info::Layer2::Aruba
-            Juniper NetScreen              -> SNMP::Info::Layer3::Netscreen
+See L<http://netdisco.org/doc/DeviceMatrix.html> or L<DeviceMatrix.txt> for more details
+about device support, or view C<device_type()> in F<Info.pm>.
 
 =cut
 
@@ -1176,10 +1160,6 @@ sub device_type {
     $desc =~ s/[\r\n\l]+/ /g;
     my $id = $info->id() || 'undef';
 
-    $info->debug()
-        and print
-        "SNMP::Info::device_type() layers:$layers id:$id sysDescr:\"$desc\"\n";
-
     # Hash for generic fallback to a device class if unable to determine using
     # the sysDescr regex.
     my %l3sysoidmap = (
@@ -1196,8 +1176,12 @@ sub device_type {
         2272 => 'SNMP::Info::Layer3::Passport',
         2636 => 'SNMP::Info::Layer3::Juniper',
         2925 => 'SNMP::Info::Layer1::Cyclades',
+        3076 => 'SNMP::Info::Layer3::Altiga',
         5624 => 'SNMP::Info::Layer3::Enterasys',
+        6486 => 'SNMP::Info::Layer3::AlcatelLucent',
+        6527 => 'SNMP::Info::Layer3::Timetra',
         8072 => 'SNMP::Info::Layer3::NetSNMP',
+        30065 => 'SNMP::Info::Layer3::Arista',
     );
 
     my %l2sysoidmap = (
@@ -1219,6 +1203,11 @@ sub device_type {
     # Get just the enterprise number for generic mapping
     $id = $1 if ( defined($id) && $id =~ /^\.1\.3\.6\.1\.4\.1\.(\d+)/ );
 
+    if ($info->debug()) {
+        print "SNMP::Info $VERSION ($VERSION_CVS)\n";
+        print "SNMP::Info::device_type() layers:$layers id:$id sysDescr:\"$desc\"\n";
+    }
+
     # Layer 3 Supported
     #   (usually has layer2 as well, so we check for 3 first)
     if ( $info->has_layer(3) ) {
@@ -1244,7 +1233,7 @@ sub device_type {
         $objtype = 'SNMP::Info::Layer3::C6500'
             if ( $desc =~ /cisco/i and $desc =~ /3750/ );
         $objtype = 'SNMP::Info::Layer3::C6500'
-            if $desc =~ /(s72033_rp|s3223_rp|s222_rp)/;
+            if $desc =~ /(s72033_rp|s3223_rp|s32p3_rp|s222_rp)/;
 
         # HP, Foundry OEM
         $objtype = 'SNMP::Info::Layer3::HP9300'
@@ -1266,7 +1255,7 @@ sub device_type {
         # Nortel Contivity
         $objtype = 'SNMP::Info::Layer3::Contivity' if $desc =~ /\bCES\b/;
 
-    # Allied Telesyn Layer2 managed switches. They report they have L3 support
+        # Allied Telesyn Layer2 managed switches. They report they have L3 support
         $objtype = 'SNMP::Info::Layer2::Allied'
             if ( $desc =~ /Allied.*AT-80\d{2}\S*/i );
 
@@ -1293,7 +1282,7 @@ sub device_type {
 
         #   Catalyst 2900 and 3500XL (IOS) series override
         $objtype = 'SNMP::Info::Layer2::C2900'
-            if ( $desc =~ /(C2900XL|C2950|C3500XL|C2940|CGESM)/i );
+            if ( $desc =~ /(C2900XL|C2950|C3500XL|C2940|CGESM|CIGESM)/i );
 
         #   Catalyst WS-C series override 2926,4k,5k,6k in Hybrid
         $objtype = 'SNMP::Info::Layer2::Catalyst' if ( $desc =~ /WS-C\d{4}/ );
@@ -1341,7 +1330,7 @@ sub device_type {
         $objtype = 'SNMP::Info::Layer2::NAP222x'
             if ( $desc =~ /Access\s+Point\s+222/ );
 
-        #  Orinco
+        #  Orinoco
         $objtype = 'SNMP::Info::Layer2::Orinoco'
             if ( $desc =~ /(AP-\d{3}|WavePOINT)/ );
 
@@ -1354,6 +1343,10 @@ sub device_type {
         $objtype = 'SNMP::Info::Layer3::Aironet'
             if ( $desc =~ /Cisco/ and $desc =~ /\D(BR500)\D/ );
 
+        # Airespace (WLC) Module
+        $objtype = 'SNMP::Info::Layer2::Airespace'
+            if ( $desc =~ /Cisco Controller/ );
+
         #Nortel 2270
         $objtype = 'SNMP::Info::Layer2::N2270'
             if (
@@ -1381,8 +1374,8 @@ sub device_type {
         $objtype = 'SNMP::Info::Layer1::Bayhub'
             if ( $desc =~ /\bBay\s*Stack.*Hub/i );
 
-#  Synoptics Hub
-#  This will override Bay Hub only for specific devices supported by this class
+        #  Synoptics Hub
+        #  This will override Bay Hub only for specific devices supported by this class
         $objtype = 'SNMP::Info::Layer1::S3000'
             if ( $desc =~ /\bNMM\s+(281|3000|3030)/i );
 
@@ -1396,6 +1389,10 @@ sub device_type {
         $objtype = 'SNMP::Info::Layer2::Aruba'
             if ( $desc =~ /(ArubaOS|AirOS)/ );
 
+        # Alcatel-Lucent branded Aruba
+        $objtype = 'SNMP::Info::Layer2::Aruba'
+            if ( $desc =~ /^AOS-W/ );
+
         #Juniper NetScreen
         $objtype = 'SNMP::Info::Layer3::Netscreen'
             if ( $desc =~ /NetScreen/i );
@@ -1407,6 +1404,11 @@ sub device_type {
         # Cisco ASA
         $objtype = 'SNMP::Info::Layer3::Cisco'
             if ( $desc =~ /Cisco Adaptive Security Appliance/i );
+
+        # Cisco FWSM
+        $objtype = 'SNMP::Info::Layer3::Cisco'
+            if ( $desc =~ /Cisco Firewall Services Module/i );
+
     }
 
     return $objtype;
@@ -2669,10 +2671,9 @@ sub munge_counter64 {
 
 =item munge_i_up
 
-There is a collision between data in C<IF-MIB> and C<RFC-1213>. 
-For devices that fully implement C<IF-MIB> it might return 7 for 
-a port that is down.  This munges the data against the C<IF-MIB> 
-by hand.
+Net-SNMP tends to load C<RFC1213-MIB> first, and so ignores the
+updated enumeration for C<ifOperStatus> in C<IF-MIB>.  This munge
+handles the "newer" definitions for the enumeration in IF-MIB.
 
 TODO: Get the precedence of MIBs and overriding of MIB data in Net-SNMP
 figured out.  Heirarchy/precendence of MIBS in SNMP::Info.
@@ -2683,9 +2684,11 @@ sub munge_i_up {
     my $i_up = shift;
     return unless defined $i_up;
 
-    $i_up = 'down' if $i_up eq '7';
-
-    return $i_up;
+    my %ifOperStatusMap = ( '4' => 'unknown',
+                            '5' => 'dormant',
+                            '6' => 'notPresent',
+                            '7' => 'lowerLayerDown' );
+    return $ifOperStatusMap{$i_up} || $i_up;
 }
 
 =item munge_port_list
@@ -3652,7 +3655,8 @@ sub AUTOLOAD {
 =head1 COPYRIGHT AND LICENSE
 
 Changes from SNMP::Info Version 0.7 and on are:
-Copyright (c) 2003-2008 Max Baker - All rights reserved.
+Copyright (c) 2003-2009 Max Baker and SNMP::Info Developers
+All rights reserved.
 
 Original Code is:
 Copyright (c) 2002-2003, Regents of the University of California

Info/Airespace.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::MIBS,

Info/Bridge.pm

@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     'BRIDGE-MIB'   => 'dot1dBaseBridgeAddress',
@@ -55,9 +55,11 @@ $VERSION = '1.09';
     'b_type'  => 'dot1dBaseType',
 
     # Spanning Tree Protocol
-    'stp_ver'  => 'dot1dStpProtocolSpecification',
-    'stp_time' => 'dot1dStpTimeSinceTopologyChange',
-    'stp_root' => 'dot1dStpDesignatedRoot',
+    'stp_ver'       => 'dot1dStpProtocolSpecification',
+    'stp_time'      => 'dot1dStpTimeSinceTopologyChange',
+    'stp_root'      => 'dot1dStpDesignatedRoot',
+    'stp_root_port' => 'dot1dStpRootPort',
+    'stp_priority'  => 'dot1dStpPriority',
 
     # Q-BRIDGE-MIB
     'qb_vlans_max'       => 'dot1qMaxSupportedVlans',
@@ -103,6 +105,7 @@ $VERSION = '1.09';
 
     # Q-BRIDGE-MIB : dot1qVlanStaticTable
     'v_name'           => 'dot1qVlanStaticName',
+    'qb_v_name'        => 'dot1qVlanStaticName',
     'qb_v_egress'      => 'dot1qVlanStaticEgressPorts',
     'qb_v_fbdn_egress' => 'dot1qVlanForbiddenEgressPorts',
     'qb_v_untagged'    => 'dot1qVlanStaticUntaggedPorts',

Info/CDP.pm

@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 # Five data structures required by SNMP::Info
 %MIBS = ( 'CISCO-CDP-MIB' => 'cdpGlobalRun' );

Info/CiscoConfig.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     'CISCO-CONFIG-COPY-MIB' => 'ccCopyTable',

Info/CiscoImage.pm

@@ -38,7 +38,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = ( 'CISCO-IMAGE-MIB' => 'ciscoImageString', );
 

Info/CiscoPortSecurity.pm

@@ -38,7 +38,7 @@ use Exporter;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PAECAPABILITIES/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     'CISCO-PORT-SECURITY-MIB' => 'ciscoPortSecurityMIB',

Info/CiscoPower.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = ( 'CISCO-POWER-ETHERNET-EXT-MIB' => 'cpeExtPsePortEntPhyIndex' );
 

Info/CiscoQOS.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = ( 'CISCO-CLASS-BASED-QOS-MIB' => 'cbQosIfIndex', );
 

Info/CiscoRTT.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = ( 'CISCO-RTTMON-MIB' => 'rttMonCtrlAdminOwner', );
 

Info/CiscoStack.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = ( 'CISCO-STACK-MIB' => 'ciscoStackMIB', );
 
@@ -214,7 +214,7 @@ sub i_speed_admin {
     my $partial = shift;
 
     my %i_speed_admin;
-    my $p_port  = $stack->p_port();
+    my $p_port  = $stack->p_port() || {};
     my %mapping = reverse %$p_port;
     my $p_speed = $stack->p_speed( $mapping{$partial} );
 

Info/CiscoStats.pm

@@ -1,7 +1,7 @@
 # SNMP::Info::CiscoStats
 # $Id$
 #
-# Changes since Version 0.7 Copyright (c) 2008 Max Baker
+# Changes since Version 0.7 Copyright (c) 2008-2009 Max Baker and SNMP::Info Developers
 # All rights reserved.
 #
 # Copyright (c) 2003 Regents of the University of California
@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     'SNMPv2-MIB'            => 'sysDescr',
@@ -50,6 +50,7 @@ $VERSION = '1.09';
     'CISCO-MEMORY-POOL-MIB' => 'ciscoMemoryPoolUsed',
     'OLD-CISCO-SYSTEM-MIB'  => 'writeMem',
     'CISCO-PRODUCTS-MIB'    => 'sysName',
+    'ENTITY-MIB'            => 'entPhysicalSoftwareRev',
 
     # some older catalysts live here
     'CISCO-STACK-MIB'                 => 'wsc1900sysID',
@@ -59,6 +60,7 @@ $VERSION = '1.09';
 
 %GLOBALS = (
     'description' => 'sysDescr',
+    'ent_physical_software_rev' => 'entPhysicalSoftwareRev.1',
 
     # We will use the numeric OID's so that we don't require people
     # to install v1 MIBs, which can conflict.
@@ -88,6 +90,10 @@ $VERSION = '1.09';
 
 %MUNGE = ();
 
+sub vendor {
+    return 'cisco';
+}
+
 sub os {
     my $l2 = shift;
     my $descr = $l2->description() || '';
@@ -96,6 +102,35 @@ sub os {
     # in their description field.
     return 'ios'      if ( $descr =~ /IOS/ );
     return 'catalyst' if ( $descr =~ /catalyst/i );
+    return 'css'      if ( $descr =~ /Content Switch SW/ );
+    return 'css-sca'  if ( $descr =~ /Cisco Systems Inc CSS-SCA-/ );
+    return 'pix'      if ( $descr =~ /Cisco PIX Security Appliance/ );
+    return 'asa'      if ( $descr =~ /Cisco Adaptive Security Appliance/ );
+
+    if ( $descr =~ /Application Control Engine Service Module/ ) {
+        # Only the admin context implements the entity MIB
+        return 'ace-admin' if defined $l2->ent_physical_software_rev();
+        return 'ace-context';
+    }
+
+    # Pre-version 3 FWSMs
+    return 'fwsm'     if ( $descr =~ /Cisco Secure FWSM Firewall/ );
+
+    # Version 3+ FWSMs (currently untested against version 4)
+    if ( $descr =~ /Firewall Services Module/ ) {
+
+        my $model = $l2->model();
+
+        if ( defined $model && $model eq "WsSvcFwm1sc" ) {
+            # Only the admin context implements the entity MIB
+            return 'fwsm-admin' if defined $l2->ent_physical_software_rev();
+            return 'fwsm-context';
+        }
+
+        # Non context mode FWSM
+        return 'fwsm';
+    }
+
     return;
 }
 
@@ -113,12 +148,60 @@ sub os_ver {
         return $1;
     }
 
+    if ( defined $os
+        and $os eq 'css'
+        and defined $descr
+        and $descr =~ m/Content Switch SW Version ([0-9\.\(\)]+) with SNMPv1\/v2c Agent/ )
+    {
+        return $1;
+    }
+
+    if ( defined $os
+        and $os eq 'css-sca'
+        and defined $descr
+        and $descr =~ m/Cisco Systems Inc CSS-SCA-2FE-K9, ([0-9\.\(\)]+) Release / )
+    {
+        return $1;
+    }
+
+    if ( defined $os
+        and $os eq 'pix'
+        and defined $descr
+        and $descr =~ m/Cisco PIX Security Appliance Version ([0-9\.\(\)]+)/ )
+    {
+        return $1;
+    }
+
+    if ( defined $os
+        and $os eq 'asa'
+        and defined $descr
+        and $descr =~ m/Cisco Adaptive Security Appliance Version ([0-9\.\(\)]+)/ )
+    {
+        return $1;
+    }
+
+    if ( defined $os
+        and $os =~ /^ace/ )
+    {
+        return $l2->ent_physical_software_rev();
+    }
+
+    if ( defined $os
+        and $os =~ /^fwsm/
+        and defined $descr
+        and $descr =~ m/Version (\d+\.\d+(\(\d+\)){0,1})/ )
+    {
+        return $1;
+    }
+
+
     # Newer Catalysts and IOS devices
     if ( defined $descr
         and $descr =~ m/Version (\d+\.\d+\([^)]+\)[^,\s]*)(,|\s)+/ )
     {
         return $1;
     }
+
     return;
 }
 
@@ -214,7 +297,7 @@ Devices
 
 =head1 AUTHOR
 
-Max Baker
+Eric Miller, Max Baker, Sam Stickland
 
 =head1 SYNOPSIS
 
@@ -263,6 +346,8 @@ None.
 
 =item F<CISCO-FLASH-MIB>
 
+=item F<ENTITY-MIB>
+
 =back
 
 MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
@@ -291,6 +376,53 @@ Returns mem_free() + mem_used()
 
 Tries to parse if device is running IOS or CatOS from description()
 
+=item $ciscostats->vendor()
+
+ 'cisco'
+
+Available values :
+
+=over
+
+=item pix
+
+Cisco PIX
+
+=item asa
+
+Cisco ASA
+
+=item fwsm
+
+Single-mode FWSM
+
+=item fwsm-admin
+
+Admin context of multi-context FWSM
+
+=item fwsm-context
+
+Standard context of multi-context FWSM
+
+=item ace-admin
+
+Admin context of ACE module
+
+=item ace-context
+
+Standard context of ACE module (NB: No OS version detection
+is available, but will be the same as it's 'ace admin')
+
+=item css
+
+Cisco Content Switch
+
+=item css-sca
+
+Cisco Content Switch Secure Content Acceleration
+
+=back
+
 =item $ciscostats->os_ver()
 
 Tries to parse device operating system version from description()

Info/CiscoStpExtensions.pm

@@ -0,0 +1,353 @@
+# SNMP::Info::CiscoStpExtensions
+#
+# Copyright (c)2009 Carlos Vicente
+# All rights reserved.  
+#
+# Redistribution and use in source and binary forms, with or without 
+# modification, are permitted provided that the following conditions are met:
+# 
+#     * Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright notice,
+#       this list of conditions and the following disclaimer in the documentation
+#       and/or other materials provided with the distribution.
+#     * Neither the name of the author nor the 
+#       names of its contributors may be used to endorse or promote products 
+#       derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package SNMP::Info::CiscoStpExtensions;
+
+use strict;
+
+use Exporter;
+use SNMP::Info;
+use SNMP::Info::Bridge;
+
+use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT $INIT/;
+$VERSION = '2.01';
+@SNMP::Info::CiscoStpExtensions::ISA = qw/SNMP::Info::Bridge SNMP::Info Exporter/;
+@SNMP::Info::CiscoStpExtensions::EXPORT_OK = qw//;
+
+%MIBS    = (
+            %SNMP::Info::Bridge::MIBS,
+            'CISCO-STP-EXTENSIONS-MIB' => 'stpxSpanningTreeType',
+           );
+
+%GLOBALS = (
+            %SNMP::Info::Bridge::GLOBALS,
+            'stpx_mst_config_digest' => 'stpxSMSTConfigDigest',
+            'stpx_mst_region_name'   => 'stpxMSTRegionName',
+            'stpx_mst_region_rev'    => 'stpxSMSTRegionRevision',
+            'stpx_stp_type'          => 'stpxSpanningTreeType',
+            'stpx_bpduguard_enable'  => 'stpxFastStartBpduGuardEnable',
+            'stpx_bpdufilter_enable' => 'stpxFastStartBpduFilterEnable',
+           );
+
+%FUNCS   = (
+            %SNMP::Info::Bridge::FUNCS,
+            'stpx_rootguard_enabled'      => 'stpxRootGuardConfigEnabled',
+            'stpx_loopguard_enabled'      => 'stpxLoopGuardConfigEnabled',
+            'stpx_port_bpduguard_mode'    => 'stpxFastStartPortBpduGuardMode',
+            'stpx_port_bpdufilter_mode'   => 'stpxFastStartPortBpduFilterMode',
+            'stpx_smst_root'              => 'stpxSMSTInstanceCISTRegionalRoot',
+            'stpx_smst_vlans_mapped_1k2k' => 'stpxSMSTInstanceVlansMapped1k2k',
+            'stpx_smst_vlans_mapped_3k4k' => 'stpxSMSTInstanceVlansMapped3k4k',
+           );
+
+%MUNGE   = (
+            %SNMP::Info::Bridge::MUNGE,
+           'stpx_mst_config_digest'     => \&SNMP::Info::CiscoStpExtensions::oct2str,
+           );
+
+
+# Report version of STP via standard method
+sub stp_ver {
+     my $self = shift;
+     my $stp_ver = $self->SUPER::stp_ver();
+     if ( $stp_ver eq 'unknown' ){
+         if ( defined $self->stpx_stp_type() ){
+             $stp_ver = $self->stpx_stp_type();
+         }
+     }
+     return $stp_ver;
+}
+
+sub mst_config_digest {
+    my $self = shift;
+    return $self->stpx_mst_config_digest;
+}
+
+sub mst_region_name {
+    my $self = shift;
+    return $self->stpx_mst_region_name;
+}
+
+sub mst_region_rev {
+    my $self = shift;
+    return $self->stpx_mst_region_rev;
+}
+
+
+sub mst_vlan2instance {
+    my $self = shift;
+    
+    # Get MST vlan-to-instance mapping
+    my $m1k2k = $self->stpx_smst_vlans_mapped_1k2k;
+    my $m3k4k = $self->stpx_smst_vlans_mapped_3k4k;
+   
+    # Get list of VLANs
+    my $vlan_membership = $self->i_vlan_membership;
+    my @vlans;
+    foreach my $iid ( keys %$vlan_membership ){
+        if ( my $vm = $vlan_membership->{$iid} ){
+            foreach my $vid ( @$vm ){
+                push @vlans, $vid;
+            }
+        }
+    }
+    my %res;
+    foreach my $vlan ( @vlans ){
+        if ( $vlan < 2048 ){
+            foreach my $inst ( keys %$m1k2k ){
+                my $list = $m1k2k->{$inst};
+                my $vlanlist = [split(//, unpack("B*", $list))];
+                if ( @$vlanlist[$vlan] ){
+                    $res{$vlan} = $inst;
+                    last;
+                }
+            }
+        }else{
+            foreach my $inst ( keys %$m3k4k ){
+                my $list = $m3k4k->{$inst};
+                my $vlanlist = [split(//, unpack("B*", $list))];
+                if ( @$vlanlist[$vlan-2048] ){
+                    $res{$vlan} = $inst;
+                    last;
+                }
+            }       
+        }
+    }
+    return \%res;
+}
+
+sub i_rootguard_enabled {
+    my $self    = shift;
+    my $partial = shift;
+
+    my $rg_enabled = $self->stpx_rootguard_enabled();
+    my $bp_index   = $self->bp_index($partial);
+
+    my %res;
+    foreach my $index ( keys %$rg_enabled ){
+        my $enabled = $rg_enabled->{$index};
+        my $iid     = $bp_index->{$index};
+        next unless defined $iid;
+        next unless defined $enabled;
+        $res{$iid} = $enabled;
+    }
+    return \%res;
+}  
+
+sub i_loopguard_enabled {
+    my $self    = shift;
+    my $partial = shift;
+
+    my $lg_enabled = $self->stpx_loopguard_enabled();
+    my $bp_index   = $self->bp_index($partial);
+
+    my %res;
+    foreach my $index ( keys %$lg_enabled ){
+        my $enabled = $lg_enabled->{$index};
+        my $iid     = $bp_index->{$index};
+        next unless defined $iid;
+        next unless defined $enabled;
+        $res{$iid} = $enabled;
+    }
+    return \%res;
+}  
+
+sub i_bpduguard_enabled {
+    my $self    = shift;
+    my $partial = shift;
+
+    my $bpdugm_default = $self->stpx_bpduguard_enable();
+    my $bp_index       = $self->bp_index($partial);
+    my $bpdugm         = $self->stpx_port_bpduguard_mode();
+    
+    my %res;
+    foreach my $index ( keys %$bpdugm ){
+        my $mode = $bpdugm->{$index};
+        my $iid  = $bp_index->{$index};
+        next unless defined $iid;
+        next unless defined $mode;
+        if ( $mode eq 'default' ){
+            $res{$iid} =  $bpdugm_default;
+        }else{
+            $res{$iid} = $mode;
+        }
+    }
+    return \%res;
+}
+
+sub i_bpdufilter_enabled {
+    my $self    = shift;
+    my $partial = shift;
+
+    my $bpdufm_default = $self->stpx_bpdufilter_enable();
+    my $bp_index       = $self->bp_index($partial);
+    my $bpdufm         = $self->stpx_port_bpdufilter_mode();
+    
+    my %res;
+    foreach my $index ( keys %$bpdufm ){
+        my $mode = $bpdufm->{$index};
+        my $iid  = $bp_index->{$index};
+        next unless defined $iid;
+        next unless defined $mode;
+        if ( $mode eq 'default' ){
+            $res{$iid} =  $bpdufm_default;
+        }else{
+            $res{$iid} = $mode;
+        }
+    }
+    return \%res;
+}
+
+
+sub oct2str {
+    my ($v) = @_;
+    return sprintf('%s', unpack('H*', $v));
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::CiscoStpExtensions - SNMP Interface to C<CISCO-STP-EXTENSIONS-MIB>
+
+=head1 AUTHOR
+
+Carlos Vicente
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+Create or use a subclass of SNMP::Info that inherits this class.  Do not use
+directly.
+
+For debugging you can call new() directly as you would in SNMP::Info 
+
+ my $stpx = new SNMP::Info::CiscoStpExtensions(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info 
+
+=item SNMP::Info::Bridge 
+
+=back
+
+MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
+
+=head1 GLOBAL METHODS
+
+These are methods that return scalar values from SNMP
+
+=over
+
+=item $stpx->stp_ver()
+
+Returns the particular STP version running on this device.  
+Meant to override SNMP::Info::Brigde::stp_ver()
+
+Values: C<pvstPlus>, C<mistp>, C<mistpPvstPlus>, C<mst>, C<rapidPvstPlus>
+
+(C<stpxSpanningTreeType>)
+
+=back
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=over
+
+=item $stpx->mst_config_digest()
+
+Returns the Multiple Spanning Tree (MST) configuration digest 
+
+(C<stpxSMSTConfigDigest>)
+
+=item $stpx->mst_region_name()
+
+Returns the Multiple Spanning Tree (MST) region name 
+
+(C<stpxMSTRegionName>)
+
+=item $stpx->mst_region_rev()
+
+Returns the Multiple Spanning Tree (MST) region name 
+
+(C<stpxSMSTRegionRevision>)
+
+=item $stpx->mst_vlan2instance()
+
+Returns the mapping of vlan to MST instance in the form of a hash reference 
+with key = VLAN id, value = STP instance
+
+=item $stpx->i_rootguard_enabled()
+
+Returns 1 or 0 depending on whether C<RootGuard> is enabled on a given port.
+Format is a hash reference with key = C<ifIndex>, value = [1|0]
+
+(C<stpxRootGuardConfigEnabled>)
+
+=item $stpx->i_loopguard_enabled()
+
+Returns 1 or 0 depending on whether C<LoopGuard> is enabled on a given port.
+Format is a hash reference with key = C<ifIndex>, value = [1|0]
+
+(C<stpxLoopGuardConfigEnabled>)
+
+=item $stpx->i_bpduguard_enabled()
+
+Returns 1 or 0 depending on whether C<BpduGuard> is enabled on a given port.
+Format is a hash reference with key = C<ifIndex>, value = [1|0]
+
+(C<stpxFastStartPortBpduGuardMode>)
+
+=item $stpx->i_bpdufilter_enabled()
+
+Returns 1 or 0 depending on whether C<BpduFilter> is enabled on a given port.
+Format is a hash reference with key = C<ifIndex>, value = [1|0]
+
+(C<stpxFastStartBpduFilterEnable>)
+
+=back
+
+=head1 MUNGES
+
+=over
+
+=item oct2str()
+
+Unpacks H* into a string
+
+=back
+
+=cut

Info/CiscoVTP.pm

@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     'CISCO-VTP-MIB'                       => 'vtpVlanName',

Info/Entity.pm

@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = ( 'ENTITY-MIB' => 'entPhysicalSerialNum' );
 

Info/EtherLike.pm

@@ -41,9 +41,9 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
-%MIBS = ( 'ETHERLIKE-MIB' => 'etherMIB' );
+%MIBS = ( 'EtherLike-MIB' => 'etherMIB' );
 
 %GLOBALS = ();
 

Info/FDP.pm

@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = ( 'FOUNDRY-SN-SWITCH-GROUP-MIB' => 'snFdpGlobalRun' );
 

Info/IEEE802dot11.pm

@@ -38,7 +38,7 @@ use Exporter;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = ( 'IEEE802dot11-MIB' => 'dot11DesiredSSID', );
 

Info/LLDP.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     'LLDP-MIB'          => 'lldpLocSysCapEnabled',
@@ -191,7 +191,13 @@ sub lldp_id {
         # May need to format other types in the future
         if ( $type =~ /mac/ ) {
             $id = join( ':', map { sprintf "%02x", $_ } unpack( 'C*', $id ) );
-        }
+        }elsif ($type eq 'networkAddress'){
+ 	    if ( length(unpack('H*', $id)) == 10 ){
+ 		# IP address (first octet is sign, I guess)
+ 		my @octets = (map { sprintf "%02x",$_ } unpack('C*', $id))[1..4];
+ 		$id = join '.', map { hex($_) } @octets;
+ 	    }
+	}
         $lldp_id{$key} = $id;
     }
     return \%lldp_id;

Info/Layer1.pm

@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = ( %SNMP::Info::MIBS, 'SNMP-REPEATER-MIB' => 'rptrPortGroupIndex' );
 

Info/Layer1/Allied.pm

@@ -41,7 +41,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, 'root_ip' => 'actualIPAddr', );

Info/Layer1/Asante.pm

@@ -41,7 +41,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, );

Info/Layer1/Bayhub.pm

@@ -42,7 +42,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,
@@ -284,7 +284,7 @@ sub set_i_up_admin {
     my $bayhub = shift;
     my ( $setting, $iid ) = @_;
 
-    my $i_index         = $bayhub->i_index();
+    my $i_index = $bayhub->i_index() || {};
     my %reverse_i_index = reverse %$i_index;
 
     $setting = lc($setting);

Info/Layer1/Cyclades.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer1::MIBS,

Info/Layer1/S3000.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,

Info/Layer2.pm

@@ -45,7 +45,7 @@ use SNMP::Info::PowerEthernet;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::MIBS,         %SNMP::Info::Bridge::MIBS,

Info/Layer2/Airespace.pm

@@ -41,7 +41,7 @@ use SNMP::Info::Airespace;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::MIBS,      %SNMP::Info::Bridge::MIBS,

Info/Layer2/Aironet.pm

@@ -1,7 +1,7 @@
 # SNMP::Info::Layer2::Aironet
 # $Id$
 #
-# Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
+# Copyright (c) 2008-2009 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2003 Regents of the University of California
 # All rights reserved.
@@ -38,17 +38,18 @@ use SNMP::Info::Layer2;
 use SNMP::Info::Entity;
 use SNMP::Info::EtherLike;
 use SNMP::Info::CiscoStats;
+use SNMP::Info::CiscoConfig;
 use SNMP::Info::CDP;
 use SNMP::Info::IEEE802dot11;
 
 @SNMP::Info::Layer2::Aironet::ISA
     = qw/SNMP::Info::Layer2 SNMP::Info::Entity SNMP::Info::EtherLike
-    SNMP::Info::CiscoStats SNMP::Info::CDP Exporter/;
+    SNMP::Info::CiscoStats SNMP::Info::CiscoConfig SNMP::Info::CDP Exporter/;
 @SNMP::Info::Layer2::Aironet::EXPORT_OK = qw//;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %GLOBALS = (
     %SNMP::Info::IEEE802dot11::GLOBALS,
@@ -56,6 +57,7 @@ $VERSION = '1.09';
     %SNMP::Info::Entity::GLOBALS,
     %SNMP::Info::EtherLike::GLOBALS,
     %SNMP::Info::CiscoStats::GLOBALS,
+    %SNMP::Info::CiscoConfig::GLOBALS,
     %SNMP::Info::CDP::GLOBALS,
     'serial' => 'entPhysicalSerialNum.1',
     'descr'  => 'sysDescr'
@@ -67,11 +69,11 @@ $VERSION = '1.09';
     %SNMP::Info::Entity::FUNCS,
     %SNMP::Info::EtherLike::FUNCS,
     %SNMP::Info::CiscoStats::FUNCS,
+    %SNMP::Info::CiscoConfig::FUNCS,
     %SNMP::Info::CDP::FUNCS,
-    'i_ssidlist'       => 'cd11IfAuxSsid',
-    'i_ssidbcast'      => 'cd11IfAuxSsidBroadcastSsid',
     'i_80211channel'   => 'cd11IfPhyDsssCurrentChannel',
     'c_dot11subif'     => 'cDot11ClientSubIfIndex',
+    'cd11_rateset'     => 'cDot11ClientDataRateSet',
     'cd11_txrate'      => 'cDot11ClientCurrentTxRateSet',
     'cd11_uptime'      => 'cDot11ClientUpTime',
     'cd11_sigstrength' => 'cDot11ClientSignalStrength',
@@ -89,7 +91,7 @@ $VERSION = '1.09';
     %SNMP::Info::Entity::MIBS,
     %SNMP::Info::EtherLike::MIBS,
     %SNMP::Info::CiscoStats::MIBS,
-    %SNMP::Info::CiscoVTP::MIBS,
+    %SNMP::Info::CiscoConfig::MIBS,
     %SNMP::Info::CDP::MIBS,
     'CISCO-DOT11-IF-MIB'                  => 'cd11IfAuxSsid',
     'CISCO-DOT11-ASSOCIATION-MIB'         => 'cDot11ClientSubIfIndex',
@@ -103,8 +105,10 @@ $VERSION = '1.09';
     %SNMP::Info::Entity::MUNGE,
     %SNMP::Info::EtherLike::MUNGE,
     %SNMP::Info::CiscoStats::MUNGE,
+    %SNMP::Info::CiscoConfig::MUNGE,
     %SNMP::Info::CDP::MUNGE,
     'cd11_txrate'   => \&munge_cd11_txrate,
+    'cd11_rateset'  => \&munge_cd11_txrate,
     'mbss_mac_addr' => \&SNMP::Info::munge_mac,
 );
 
@@ -314,6 +318,19 @@ sub cd11_mac {
     return \%ret;
 }
 
+# Map VLAN N on interface I to its actual ifIndex.
+sub _vlan_map_n_stack {
+    my $aironet  = shift;
+    my $vlan_idx = $aironet->cviRoutedVlanIfIndex();
+
+    my $vlan_map = {};
+    foreach my $idx ( keys %$vlan_idx ) {
+        my ( $vlan, $num ) = split( /\./, $idx );
+        $vlan_map->{$vlan}->{$num} = $vlan_idx->{$idx};
+    }
+    return $vlan_map;
+}
+
 # When using MBSS, the ifTable reports the
 # base MAC address, but the actual association is
 # with a different MAC address for MBSS.
@@ -363,6 +380,63 @@ sub i_mac {
     return $mbss_mac;
 }
 
+sub i_ssidlist {
+    my $aironet = shift;
+
+    # no partial is possible due to the levels
+    # of indirection.
+    my $ssid_row  = $aironet->cdot11SecInterfSsidRowStatus();
+    my $ssid_vlan = $aironet->cdot11SecAuxSsidVlan();
+    if ( !defined($ssid_row) || !defined($ssid_vlan) ) {
+        return $aironet->cd11IfAuxSsid();
+    }
+    my $ssidlist     = {};
+    my $if_ssidcount = {};
+    my $vlan_map     = $aironet->_vlan_map_n_stack();
+    foreach my $idx ( keys %$ssid_row ) {
+        next unless $ssid_row->{$idx} eq 'active';
+
+        # ssid_row index is radio.ssid
+        my ( $interface, $ssid ) = split( /\./, $idx, 2 );
+        my ( $len, @ssidt ) = split( /\./, $ssid );
+        my $mappedintf = $vlan_map->{ $ssid_vlan->{$ssid} }->{$interface};
+        next unless $mappedintf;
+        if ( !$if_ssidcount->{$mappedintf} ) {
+            $if_ssidcount->{$mappedintf} = 1;
+        }
+        my $ssidlist_idx
+            = sprintf( "%s.%d", $mappedintf, $if_ssidcount->{$mappedintf} );
+        $ssidlist->{$ssidlist_idx} = pack( "C*", @ssidt );
+        $if_ssidcount->{$mappedintf}++;
+    }
+    return $ssidlist;
+}
+
+sub i_ssidbcast {
+    my $aironet    = shift;
+    my $partial    = shift;
+    my $mbss_bcast = $aironet->cdot11SecAuxSsidMbssidBroadcast();
+    if ( !defined($mbss_bcast) ) {
+        return $aironet->cd11IfAuxSsidBroadcastSsid($partial);
+    }
+    my $map = {};
+    foreach my $key ( keys %$mbss_bcast ) {
+        my (@idx) = split( /\./, $key );
+        my $len = shift(@idx);
+        $map->{ pack( "C*", @idx ) } = $mbss_bcast->{$key};
+    }
+
+    # This needs to return the same indexes as i_ssidlist.
+    # mbss_bcast maps ssid -> broadcasting
+    #  so we just replace the i_ssidlist values with the mbss_bcast ones.
+    my $i_ssidlist  = $aironet->i_ssidlist();
+    my $i_ssidbcast = {};
+    foreach my $key ( keys %$i_ssidlist ) {
+        $i_ssidbcast->{$key} = $map->{ $i_ssidlist->{$key} };
+    }
+    return $i_ssidbcast;
+}
+
 1;
 __END__
 
@@ -424,7 +498,9 @@ my $aironet = new SNMP::Info::Layer2::Aironet(...);
 
 =item SNMP::Info::EtherLike
 
-=item SNMP::Info::CiscoVTP
+=item SNMP::Info::CiscoStats
+
+=item SNMP::Info::CiscoConfig
 
 =back
 
@@ -536,6 +612,17 @@ Returns VLAN IDs
 
 Returns VLAN names
 
+=item $aironet->i_ssidlist()
+
+Returns a list of SSIDs associated with interfaces.  This function
+is C<MBSSID> aware, so when using C<MBSSID> can map SSIDs to the sub-interface
+to which they belong.
+
+=item $aironet->i_ssidbcast()
+
+With the same keys as i_ssidlist, returns whether the given SSID is
+being broadcast.
+
 =back
 
 =head2 Table Methods imported from SNMP::Info::Layer2

Info/Layer2/Allied.pm

@@ -40,7 +40,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );
 

Info/Layer2/Aruba.pm

@@ -39,12 +39,14 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,
-    'WLSX-SWITCH-MIB' => 'wlsxHostname',
-    'WLSR-AP-MIB'     => 'wlsrHideSSID',
+    'WLSX-SWITCH-MIB'         => 'wlsxHostname',
+    'WLSX-WLAN-MIB'           => 'wlanAPFQLN',
+    'WLSR-AP-MIB'             => 'wlsrHideSSID',
+    #'ALCATEL-IND1-TP-DEVICES' => 'familyOmniAccessWireless',
 );
 
 %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS, );
@@ -61,6 +63,9 @@ $VERSION = '1.09';
     'aruba_ap_essid'     => 'apESSID',
     'aruba_ap_ssidbcast' => 'wlsrHideSSID',
 
+    # WLSX-WLAN-MIB::wlsxWlanAPTable
+    'aruba_perap_fqln'   => 'wlanAPFQLN',
+
     # WLSR-AP-MIB::wlsrConfigTable
     'aruba_ap_channel' => 'apCurrentChannel',
 
@@ -81,11 +86,27 @@ sub layers {
 }
 
 sub os {
-    return 'airos';
+    my $aruba = shift;
+    my %osmap = (
+        'alcatel-lucent' => 'aos-w',
+                );
+    return $osmap{$aruba->vendor()} || 'airos';
 }
 
 sub vendor {
-    return 'aruba';
+    my $aruba = shift;
+    my $id     = $aruba->id() || 'undef';
+    my %oidmap = (
+                  6486 => 'alcatel-lucent',
+                );
+    $id = $1 if (defined($id) && $id =~ /^\.1\.3\.6\.1\.4\.1\.(\d+)/);
+
+    if (defined($id) and exists($oidmap{$id})) {
+        return $oidmap{$id};
+    }
+    else {
+        return 'aruba';
+    }
 }
 
 sub os_ver {
@@ -111,6 +132,8 @@ sub model {
 }
 
 # Thin APs do not support ifMIB requirement
+#
+# We return all BSSIDs as pseudo-ports on the controller.
 
 sub i_index {
     my $aruba   = shift;
@@ -170,6 +193,29 @@ sub interfaces {
     return \%if;
 }
 
+# Most items are indexed by BSSID.
+# aruba_perap_fqln is indexed by AP, so we use the
+# [haven't decided yet] index to figure out all of the
+# BSSIDs served by a given radio.
+sub aruba_ap_fqln {
+    my $aruba  = shift;
+    # I don't think $partial is meaningful in this context
+
+    my $perap_fqln = $aruba->aruba_perap_fqln();
+    my $channel = $aruba->wlanAPBssidChannel();
+    my $aruba_ap_fqln = {};
+
+    # Channel index is: AP, radio, BSSID
+    foreach my $idx (keys %$channel) {
+	my @oid = split(/\./, $idx );
+	my $ap = join(".", @oid[0..5]);
+        my $bssid = join(".", @oid[7..12]);
+	$aruba_ap_fqln->{$bssid} = $perap_fqln->{$ap};
+    }
+
+    return $aruba_ap_fqln;
+}
+
 sub i_name {
     my $aruba   = shift;
     my $partial = shift;
@@ -177,6 +223,7 @@ sub i_name {
     my $i_index = $aruba->i_index($partial)       || {};
     my $i_name2 = $aruba->orig_i_name($partial)   || {};
     my $ap_name = $aruba->aruba_ap_name($partial) || {};
+    my $ap_fqln = $aruba->aruba_ap_fqln($partial) || {};
 
     my %i_name;
     foreach my $iid ( keys %$i_index ) {
@@ -190,7 +237,7 @@ sub i_name {
         }
 
         elsif ( $index =~ /(?:[0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/ ) {
-            my $name = $ap_name->{$iid};
+            my $name = $ap_fqln->{$iid} || $ap_name->{$iid};
             next unless defined $name;
             $i_name{$index} = $name;
         }
@@ -348,6 +395,26 @@ sub fw_mac {
     return \%fw_mac;
 }
 
+# Return the BSSID in i_mac.
+sub i_mac {
+    my $aruba = shift;
+    my $partial = shift;
+
+    # Start with the i_mac entries for the physical ports.
+    my $i_mac = $aruba->orig_i_mac($partial) || {};
+
+    # Add in all the BSSID entries.
+    my $i_index  = $aruba->i_index($partial) || {};
+    foreach my $iid (keys %$i_index) {
+        my $index = $i_index->{$iid};
+	if ($index =~ /:/) {
+	    $i_mac->{$index} = $index;
+	}
+    }
+
+    return $i_mac;
+}
+
 1;
 
 __END__
@@ -471,12 +538,17 @@ Extends C<ifIndex> to support thin APs as device interfaces.
 =item $aruba->interfaces()
 
 Returns reference to map of IIDs to ports.  Thin APs are implemented as device 
-interfaces.  The thin AP MAC address is used as the port identifier.
+interfaces.  The thin AP BSSID is used as the port identifier.
 
 =item $aruba->i_name()
 
 Interface name.  Returns (C<ifName>) for Ethernet interfaces and
-(C<apLocation>) for thin AP interfaces.
+(C<wlanAPFQLN> or C<apLocation>) for thin AP interfaces.
+
+=item $aruba->i_mac()
+
+Interface MAC address.  Returns interface MAC address for Ethernet
+interfaces and BSSID for thin AP interfaces.
 
 =item $aruba->bp_index()
 
@@ -511,6 +583,10 @@ interface.
 
 (C<apCurrentChannel>)
 
+=item $aruba->aruba_ap_fqln()
+
+Returns F<aruba_perap_fqln> indexed by BSSID instead of by AP.
+
 =back
 
 =head2 Aruba Switch AP Table  (C<wlsxSwitchAccessPointTable>)
@@ -535,6 +611,16 @@ interface.
 
 =back
 
+=head2 Aruba AP Table (C<wlsxWlanAPTable>)
+
+=over
+
+=item $aruba->aruba_perap_fqln()
+
+(C<wlanAPFQLN>)
+
+=back
+
 =head2 Aruba Switch Station Management Table (C<wlsxSwitchStationMgmtTable>)
 
 =over

Info/Layer2/Bay.pm

@@ -42,7 +42,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 # Set for No CDP
 %GLOBALS = (

Info/Layer2/Baystack.pm

@@ -46,7 +46,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,    %SNMP::Info::LLDP::MIBS,

Info/Layer2/C1900.pm

@@ -46,7 +46,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %GLOBALS = (
     %SNMP::Info::Layer2::GLOBALS,

Info/Layer2/C2900.pm

@@ -47,7 +47,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %GLOBALS = (
     %SNMP::Info::Layer2::GLOBALS,     %SNMP::Info::CiscoConfig::GLOBALS,
@@ -95,7 +95,7 @@ sub i_duplex {
     my $partial = shift;
 
     my $interfaces     = $c2900->interfaces($partial);
-    my $c2900_p_index  = $c2900->c2900_p_index();
+    my $c2900_p_index  = $c2900->c2900_p_index() || {};
     my $c2900_p_duplex = $c2900->c2900_p_duplex();
 
     my %reverse_2900 = reverse %$c2900_p_index;
@@ -119,7 +119,7 @@ sub i_duplex_admin {
     my $partial = shift;
 
     my $interfaces    = $c2900->interfaces($partial);
-    my $c2900_p_index = $c2900->c2900_p_index();
+    my $c2900_p_index = $c2900->c2900_p_index() || {};
     my $c2900_p_admin = $c2900->c2900_p_duplex_admin();
 
     my %reverse_2900 = reverse %$c2900_p_index;
@@ -146,8 +146,8 @@ sub set_i_speed_admin {
     # map speeds to those the switch will understand
     my %speeds = qw/auto 1 10 10000000 100 100000000/;
 
-    my $c2900_p_index = $c2900->c2900_p_index();
-    my %reverse_2900  = reverse %$c2900_p_index;
+    my $c2900_p_index = $c2900->c2900_p_index() || {};
+    my %reverse_2900 = reverse %$c2900_p_index;
 
     $speed = lc($speed);
 
@@ -166,8 +166,8 @@ sub set_i_duplex_admin {
     # map a textual duplex to an integer one the switch understands
     my %duplexes = qw/full 1 half 2 auto 3/;
 
-    my $c2900_p_index = $c2900->c2900_p_index();
-    my %reverse_2900  = reverse %$c2900_p_index;
+    my $c2900_p_index = $c2900->c2900_p_index() || {};
+    my %reverse_2900 = reverse %$c2900_p_index;
 
     $duplex = lc($duplex);
 

Info/Layer2/Catalyst.pm

@@ -49,7 +49,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,     %SNMP::Info::CiscoPortSecurity::MIBS,

Info/Layer2/Centillion.pm

@@ -43,7 +43,7 @@ use SNMP::Info::SONMP;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::MIBS,

Info/Layer2/Cisco.pm

@@ -50,7 +50,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,     %SNMP::Info::CiscoConfig::MIBS,

Info/Layer2/Foundry.pm

@@ -44,7 +44,7 @@ use SNMP::Info::MAU;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,    %SNMP::Info::FDP::MIBS,

Info/Layer2/HP.pm

@@ -1,7 +1,7 @@
 # SNMP::Info::Layer2::HP - SNMP Interface to HP ProCurve Switches
 # $Id$
 #
-# Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
+# Copyright (c) 2008-2009 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
@@ -46,7 +46,7 @@ use SNMP::Info::CDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
@@ -112,12 +112,12 @@ $VERSION = '1.09';
 );
 
 %MUNGE = (
-
     # Inherit all the built in munging
     %SNMP::Info::Layer3::MUNGE,
     %SNMP::Info::MAU::MUNGE,
     %SNMP::Info::LLDP::MUNGE,
-    %SNMP::Info::CDP::MUNGE
+    %SNMP::Info::CDP::MUNGE,
+    'c_id'   => \&munge_hp_c_id,
 );
 
 %MODEL_MAP = (
@@ -553,7 +553,6 @@ sub c_port {
     foreach my $iid ( keys %$lldp ) {
         my $port = $lldp->{$iid};
         next unless defined $port;
-
         $c_port{$iid} = $port;
     }
     return \%c_port;
@@ -570,19 +569,32 @@ sub c_id {
     foreach my $iid ( keys %$cdp ) {
         my $id = $cdp->{$iid};
         next unless defined $id;
-
+	
         $c_id{$iid} = $id;
     }
-
+    
     foreach my $iid ( keys %$lldp ) {
-        my $id = $lldp->{$iid};
-        next unless defined $id;
-
-        $c_id{$iid} = $id;
+	my $id = $lldp->{$iid};
+	next unless defined $id;
+	
+	$c_id{$iid} = $id;
     }
     return \%c_id;
 }
 
+sub munge_hp_c_id {
+    my ($v) = @_;
+    if ( length(unpack('H*', $v)) == 12 ){
+	return join(':',map { sprintf "%02x", $_ } unpack('C*', $v));
+    }if ( length(unpack('H*', $v)) == 10 ){
+	# IP address (first octet is sign, I guess)
+	my @octets = (map { sprintf "%02x",$_ } unpack('C*', $v))[1..4];
+	return join '.', map { hex($_) } @octets;
+    }else{
+	return $v;
+    }
+}
+
 sub c_platform {
     my $hp      = shift;
     my $partial = shift;
@@ -607,6 +619,26 @@ sub c_platform {
     return \%c_platform;
 }
 
+# POWER-ETHERNET-MIB doesn't define a mapping of its
+# "module"/"port" index to ifIndex.  Different vendors
+# do this in different ways.
+# HP switches use the ifIndex as port index, so we can
+# ignore the module information and map the index directly
+# onto an ifIndex.
+sub peth_port_ifindex {
+    my $peth    = shift;
+    my $partial = shift;
+
+    my $peth_port_status = $peth->peth_port_status($partial);
+    my $peth_port_ifindex;
+
+    foreach my $i ( keys %$peth_port_status ) {
+        my ( $module, $port ) = split( /\./, $i );
+        $peth_port_ifindex->{$i} = $port;
+    }
+    return $peth_port_ifindex;
+}
+
 1;
 __END__
 
@@ -906,6 +938,11 @@ identifier (iid)
 Returns (C<ifIndex>) for both key and value for 1600, 2424, 4000, and 8000
 models since they seem to have problems with F<BRIDGE-MIB>
 
+=item $hp->peth_port_ifindex()
+
+Returns reference to hash of power Ethernet port table entries map back to
+interface index (c<ifIndex>)
+
 =back
 
 =head2 Topology information
@@ -967,4 +1004,14 @@ See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
 
 See documentation in L<SNMP::Info::MAU/"TABLE METHODS"> for details.
 
+=head1 MUNGES
+
+=over
+
+=item munge_hp_c_id()
+
+Munge for c_id which handles CDP and LLDP.
+
+=back
+
 =cut

Info/Layer2/N2270.pm

@@ -43,7 +43,7 @@ use SNMP::Info::Airespace;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::MIBS,        %SNMP::Info::Bridge::MIBS,

Info/Layer2/NAP222x.pm

@@ -42,7 +42,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS, %SNMP::Info::IEEE802dot11::MIBS,

Info/Layer2/Netgear.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = ( %SNMP::Info::Layer2::MIBS, );
 

Info/Layer2/Orinoco.pm

@@ -41,7 +41,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,

Info/Layer2/ZyXEL_DSLAM.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );

Info/Layer3.pm

@@ -47,7 +47,7 @@ use SNMP::Info::PowerEthernet;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::MIBS,
@@ -286,7 +286,12 @@ sub vendor {
     my $l3 = shift;
 
     my $descr = $l3->description();
+    my $id = $l3->id();
 
+    # .1.3.6.1.4.1.9.1 is the CISCO-PRODUCTS-MIB
+    # .1.3.6.1.4.1.9.9.368.4 is an old tree that Cisco CSSs were numbered from
+    return 'cisco'   if $id =~ /^\Q.1.3.6.1.4.1.9.1.\E\d+$/;
+    return 'cisco'   if $id =~ /^\Q.1.3.6.1.4.1.9.9.368.4.\E\d+/;
     return 'cisco'   if ( $descr =~ /(cisco|\bios\b)/i );
     return 'foundry' if ( $descr =~ /foundry/i );
 

Info/Layer3/Aironet.pm

@@ -41,7 +41,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/AlcatelLucent.pm

@@ -0,0 +1,552 @@
+# SNMP::Info::Layer3::AlcatelLucent
+# $Id$
+#
+# Copyright (c) 2008 Bill Fenner
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the University of California, Santa Cruz nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+package SNMP::Info::Layer3::AlcatelLucent;
+
+use strict;
+
+use Exporter;
+use SNMP::Info::Layer3;
+use SNMP::Info::MAU;
+use SNMP::Info::LLDP;
+
+@SNMP::Info::Layer3::AlcatelLucent::ISA = qw/SNMP::Info::LLDP SNMP::Info::MAU
+    SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::AlcatelLucent::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.01';
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::MAU::MIBS,
+    %SNMP::Info::LLDP::MIBS,
+    'ALCATEL-IND1-DEVICES'     => 'familyOmniSwitch7000',
+    'ALCATEL-IND1-CHASSIS-MIB' => 'chasEntPhysOperStatus',
+    'ALU-POWER-ETHERNET-MIB'   => 'pethPsePortDetectionStatus',
+);
+
+# Alcatel provides their own version of the POWER-ETHERNET-MIB,
+# off in vendor-space, without renaming any of the objects.
+# This means we have to *not* load the POWER-ETHERNET-MIB
+# but can then still use the standard PowerEthernet module,
+# but cannot try both so we hope Alcatel doesn't stop supporting
+# their private version even if they get around to supporting the
+# standard.
+delete $MIBS{'POWER-ETHERNET-MIB'};
+
+%GLOBALS = (
+    %SNMP::Info::Layer3::GLOBALS, %SNMP::Info::MAU::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS, %SNMP::Info::MAU::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,
+);
+
+%MUNGE = (
+    %SNMP::Info::Layer3::MUNGE, %SNMP::Info::MAU::MUNGE,
+    %SNMP::Info::LLDP::MUNGE,
+);
+
+# use MAU-MIB for admin. duplex and admin. speed
+*SNMP::Info::Layer3::AlcatelLucent::i_duplex_admin
+    = \&SNMP::Info::MAU::mau_i_duplex_admin;
+*SNMP::Info::Layer3::AlcatelLucent::i_speed_admin
+    = \&SNMP::Info::MAU::mau_i_speed_admin;
+
+sub model {
+    my $alu   = shift;
+    my $id    = $alu->id();
+    my $model = &SNMP::translateObj($id);
+
+    return $id unless defined $model;
+
+    $model =~ s/^device//;
+
+    return $model;
+}
+
+sub os {
+    return 'AOS';
+}
+
+sub vendor {
+    return 'alcatel-lucent';
+}
+
+sub os_ver {
+    my $alu = shift;
+
+    my $descr = $alu->description();
+    if ( $descr =~ m/^(\S+)/ ) {
+        return $1;
+    }
+
+    # No clue what this will try but hey
+    return $alu->SUPER::os_ver();
+}
+
+# ps1_type, ps1_status, ps2_type, ps2_status:
+# Find the list of power supplies in the ENTITY-MIB
+# e_class = powerSupply
+# e_descr = ps_type
+# chasEntPhysOperStatus = ps_status
+sub _power_supplies {
+    my $alu = shift;
+
+    my $e_class  = $alu->e_class();
+    my @supplies = ();
+
+    foreach my $key ( sort { int($a) cmp int($b) } keys %$e_class ) {
+        if ( $e_class->{$key} eq 'powerSupply' ) {
+            push( @supplies, int($key) );
+        }
+    }
+    return @supplies;
+}
+
+sub _ps_type {
+    my $alu   = shift;
+    my $psnum = shift;
+    my @ps    = $alu->_power_supplies();
+
+    if ( $psnum > $#ps ) {
+        return "none";
+    }
+    my $supply = $ps[$psnum];
+    my $descr  = $alu->e_descr($supply);
+    return $descr->{$supply};
+}
+
+sub _ps_status {
+    my $alu   = shift;
+    my $psnum = shift;
+    my @ps    = $alu->_power_supplies();
+
+    if ( $psnum > $#ps ) {
+        return "not present";
+    }
+    my $supply = $ps[$psnum];
+    my $status = $alu->chasEntPhysOperStatus($supply);
+    return $status->{$supply};
+}
+
+sub ps1_type {
+    my $alu = shift;
+    return $alu->_ps_type(0);
+}
+
+sub ps2_type {
+    my $alu = shift;
+    return $alu->_ps_type(1);
+}
+
+sub ps1_status {
+    my $alu = shift;
+    return $alu->_ps_status(0);
+}
+
+sub ps2_status {
+    my $alu = shift;
+    return $alu->_ps_status(1);
+}
+
+# The interface description contains the software version, so
+# to avoid losing historical information through a software upgrade
+# we use interface name instead.
+sub interfaces {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->orig_i_name($partial);
+}
+
+# Use Q-BRIDGE-MIB
+sub fw_mac {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->qb_fw_mac($partial);
+}
+
+sub fw_port {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->qb_fw_port($partial);
+}
+
+# Work around buggy bp_index in 6.3.1.871.R01 and 6.3.1.975.R01
+sub bp_index {
+    my $alu     = shift;
+    my $partial = shift;
+
+    my $bp_index = $alu->SUPER::bp_index($partial);
+
+    #
+    # This device sometimes reports an ifIndex and sometimes reports
+    # dot1dBasePort for the dot1d port values - e.g.,
+    # in 6.3.1.871.R01 both dot1dTpFdbPort and dot1qTpFdbPort report
+    # the ifIndex; in 6.3.1.975.R01 dot1dTpFdbPort has been updated
+    # to report the dot1dBasePort but dot1qTpFdbPort still returns an
+    # ifIndex.  For this reason, we augment the dot1dBasePort
+    # mapping with ifIndex->ifIndex mappings -- we can do this because
+    # the ifIndex and dot1dBasePort spaces don't overlap, at least for
+    # the ports we care about.
+    my @keys = keys %$bp_index;
+    foreach my $idx (@keys) {
+        my $ifIndex = $bp_index->{$idx};
+        $bp_index->{$ifIndex} = $ifIndex;
+    }
+
+    #
+    # In addition, aggregates aren't reported at all in bp_index.
+    # We grab them from i_index.
+    my $i_index = $alu->i_index();
+    foreach my $idx ( keys %$i_index ) {
+        my $ifIndex = $i_index->{$idx};
+        if ( int($ifIndex) > 40000001 ) {
+            $bp_index->{$ifIndex} = $ifIndex;
+
+            # dot1dTpFdbPort seems to use 4098, 4099, 4100 for
+            # 40000001, 40000002, 40000003.  I guess this is
+            # 4096 + 1 + aggregate number.
+            my $tmp = sprintf( "%d", int($ifIndex) - 39995903 );
+            $bp_index->{$tmp} = $ifIndex;
+        }
+    }
+    return $bp_index;
+}
+
+# Workaround for unimplemented Q-BRIDGE-MIB::dot1qPvid
+# If there is only one VLAN on which a given port is output
+# untagged, then call that one the PVID.  This is a guess that
+# works in obvious configurations but may be wrong in
+# subtle cases (like there's one output VLAN but a different
+# input one - the only way to know that is via the dot1qPvid
+# object)
+#
+# Newer versions have implemented dot1qPvid (but wrong, but
+# that's just life)
+#sub i_vlan {
+#    my $alu = shift;
+#
+#    my $qb_v_untagged = $alu->qb_v_untagged();
+#    my $bp_index = $alu->bp_index();
+#    my $vlan_list = {};
+#    foreach my $vlan (keys %$qb_v_untagged) {
+#	my $portlist = $qb_v_untagged->{$vlan};
+#	my $port;
+#	for ($port = 0; $port <= $#$portlist; $port++) {
+#	    if ($portlist->[$port]) {
+#		my $ifindex = $bp_index->{$port + 1};
+#		if ($ifindex) {
+#		    push(@{$vlan_list->{$ifindex}}, int($vlan));
+#		}
+#	    }
+#	}
+#    }
+#
+#    my $i_vlan = {};
+#    foreach my $ifindex (keys %$vlan_list) {
+#	if ($#{$vlan_list->{$ifindex}} == 0) {
+#	    $i_vlan->{$ifindex} = ${$vlan_list->{$ifindex}}[0];
+#	}
+#    }
+#    return $i_vlan;
+#}
+
+# Use LLDP
+# (or at least try.  The versions I've seen have two problems:
+# 1. they report ifIndex values as 'local'; we don't support ifIndex
+#    but *could*
+# 2. They report 0.0.0.0 as the management address
+# )
+sub hasCDP {
+    my $alu = shift;
+
+    return $alu->hasLLDP();
+}
+
+sub c_ip {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->lldp_ip($partial);
+}
+
+sub c_if {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->lldp_if($partial);
+}
+
+sub c_port {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->lldp_port($partial);
+}
+
+sub c_id {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->lldp_id($partial);
+}
+
+sub c_platform {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->lldp_rem_sysdesc($partial);
+}
+
+# Power-Ethernet ifIndex mapping.  I've only seen this from a
+# fixed-config single-module system, so this is only a plausible
+# guess as to the mapping on a stack or modular system.
+sub peth_port_ifindex {
+    my $alu     = shift;
+    my $partial = shift;
+
+    my $peth_port_status  = $alu->peth_port_status($partial);
+    my $peth_port_ifindex = {};
+
+    foreach my $key ( keys %$peth_port_status ) {
+        my @oid = split( m/\./, $key );
+        $peth_port_ifindex->{$key} = int( $oid[0] ) * 1000 + int( $oid[1] );
+    }
+    return $peth_port_ifindex;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::AlcatelLucent - SNMP Interface to Alcatel-Lucent OmniSwitch
+
+=head1 AUTHOR
+
+Bill Fenner
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $alu = new SNMP::Info(
+                        AutoSpecify => 1,
+                        Debug       => 1,
+                        # These arguments are passed directly to SNMP::Session
+                        DestHost    => 'myswitch',
+                        Community   => 'public',
+                        Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $alu->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Alcatel-Lucent OmniSwitch devices
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=item SNMP::Info::MAU
+
+=item SNMP::Info::LLDP
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<ALCATEL-IND1-DEVICES>
+
+=item F<ALCATEL-IND1-CHASSIS-MIB>
+
+=item F<ALU-POWER-ETHERNET-MIB>
+
+Note that Alcatel-Lucent distributes their own proprietary version of the
+F<POWER-ETHERNET-MIB>, but the MIB module name that they distribute is
+simply F<POWER-ETHERNET-MIB>.  This module must be hand-edited to change the
+module name to F<ALU-POWER-ETHERNET-MIB> so that it can be used simultaneously
+with the standard F<POWER-ETHERNET-MIB>.
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::MAU/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::LLDP/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $alu->vendor()
+
+    Returns 'alcatel-lucent'
+
+=item $alu->hasCDP()
+
+    Returns whether LLDP is enabled.
+
+=item $alu->model()
+
+Tries to reference $alu->id() to one of the product MIBs listed above
+
+Removes 'device' from the name for readability.
+
+=item $alu->os()
+
+Returns 'AOS'
+
+=item $alu->os_ver()
+
+Grabs the os version from C<sysDescr>
+
+=item $alu->ps1_type()
+
+Return the type of the first power supply from the F<ENTITY-MIB>
+
+=item $alu->ps2_type()
+
+Return the type of the second power supply from the F<ENTITY-MIB>
+
+=item $alu->ps1_status()
+
+Return the status of the first power supply from the F<ALCATEL-IND1-CHASSIS-MIB>
+
+=item $alu->ps2_status()
+
+Return the status of the second power supply from the F<ALCATEL-IND1-CHASSIS-MIB>
+
+=back
+
+=head2 Global Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::MAU
+
+See documentation in L<SNMP::Info::MAU/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=over
+
+=item $alu->interfaces()
+
+Returns interface name from C<ifName>, since the default return value
+of C<ifDescr> includes the OS version.
+
+=item $alu->fw_mac()
+
+Use the F<Q-BRIDGE-MIB> instead of F<BRIDGE-MIB>
+
+=item $alu->fw_port()
+
+Use the F<Q-BRIDGE-MIB> instead of F<BRIDGE-MIB>
+
+=item $alu->bp_index()
+
+Work around various bugs in the F<BRIDGE-MIB> and
+F<Q-BRIDGE-MIB> implementations, by returning both
+C<ifIndex> and C<dot1dBasePort> mappings to C<ifIndex> values.
+
+=item $alu->c_id()
+
+Returns LLDP information.
+
+=item $alu->c_if()
+
+Returns LLDP information.
+
+=item $alu->c_ip()
+
+Returns LLDP information.
+
+=item $alu->c_platform()
+
+Returns LLDP information.
+
+=item $alu->c_port()
+
+Returns LLDP information.
+
+=item $alu->i_duplex_admin()
+
+Returns info from F<MAU-MIB>
+
+=item $alu->i_speed_admin()
+
+Returns info from F<MAU-MIB>
+
+=item $alu->peth_port_ifindex()
+
+Returns the C<ifIndex> value for power-ethernet ports
+using the OmniSwitch algorithm.
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::MAU
+
+See documentation in L<SNMP::Info::MAU/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3/AlteonAD.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Altiga.pm

@@ -0,0 +1,400 @@
+# SNMP::Info::Layer3::Altiga
+# $Id$
+#
+# Copyright (c) 2008 Jeroen van Ingen Schenau
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without 
+# modification, are permitted provided that the following conditions are met:
+# 
+#     * Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the University of California, Santa Cruz nor the 
+#       names of its contributors may be used to endorse or promote products 
+#       derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE  
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+package SNMP::Info::Layer3::Altiga;
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer3;
+
+@SNMP::Info::Layer3::Altiga::ISA = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Altiga::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE 
+            $int_include_vpn $fake_idx $type_class/;
+
+$VERSION = '2.01';
+
+%MIBS = (
+            %SNMP::Info::Layer3::MIBS,
+            'ALTIGA-VERSION-STATS-MIB'  => 'alVersionString',
+            'ALTIGA-SESSION-STATS-MIB'  => 'alActiveSessionCount',
+            'ALTIGA-HARDWARE-STATS-MIB' => 'alHardwarePs1Type',  
+    );
+
+%GLOBALS = (
+            %SNMP::Info::Layer3::GLOBALS,
+            # From ALTIGA-VERSION-STATS-MIB
+            'os_ver'          => 'alVersionString',
+            # From ALTIGA-SESSION-STATS-MIB
+            'vpn_act_sess'    => 'alActiveSessionCount',
+            'vpn_total_sess'  => 'alTotalSessionCount',
+            'vpn_max_sess'    => 'alMaxSessionCount',
+            'vpn_l2l_sess'    => 'alActiveLanToLanSessionCount',
+            'vpn_mgmt_sess'   => 'alActiveManagementSessionCount',
+            'vpn_ras_sess'    => 'alActiveRemoteAccessSessionCount',
+            # From ALTIGA-HARDWARE-STATS-MIB
+            'ps1_type'        => 'alHardwarePs1Type',
+            'ps1_3v_alarm'    => 'alHardwarePs1Voltage3vAlarm',
+            'ps1_5v_alarm'    => 'alHardwarePs1Voltage5vAlarm',
+            'ps2_type'        => 'alHardwarePs2Type',
+            'ps2_3v_alarm'    => 'alHardwarePs2Voltage3vAlarm',
+            'ps2_5v_alarm'    => 'alHardwarePs2Voltage5vAlarm',
+            'fan1_alarm'      => 'alHardwareFan1RpmAlarm',
+            'fan2_alarm'      => 'alHardwareFan2RpmAlarm',
+            'fan3_alarm'      => 'alHardwareFan3RpmAlarm',
+            
+       );
+
+%FUNCS = (
+            %SNMP::Info::Layer3::FUNCS,
+            'i_type2'           => 'ifType',
+            'i_lastchange2'     => 'ifLastChange',
+            'vpn_sess_status'   => 'alActiveSessionRowStatus',
+            'vpn_sess_user'     => 'alActiveSessionUserName',
+            'vpn_sess_peer_ip'  => 'alActiveSessionIpAddress',
+            'vpn_sess_protocol' => 'alActiveSessionProtocol',
+            'vpn_sess_encr'     => 'alActiveSessionEncrType',
+            'vpn_sess_start'    => 'alActiveSessionStartTime',
+            'vpn_sess_conntime' => 'alActiveSessionConnectTime',
+            'vpn_sess_out_oct'  => 'alActiveSessionOctetsSent',
+            'vpn_sess_in_oct'   => 'alActiveSessionOctetsRcvd',
+            'vpn_sess_group'    => 'alActiveSessionGroupName',
+            'vpn_sess_gid'      => 'alActiveSessionGroupId',
+            'vpn_sess_rem_ip'   => 'alActiveSessionPublicIpAddress',
+     );
+
+%MUNGE = (
+            %SNMP::Info::Layer3::MUNGE,
+            'ps1_3v_alarm'    => \&munge_alarm,
+            'ps1_5v_alarm'    =>  \&munge_alarm,
+            'ps2_3v_alarm'    =>  \&munge_alarm,
+            'ps2_5v_alarm'    =>  \&munge_alarm,
+            'fan1_alarm'      =>  \&munge_alarm,
+            'fan2_alarm'      =>  \&munge_alarm,
+            'fan3_alarm'      =>  \&munge_alarm,
+
+     );
+
+# Variable to modify behaviour of "interfaces" subroutine.
+# * When set to 0, "interfaces" returns only fixed interfaces from the IF-MIB,
+# * When set to 1, "interfaces" returns fixed interfaces from IF-MIB and LAN-to-LAN tunnels from ALTIGA-SESSION-MIB
+# TODO: This should be an instance method, not a class global
+$int_include_vpn = 1;
+
+# Variable to prepended to each tunnel index when tunnel is added to %interfaces, to avoid overwriting "real" ifIndex entries
+$fake_idx = 3076;
+
+# Variable to classify session types into categories: 0 - unclassified, 1 - LAN-to-LAN or fixed, 2 - RAS or dynamic, 3 - administrative
+$type_class = {
+    'pptp'                  => 2,
+    'l2tp'                  => 2,
+    'ipsec'                 => 2,
+    'http'                  => 3,
+    'ftp'                   => 3,
+    'telnet'                => 3,
+    'snmp'                  => 3,
+    'tftp'                  => 3,
+    'console'               => 3,
+    'debugTelnet'           => 3,
+    'debugConsole'          => 3,
+    'other'                 => 3,
+    'ike'                   => 0,
+    'l2tpOverIpSec'         => 2,
+    'ipsecLanToLan'         => 1,
+    'ipsecOverUdp'          => 2,
+    'ssh'                   => 3,
+    'vcaLanToLan'           => 1,
+    'ipsecOverTcp'          => 2,
+    'pppoe'                 => 2,
+    'ipsecOverNatT'         => 2,
+    'ipsecLan2LanOverNatT'  => 1,
+    'l2tpOverIpsecOverNatT' => 2,
+    'userHttps'             => 2,
+    'pop3s'                 => 2,
+    'imap4s'                => 2,
+    'smtps'                 => 2,
+    'httpsTunnel'           => 2,
+};
+
+sub vendor {
+    return 'altiga';
+}
+
+sub os {
+    return 'altiga';
+}
+
+sub hasCDP {
+    return 0;
+}
+
+# $altiga->interfaces() - Map the Interfaces to their physical names
+# Add interface number to interface name to prevent duplicate ifDescr
+# Included statically configured VPN tunnels if ($int_include_vpn)
+sub interfaces {
+    my $altiga = shift;
+    my $partial = shift;
+
+    my $interfaces = $altiga->i_index($partial);
+    my $descriptions = $altiga->i_description($partial);
+
+    my %int_rev = ();
+    my %interfaces = ();
+    foreach my $iid (sort {$a cmp $b} keys %$interfaces) {
+        my $desc = $descriptions->{$iid};
+        next unless defined $desc;
+        if (!exists $int_rev{$desc}) {
+            $interfaces{$iid} = $desc;
+            $int_rev{$desc} = $iid;
+        } else {
+            my $done = 0;
+            my $unique_desc;
+            my $cnt = 1;
+            until ($done) {
+                $cnt++;
+                $unique_desc = sprintf("%s (%d)", $desc, $cnt);
+                if (!exists $int_rev{$unique_desc}) {
+                    $done++;
+                }
+            }
+            $int_rev{$unique_desc} = $iid;
+            $interfaces{$iid} = $unique_desc;
+            $interfaces{ $int_rev{$desc} } = sprintf("%s (%d)", $desc, 1);
+        }
+    }
+    if ($int_include_vpn) {
+        my $tun_type = $altiga->vpn_sess_protocol();
+        my $peer = $altiga->vpn_sess_peer_ip();
+        my $remote = $altiga->vpn_sess_rem_ip(); 
+        my $group = $altiga->vpn_sess_gid();
+        foreach my $tunnel (keys %$tun_type) {
+            if ($type_class->{$tun_type->{$tunnel}} eq 1) {
+                $interfaces{"$fake_idx.$tunnel"} = sprintf("%s VPN to %s", uc($tun_type->{$tunnel}), $remote->{$tunnel});
+            }
+        }
+    }
+            
+    return \%interfaces;
+}
+
+sub i_type {
+    my $altiga = shift;
+    my $partial = shift;
+    my $types = $altiga->i_type2();
+    if ($int_include_vpn) {
+        my $tun_type = $altiga->vpn_sess_protocol();
+        foreach my $tunnel (keys %$tun_type) {
+            $types->{"$fake_idx.$tunnel"} = $tun_type->{$tunnel};
+        }
+    }
+    return $types;
+}
+
+sub i_lastchange {
+    my $altiga = shift;
+    my $partial = shift;
+
+    # TODO: This is what munges are for.
+    my $lastchange = $altiga->i_lastchange2();
+    if ($int_include_vpn) {
+        my $tun_start = $altiga->vpn_sess_start();
+        foreach my $tunnel (keys %$tun_start) {
+            $lastchange->{"$fake_idx.$tunnel"} = $tun_start->{$tunnel};
+        }
+    }
+    return $lastchange;
+}
+
+sub ps1_status {
+    my $altiga = shift;
+    my $alarm_3v = $altiga->ps1_3v_alarm() || "";
+    my $alarm_5v = $altiga->ps1_5v_alarm() || "";
+    return sprintf("3V: %s, 5V: %s", $alarm_3v, $alarm_5v);
+}
+
+sub ps2_status {
+    my $altiga = shift;
+    my $alarm_3v = $altiga->ps2_3v_alarm() || "";
+    my $alarm_5v = $altiga->ps2_5v_alarm() || "";
+    return sprintf("3V: %s, 5V: %s", $alarm_3v, $alarm_5v);
+}
+
+sub fan {
+    my $altiga = shift;
+    my $alarm_fan1 = $altiga->fan1_alarm() || "";
+    my $alarm_fan2 = $altiga->fan2_alarm() || "";
+    my $alarm_fan3 = $altiga->fan3_alarm() || "";
+    return sprintf("Fan 1: %s, Fan 2: %s, Fan 3: %s", $alarm_fan1, $alarm_fan2, $alarm_fan3);
+}
+
+sub munge_alarm {
+    my $alarm = shift;
+    if ($alarm eq 'false') {
+        return 'OK';
+    } elsif ($alarm eq 'true') {
+        return 'FAIL';
+    } else {
+        return "(n/a)";
+    }
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Altiga - SNMP Interface to Cisco (formerly Altiga) VPN concentrators
+
+=head1 AUTHOR
+
+Jeroen van Ingen Schenau
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $altiga = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'my_vpn_host',
+                          Community   => 'public',
+                          Version     => 1
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $altiga->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Cisco (formerly Altiga) VPN concentrators
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 Class Variables (options)
+
+=over
+
+=item $SNMP::Info::Layer3::Altiga::int_include_vpn
+
+Variable to modify behavior of "interfaces" subroutine.
+
+  * When set to 0, "interfaces" returns only fixed interfaces from the IF-MIB,
+  * When set to 1, "interfaces" returns fixed interfaces from IF-MIB and
+    LAN-to-LAN tunnels from ALTIGA-SESSION-MIB (default)
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $altiga->vendor()
+
+Returns 'altiga'
+
+=item $altiga->os()
+
+Returns 'altiga'
+
+=item $altiga->os_ver()
+
+Tries to determine OS version from the C<sysDescr.0> field. Returns version or C<sysDescr.0>
+
+=item $altiga->fan()
+
+Combines results from C<fan1_alarm>, C<fan2_alarm>, and C<fam3_alarm> methods.
+
+=item $altiga->hasCDP()
+
+No.
+
+=item $altiga->ps1_status()
+
+Combines C<ps1_3v_alarm> and C<ps1_5v_alarm> methods.
+
+=item $altiga->ps2_status()
+
+Combines C<ps2_3v_alarm> and C<ps2_5v_alarm> methods.
+
+=back
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=over
+
+=item $altiga->interfaces()
+
+This method overrides the interfaces() method inherited from SNMP::Info.
+It provides a mapping between the Interface Table Index (iid) and the physical 
+port name, adding a port number to the port name to prevent duplicate names.
+
+=item $altiga->i_lastchange()
+
+Filters out the results depending on the value of $SNMP::Info::Layer3::Altiga::int_include_vpn
+
+=item $altiga->i_type()
+
+Filters out the results depending on the value of $SNMP::Info::Layer3::Altiga::int_include_vpn
+
+=back
+
+=head1 MUNGES
+
+=over
+
+=item munge_alarm()
+
+Changes C<true> and C<false> to C<FAIL>, C<OK>, and C<(n/a)>.
+
+=back
+
+=cut

Info/Layer3/Arista.pm

@@ -0,0 +1,324 @@
+# SNMP::Info::Layer3::Arista
+# $Id$
+#
+# Copyright (c) 2008 Arista Networks, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of Arista Networks, Inc. nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+package SNMP::Info::Layer3::Arista;
+
+use strict;
+use Exporter;
+
+use SNMP::Info::Layer3;
+use SNMP::Info::MAU;
+use SNMP::Info::LLDP;
+
+@SNMP::Info::Layer3::Arista::ISA = qw/SNMP::Info::LLDP SNMP::Info::MAU
+    SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Arista::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.01';
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::MAU::MIBS,
+    %SNMP::Info::LLDP::MIBS,
+    'ARISTA-PRODUCTS-MIB' => 'aristaProducts',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::MAU::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::MAU::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,
+);
+
+%MUNGE = (
+    %SNMP::Info::Layer3::MUNGE,
+    %SNMP::Info::MAU::MUNGE,
+    %SNMP::Info::LLDP::MUNGE,
+);
+
+# use MAU-MIB for admin. duplex and admin. speed
+*SNMP::Info::Layer3::Arista::i_duplex_admin
+    = \&SNMP::Info::MAU::mau_i_duplex_admin;
+*SNMP::Info::Layer3::Arista::i_speed_admin
+    = \&SNMP::Info::MAU::mau_i_speed_admin;
+
+sub vendor {
+    return 'arista';
+}
+
+sub os {
+    return 'EOS';
+}
+
+sub os_ver {
+    my $arista = shift;
+    my $descr   = $arista->description();
+    my $os_ver  = undef;
+
+    $os_ver = $1 if ( $descr =~ /\s+EOS\s+version\s+(\S+)\s+/ );
+    return $os_ver;
+}
+
+sub model {
+    my $arista = shift;
+    my $id     = $arista->id();
+
+    my $model = &SNMP::translateObj($id);
+    return $id unless defined $model;
+
+    $model =~ s/^arista//;
+    return $model;
+}
+
+# Use Q-BRIDGE-MIB
+
+sub fw_mac {
+    my $arista  = shift;
+    my $partial = shift;
+
+    return $arista->qb_fw_mac($partial);
+}
+
+sub fw_port {
+    my $arista  = shift;
+    my $partial = shift;
+
+    return $arista->qb_fw_port($partial);
+}
+
+# Use LLDP
+
+sub hasCDP {
+    my $arista = shift;
+
+    return $arista->hasLLDP();
+}
+
+sub c_ip {
+    my $arista  = shift;
+    my $partial = shift;
+
+    return $arista->lldp_ip($partial);
+}
+
+sub c_if {
+    my $arista  = shift;
+    my $partial = shift;
+
+    return $arista->lldp_if($partial);
+}
+
+sub c_port {
+    my $arista  = shift;
+    my $partial = shift;
+
+    return $arista->lldp_port($partial);
+}
+
+sub c_id {
+    my $arista  = shift;
+    my $partial = shift;
+
+    return $arista->lldp_id($partial);
+}
+
+sub c_platform {
+    my $arista  = shift;
+    my $partial = shift;
+
+    return $arista->lldp_rem_sysdesc($partial);
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Arista - SNMP Interface to Arista Networks EOS
+
+=head1 AUTHOR
+
+Bill Fenner
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $arista = new SNMP::Info(
+                        AutoSpecify => 1,
+                        Debug       => 1,
+                        # These arguments are passed directly to SNMP::Session
+                        DestHost    => 'myswitch',
+                        Community   => 'public',
+                        Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $arista->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Arista Networks EOS-based devices
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=item SNMP::Info::MAU
+
+=item SNMP::Info::LLDP
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<ARISTA-PRODUCTS-MIB>
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::MAU/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::LLDP/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar values from SNMP
+
+=over
+
+=item $arista->vendor()
+
+    Returns 'Arista Networks, Inc.'
+
+=item $arista->hasCDP()
+
+    Returns whether LLDP is enabled.
+
+=item $arista->model()
+
+Tries to reference $arista->id() to one of the product MIBs listed above
+
+Removes 'arista' from the name for readability.
+
+=item $arista->os()
+
+Returns 'EOS'
+
+=item $arista->os_ver()
+
+Grabs the os version from C<sysDescr>
+
+=back
+
+=head2 Global Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::MAU
+
+See documentation in L<SNMP::Info::MAU/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=over
+
+=item $arista->fw_mac()
+
+Use the F<Q-BRIDGE-MIB> instead of F<BRIDGE-MIB>
+
+=item $arista->fw_port()
+
+Use the F<Q-BRIDGE-MIB> instead of F<BRIDGE-MIB>
+
+=item $arista->c_id()
+
+Returns LLDP information.
+
+=item $arista->c_if()
+
+Returns LLDP information.
+
+=item $arista->c_ip()
+
+Returns LLDP information.
+
+=item $arista->c_platform()
+
+Returns LLDP information.
+
+=item $arista->c_port()
+
+Returns LLDP information.
+
+=item $arista->i_duplex_admin()
+
+Returns info from F<MAU-MIB>
+
+=item $arista->i_speed_admin()
+
+Returns info from F<MAU-MIB>
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::MAU
+
+See documentation in L<SNMP::Info::MAU/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3/BayRS.pm

@@ -43,7 +43,7 @@ use SNMP::Info::Bridge;
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE %MODEL_MAP
     %MODID_MAP %PROCID_MAP/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::MIBS,

Info/Layer3/C3550.pm

@@ -1,7 +1,7 @@
 # SNMP::Info::Layer3::C3550
 # $Id$
 #
-# Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
+# Copyright (c) 2008-2009 Max Baker changes from version 0.8 and beyond.
 # Copyright (c) 2004 Regents of the University of California
 # All rights reserved.
 #
@@ -36,62 +36,76 @@ use Exporter;
 use SNMP::Info::CiscoVTP;
 use SNMP::Info::CiscoStack;
 use SNMP::Info::CDP;
+use SNMP::Info::CiscoConfig;
 use SNMP::Info::CiscoStats;
 use SNMP::Info::CiscoImage;
 use SNMP::Info::CiscoPortSecurity;
 use SNMP::Info::CiscoPower;
 use SNMP::Info::Layer3;
-
-@SNMP::Info::Layer3::C3550::ISA
-    = qw/SNMP::Info::CiscoVTP SNMP::Info::CiscoStack
-    SNMP::Info::CDP SNMP::Info::CiscoStats
-    SNMP::Info::CiscoPortSecurity
-    SNMP::Info::CiscoImage SNMP::Info::CiscoPower
-    SNMP::Info::Layer3
-    Exporter/;
-@SNMP::Info::Layer3::C3550::EXPORT_OK = qw//;
+use SNMP::Info::CiscoStpExtensions;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '1.09';
+# NOTE : Top-most items gets precedence for @ISA
+@SNMP::Info::Layer3::C3550::ISA = qw/
+    SNMP::Info::CiscoVTP
+    SNMP::Info::CiscoStpExtensions
+    SNMP::Info::CiscoStack
+    SNMP::Info::CDP
+    SNMP::Info::CiscoStats
+    SNMP::Info::CiscoImage
+    SNMP::Info::CiscoPortSecurity
+    SNMP::Info::CiscoConfig
+    SNMP::Info::CiscoPower
+    SNMP::Info::Layer3
+    Exporter/;
+
+@SNMP::Info::Layer3::C3550::EXPORT_OK = qw//;
+
+$VERSION = '2.01';
+
+# NOTE: Order creates precedence
+#       Example: v_name exists in Bridge.pm and CiscoVTP.pm
+#       Bridge is called from Layer3 and CiscoStpExtensions
+#       So we want CiscoVTP to come last to get the right one.
+# The @ISA order should match these orders.
 
 %MIBS = (
-    %SNMP::Info::Layer3::MIBS,            %SNMP::Info::CiscoPower::MIBS,
-    %SNMP::Info::CiscoPortSecurity::MIBS, %SNMP::Info::CiscoImage::MIBS,
-    %SNMP::Info::CiscoStats::MIBS,        %SNMP::Info::CDP::MIBS,
-    %SNMP::Info::CiscoStack::MIBS,        %SNMP::Info::CiscoVTP::MIBS,
+    %SNMP::Info::Layer3::MIBS,             %SNMP::Info::CiscoPower::MIBS,
+    %SNMP::Info::CiscoConfig::MIBS,        %SNMP::Info::CiscoPortSecurity::MIBS,
+    %SNMP::Info::CiscoImage::MIBS,         %SNMP::Info::CiscoStats::MIBS,
+    %SNMP::Info::CDP::MIBS,                %SNMP::Info::CiscoStack::MIBS,
+    %SNMP::Info::CiscoStpExtensions::MIBS, %SNMP::Info::CiscoVTP::MIBS,
 );
 
+
 %GLOBALS = (
     %SNMP::Info::Layer3::GLOBALS,
     %SNMP::Info::CiscoPower::GLOBALS,
+    %SNMP::Info::CiscoConfig::GLOBALS,
     %SNMP::Info::CiscoPortSecurity::GLOBALS,
     %SNMP::Info::CiscoImage::GLOBALS,
     %SNMP::Info::CiscoStats::GLOBALS,
     %SNMP::Info::CDP::GLOBALS,
     %SNMP::Info::CiscoStack::GLOBALS,
+    %SNMP::Info::CiscoStpExtensions::GLOBALS,
     %SNMP::Info::CiscoVTP::GLOBALS,
-    'ports2' => 'ifNumber',
 );
 
 %FUNCS = (
-    %SNMP::Info::Layer3::FUNCS,            %SNMP::Info::CiscoPower::FUNCS,
-    %SNMP::Info::CiscoPortSecurity::FUNCS, %SNMP::Info::CiscoImage::FUNCS,
-    %SNMP::Info::CiscoStats::FUNCS,        %SNMP::Info::CDP::FUNCS,
-    %SNMP::Info::CiscoStack::FUNCS,        %SNMP::Info::CiscoVTP::FUNCS,
+    %SNMP::Info::Layer3::FUNCS,             %SNMP::Info::CiscoPower::FUNCS,
+    %SNMP::Info::CiscoConfig::FUNCS,        %SNMP::Info::CiscoPortSecurity::FUNCS,
+    %SNMP::Info::CiscoImage::FUNCS,         %SNMP::Info::CiscoStats::FUNCS,
+    %SNMP::Info::CDP::FUNCS,                %SNMP::Info::CiscoStack::FUNCS,
+    %SNMP::Info::CiscoStpExtensions::FUNCS, %SNMP::Info::CiscoVTP::FUNCS,    
 );
 
 %MUNGE = (
-
-    # Inherit all the built in munging
-    %SNMP::Info::Layer3::MUNGE,
-    %SNMP::Info::CiscoPower::MUNGE,
-    %SNMP::Info::CiscoPortSecurity::MUNGE,
-    %SNMP::Info::CiscoImage::MUNGE,
-    %SNMP::Info::CiscoStats::MUNGE,
-    %SNMP::Info::CDP::MUNGE,
-    %SNMP::Info::CiscoStack::MUNGE,
-    %SNMP::Info::CiscoVTP::MUNGE,
+    %SNMP::Info::Layer3::MUNGE,             %SNMP::Info::CiscoPower::MUNGE,
+    %SNMP::Info::CiscoConfig::MUNGE,        %SNMP::Info::CiscoPortSecurity::MUNGE,
+    %SNMP::Info::CiscoImage::MUNGE,         %SNMP::Info::CiscoStats::MUNGE,
+    %SNMP::Info::CDP::MUNGE,                %SNMP::Info::CiscoStack::MUNGE,
+    %SNMP::Info::CiscoStpExtensions::MUNGE, %SNMP::Info::CiscoVTP::MUNGE,    
 );
 
 sub vendor {
@@ -115,14 +129,14 @@ sub model {
 sub ports {
     my $c3550 = shift;
 
-    my $ports2 = $c3550->ports2();
-
     my $id    = $c3550->id();
     my $model = &SNMP::translateObj($id);
     if ( $model =~ /(12|24|48)(C|T|TS|G|TS-E|TS-S|T-E)?$/ ) {
         return $1;
     }
-    return $ports2;
+
+    my $ports = $c3550->orig_ports();
+    return $ports;
 }
 
 #  Verions prior to 12.1(22)EA1a use the older CiscoStack method
@@ -263,6 +277,8 @@ after determining a more specific class using the method above.
 
 =item SNMP::Info::Layer3
 
+=item SNMP::Info::CiscoSTPExtensions
+
 =item SNMP::Info::CiscoPower
 
 =item SNMP::Info::CiscoPortSecurity
@@ -287,6 +303,8 @@ after determining a more specific class using the method above.
 
 See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
 
+See L<SNMP::Info::CiscoStpExtensions/"Required MIBs"> for its own MIB requirements.
+
 See L<SNMP::Info::CiscoPower/"Required MIBs"> for its own MIB requirements.
 
 See L<SNMP::Info::CiscoPortSecurity/"Required MIBs"> for its own MIB
@@ -335,6 +353,10 @@ Returns 1.  Use vlan indexing.
 
 See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 
+=head2 Globals imported from SNMP::Info::CiscoStpExtensions
+
+See documentation in L<SNMP::Info::CiscoStpExtensions/"GLOBALS"> for details.
+
 =head2 Globals imported from SNMP::Info::CiscoPower
 
 See documentation in L<SNMP::Info::CiscoPower/"GLOBALS"> for details.
@@ -412,6 +434,10 @@ Crosses $c3550->p_port() with $c3550->p_duplex() to utilize port C<ifIndex>.
 
 See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
 
+=head2 Table Methods imported from SNMP::Info::CiscoStpExtensions
+
+See documentation in L<SNMP::Info::CiscoStpExtensions/"TABLE METHODS"> for details.
+
 =head2 Table Methods imported from SNMP::Info::CiscoPower
 
 See documentation in L<SNMP::Info::CiscoPower/"TABLE METHODS"> for details.

Info/Layer3/C4000.pm

@@ -50,7 +50,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/C6500.pm

@@ -1,7 +1,7 @@
 # SNMP::Info::Layer3::C6500
 # $Id$
 #
-# Copyright (c) 2008 Max Baker
+# Copyright (c) 2008-2009 Max Baker
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,6 @@ package SNMP::Info::Layer3::C6500;
 
 use strict;
 use Exporter;
-use SNMP::Info::CiscoVTP;
 use SNMP::Info::CiscoStack;
 use SNMP::Info::CDP;
 use SNMP::Info::CiscoStats;
@@ -41,28 +40,44 @@ use SNMP::Info::CiscoPortSecurity;
 use SNMP::Info::CiscoConfig;
 use SNMP::Info::CiscoPower;
 use SNMP::Info::Layer3;
+use SNMP::Info::CiscoStpExtensions;
+use SNMP::Info::CiscoVTP;
 
-@SNMP::Info::Layer3::C6500::ISA
-    = qw/SNMP::Info::CiscoVTP SNMP::Info::CiscoStack
-    SNMP::Info::CDP SNMP::Info::CiscoStats
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+# NOTE : Top-most items gets precedence for @ISA
+@SNMP::Info::Layer3::C6500::ISA = qw/
+    SNMP::Info::CiscoVTP 
+    SNMP::Info::CiscoStpExtensions
+    SNMP::Info::CiscoStack
+    SNMP::Info::CDP 
     SNMP::Info::CiscoImage
+    SNMP::Info::CiscoStats
     SNMP::Info::CiscoPortSecurity
     SNMP::Info::CiscoConfig
     SNMP::Info::CiscoPower
     SNMP::Info::Layer3
-    Exporter/;
+    Exporter
+/;
+
 @SNMP::Info::Layer3::C6500::EXPORT_OK = qw//;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
+
+# NOTE: Order creates precedence
+#       Example: v_name exists in Bridge.pm and CiscoVTP.pm
+#       Bridge is called from Layer3 and CiscoStpExtensions
+#       So we want CiscoVTP to come last to get the right one.
+# The @ISA order should match these orders.
 
 %MIBS = (
-    %SNMP::Info::Layer3::MIBS,      %SNMP::Info::CiscoPower::MIBS,
-    %SNMP::Info::CiscoConfig::MIBS, %SNMP::Info::CiscoPortSecurity::MIBS,
-    %SNMP::Info::CiscoImage::MIBS,  %SNMP::Info::CiscoStats::MIBS,
-    %SNMP::Info::CDP::MIBS,         %SNMP::Info::CiscoStack::MIBS,
-    %SNMP::Info::CiscoVTP::MIBS,
+    %SNMP::Info::Layer3::MIBS,             %SNMP::Info::CiscoPower::MIBS,
+    %SNMP::Info::CiscoConfig::MIBS,        %SNMP::Info::CiscoPortSecurity::MIBS,
+    %SNMP::Info::CiscoImage::MIBS,         %SNMP::Info::CiscoStats::MIBS,
+    %SNMP::Info::CDP::MIBS,                %SNMP::Info::CiscoStack::MIBS,
+    %SNMP::Info::CiscoStpExtensions::MIBS, %SNMP::Info::CiscoVTP::MIBS,    
 );
 
 %GLOBALS = (
@@ -74,23 +89,25 @@ $VERSION = '1.09';
     %SNMP::Info::CiscoStats::GLOBALS,
     %SNMP::Info::CDP::GLOBALS,
     %SNMP::Info::CiscoStack::GLOBALS,
+    %SNMP::Info::CiscoStpExtensions::GLOBALS,
     %SNMP::Info::CiscoVTP::GLOBALS,
 );
 
 %FUNCS = (
-    %SNMP::Info::Layer3::FUNCS,      %SNMP::Info::CiscoPower::FUNCS,
-    %SNMP::Info::CiscoConfig::FUNCS, %SNMP::Info::CiscoPortSecurity::FUNCS,
-    %SNMP::Info::CiscoImage::FUNCS,  %SNMP::Info::CiscoStats::FUNCS,
-    %SNMP::Info::CDP::FUNCS,         %SNMP::Info::CiscoStack::FUNCS,
-    %SNMP::Info::CiscoVTP::FUNCS,
+    %SNMP::Info::Layer3::FUNCS,             %SNMP::Info::CiscoPower::FUNCS,
+    %SNMP::Info::CiscoConfig::FUNCS,        %SNMP::Info::CiscoPortSecurity::FUNCS,
+    %SNMP::Info::CiscoImage::FUNCS,         %SNMP::Info::CiscoStats::FUNCS,
+    %SNMP::Info::CDP::FUNCS,                %SNMP::Info::CiscoStack::FUNCS,
+    %SNMP::Info::CiscoStpExtensions::FUNCS, %SNMP::Info::CiscoVTP::FUNCS,    
 );
 
+
 %MUNGE = (
-    %SNMP::Info::Layer3::MUNGE,      %SNMP::Info::CiscoPower::MUNGE,
-    %SNMP::Info::CiscoConfig::MUNGE, %SNMP::Info::CiscoPortSecurity::MUNGE,
-    %SNMP::Info::CiscoImage::MUNGE,  %SNMP::Info::CiscoStats::MUNGE,
-    %SNMP::Info::CDP::MUNGE,         %SNMP::Info::CiscoStack::MUNGE,
-    %SNMP::Info::CiscoVTP::MUNGE,
+    %SNMP::Info::Layer3::MUNGE,             %SNMP::Info::CiscoPower::MUNGE,
+    %SNMP::Info::CiscoConfig::MUNGE,        %SNMP::Info::CiscoPortSecurity::MUNGE,
+    %SNMP::Info::CiscoImage::MUNGE,         %SNMP::Info::CiscoStats::MUNGE,
+    %SNMP::Info::CDP::MUNGE,                %SNMP::Info::CiscoStack::MUNGE,
+    %SNMP::Info::CiscoStpExtensions::MUNGE, %SNMP::Info::CiscoVTP::MUNGE,    
 );
 
 sub vendor {
@@ -184,6 +201,7 @@ sub set_i_duplex_admin {
     }
 }
 
+
 1;
 __END__
 
@@ -247,6 +265,8 @@ after determining a more specific class using the method above.
 
 =item SNMP::Info::Layer3
 
+=item SNMP::Info::CiscoStpExtensions
+
 =back
 
 =head2 Required MIBs
@@ -274,6 +294,8 @@ See L<SNMP::Info::CiscoPower/"Required MIBs"> for its own MIB requirements.
 
 See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
 
+See L<SNMP::Info::CiscoStpExtensions/"Required MIBs"> for its own MIB requirements.
+
 =back
 
 =head1 GLOBALS
@@ -328,6 +350,10 @@ See documentation in L<SNMP::Info::CiscoPower/"GLOBALS"> for details.
 
 See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 
+=head2 Globals imported from SNMP::Info::CiscoStpExtensions
+
+See documentation in L<SNMP::Info::CiscoStpExtensions/"GLOBALS"> for details.
+
 =head1 TABLE METHODS
 
 These are methods that return tables of information in the form of a reference
@@ -406,9 +432,13 @@ See documentation in L<SNMP::Info::CiscoConfig/"TABLE METHODS"> for details.
 
 See documentation in L<SNMP::Info::CiscoPower/"TABLE METHODS"> for details.
 
+=head2 Table Methods imported from SNMP::Info::CiscoStpExtensions
+
 =head2 Table Methods imported from SNMP::Info::Layer3
 
 See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
 
+See documentation in L<SNMP::Info::CiscoStpExtensions/"TABLE METHODS"> for details.
+
 =cut
 

Info/Layer3/Cisco.pm

@@ -52,7 +52,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Contivity.pm

@@ -42,7 +42,7 @@ use SNMP::Info::Entity;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::MIBS, %SNMP::Info::Layer3::MIBS, %SNMP::Info::Entity::MIBS,

Info/Layer3/Dell.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
@@ -154,7 +154,7 @@ sub interfaces {
     my $partial = shift;
 
     my $i_descr = $dell->i_description($partial) || {};
-    my $i_name  = $dell->i_name($partial)        || {};
+    my $i_name  = $dell->orig_i_name($partial)   || {};
 
     # Descriptions are all the same on some Dells, so use name instead if
     # available

Info/Layer3/Enterasys.pm

@@ -44,7 +44,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS, %SNMP::Info::CDP::MIBS,

Info/Layer3/Extreme.pm

@@ -43,7 +43,7 @@ use SNMP::Info::MAU;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Foundry.pm

@@ -44,7 +44,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/HP9300.pm

@@ -42,7 +42,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Juniper.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Microsoft.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, );
 

Info/Layer3/N1600.pm

@@ -41,7 +41,7 @@ use SNMP::Info::SONMP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/NetSNMP.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Netscreen.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,

Info/Layer3/Passport.pm

@@ -43,7 +43,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS, %SNMP::Info::RapidCity::MIBS,
@@ -188,7 +188,7 @@ sub interfaces {
         )
         )
     {
-        $vlan_index   = $passport->rc_vlan_if();
+        $vlan_index   = $passport->rc_vlan_if() || {};
         %reverse_vlan = reverse %$vlan_index;
         $vlan_id      = $passport->rc_vlan_id();
     }

Info/Layer3/Sun.pm

@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, );
 

Info/Layer3/Timetra.pm

@@ -0,0 +1,194 @@
+# SNMP::Info::Layer3::Timetra
+# $Id$
+#
+# Copyright (c) 2008 Bill Fenner
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#     * Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the University of California, Santa Cruz nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+package SNMP::Info::Layer3::Timetra;
+
+use strict;
+
+use Exporter;
+use SNMP::Info::Layer3;
+
+@SNMP::Info::Layer3::Timetra::ISA = qw/SNMP::Info::Layer3
+    Exporter/;
+@SNMP::Info::Layer3::Timetra::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '2.01';
+
+%MIBS = ( %SNMP::Info::Layer3::MIBS, 'TIMETRA-GLOBAL-MIB' => 'timetraReg', );
+
+%GLOBALS = ( %SNMP::Info::Layer3::GLOBALS, );
+
+%FUNCS = ( %SNMP::Info::Layer3::FUNCS, );
+
+%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );
+
+sub model {
+    my $timetra = shift;
+    my $id      = $timetra->id();
+    my $model   = &SNMP::translateObj($id);
+
+    return $id unless defined $model;
+
+    $model =~ s/^tmnxModel//;
+
+    return $model;
+}
+
+sub os {
+    return 'TiMOS';
+}
+
+sub vendor {
+    return 'alcatel-lucent';
+}
+
+sub os_ver {
+    my $timetra = shift;
+
+    my $descr = $timetra->description();
+    if ( $descr =~ m/^TiMOS-(\S+)/ ) {
+        return $1;
+    }
+
+    # No clue what this will try but hey
+    return $timetra->SUPER::os_ver();
+}
+
+# The interface description contains the SFP type, so
+# to avoid losing historical information through a configuration change
+# we use interface name instead.
+sub interfaces {
+    my $alu     = shift;
+    my $partial = shift;
+
+    return $alu->orig_i_name($partial);
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Timetra - SNMP Interface to Alcatel-Lucent SR
+
+=head1 AUTHOR
+
+Bill Fenner
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $alu = new SNMP::Info(
+                        AutoSpecify => 1,
+                        Debug       => 1,
+                        # These arguments are passed directly to SNMP::Session
+                        DestHost    => 'myswitch',
+                        Community   => 'public',
+                        Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $alu->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Alcatel-Lucent Service Routers
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<TIMETRA-GLOBAL-MIB>
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $alu->vendor()
+
+Returns 'alcatel-lucent'
+
+=item $alu->os()
+
+Returns 'TiMOS'
+
+=item $alu->os_ver()
+
+Grabs the version string from C<sysDescr>.
+
+=item $alu->model()
+
+Tries to reference $alu->id() to one of the product MIBs listed above
+
+Removes 'tmnxModel' from the name for readability.
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=over
+
+=item $alu->interfaces()
+
+Returns C<ifName>, since the default Layer3 C<ifDescr> varies based
+upon the transceiver inserted.
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=cut

Info/MAU.pm

@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = ( 'MAU-MIB' => 'mauMod' );
 
@@ -170,16 +170,15 @@ sub mau_i_duplex_admin {
     my $mau     = shift;
     my $partial = shift;
 
-    my $mau_index     = $mau->mau_index();
-    my %rev_mau_index = reverse %$mau_index;
-    my $mau_autostat
-        = defined $partial
-        ? $mau->mau_autostat( $rev_mau_index{$partial} )
-        : $mau->mau_autostat();
-    my $mau_type_admin
-        = defined $partial
-        ? $mau->mau_type_admin( $rev_mau_index{$partial} )
-        : $mau->mau_type_admin();
+    my $mau_index = $mau->mau_index() || {};
+
+    if ($partial) {
+        my %rev_mau_index = reverse %$mau_index;
+        $partial = $rev_mau_index{$partial};
+    }
+
+    my $mau_autostat   = $mau->mau_autostat($partial)   || {};
+    my $mau_type_admin = $mau->mau_type_admin($partial) || {};
 
     # Older HP4000's don't implement ifMauDefaultType, but we can
     # figure out from ifMauAutoNegCapAdvertised what we'd like.

Info/NortelStack.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
 

Info/PowerEthernet.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = ( 'POWER-ETHERNET-MIB' => 'pethPsePortDetectionStatus' );
 

Info/RapidCity.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = ( 'RAPID-CITY' => 'rapidCity', );
 

Info/SONMP.pm

@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '1.09';
+$VERSION = '2.01';
 
 %MIBS = (
     'SYNOPTICS-ROOT-MIB'           => 'synoptics',

MANIFEST

@@ -13,6 +13,7 @@ Info/CiscoQOS.pm
 Info/CiscoRTT.pm
 Info/CiscoStack.pm
 Info/CiscoStats.pm
+Info/CiscoStpExtensions.pm
 Info/CiscoVTP.pm
 Info/Entity.pm
 Info/EtherLike.pm
@@ -45,7 +46,10 @@ Info/Layer2/Orinoco.pm
 Info/Layer2/ZyXEL_DSLAM.pm
 Info/Layer3.pm
 Info/Layer3/Aironet.pm
+Info/Layer3/AlcatelLucent.pm
 Info/Layer3/AlteonAD.pm
+Info/Layer3/Altiga.pm
+Info/Layer3/Arista.pm
 Info/Layer3/BayRS.pm
 Info/Layer3/C3550.pm
 Info/Layer3/C4000.pm
@@ -64,6 +68,7 @@ Info/Layer3/Netscreen.pm
 Info/Layer3/NetSNMP.pm
 Info/Layer3/Passport.pm
 Info/Layer3/Sun.pm
+Info/Layer3/Timetra.pm
 Info/LLDP.pm
 Info/MAU.pm
 Info/NortelStack.pm
@@ -79,4 +84,6 @@ t/make_dev_matrix.pl
 t/pod-coverage.t
 t/pod.t
 t/prereq.t
+t/push_ver
+t/run_test
 t/test_class.pl

README

@@ -5,16 +5,24 @@ NAME
 
 VERSION
 
-    SNMP::Info - Version 1.09
+    SNMP::Info - Version 2.01
 
 AUTHOR
 
-    SNMP::Info was created at UCSC for the netdisco project
-    (www.netdisco.org) and was originally written by Max Baker.
-
-    Currently being maintained by team of Open Source authors headed by Eric
+    SNMP::Info is maintained by team of Open Source authors headed by Eric
     Miller and Bill Fenner.
 
+    Please visit <http://sourceforge.net/projects/snmp-info/> for most
+    up-to-date list of developers.
+
+    SNMP::Info was originally created at UCSC for the Netdisco project
+    <http://netdisco.org> by Max Baker.
+
+DEVICES SUPPORTED
+
+    See <http://netdisco.org/doc/DeviceMatrix.html> or DeviceMatrix.txt for
+    more details.
+
 SYNOPSIS
 
      use SNMP::Info;
@@ -82,9 +90,6 @@ DESCRIPTION
     SNMP::Info gives an object oriented interface to information obtained
     through SNMP.
 
-    This module lives at http://snmp-info.sourceforge.net Check for newest
-    version and documentation.
-
     This module is geared towards network devices. Subclasses exist for a
     number of network devices and common MIBs.
 
@@ -125,13 +130,10 @@ REQUIREMENTS
 
         Net-SNMP can be found at http://net-snmp.sourceforge.net
 
-        Version 5.1.2 or greater is recommended.
+        Version 5.3.2 or greater is recommended.
 
-        Various version 4's and 5.0 and 5.1 series will work. 5.0.1 is kinda
-        flaky on the Perl side.
-
-        Versions 5.0301 and 5.0203 have issues with bulkwalk, turn off
-        bulkwalk.
+        Versions 5.0.1, 5.0301 and 5.0203 have issues with bulkwalk and are
+        not supported.
 
         Redhat Users: Some versions that come with certain versions of
         Redhat/Fedora don't have the Perl library installed. Uninstall the
@@ -142,8 +144,8 @@ REQUIREMENTS
 
         If you are using SNMP::Info separate from Netdisco, download the
         Netdisco MIB package at
-
-         http://sourceforge.net/project/showfiles.php?group_id=80033&package_id=135517
+        <http://sourceforge.net/project/showfiles.php?group_id=80033&package
+        _id=135517>
 
         Make sure that your snmp.conf is updated to point to your MIB
         directory and that the MIBs are world-readable.
@@ -225,6 +227,11 @@ SUBCLASSES
 
         See documentation in SNMP::Info::CiscoPortSecurity for details.
 
+    SNMP::Info::CiscoPower
+        CISCO-POWER-ETHERNET-EXT-MIB.
+
+        See documentation in SNMP::Info::CiscoPower for details.
+
     SNMP::Info::CiscoQOS
         CISCO-CLASS-BASED-QOS-MIB. A collection of OIDs providing
         information about a Cisco device's QOS config.
@@ -242,6 +249,11 @@ SUBCLASSES
 
         See documentation in SNMP::Info::CiscoStack for details.
 
+    SNMP::Info::CiscoStpExtensions
+        CISCO-STP-EXTENSIONS-MIB
+
+        See documentation in SNMP::Info::CiscoStpExtensions for details.
+
     SNMP::Info::CiscoStats
         OLD-CISCO-CPU-MIB, CISCO-PROCESS-MIB, and CISCO-MEMORY-POOL-MIB.
         Provides common interfaces for memory, cpu, and os statistics for
@@ -261,7 +273,7 @@ SUBCLASSES
         See documentation in SNMP::Info::Entity for details.
 
     SNMP::Info::EtherLike
-        ETHERLIKE-MIB (RFC1398) - Some Layer3 devices implement this MIB, as
+        EtherLike-MIB (RFC1398) - Some Layer3 devices implement this MIB, as
         well as some Aironet Layer 2 devices (non Cisco).
 
         See documentation in SNMP::Info::EtherLike for details.
@@ -294,6 +306,11 @@ SUBCLASSES
 
         See documentation in SNMP::Info::NortelStack for details.
 
+    SNMP::Info::PowerEthernet
+        POWER-ETHERNET-MIB
+
+        See documentation in SNMP::Info::PowerEthernet for details.
+
     SNMP::Info::RapidCity
         RAPID-CITY. Inherited by Nortel switches for duplex and VLAN
         information.
@@ -439,6 +456,11 @@ SUBCLASSES
 
             See documentation in SNMP::Info::Layer2::NAP222x for details.
 
+        SNMP::Info::Layer2::Netgear
+            Subclass for Netgear switches
+
+            See documentation in SNMP::Info::Layer2::Netgear for details.
+
         SNMP::Info::Layer2::Orinoco
             Subclass for Orinoco/Proxim wireless access points.
 
@@ -466,12 +488,24 @@ SUBCLASSES
 
             See documentation in SNMP::Info::Layer3::Aironet for details.
 
+        SNMP::Info::Layer3::AlcatelLucent
+            Alcatel-Lucent OmniSwitch Class.
+
+            See documentation in SNMP::Info::Layer3::AlcatelLucent for
+            details.
+
         SNMP::Info::Layer3::AlteonAD
             Subclass for Nortel Alteon Series Layer 2-7 load balancing
             switches and Nortel BladeCenter Layer2-3 GbE Switch Modules.
 
             See documentation in SNMP::Info::Layer3::AlteonAD for details.
 
+        SNMP::Info::Layer3::Altiga
+            See documentation in SNMP::Info::Layer3::Altiga for details.
+
+        SNMP::Info::Layer3::Arista
+            See documentation in SNMP::Info::Layer3::Arista for details.
+
         SNMP::Info::Layer3::BayRS
             Subclass for Nortel Multiprotocol/BayRS routers. This includes
             BCN, BLN, ASN, ARN, AN, 2430, and 5430 routers.
@@ -572,6 +606,11 @@ SUBCLASSES
 
             See documentation in SNMP::Info::Layer3::Sun for details.
 
+        SNMP::Info::Layer3::Timetra
+            Alcatel-Lucent SR Class.
+
+            See documentation in SNMP::Info::Layer3::Timetra for details.
+
 Thanks
 
     Thanks for testing and coding help (in no particular order) to :
@@ -754,68 +793,9 @@ USAGE
         If the device still can be connected to via SNMP::Info, then
         SNMP::Info is returned.
 
-        Algorithm for Subclass Detection:
-
-                Layer3 Support                     -> SNMP::Info::Layer3
-                    Aironet (BR500,AP340,350,1200) -> SNMP::Info::Layer3::Aironet
-                             AP4800... All Non IOS
-                    Catalyst 3550,3548,3560        -> SNMP::Info::Layer3::C3550
-                    Catalyst 4000,4500             -> SNMP::Info::Layer3::C4000
-                    Catalyst 6500,3750             -> SNMP::Info::Layer3::C6500
-                    Cisco Generic L3 IOS device    -> SNMP::Info::Layer3::Cisco
-                    Cyclades terminal server       -> SNMP::Info::Layer1::Cyclades
-                    Dell PowerConnect              -> SNMP::Info::Layer3::Dell
-                    D-Link                         -> SNMP::Info::Layer3::Dell
-                    Enterasys                      -> SNMP::Info::Layer3::Enterasys
-                    Extreme                        -> SNMP::Info::Layer3::Extreme
-                    Foundry                        -> SNMP::Info::Layer3::Foundry
-                    HP Procurve                    -> SNMP::Info::Layer2::HP
-                    HP Procurve 9300 series        -> SNMP::Info::Layer3::HP9300
-                    Juniper                        -> SNMP::Info::Layer3::Juniper
-                    Microsoft                      -> SNMP::Info::Layer3::Microsoft
-                    Net-SNMP                       -> SNMP::Info::Layer3::NetSNMP
-                    Nortel Passport/Accelar LAN    -> SNMP::Info::Layer3::Passport
-                    Nortel/Bay Baystack            -> SNMP::Info::Layer2::Baystack
-                    Alteon Ace Director            -> SNMP::Info::Layer3::AlteonAD
-                    Nortel Contivity               -> SNMP::Info::Layer3::Contivity
-                    Nortel BayRS Router            -> SNMP::Info::Layer3::BayRS
-                    Sun Router                     -> SNMP::Info::Layer3::Sun
-                 Elsif Layer2 (no Layer3)          -> SNMP::Info::Layer2
-                    Aironet - IOS Devices          -> SNMP::Info::Layer2::Aironet
-                    Catalyst 1900                  -> SNMP::Info::Layer2::C1900
-                    Catalyst 2900XL,2940,2950,
-                             3500XL                -> SNMP::Info::Layer2::C2900
-                    Catalyst 2960, 2970            -> SNMP::Info::Layer3::C6500
-                    Catalyst 3550/3548             -> SNMP::Info::Layer3::C3550
-                    Cisco 3400 w/ MetroBase        -> SNMP::Info::Layer3::C3550
-                    Catalyst WS-C 2926,5xxx        -> SNMP::Info::Layer2::Catalyst
-                    Cisco (Airespace) Wireless     -> SNMP::Info::Layer2::Airespace
-                    Cisco (not covered by above)   -> SNMP::Info::Layer2::Cisco
-                    Cyclades terminal server       -> SNMP::Info::Layer1::Cyclades
-                    Dell PowerConnect              -> SNMP::Info::Layer3::Dell
-                    D-Link                         -> SNMP::Info::Layer3::Dell
-                    Enterasys                      -> SNMP::Info::Layer3::Enterasys
-                    Extreme                        -> SNMP::Info::Layer3::Extreme
-                    Foundry                        -> SNMP::Info::Layer3::Foundry
-                    HP Procurve                    -> SNMP::Info::Layer2::HP
-                    HP Procurve 9300 series        -> SNMP::Info::Layer3::HP9300
-                    IBM BladeCenter GbESM          -> SNMP::Info::Layer3::Dell
-                    Nortel/Bay Centillion ATM      -> SNMP::Info::Layer2::Centillion
-                    Nortel/Bay Baystack            -> SNMP::Info::Layer2::Baystack
-                    Nortel Business Ethernet Switch-> SNMP::Info::Layer2::Baystack
-                    Nortel Passport/Accelar 8100   -> SNMP::Info::Layer3::Passport
-                    Nortel AP 222x                 -> SNMP::Info::Layer2::NAP222x
-                    Orinco AP                      -> SNMP::Info::Layer2::Orinoco
-                    Nortel 2270 WSS                -> SNMP::Info::Layer2::N2270
-                Elsif Layer1 Support               -> SNMP::Info::Layer1
-                    Allied                         -> SNMP::Info::Layer1::Allied
-                    Asante                         -> SNMP::Info::Layer1::Asante
-                    Nortel/Bay Hub                 -> SNMP::Info::Layer1::Bayhub
-                    Bay/Synoptics Hub              -> SNMP::Info::Layer1::S3000
-                Else                               -> SNMP::Info
-                    ZyXEL_DSLAM                    -> SNMP::Info::Layer2::ZyXEL_DSLAM
-                    Aruba wireless                 -> SNMP::Info::Layer2::Aruba
-                    Juniper NetScreen              -> SNMP::Info::Layer3::Netscreen
+        See <http://netdisco.org/doc/DeviceMatrix.html> or DeviceMatrix.txt
+        for more details about device support, or view "device_type()" in
+        Info.pm.
 
     $info->error(no_clear)
         Returns Error message if there is an error, or undef if there is
@@ -1562,9 +1542,9 @@ SNMP::INFO INTERNALS
         See Math::BigInt for details.
 
     munge_i_up
-        There is a collision between data in "IF-MIB" and "RFC-1213". For
-        devices that fully implement "IF-MIB" it might return 7 for a port
-        that is down. This munges the data against the "IF-MIB" by hand.
+        Net-SNMP tends to load "RFC1213-MIB" first, and so ignores the
+        updated enumeration for "ifOperStatus" in "IF-MIB". This munge
+        handles the "newer" definitions for the enumeration in IF-MIB.
 
         TODO: Get the precedence of MIBs and overriding of MIB data in
         Net-SNMP figured out. Heirarchy/precendence of MIBS in SNMP::Info.
@@ -1654,8 +1634,8 @@ SNMP::INFO INTERNALS
             <obj> - One of the following forms:
                 1) leaf identifier (e.g., C<'sysContact'>)
                 2) An entry in either %FUNCS, %GLOBALS (e.g., 'contact')
-            <iid> - The dotted-decimal, instance identifier. For scalar MIB
-                    objects use '0'
+            <iid> - The dotted-decimal, instance identifier. For scalar MIB objects
+                     use '0'
             <val>  - The SNMP data value being set (e.g., 'netdisco')
             <type> - Optional as the MIB should be loaded.
 
@@ -1746,8 +1726,8 @@ SNMP::INFO INTERNALS
 
 COPYRIGHT AND LICENSE
 
-    Changes from SNMP::Info Version 0.7 and on are: Copyright (c) 2003-2008
-    Max Baker - All rights reserved.
+    Changes from SNMP::Info Version 0.7 and on are: Copyright (c) 2003-2009
+    Max Baker and SNMP::Info Developers All rights reserved.
 
     Original Code is: Copyright (c) 2002-2003, Regents of the University of
     California All rights reserved.

t/00_local_docininfo.t

@@ -0,0 +1,46 @@
+#!/usr/bin/perl
+# 00_local_versionsync.t - Private test to check that all modules are listed in Info.pm
+# $Id$
+
+use warnings;
+use strict;
+use File::Find;
+use Test::More;
+
+eval "use File::Slurp";
+plan skip_all => "File::Slurp required for testing version sync"
+    if $@;
+
+plan qw(no_plan);
+
+my %Items;
+# Grab all the =item's from Info.pm
+open (I,"blib/lib/SNMP/Info.pm") or fail("Can't open Info.pm");
+while (<I>) {
+    next unless /^\s*=item\s*(\S+)/;
+    $Items{$1}++;
+}
+close I;
+
+#warn "items : ",join(', ',keys %Items),"\n";
+
+# Check that each package is represented in Info.pm docs
+find({wanted => \&check_version, no_chdir => 1}, 'blib');
+
+sub check_version {
+    # $_ is the full path to the file
+    return unless (m{blib/lib/}xms and m{\.pm \z}xms);
+
+    my $content = read_file($_);
+
+    # Make sure that this package is listed in Info.pm
+    fail($_) unless $content =~ m/^\s*package\s+(\S+)\s*;/m;
+    
+    my $package = $1;
+
+    return if $package eq 'SNMP::Info';
+
+    fail($_) unless defined $Items{$package};
+
+    pass($_);
+}

t/00_local_spelling.t

@@ -5,7 +5,10 @@
 use warnings;
 use strict;
 use Test::More;
-use Test::Spelling;
+
+eval "use Test::Spelling";
+plan skip_all => "Test::Spelling required for checking spelling"
+    if $@;
 
 set_spell_cmd('aspell list');
 add_stopwords(<DATA>);
@@ -18,16 +21,23 @@ acl
 adsl
 af
 agere
-alteon
 airespace
 aironet
 airos
+Alcatel
 alcatel
+alteon
+Altiga
+altiga
+AOS
 ap
 APs
+Arista
+arista
 arn
 arp
 aruba
+asa
 asante
 ascii
 asn
@@ -49,6 +59,7 @@ bitmask
 bladecenter
 bln
 bpdus
+BSSID
 bulkrepeaters
 bulkwalk
 cabletron
@@ -81,16 +92,20 @@ dynamicgvrp
 eapol
 edgeiron
 eigrp
+enterasys
+EOS
 erszenyi
 ess
 etherlike
-enterasys
+ethernet
 extranet
 fastiron
 fdb
 fdp
 fenner
 fsm
+FWSM
+fwsm
 gbe
 gbesm
 getnext
@@ -110,8 +125,8 @@ indices
 ingen
 ios
 ip
-IPv
 IPV
+IPv
 jeroen
 junos
 kramarov
@@ -122,6 +137,7 @@ loopback
 loopdetect
 lorensen
 lsb
+Lucent
 lucent
 luiggi
 lwapp
@@ -131,30 +147,34 @@ maxrepeaters
 mbs
 mckeown
 mda
-mib
+MIB
 mibdirs
+mib
 mibs
 milliwatts
 msb
 mtu
+multi
 multicast
 multiseg
 multivlan
+munge
 munges
 namespace
+ndp
 netdisco
 netgear
 netmask
 netscreen
 nmm
-ndp
 nopassword
-nosuch
 nortel
+nosuch
 oem
 ofdm
 oid
 oids
+OmniSwitch
 os
 osi
 ospf
@@ -182,34 +202,40 @@ retrynosuch
 rom
 rtt
 rttmon
+sca
+Schenau
 sergienko
 sieborger
 SNMP
-SNMP's
 snmp
-snmpwalk
+SNMP's
 snmpv2
 snmpv3
+snmpwalk
 solaris
 sonmp
 ssid
 SSID's
+SSIDs
+Stickland
 stackable
 stdout
 stg
 stp
 subcomponents
 subnet
-supply's
 sunos
+supply's
 synoptics
 sys
-todo
 telesyn
 telesys
 tftp
 tftpfilename
 tftpserver
+TiMOS
+tmnxModel
+todo
 tuttle
 ucsc
 uninstall
@@ -223,4 +249,4 @@ wlan
 wlans
 WS
 zoltan
-zyxel
+zyxel

t/00_local_versionsync.t

@@ -5,12 +5,14 @@
 use warnings;
 use strict;
 use File::Find;
-use Test::More qw(no_plan);
+use Test::More;
 
 eval "use File::Slurp";
 plan skip_all => "File::Slurp required for testing version sync"
     if $@;
 
+plan qw(no_plan);
+
 my $last_version = undef;
 find({wanted => \&check_version, no_chdir => 1}, 'blib');
 if (! defined $last_version) {

t/make_dev_matrix.pl

@@ -40,6 +40,7 @@ if ($@) {
     $gvds->graph()->as_png($DevPNG);
 }
 
+print "Creating $DevHTML\n";
 open (HTML, "> $DevHTML") or die "Can't open $DevHTML. $!\n";
 $old_fh = select(HTML);
 &html_head;

t/push_ver

@@ -0,0 +1,46 @@
+#!/usr/bin/perl -w
+# $Id$
+
+use File::Glob qw/bsd_glob/;
+
+my @pms = glob_rec("../Info");
+
+$new_version = shift @ARGV || '2.01';
+
+foreach my $p (@pms) {
+    print "$p\n";
+
+    rename($p,"$p.orig");
+    open (O,"<$p.orig") or die;
+    open (P,">$p") or die "Can't open $p for write. $!\n";
+
+    while (<O>) {
+        s/^\s*\$VERSION\s+=\s*'[^']+'\s*;/\$VERSION = '$new_version';/;
+        print P;
+    }
+
+    close O;
+    close P or die "Can't write $p. $!\n";
+    #last;
+}
+
+sub glob_rec {
+    my $dir = shift;
+
+    my @files = bsd_glob("$dir/*");
+
+    my @pms;
+
+    foreach my $f (@files) {
+        next if $f eq '\.$';
+        
+        if (-d $f) {
+            push @pms, glob_rec($f);
+            next;
+        }
+
+        push @pms,$f if $f =~ /.pm$/;
+    }
+
+    return @pms;
+}

t/run_test

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Run this from ../
+/usr/local/bin/perl "-MExtUtils::Command::MM" "-e" "test_harness(0, 'blib/lib', 'blib/arch')" t/$1

t/test_class.pl

@@ -9,11 +9,14 @@
 # $Id$
 #
 
-use lib '/usr/local/netdisco';
+use FindBin;
+use lib "$FindBin::Bin/../..";
+#use lib '/usr/local/netdisco';
+
 use SNMP::Info;
 use Getopt::Long;
 use strict;
-use vars qw/$Class $Dev $Comm $Ver @Dump %Dumped $Debug %args $NoBulk/;
+use vars qw/$Class $Dev $Comm $Ver @Dump %Dumped $Debug %args $NoBulk $MibDirs/;
 
 # Default Values
 $Class = '';
@@ -32,18 +35,31 @@ GetOptions ('c|class=s'  => \$Class,
             'p|print=s'  => \@Dump,
             'x|debug+'   => \$Debug,
             'n|nobulk'   => \$NoBulk,
+            'm|mibdir=s@' => \$MibDirs,
            );
 
 &usage unless ($Dev and $Comm);
 
+# Default MIB directories
+my $n = '/usr/local/netdisco';
+unless (defined $MibDirs) {
+    $MibDirs = ["$n/mibs/allied", "$n/mibs/asante", "$n/mibs/cisco", "$n/mibs/foundry",
+                "$n/mibs/hp", "$n/mibs/nortel", "$n/mibs/extreme", "$n/mibs/rfc",
+                "$n/mibs/net-snmp"];
+}
+
 $Class = $Class ? "SNMP::Info::$Class" : 'SNMP::Info';
 eval "require $Class;";
 if ($@) {
     die "Can't load Class specified : $Class.\n\n$@\n";
 }
 
-print "Class $Class loaded.\n";
-
+my $class_ver = 'undef';
+{ no strict 'refs';
+    $class_ver = ${"${Class}::VERSION"};
+}
+print "Class $Class ($class_ver) loaded from SNMP::Info $SNMP::Info::VERSION.\n";
+#print "MIB Dirs : ",join(', ',@$MibDirs),"\n";
 print "Dumping : ",join(',',@Dump),"\n"  if scalar @Dump;
 
 %args = ();
@@ -57,11 +73,13 @@ my $dev = new $Class( 'AutoSpecify' => 0,
                       'Debug'       => $Debug,
                       'DestHost'    => $Dev,
                       'Community'   => $Comm,
+                      'MibDirs'     => $MibDirs,
 			%args
                     ) or die "\n"; 
 
 print "Connected to $Dev.\n";
-print "It's a ", $dev->device_type(), ".\n";
+print "Detected Class: ", $dev->device_type(), "\n";
+print "Using    Class: $Class (-c to change)\n";
     
 my $layers = $dev->layers();
 
@@ -182,6 +200,7 @@ test_class - Test a device against an SNMP::Info class
     -p  --print  i_blah2
     -x  --debug  debugging flag
     -n  --nobulk disable bulkwalk
+    -m  --mibdirs directory (repeat as needed)
 
 end_usage
     exit;