update for 1.07

- Trunk VLANs only exist on ports which are trunking

COPYRIGHT

@@ -1,3 +1,8 @@
+All code from version 0.7 on
+Copyright (c) 2003,2004 Max Baker
+All rights reserved.
+
+Original Code
 Copyright (c) 2002,2003 Regents of the University of California
 All rights reserved.
 

ChangeLog

@@ -1,19 +1,244 @@
-SNMP::Info - Perl5 OO Interface to Network Devices and SNMP MIBs
+SNMP::Info - Friendly OO-style interface to Network devices using SNMP.
 ChangeLog $Id$
 
-version 0.5 ()
+version 1.07 (11/26/07) - Beta/developer release
+
+version 1.05 (11/25/07) - CVS only. No official release
+    + Added support for LLDP in new class LLDP (contributions from Bernhard
+      Augenstein)
+    + Added device specific support for LLDP in L2::HP, L2::Baystack,
+      L3::Enterasys and L3::Foundry
+    + Added support for Enterasys devices as new class L3::Enterasys 
+    + Added support for Dell PowerConnect switches as new class L3::Dell
+    + Added basic support for generic routers running Microsoft Windows OS
+      as new class L3::Microsoft (begemot)
+    + Added basic support for Sun routers as new class L3::Sun (begemot)
+    + Added basic support for Juniper NetScreen devices as new class
+      L3::Netscreen (Kent Hamilton)
+    + Added support for Cyclades terminal servers as new class L1::Cyclades
+    + Added support for Cisco (Airespace) wireless controllers as new class
+      L2::Airespace
+    + Added support for Nortel Ethernet Routing Switch 2500 series and
+      Business Ethernet Switches (David Sieb<65>rger)
+    + Update of L3::Foundry to support all Foundry devices including newer
+      switches.  Depreciate L2::Foundry.
+    + Added generic device type detection using IANA assigned enterpise
+      number extracted from sysObjectID
+    + Added ifDiscards and other missing entries from IF-MIB::ifEntry (Greg King)
+    + Added CGESM devices to L2::C2900 class (Alexander Hartmaier)
+    + Added support for dual speed 10/100 hubs and i_speed() in L1::Bayhub
+    + Added i_ssidlist(), i_ssidbcast(), and i_80211channel() methods to
+      L2::Aruba, Airespace, and L2::NAP222x classes
+    + New class IEEE802dot11 class for generic standards based wireless AP
+      support to include i_ssidlist()and i_80211channel() methods.
+    + L2::Orinoco inherits from new IEEE802dot11 for i_ssidlist()and
+      i_80211channel() support. 
+    + Added new VLAN methods i_pvid(), i_vlan_membership(), set_i_pvid(),
+      set_i_vlan(), set_add_i_vlan_tagged(), set_remove_i_vlan_tagged() to
+      Bridge, CiscoVTP, Extreme, HP, and RapidCity classes.
+    + Added set_i_speed_admin() method to RapidCity class,
+    + Added set_i_duplex_admin() method to RapidCity class,
+    + Added OSPF Neighbor Tables, SF Patch 1577918 to Layer 3 (Andrew Herrick)
+    + Added CiscoConfig class, SF Patch 1555001 (Justin Hunter)
+    + Enable load_ methods for %GLOBALS and MIB Leaf node names.
+    + Enable dynamic methods in AUTOLOAD with MIB Leaf node names for loaded
+      MIBs without definition in %FUNCS or %GLOBALS.  Single instance mib leafs
+      will be treated as a GLOBAL and returna scalar while mib leafs which
+      reside in a table will be treated as a FUNC and return a reference to a
+      hash.
+    + Enable load_ methods for %GLOBALS and MIB Leaf node names.
+    + Add loop detect option and code for getnext table column walks.
+    + Add Layer3::NetSNMP for Net-SNMP-based hosts, part of
+      SF patch 1557529 (Bradley Baetz).
+    + Add EIGRP Neighbor Tables to L3::Cisco SF Patch 1577927 (Andrew Herrick)
+    + Additions to CiscoQOS and CiscoStats (Alexander Hartmaier)
+    + Emulate ENTITY-MIB Physical Table methods for devices which don't
+      have ENTITY-MIB support in Airespace, Bayhub, Baystack, BayRS,
+      NortelStack, and Passport classes.
+    + Enable use of MIB Leaf node names in SNMP sets.
+    + Add POWER-ETHERNET-MIB and CISCO-POWER-ETHERNET-EXT-MIB support.
+
+    * Fix for bug where an SNMP error in any operation would cause subsequent
+      table get operations to fail while using the same session, originally
+      identified by Nicolai Petri.
+    * Enable single instance partial table fetches (Alexander Hartmaier)
+    * Enable partial table fetches in overriden table methods (Justin Hunter)
+    * Allow partial table fetches with load_ methods.
+    * Fixed vlan trunk port handling bug in L2:HP (Michael Robbert)
+    * Correct bp_port() definition in Bridge class (Reported by Nicolai Petri)
+    * Remove port security definitions from CiscoStack and move into new class
+      CiscoPortSecurity.  Needed to support devices such a L3::C4000 which
+      support CISCO-PORT-SECURITY-MIB, but not CISCO-STACK-MIB.
+      (Reported by Prakash RudraRaju)
+    * Correct port numbering for Nortel 8110, 1100, 1150 in L3:Passport
+      (Reported by David Pinkoski)
+    * Documentation updates
+    * Translate OIDs returned by Entity MIB e_type
+    * Modify inheritance to use Cisco classes before generic classes
+    * Create e_index method in ENTITY-MIB to facilitate emulation methods in
+      other classes as entPhysicalIndex is not-accessible.
+    * Only return MAC from munge_mac() if it actually is a MAC. Fix for
+      netdisco where device would not be inserted in DB due to malformed MAC.
+    * Enable SUPER class calls to find autoloaded methods (Bernhard Augenstein)
+    * Clear attribute cache on sucessful SNMP set.
+    * Improve accuracy of operational and administrative duplex reporting on
+      devices using CiscoStack.
+    * All i_type() methods now use standard IANAifType values.
+    * Report bridge groups (VLANs) in L2::C1900.
+    * Turn on bulkwalk for C6500.  Users with buggy OS versions can turn
+      it off when creating the object.
+    * c_ip() now attempts to return only IPV4 addresses, use c_addr() for all
+      address types.
+
+version 1.04 (07/08/06)
+    +  Added C1130 and C1240 to L2::Aironet (Ralf Gross)
+    +  Added detection for Cisco 2960, 2940, 3400 w/ MetroBase
+    +  Added generic L2::Cisco Class
+    *  Corrected detection for Cisco Supervisor Engine 2 and 32 (IOS).  
+    *  Fixed warnings in CiscoStack
+    *  Updated ProCurve HP device detection for newer firmwares
+
+version 1.03 (04/14/06) - Beta/developer release
+    * Use ipNetToMedia table instead of atTable for ARP
+    * Remove CiscoStack from Layer3::C4000
+    * Fixed bug in MAU class when polling devices without MAU-MIB support 
+
+version 1.01 (04/08/06) - Beta/developer release
+    + Change version numbers to X.XX format.  Odd releases are beta
+      or developer only releases.  Even are official releases.
+
+version 1.0 (04/07/06) - CVS only. No official release
+    + Added Interface FlowControl status to CiscoStack (Nicolai Petri)
+    + Added CiscoImage class (Matthew Tuttle)
+    + Added C1200 and C350 IOS devices to L2::Aironet (Matthew Tuttle)
+    + Added support for Foundry IronWare and gave L3::Foundry CPR
+    + Added support for Foundry EdgeIrons as new class L2::Foundry
+    + Added BulkWalk and BulkRepeaters options to new()
+    + Added DebugSNMP option to new()
+    + Added CISCO-ENTITY-VENDORTYPE-OID-MIB,CISCO-PRODUCTS-MIB,CISCO-STACK-MIB
+      to CiscoStats.pm for model()
+    + Check for bulkwalk_no() method
+    + Added Entity.pm to L3 and L2 classes per N. Petri's suggestion.
+    + Added support for Passport/Accelar 1100 and 1200 series in L3::Passport
+    + Added support for Passport/Accelar 8100 series in L3::Passport
+    + Added support for Passport 1600 series as new class, L3::N1600
+    + Added support for Extreme Alpine and Summit switches as new class
+      L3:Extreme (Mike Hunter and Eric Miller)
+    + Added support for Aruba wireless switches (Eric Miller and Brian Chow)
+    + Added support for Nortel 2700 series (Airespace) wireless switches
+    + Added support for Synoptics hubs as new class L1:S3000
+    + Added Cisco QOS and RTT classes (Alexander Hartmaier)
+    + Added BGP Peer Table to L3 class (Carlos Vicente)
+    + Added ipforwarding status to Info base class (Carlos Vicente)
+    + Added STP port state to Bridge class (Alexander Barthel)
+    + Added L3 support (arpnip) to Baystack class for routing capable switches
+    + Added set_i_duplex_admin() and set_i_speed_admin() to C2900 class
+      (Justin Hunter)
+    + Added set_i_duplex_admin() and set_i_speed_admin() to CiscoStack class
+    + CDP added to Aironet class
+    + Added Juniper class
+    + Added support for Catalyst 4000 and 4500, get admin. duplex
+      and speed properly
+    + Added i_speed_high(), which i_speed() uses if needed to support
+      interfaces >4Gbps
+
+    * More error checking in  _load_attr() around bulkwalk code
+    * Minor warning fix in L3::Aironet::os_ver()
+    * Abstracted remaining Cisco stuff from L3 to L3::Cisco
+    * Removed all Cisco stuff from L2
+    * Expanded Entity.pm to cover the whole ENTITY-MIB and improved docs.
+    * changed all refs to $DEBUG to $self->debug() for reentrant code
+    * [ 1111284 ] Parameters not being set with AutoSpecify - fixed.
+    * Turned off BULKWALK for C1900 and C6500 classes.
+    * Added exception handling for V2 ENDOFMIBVIEW
+    * Fix in SONMP when topology not enabled
+    * Fix in L3::Passport root_ip()
+    * Fix in L3::Passport bp_index() some devices not returning complete index.
+    * Enable set_i_up_admin() in Bayhub
+    * Recognize new Nortel model names in Baystack and Passport classes
+    * Orinoco class should now recognize more models
+    * Cleanup model recognition in Baystack class, recognize more models
+    * Modify Catalyst class to use CISCO-STACK-MIB for brige port index mapping
+      some devices having problems returning complete index from BRIDGE-MIB
+    * Check root ip for reachability before assignment
+    * HP class should recognize more models
+    * Fix in HP class for models not returning full bp_index
+    * [ 1436103 ] L2::Aironet devices weren't getting their model
+      translated properly
+
+verison 0.9 (11/15/04)
+    + ** Added full Nortel/Bay/BayStack support 
+        by new developer Eric Miller.  
+        L2::Bay now depricated.
+    + Added Alteon Ace support (Eric Miller)
+    + Added Nortel Cotivity support (Eric Miller)
+    + Added Nortel BayRS support (Eric Miller)
+    + Added Nortel Centillion support (Eric Miller)
+    + Added Nortel AP 222x support (Eric Miller)
+    + Added Orinco AP support (Eric Miller) 
+    + Added i_lastchange() per suggestion of Nicolai Petri
+    + Added BULKWALK patch by Bradley Baetz - This should
+          greatly speed up requests on SNMPv2c devices.
+    + Added MibDirs option to new() to allow specifying non-system MIB
+      directories.
+
+    * Added C3560s to the C3550 class. Thanks to Nicolai.
+    * Fixed Bug where older Cisco's would append nulls to certain
+      CDP information.  Would come up a 'DBD::Pg parser' error in Netdisco
+    * Changed so a failed _global() call is cached so it won't retry
+      an error over and over again if the same global is used.
+    * Added check in _set() to see if data came from sub or FUNCS/GLOBALS
+      Fails if came from sub.
+
+version 0.8 (03/21/04)
+    + Added Q-BRIDGE-MIB support to SNMP::Info::Bridge
+    + Added Aironet AP4800 to Layer3::Aironet class
+    + Added C3500XL devices to the Layer2::C2900 class
+    + Added Cisco 3750 (37xxstack) to Layer3::C6500 class
+    + Added Cisco Catalyst 4000 to Layer3::C6500 class
+    + Added Cisco Catalyst 2970 to Layer3::C6500 Class
+    * Made Cisco Commuinty string indexing a boolean method for clarification
+    * Added VLAN info for HP devices using Q-BRIDGE-MIB
+    * Fixed warning about uninitialized value in CiscoStats line 92
+    * Added for more serial# checking for L2 and L3
+    * Fixed warning in Layer2::Bay about non numeric port line 199
+    Contributions from Dmitry Sergienko:
+    + Added Cisco Aironet BR500 and AP1200 to L2::Aironet Class
+    * Fixed the Port name alias for Catalyst 2900 devices
+    + Added Support For ZyXEL DSLAMs and Allied Telesys Switches
+
+version 0.7 (08/14/03)
+    * Added Class for Catalyst 6500 Series - Layer3::C6500
+    * Added CiscoVTP support to 3550,2900, and Catalyst classes
+    * Extracted VLAN stuff from Layer2::Catalyst to SNMP::Info::CiscoVTP
+    * Extracted CISCO-STACK-MIB from Layer2::Catalyst to SNMP::Info::CiscoStack
+    * Added 2950's to the Layer2::C2900 class
+    * Added 3548's and 350x's to the Layer3::C3550 class
+    * Broke out 3550's into separate device types (3550-24, 3550-48)
+    * Added T1,dual T1, and T3 , ATM over OC-12 ... to the SPEED_MAP
+    * Fixed speed map -- OC-1 -> OC-3
+    * Fixed Bug where Catalyst Switch running IOS would report CatOS as os()
+
+version 0.6 (06/18/03)
+    * Minor Bug Fix.  SNMP::Info::Layer2::Bay and SNMP::Info::Layer2::C1900
+      didn't return 1 and failed to load on some versions of Perl.
+
+version 0.5 (06/10/03)
     * Added ability to get paritial tables.  For example to get the
       IP routing table for 128.114.*  you can do 
       $ipr = $dev->ipr_dest('128.114');
     * Added IP Routing Table entries from RFC1213 to SNMP::Info
+    * minor bug fixes
 
 version 0.4 (04/29/03)
     * BIG CHANGE ! Internal Data structure has changed.  
     * Added clear_cache() method
     * Added NO_SUCH support for snmpget (TABLE) calls to get SNMP MIB II data 
       from SNMP Version 1 devices.
-    * Methods load_all() and all() have changed their return value. Sorry but the API had to change.
-    * New object methods snmp_comm(), snmp_ver(), store(), class(), nosuch() to make it more OO happy.
+    * Methods load_all() and all() have changed their return value. Sorry but
+      the API had to change.
+    * New object methods snmp_comm(), snmp_ver(), store(), class(), nosuch()
+      to make it more OO happy.
     * Globals are now cached
     * Added new argument 'AutoSpecify' to new() to auto-connect with subclass 
       detected in device_type()
@@ -26,8 +251,8 @@ version 0.4 (04/29/03)
 
 version 0.3 (03/06/03)
     * Fixed HP model() warning
-    * Added error checking for responses of NOSUCHOBJECT and NOSUCHINSTANCE in _global
-      and _load_attr
+    * Added error checking for responses of NOSUCHOBJECT and NOSUCHINSTANCE
+      in _global and _load_attr
     * Added more debugging
     * Added info and munging for c_capabilities in SNMP::Info::CD
       Thanks to Martin Lorensen <martin /at- lorensen.dk>
@@ -44,7 +269,8 @@ version 0.2 (02/19/03)
     * Added Spanning Tree Protocol (STP) methods to SNMP::Info::Bridge
     * Removed HP Specific MIBS in SNMP::Info::Layer2 and cleaned up model()
     * Added poke for Bay 450 Switches 
-    * Mapped HP Part Numbers to model numbers J4812A => 2512 in SNMP::Info::Layer2::HP
+    * Mapped HP Part Numbers to model numbers J4812A => 2512 in
+      SNMP::Info::Layer2::HP
      
 version 0.1 (12/30/02)
     * Initial Release

DeviceMatrix.txt

@@ -0,0 +1,761 @@
+# SNMP Device Compatibility Matrix
+# SNMP::Info - (C) 2004 Max Baker
+
+# This file is meant to detail the cababilities
+# of network devices to supply data via SNMP.  
+
+# $Id$
+
+# Airespace (pre-Cisco)
+device-vendor: Airespace
+cdp:no
+arpnip: no
+macsuck: yes
+portmac: yes
+duplex: both
+vlan: yes
+modules: yes
+class: Layer2::Airespace
+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
+
+# Allied
+device-vendor: Allied Telesyn
+cdp:no
+class: Layer1::Allied
+ver: 1
+arpnip: no
+macsuck: no
+duplex: no
+
+device-family: Allied Hubs
+
+device: AT-3624T
+
+device-family: AT-8000 Switches
+class: Layer2::Allied
+ver: 2
+macsuck: yes
+
+# 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
+
+device: 5000
+
+# Asante
+device-vendor: Asante
+class: Layer1::Asante
+ver: 1
+arpnip: no
+macsuck: no
+duplex: no
+
+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
+class: Layer3::Aironet
+
+device: AIRAP1100, AP1200, C1100, C1130, C1240
+note: IOS based device
+class: Layer2::Aironet
+
+device: BR500
+note: Aironet based device
+
+device: AP350, AP340, CAP350, CAP340, 1200, AP4800
+note: Aironet based device
+
+device-family: 1000
+duplex: no
+ver: 1
+class: Layer3::Cisco
+
+device: 1003
+
+device-family: 1700
+class: Layer3::Cisco
+
+device: 1710
+duplex: link
+
+device-family: 2500
+duplex: no
+macsuck: yes
+arpnip: yes
+ver: 1
+class: Layer3::Cisco
+
+device: 2501,2503,2511,2514
+
+device: AS2509RJ,AS2511RJ
+
+device-family: 2600
+duplex: link
+arpnip: yes
+macsuck: yes
+class: Layer3::Cisco
+
+device:2610,2610XM,2611,2620,2620XM,2621,2621XM
+
+device:2651XM
+
+device:2691
+
+device-family: 2800
+duplex: link
+arpnip: yes
+macsuck: yes
+class: Layer3::Cisco
+
+device: 2811,2821,2851
+
+device-family: 3600
+class: Layer3::Cisco
+
+device: 3620
+
+device: 3640
+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-family: 7500
+class: Layer3::Cisco
+
+device: 7507
+duplex: no
+note: !Duplex settings are falsely reported in older IOS versions
+
+device-family: AS5000
+duplex: no
+class: Layer3::Cisco
+
+device: AS5300
+
+#
+# Cisco - Catalyst
+#
+device-family: Catalyst 1900
+note: !Upgrade older (pre 9.0) versions of CatOS
+note: !CatOS ver 9.00.03 through 9.00.06 have problems when trunking. Upgrade to 9.00.07 or higher.
+ver: 1
+duplex: both
+vlan: write
+class: Layer2::C1900
+
+device: wsc1900c
+device-family: Catalyst 1900
+
+device: wsc1900
+device-family: Catalyst 1900
+
+device-family: Catalyst 2900
+note: IOS
+macsuck: vlan
+duplex: write
+vlan: write
+class: Layer2::C2900
+portmac: yes
+note: !Pre IOS 11.2 (8) SA3 - PortMAC shows up in CAM table.
+
+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
+duplex: write
+vlan: write
+class: Layer2::C2900
+portmac: yes
+
+device: 2940-8TT
+
+device-family: Catalyst 2950
+note: IOS
+macsuck: vlan
+duplex: write
+vlan: write
+class: Layer2::C2900
+portmac: yes
+
+device: 2950-t24
+
+device-family: Catalyst 2970
+macsuck:vlan
+duplex: write
+vlan: write
+note: Acts just like IOS Catalyst 6500 series
+class: Layer3::C6500
+
+device: 2960, 2970G-24T-E
+
+device-family: Catalyst 3500 XL
+portmac: yes
+macsuck: vlan
+duplex: write
+vlan: write
+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-family: Catalyst 3550
+macsuck: vlan
+duplex: write
+vlan: write
+class: Layer3::C3550
+note: Run IOS
+note: Has VLANs that don't accept SNMP connections.  Don't know if they are standard (by name or number).
+note: Uses CISCO-STACK-MIB like Catalyst 5000 series for serial,duplex,type but not name
+note: Comes in flavors that support L2, L3 or combo.
+
+device: 3550-12T
+
+device: 3400 w/ MetroBase Image
+
+device: 3550
+note: L2/L3 Switch
+arpnip: yes
+
+device: 3550-24, 3550-48
+macsuck: vlan
+
+device-family: Catalyst 3750
+class: Layer3::C6500
+
+device: 3750
+
+device-family: Catalyst 4000
+duplex: write
+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: !IOS Version 12.1.8a reported not to respond to BRIDGE-MIB calls.
+
+device: wsc4003, wsc4006
+
+device: wsc4503, wsc4506
+
+device: wsc4912g
+note: Dedicated 12 port gig-e switch
+
+device: 4006
+duplex: both
+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: 4503, 4506, 4507, 4510
+duplex: both
+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: 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
+note: Router blade that runs IOS
+
+device-family: Catalyst 6500
+macsuck:vlan
+duplex: write
+vlan: write
+class: Layer3::C6500
+note: Runs in two possible modes, native (IOS) and hybrid (IOS with CatOS on top).
+note: Switch running Hybrid has WS-C in description field and loves L2::Catalyst class
+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
+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
+note: Hybrid Mode (Catalyst) reports L2 only
+
+device: 6kMsfc
+class: Layer3
+duplex: no
+vlan: no
+note: IOS portion of Hybrid mode.  VLAN and other L3 Services.
+
+device: 6kMsfc2
+class: Layer3
+duplex: no
+vlan: no
+note: IOS portion of Hybrid mode.  VLAN and other L3 Services.
+
+device-family: Voice Gateway
+class: Layer3
+duplex: no
+
+device: VG200
+
+device-family: Wireless Controllers
+class: Layer2::Airespace
+cdp:no
+arpnip: no
+macsuck: yes
+portmac: yes
+duplex: both
+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: 2006, 4112, 4124, 4136, 4402, 4404
+
+# Dell
+device-vendor: Dell
+arpnip: no
+macsuck: yes
+duplex: both
+vlan: yes
+cdp: no
+modules: yes
+class: Layer3::Dell
+
+device-family: Dell PowerConnect 6000 Series
+arpnip: yes
+device: 6024F, 6224, 6248
+
+device-family: Dell PowerConnect 5000 Series
+device: 5324
+
+device-family: Dell PowerConnect 3000 Series
+device: 3348, 3448P, 3424, 3424P
+
+# Enterasys
+device-vendor: Enterasys Networks
+arpnip: yes
+macsuck: yes
+duplex: both
+vlan: yes
+cdp: yes
+modules: yes
+class: Layer3::Enterasys
+
+device-family: SuperStack C-Series
+
+device: C3G124-24, C3G124-48
+device: C2G124-24, C2G124-48
+
+device-family: Matrix
+
+device: Matrix N-Series DFE
+
+# Extreme
+device-vendor: Extreme Networks
+arpnip: yes
+macsuck: yes
+duplex: both
+vlan: yes
+cdp: no
+modules: yes
+class: Layer3::Extreme
+
+device-family: Alpine and Summit
+
+device: Alpine 3808
+device: Summit 7i, 48si
+
+# Foundry
+device-vendor: Foundry Networks
+note: CDP --> FDP.
+vlan: yes
+modules: no
+
+device-family: FastIron
+class: Layer3::Foundry
+ver: 1
+note: Support very limited
+
+device: FastIron 4802
+
+device-family: EdgeIron
+ver: 2
+class: Layer3::Foundry
+cdp: yes
+duplex: yes
+macsuck: yes
+device: EdgeIron 24G
+note: Bug where spanning tree stuff loops forever when polled by SNMP.
+
+device-family: IronWare
+class: Layer3::Foundry
+ver: 2
+cdp: yes
+note: FDP enabled.
+duplex: yes
+macsuck: yes
+arpnip: yes
+device: FWSX424 
+device: ServerIronGT
+device: FLS624, FLS648
+
+# HP
+device-vendor: HP
+class:  Layer2::HP
+ver: 2
+modules: yes
+
+device-family: HP ProCurve
+duplex: both
+macsuck: yes
+arpnip: no
+cdp: yes
+vlan: write
+note: CDP only available with newer ROM versions. 
+
+device: 2512
+ver: 1
+
+device: 2524
+ver: 1
+
+device: 4000
+note: duplex issues?
+
+device: 4104GL
+duplex: link
+
+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-family: NetScreen
+class: Layer3::Netscreen
+device:  Netscreen
+
+# NetScreen
+device-vendor: NetScreen
+note: See Juniper
+
+# Net-SNMP
+device-vendor: Net-SNMP
+class: Layer3
+ver: 2
+
+device-family: Linux
+note: net-snmp 4.x agent and 5.x agent.
+device:  Linux routers
+
+device-family: BSD
+device:  BSD routers
+
+# NORTEL
+device-vendor: Nortel
+macsuck: yes
+cdp: proprietary
+note: CDP --> SONMP.
+
+device-family: BayStack Hub
+duplex: both
+ver: 1
+modules: yes
+class: Layer1::Bayhub
+note: Uses proprietary MIBs to provide MAC to port mapping.
+note: !Requires Advanced or Advanced Analyzer NMM
+
+device: 102
+
+device: System 5000
+
+device-family: Ethernet Switch/Baystack Switch
+macsuck: yes
+duplex: both
+vlan: write
+modules: yes
+class: Layer2::Baystack
+
+device: 303,304
+
+device: 350
+
+device: 380
+
+device: 410
+
+device: 420,425
+
+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-family: Ethernet Routing Switch/Baystack Switch
+arpnip: yes
+duplex: write
+vlan: write
+modules: yes
+class: Layer2::Baystack
+
+device: 3510
+
+device: 2526,2550
+
+device: 4524,4526,4548,4550
+
+device: 5510,5520,5530
+
+device-family: Business Ethernet Switch
+arpnip: yes
+duplex: write
+vlan: write
+modules: yes
+class: Layer2::Baystack
+
+device: 50,110,120,210,220,1010,1020 
+
+device-family: Centillion
+duplex: both
+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-family: AP222x
+duplex: both
+modules: no
+class: Layer2::NAP222x
+note: !Upgrade to version 1.3 or higher.
+note: Sends out topology packets if enabled but does not build neighbor table.
+
+device: AP-2220, AP-2221
+
+device-family: Alteon AD
+arpnip: yes
+duplex: both
+cdp: no
+vlan: yes
+modules: no
+class: Layer3::AlteonAD
+note: !Some versions have issues with continuous SNMP polling. Upgrade to 10.0.30.7 or higher.
+
+device: AD2,AD3,AD4
+
+device: 180,183,184
+
+device-family: Multiprotocol Router/BayRS
+arpnip: yes
+portmac: yes
+duplex: both
+cdp: no
+vlan: yes
+modules: yes
+class: Layer3::BayRS
+
+device: AN,ARN,ASN,BLN,BCN
+
+device: 2430,5430
+
+device-family: VPN Router/Contivity
+arpnip: yes
+macsuck: no
+portmac: yes
+duplex: no
+cdp: no
+modules: yes
+class: Layer3::Contivity
+
+device: 100,400,600
+
+device: 1000,1010,1050
+
+device: 1500,1600,1700,1740,1750
+
+device: 2500,2600,2700
+
+device: 4500,4600,5000
+
+device-family: Ethernet Routing Switch/Passport/Accelar LAN
+arpnip: yes
+macsuck: yes
+portmac: yes
+duplex: write
+cdp: proprietary
+vlan: write
+modules: yes
+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: 1050,1100,1150,1200
+
+device-family: Ethernet Routing Switch/Passport 1600 (Software < 2.1)
+arpnip: yes
+macsuck: yes
+portmac: yes
+duplex: both
+cdp: proprietary
+vlan: write
+class: Layer3::N1600
+
+device: 1612,1624,1648
+
+device-family: Ethernet Routing Switch/Passport 1600 (Software >= 2.1)
+arpnip: yes
+macsuck: yes
+portmac: yes
+duplex: write
+cdp: proprietary
+vlan: write
+class: Layer3::Passport
+
+device: 1612,1624,1648
+
+device-family: Synoptics
+macsuck: yes
+duplex: both
+cdp: proprietary
+ver: 1
+class: Layer1::S3000
+note: Uses proprietary MIBs to provide MAC to port mapping.
+note: !Requires Advanced or Advanced Analyzer NMM
+
+device: 281X
+
+device: System 3000
+
+device-family: Wireless Switch 2270
+arpnip: no
+macsuck: yes
+portmac: yes
+duplex: both
+cdp: proprietary
+modules: yes
+class: Layer2::N2270
+note: Uses proprietary MIBs to provide MAC to port mapping.  APs appear as switch ports.
+
+device: 2270
+
+# Proxim
+device-vendor: Proxim
+macsuck: yes
+duplex: no
+cdp: no
+class: Layer2::Orinoco
+
+device-family: Orinoco
+
+device: AP-1000,AP-2000,AP-4000
+
+device: WavePOINT-II
+
+# Sun
+device-vendor: Sun
+class: Layer3::Sun
+
+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)
+
+device-family: Zyxel DSLAM
+
+device:AAM10008-61, AAM1008-63

Info/Bridge.pm

@@ -1,8 +1,12 @@
 # SNMP::Info::Bridge
-# Max Baker <max@warped.org>
+# Max Baker
+#
+# Changes since Version 0.7 Copyright (c) 2004 Max Baker 
+# All rights reserved.  
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
+#
 # 
 # Redistribution and use in source and binary forms, with or without 
 # modification, are permitted provided that the following conditions are met:
@@ -28,7 +32,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::Bridge;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 
 use strict;
@@ -40,21 +44,22 @@ use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
 @SNMP::Info::Bridge::ISA = qw/SNMP::Info Exporter/;
 @SNMP::Info::Bridge::EXPORT_OK = qw//;
 
-$DEBUG=0;
-$SNMP::debugging=$DEBUG;
-
-$INIT = 0;
-
-%MIBS    = ('BRIDGE-MIB' => 'dot1dBaseBridgeAddress');
+%MIBS    = ('BRIDGE-MIB'   => 'dot1dBaseBridgeAddress',
+            'Q-BRIDGE-MIB' => 'dot1qPvid',
+           );
 
 %GLOBALS = (
-            'b_mac'   => 'dot1dBaseBridgeAddress',
-            'b_ports' => 'dot1dBaseNumPorts',
-            'b_type'  => 'dot1dBaseType',
+            'b_mac'    => 'dot1dBaseBridgeAddress',
+            'b_ports'  => 'dot1dBaseNumPorts',
+            'b_type'   => 'dot1dBaseType',
             # Spanning Tree Protocol
-            'stp_ver' => 'dot1dStpProtocolSpecification',
+            'stp_ver'  => 'dot1dStpProtocolSpecification',
             'stp_time' => 'dot1dStpTimeSinceTopologyChange',
             'stp_root' => 'dot1dStpDesignatedRoot',
+            # Q-BRIDGE-MIB
+            'qb_vlans_max'        => 'dot1qMaxSupportedVlans',
+            'qb_vlans'            => 'dot1qNumVlans',
+            'qb_next_vlan_index'  => 'dot1qNextFreeLocalVlanIndex',
            );
 
 %FUNCS = (
@@ -64,9 +69,9 @@ $INIT = 0;
           'fw_status' => 'dot1dTpFdbStatus',
           # Bridge Port Table: Dot1dBasePortEntry
           'bp_index'  => 'dot1dBasePortIfIndex',
-          'bp_port'   => 'dot1dBasePortCircuit ',
+          'bp_port'   => 'dot1dBasePortCircuit',
           # Bridge Static (Destination-Address Filtering) Database
-          'bs_mac'     => 'dot1dStaticAddress',
+          'bs_mac'    => 'dot1dStaticAddress',
           'bs_port'   => 'dot1dStaticReceivePort',
           'bs_to'     => 'dot1dStaticAllowedToGoTo',
           'bs_status' => 'dot1dStaticStatus',
@@ -78,6 +83,23 @@ $INIT = 0;
           'stp_p_root'     => 'dot1dStpPortDesignatedRoot',
           'stp_p_bridge'   => 'dot1dStpPortDesignatedBridge',
           'stp_p_port'     => 'dot1dStpPortDesignatedPort',
+          # Q-BRIDGE-MIB : dot1qPortVlanTable
+          'qb_i_vlan'        => 'dot1qPvid',
+          'qb_i_vlan_type'   => 'dot1qPortAcceptableFrameTypes',
+          'qb_i_vlan_in_flt' => 'dot1qPortIngressFiltering',
+          # Q-BRIDGE-MIB : dot1qVlanCurrentTable
+          'qb_cv_egress'      => 'dot1qVlanCurrentEgressPorts',
+          'qb_cv_untagged'    => 'dot1qVlanCurrentUntaggedPorts',
+          'qb_cv_stat'        => 'dot1qVlanStatus',
+          # Q-BRIDGE-MIB : dot1qVlanStaticTable
+          'v_name'           => 'dot1qVlanStaticName',
+          'qb_v_egress'      => 'dot1qVlanStaticEgressPorts',
+          'qb_v_fbdn_egress' => 'dot1qVlanForbiddenEgressPorts',
+          'qb_v_untagged'    => 'dot1qVlanStaticUntaggedPorts',
+          'qb_v_stat'        => 'dot1qVlanStaticRowStatus',
+          # VLAN Forwarding Table: Dot1qTpFdbEntry
+          'qb_fw_port'       => 'dot1qTpFdbPort',
+          'qb_fw_status'     => 'dot1qTpFdbStatus',
           );
 
 %MUNGE = (
@@ -93,11 +115,51 @@ $INIT = 0;
           'stp_p_port'   => \&SNMP::Info::munge_mac
          );
 
+# break up the Dot1qTpFdbEntry INDEX into FDB ID and MAC Address.
+sub _qb_fdbtable_index {
+    my $idx = shift;
+    my @values = split(/\./, $idx);
+    my $fdb_id = shift(@values);
+    return ($fdb_id, join(':',map { sprintf "%02x",$_ } @values));
+}
+
+sub qb_fw_mac {
+    my $bridge = shift;
+    my $partial = shift;
+
+    my $qb_fw_port = $bridge->qb_fw_port($partial);
+    my $qb_fw_mac = {};
+    foreach my $idx (keys %$qb_fw_port) {
+        my($fdb_id, $mac) = _qb_fdbtable_index($idx);
+        $qb_fw_mac->{$idx} = $mac;
+    }
+    $qb_fw_mac;
+}
+
+sub qb_i_vlan_t {
+    my $bridge = shift;
+    my $partial = shift;
+
+    my $qb_i_vlan      = $bridge->qb_i_vlan($partial);
+    my $qb_i_vlan_type = $bridge->qb_i_vlan_type($partial);
+        
+    my $i_vlan = {};
+
+    foreach my $if (keys %$qb_i_vlan){
+        my $vlan   = $qb_i_vlan->{$if};
+        my $tagged = $qb_i_vlan_type->{$if} || '';
+        next unless defined $vlan;
+        $i_vlan->{$if} = $tagged eq 'admitOnlyVlanTagged' ? 'trunk' : $vlan;
+    }
+    return $i_vlan;
+}
 
 sub i_stp_state {
     my $bridge = shift;
-    my $bp_index = $bridge->bp_index();
-    my $stp_p_state = $bridge->stp_p_state();
+    my $partial = shift;
+
+    my $bp_index = $bridge->bp_index($partial);
+    my $stp_p_state = $bridge->stp_p_state($partial);
 
     my %i_stp_state;
 
@@ -112,17 +174,439 @@ sub i_stp_state {
     return \%i_stp_state;
 }
 
+sub i_stp_port {
+    my $bridge = shift;    
+    my $partial = shift;
+
+    my $bp_index = $bridge->bp_index($partial);
+    my $stp_p_port = $bridge->stp_p_port($partial);
+    
+    my %i_stp_port;
+
+    foreach my $index (keys %$stp_p_port){
+       my $bridge = $stp_p_port->{$index};
+       my $iid   = $bp_index->{$index};
+       next unless defined $iid;
+       next unless defined $bridge;
+       $i_stp_port{$iid}=$bridge;
+    }
+    return \%i_stp_port;
+}
+
+sub i_stp_id {
+    my $bridge = shift;
+    my $partial = shift;
+
+    my $bp_index = $bridge->bp_index($partial);
+    my $stp_p_id = $bridge->stp_p_id($partial);
+
+    my %i_stp_id;
+
+    foreach my $index (keys %$stp_p_id){
+        my $bridge = $stp_p_id->{$index};
+        my $iid   = $bp_index->{$index};
+        next unless defined $iid;
+        next unless defined $bridge;
+        $i_stp_id{$iid}=$bridge;
+    }
+    return \%i_stp_id;
+}
+
+sub i_stp_bridge {
+    my $bridge = shift;
+    my $partial = shift;
+
+    my $bp_index = $bridge->bp_index($partial);
+    my $stp_p_bridge = $bridge->stp_p_bridge($partial);
+
+    my %i_stp_bridge;
+
+    foreach my $index (keys %$stp_p_bridge){
+        my $bridge = $stp_p_bridge->{$index};
+        my $iid   = $bp_index->{$index};
+        next unless defined $iid;
+        next unless defined $bridge;
+        $i_stp_bridge{$iid}=$bridge;
+    }
+    return \%i_stp_bridge;
+}
+
+# Non-accessible, but needed for consistency with other classes
+sub v_index {
+    my $bridge = shift;
+    my $partial = shift;
+
+    my $v_name = $bridge->v_name($partial);
+    my %v_index;
+    foreach my $idx (keys %$v_name) {
+        $v_index{$idx} = $idx;
+    }
+    return \%v_index;
+}
+
+sub i_vlan {
+    my $bridge  = shift;
+    my $partial = shift;
+    
+    my $index   = $bridge->bp_index();
+    
+    # If given a partial it will be an ifIndex, we need to use dot1dBasePort
+    if ($partial) {
+        my %r_index = reverse %$index;
+        $partial = $r_index{$partial};
+    }
+
+    my $i_pvid  = $bridge->qb_i_vlan($partial) || {};
+    my $i_vlan = {};
+
+    foreach my $bport (keys %$i_pvid) {
+        my $vlan    = $i_pvid->{$bport};
+        my $ifindex = $index->{$bport};
+        unless (defined $ifindex) {
+            print "  Port $bport has no bp_index mapping. Skipping\n"
+                if $DEBUG;
+            next;
+        }
+        $i_vlan->{$ifindex} = $vlan;
+    }
+    
+    return $i_vlan;
+}
+
+sub i_vlan_membership {
+    my $bridge = shift;
+    my $partial = shift;
+
+    my $index   = $bridge->bp_index();
+
+    # Use VlanCurrentTable if available since it will include dynamic
+    # VLANs.  However, some devices do not populate the table.
+    
+    # 11/07 - Todo: Issue with some devices trying to query VlanCurrentTable
+    # as table may grow very large with frequent VLAN changes.
+    #my $v_ports = $bridge->qb_cv_egress() || $bridge->qb_v_egress();
+
+    my $v_ports = $bridge->qb_v_egress() || {};
+
+    my $i_vlan_membership = {};
+    foreach my $idx (keys %$v_ports) {
+        next unless (defined $v_ports->{$idx});
+        my $portlist = [split(//, unpack("B*", $v_ports->{$idx}))];
+        my $ret = [];
+        my $vlan;
+        # Strip TimeFilter if we're using VlanCurrentTable
+        ($vlan = $idx) =~ s/^\d+\.//;
+
+        # Convert portlist bit array to bp_index array
+        for (my $i = 0; $i <= $#$portlist; $i++) {
+	    push(@{$ret}, $i+1) if (@$portlist[$i]);
+        }
+
+        #Create HoA ifIndex -> VLAN array
+        foreach my $port (@{$ret}) {
+            my $ifindex = $index->{$port};
+            next unless (defined($ifindex));    # shouldn't happen
+            next if (defined $partial and $ifindex !~ /^$partial$/);
+	    push(@{$i_vlan_membership->{$ifindex}}, $vlan);
+        }
+    }
+    return $i_vlan_membership;
+}
+
+sub set_i_pvid {
+    my $bridge = shift;
+    my ($vlan_id, $ifindex) = @_; 
+
+    return undef unless ($bridge->_validate_vlan_param ($vlan_id, $ifindex));
+
+    my $index = $bridge->bp_index();
+    my %r_index = reverse %$index;
+    my $bport = $r_index{$ifindex};
+
+    unless ( $bridge->set_qb_i_vlan($vlan_id, $bport) ) {
+        $bridge->error_throw("Unable to change PVID to $vlan_id on
+                             IfIndex: $ifindex");
+        return undef;
+    }
+    return 1;
+}
+
+sub set_i_vlan {
+    my $bridge = shift;
+    my ($new_vlan_id, $ifindex) = @_;
+
+    return undef unless ($bridge->_validate_vlan_param ($new_vlan_id, $ifindex));
+
+    my $index = $bridge->bp_index();
+    my %r_index = reverse %$index;
+    my $bport = $r_index{$ifindex};
+
+    my $vlan_p_type = $bridge->qb_i_vlan_type($bport);
+    unless ( $vlan_p_type->{$bport} =~ /admitAll/ ) {
+        $bridge->error_throw("Not an access port");
+        return undef;
+    }
+
+    my $i_pvid = $bridge->qb_i_vlan($bport);
+
+    # Store current untagged VLAN to remove it from the egress port list later
+    my $old_vlan_id = $i_pvid->{$bport};
+    print "Changing VLAN: $old_vlan_id to $new_vlan_id on IfIndex: $ifindex\n"
+        if $bridge->debug();
+
+    # Check if port in forbidden list for the VLAN, haven't seen this used,
+    # but we'll check anyway
+    return undef unless
+        ($bridge->_check_forbidden_ports($new_vlan_id, $bport));
+
+    # Remove port from any untagged list
+    return undef unless
+        ($bridge->_remove_from_untagged_lists($bport));
+
+    # Remove port from old VLAN from egress list
+    return undef unless
+        ($bridge->_remove_from_egress_portlist($old_vlan_id, $bport));
+
+    # Add port to egress list for VLAN
+    return undef unless
+        ($bridge->_add_to_egress_portlist($new_vlan_id, $bport));
+
+    # Add port to untagged egress list for VLAN
+    return undef unless
+        ($bridge->_add_to_untagged_portlist($new_vlan_id, $bport));
+
+    # Set new untagged / native VLAN
+    # Some models/versions do this for us also, so check to see if we need
+    $i_pvid = $bridge->qb_i_vlan($bport);
+
+    my $cur_i_pvid = $i_pvid->{$bport};
+    print "Current PVID: $cur_i_pvid\n" if $bridge->debug();
+    unless ($cur_i_pvid eq $new_vlan_id) {
+        return undef unless ($bridge->set_i_pvid($new_vlan_id, $ifindex));
+    }
+
+    print "Successfully changed VLAN: $old_vlan_id to $new_vlan_id on IfIndex: $ifindex\n" if $bridge->debug();
+    return 1;
+}
+
+sub set_add_i_vlan_tagged {
+    my $bridge = shift;
+    my ($vlan_id, $ifindex) = @_;
+
+    my $index = $bridge->bp_index();
+    my %r_index = reverse %$index;
+    my $bport = $r_index{$ifindex};
+
+    return undef unless ( $bridge->_validate_vlan_param ($vlan_id, $ifindex) );
+
+    print "Adding VLAN: $vlan_id to IfIndex: $ifindex\n" if $bridge->debug();
+
+    # Check if port in forbidden list for the VLAN, haven't seen this used,
+    # but we'll check anyway
+    return undef unless ($bridge->_check_forbidden_ports($vlan_id, $bport));
+
+    # Add port to egress list for VLAN
+    return undef unless ($bridge->_add_to_egress_portlist($vlan_id, $bport));
+
+    print "Successfully added IfIndex: $ifindex to VLAN: $vlan_id egress list\n" if $bridge->debug();
+    return 1;
+}
+
+sub set_remove_i_vlan_tagged {
+    my $bridge = shift;
+    my ($vlan_id, $ifindex) = @_;
+
+    my $index = $bridge->bp_index();
+    my %r_index = reverse %$index;
+    my $bport = $r_index{$ifindex};
+
+    return undef unless ( $bridge->_validate_vlan_param ($vlan_id, $ifindex) );
+
+    print "Removing VLAN: $vlan_id from IfIndex: $ifindex\n" if $bridge->debug();
+
+    # Remove port from egress list for VLAN
+    return undef unless ($bridge->_remove_from_egress_portlist($vlan_id, $bport));
+
+    print "Successfully removed IfIndex: $ifindex from VLAN: $vlan_id egress list\n" if $bridge->debug();
+    return 1;
+}
+
+#
+# These are internal methods and are not documented.  Do not use directly. 
+#
+sub _check_forbidden_ports {
+    my $bridge = shift;
+    my ($vlan_id, $index) = @_;
+    return undef unless ($vlan_id =~ /\d+/ and $index =~ /\d+/);
+
+    my $iv_forbidden = $bridge->qb_v_fbdn_egress($vlan_id);
+
+    my @forbidden_ports = split(//, unpack("B*", $iv_forbidden->{$vlan_id}));
+    print "Forbidden ports: @forbidden_ports\n" if $bridge->debug();
+    if ( defined($forbidden_ports[$index-1]) and ($forbidden_ports[$index-1] eq "1")) {
+        print "Error: Index: $index in forbidden list for VLAN: $vlan_id unable to add\n" if $bridge->debug();
+        return undef;
+    }
+    return 1;
+}
+
+sub _add_to_untagged_portlist {
+    my $bridge = shift;
+    my ($vlan_id, $index) = @_;
+    return undef unless ($vlan_id =~ /\d+/ and $index =~ /\d+/);
+
+    my $iv_members   = $bridge->qb_v_untagged($vlan_id);
+
+    my @untagged_list = split(//, unpack("B*", $iv_members->{$vlan_id}));
+    print "Original untagged list for VLAN: $vlan_id: @untagged_list \n" if $bridge->debug();
+    $untagged_list[$index-1] = '1';
+    # Some devices do not populate the portlist with all possible ports.
+    # If we have lengthened the list fill all undefined elements with zero.
+    foreach my $item (@untagged_list) {
+        $item = '0' unless (defined($item));
+    }
+    print "Modified untagged list for VLAN: $vlan_id: @untagged_list \n" if $bridge->debug();
+    my $new_untagged = pack("B*", join('', @untagged_list));
+
+    my $untagged_rv = $bridge->set_qb_v_untagged($new_untagged, $vlan_id);
+    unless ($untagged_rv) {
+        print "Error: Unable to add VLAN: $vlan_id to Index: $index untagged list\n" if $bridge->debug();
+        return undef;
+    }
+    return 1;
+}
+
+sub _remove_from_untagged_lists {
+    my $bridge = shift;
+    my ($index) = @_;
+    return undef unless ($index =~ /\d+/);
+
+    my $iv_members = $bridge->qb_v_untagged();
+    
+    foreach my $vlan (keys %$iv_members) {
+
+        my @untagged_list = split(//, unpack("B*", $iv_members->{$vlan}));
+        print "Original untagged list for VLAN: $vlan: @untagged_list \n" if $bridge->debug();
+        if ( defined($untagged_list[$index-1]) and ($untagged_list[$index-1] eq "1")) {
+            $untagged_list[$index-1] = '0';
+            print "Modified untagged list for VLAN: $vlan: @untagged_list \n" if $bridge->debug();
+            my $new_untagged = pack("B*", join('', @untagged_list));
+
+            my $untagged_rv = $bridge->set_qb_v_untagged($new_untagged, $vlan);
+            unless ($untagged_rv) {
+                print "Warning: Unable to remove Index: $index from VLAN: $vlan untagged list\n" if $bridge->debug();
+                return undef;
+            }
+        }
+    }
+    return 1;
+}
+
+sub _add_to_egress_portlist {
+    my $bridge = shift;
+    my ($vlan_id, $index) = @_;
+    return undef unless ($vlan_id =~ /\d+/ and $index =~ /\d+/);
+
+    my $iv_members = $bridge->qb_v_egress($vlan_id);
+
+    my @egress_list = split(//, unpack("B*", $iv_members->{$vlan_id}));
+    print "Original egress list for VLAN: $vlan_id: @egress_list \n" if $bridge->debug();
+    $egress_list[$index-1] = '1';
+    # Some devices do not populate the portlist with all possible ports.
+    # If we have lengthened the list fill all undefined elements with zero.
+    foreach my $item (@egress_list) {
+        $item = '0' unless (defined($item));
+    }
+    print "Modified egress list for VLAN: $vlan_id: @egress_list \n" if $bridge->debug();
+    my $new_egress = pack("B*", join('', @egress_list));
+
+    my $egress_rv = $bridge->set_qb_v_egress($new_egress, $vlan_id);
+    unless ($egress_rv) {
+        print "Error: Unable to add VLAN: $vlan_id to Index: $index egress list\n" if $bridge->debug();
+        return undef;
+    }
+    return 1;
+}
+
+sub _remove_from_egress_portlist {
+    my $bridge = shift;
+    my ($vlan_id, $index) = @_;
+    return undef unless ($vlan_id =~ /\d+/ and $index =~ /\d+/);
+
+    my $iv_members   = $bridge->qb_v_egress($vlan_id);
+
+    my @egress_list = split(//, unpack("B*", $iv_members->{$vlan_id}));
+    print "Original egress list for VLAN: $vlan_id: @egress_list \n" if $bridge->debug();
+    # Some devices may remove automatically, so check state before set
+    if ( defined($egress_list[$index-1]) and ($egress_list[$index-1] eq "1")) {
+        $egress_list[$index-1] = '0';
+        print "Modified egress list for VLAN: $vlan_id: @egress_list \n" if $bridge->debug();
+        my $new_egress = pack("B*", join('', @egress_list));
+
+        my $egress_rv = $bridge->set_qb_v_egress($new_egress, $vlan_id);
+        unless ($egress_rv) {
+            print "Warning: Unable to remove Index: $index from VLAN: $vlan_id egress list\n" if $bridge->debug();
+            return undef;
+        }  
+    }
+    return 1;
+}
+
+sub _validate_vlan_param {
+    my $bridge = shift;
+    my ($vlan_id, $ifindex) = @_;
+
+    # VID and ifIndex should both be numeric
+    unless ( defined $vlan_id and defined $ifindex and
+            $vlan_id =~ /^\d+$/ and $ifindex =~ /^\d+$/ ) {
+        $bridge->error_throw("Invalid parameter");
+        return undef;
+    }
+    
+    # Check that ifIndex exists on device
+    my $index = $bridge->interfaces($ifindex);
+
+    unless ( exists $index->{$ifindex} ) {
+        $bridge->error_throw("ifIndex $ifindex does not exist");
+        return undef;
+    }
+
+    #Check that VLAN exists on device
+    my $vtp_vlans   = $bridge->load_qb_cv_stat() || $bridge->load_qb_v_stat();
+    my $vlan_exists = 0;
+    
+    foreach my $iid (keys %$vtp_vlans) {
+        my $vlan = 0;
+        my $state = $vtp_vlans->{$iid};
+        next unless defined $state;
+        if ($iid =~ /(\d+)$/ ) {
+            $vlan    = $1;
+        }
+        
+        $vlan_exists = 1 if ( $vlan_id eq $vlan );
+    }
+    unless ( $vlan_exists ) {
+        $bridge->error_throw("VLAN $vlan_id does not exist or is not
+                             operational");
+        return undef;
+    }
+
+    return 1;
+}
+
 1;
+
 __END__
 
 
 =head1 NAME
 
-SNMP::Info::Bridge - Perl5 Interface to SNMP data available through the BRIDGE-MIB (RFC1493)
+SNMP::Info::Bridge - SNMP Interface to SNMP data available through the
+BRIDGE-MIB (RFC1493)
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
@@ -134,7 +618,7 @@ Max Baker (C<max@warped.org>)
                              Version     => 2
                              );
 
- my $class = $cdp->class();
+ my $class = $bridge->class();
  print " Using device sub class : $class\n";
 
  # Grab Forwarding Tables
@@ -145,7 +629,7 @@ Max Baker (C<max@warped.org>)
 
  foreach my $fw_index (keys %$fw_mac){
     my $mac   = $fw_mac->{$fw_index};
-    my $bp_id = $fw_mac->{$fw_index};
+    my $bp_id = $fw_port->{$fw_index};
     my $iid   = $bp_index->{$bp_id};
     my $port  = $interfaces->{$iid};
 
@@ -154,9 +638,15 @@ Max Baker (C<max@warped.org>)
 
 =head1 DESCRIPTION
 
-BRIDGE-MIB is used by most Layer 2 devices, and holds information like the MAC Forwarding Table and Spanning Tree Protocol info.
+BRIDGE-MIB is used by most Layer 2 devices, and holds information like the
+MAC Forwarding Table and Spanning Tree Protocol info.
 
-Create or use a subclass of SNMP::Info that inherits this class.  Do not use directly.
+Q-BRIDGE-MIB holds 802.1q information -- VLANs and Trunking.  Cisco tends not
+to use this MIB, but some proprietary ones.  HP and some nicer vendors use
+this.  This is from C<RFC2674_q>.  
+
+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 
 
@@ -172,6 +662,10 @@ None.
 
 =item BRIDGE-MIB
 
+=item Q-BRIDGE-MIB
+
+F<rfc2674_q.mib>
+
 =back
 
 BRIDGE-MIB needs to be extracted from ftp://ftp.cisco.com/pub/mibs/v1/v1.tar.gz
@@ -196,13 +690,15 @@ Returns the number of ports in device
 
 =item $bridge->b_type()
 
-Returns the type? of the device
+Returns the type of bridging this bridge can perform, transparent and/or
+sourceroute.
 
 (B<dot1dBaseType>)
 
 =item $bridge->stp_ver()
 
-Returns what version of STP the device is running.  Either decLb100 or ieee8021d.
+Returns what version of STP the device is running.  Either decLb100 or
+ieee8021d.
 
 (B<dot1dStpProtocolSpecification>)
 
@@ -218,6 +714,25 @@ Returns root of STP.
 
 (B<dot1dStpDesignatedRoot>)
 
+=item $bridge->qb_vlans_max() 
+
+Maximum number of VLANS supported on this device.
+
+(B<dot1qMaxSupportedVlans>)
+
+=item $bridge->qb_vlans() 
+
+Current number of VLANs that are configured in this device.
+
+(B<dot1qNumVlans>)
+
+=item $bridge->qb_next_vlan_index() 
+
+The next available value for B<dot1qVlanIndex> of a local VLAN entry in
+B<dot1qVlanStaticTable>
+
+(B<dot1qNextFreeLocalVlanIndex>)
+
 =back
 
 =head1 TABLE METHODS
@@ -225,6 +740,29 @@ Returns root of STP.
 These are methods that return tables of information in the form of a reference
 to a hash.
 
+=over
+
+=item $bridge->i_vlan()
+
+Returns a mapping between ifIndex and the PVID or default VLAN.
+
+=item $bridge->i_vlan_membership()
+
+Returns reference to hash of arrays: key = ifIndex, value = array of VLAN IDs.
+These are the VLANs which are members of the egress list for the port.
+
+  Example:
+  my $interfaces = $bridge->interfaces();
+  my $vlans      = $bridge->i_vlan_membership();
+  
+  foreach my $iid (sort keys %$interfaces) {
+    my $port = $interfaces->{$iid};
+    my $vlan = join(',', sort(@{$vlans->{$iid}}));
+    print "Port: $port VLAN: $vlan\n";
+  }
+
+=back
+
 =head2 Forwarding Table (dot1dTpFdbEntry)
 
 =over 
@@ -237,7 +775,8 @@ Returns reference to hash of forwarding table MAC Addresses
 
 =item $bridge->fw_port()
 
-Returns reference to hash of forwarding table entries port interface identifier (iid)
+Returns reference to hash of forwarding table entries port interface
+identifier (iid)
 
 (B<dot1dTpFdbPort>)
 
@@ -255,13 +794,17 @@ Returns reference to hash of forwading table entries status
 
 =item $bridge->bp_index()
 
-Returns reference to hash of bridge port table entries map back to interface identifier (iid)
+Returns reference to hash of bridge port table entries map back to interface
+identifier (iid)
 
 (B<dot1dBasePortIfIndex>)
 
 =item $bridge->bp_port()
 
-Returns reference to hash of bridge port table entries physical port name.
+Returns reference to hash of bridge port table entries for a port which
+(potentially) has the same value of B<dot1dBasePortIfIndex> as another port
+on the same bridge, this object contains the name of an	object instance unique
+to this port.
 
 (B<dot1dBasePortCircuit>)
 
@@ -275,25 +818,26 @@ Descriptions are lifted straight from F<BRIDGE-MIB.my>
 
 =item $bridge->stp_p_id()
 
-"The port number of the port for which this entry contains Spanning Tree Protocol management
-information."
+"The port number of the port for which this entry contains Spanning Tree
+Protocol management information."
 
 (B<dot1dStpPort>)
 
 =item $bridge->stp_p_priority()
 
-"The value of the priority field which is contained in the first (in network byte order)
-octet of the (2 octet long) Port ID.  The other octet of the Port ID is given by the value of
-dot1dStpPort."
+"The value of the priority field which is contained in the first
+(in network byte order) octet of the (2 octet long) Port ID.  The other octet
+of the Port ID is given by the value of dot1dStpPort."
 
 (B<dot1dStpPortPriority>)
 
 =item $bridge->stp_p_state()
 
-"The port's current state as defined by application of the Spanning Tree Protocol.  This
-state controls what action a port takes on reception of a frame.  If the bridge has detected
-a port that is malfunctioning it will place that port into the broken(6) state.  For ports which
-are disabled (see dot1dStpPortEnable), this object will have a value of disabled(1)."
+"The port's current state as defined by application of the Spanning Tree
+Protocol.  This state controls what action a port takes on reception of a
+frame.  If the bridge has detected a port that is malfunctioning it will place
+that port into the broken(6) state.  For ports which are disabled
+(see dot1dStpPortEnable), this object will have a value of disabled(1)."
 
  disabled(1)
  blocking(2)
@@ -306,23 +850,25 @@ are disabled (see dot1dStpPortEnable), this object will have a value of disabled
 
 =item $bridge->stp_p_cost()
 
-"The contribution of this port to the path cost of paths towards the spanning tree root which include
-this port.  802.1D-1990 recommends that the default value of this parameter be in inverse
-proportion to the speed of the attached LAN."
+"The contribution of this port to the path cost of paths towards the spanning
+tree root which include this port.  802.1D-1990 recommends that the default
+value of this parameter be in inverse proportion to the speed of the attached
+LAN."
 
 (B<dot1dStpPortPathCost>)
 
 =item $bridge->stp_p_root()
 
-"The unique Bridge Identifier of the Bridge recorded as the Root in the Configuration BPDUs
-transmitted by the Designated Bridge for the segment to which the port is attached."
+"The unique Bridge Identifier of the Bridge recorded as the Root in the
+Configuration BPDUs transmitted by the Designated Bridge for the segment to
+which the port is attached."
 
 (B<dot1dStpPortDesignatedRoot>)
 
 =item $bridge->stp_p_bridge()
 
-"The Bridge Identifier of the bridge which this port considers to be the Designated Bridge for
-this port's segment."
+"The Bridge Identifier of the bridge which this port considers to be the
+Designated Bridge for this port's segment."
 
 (B<dot1dStpPortDesignatedBridge>)
 
@@ -330,8 +876,190 @@ this port's segment."
 
 (B<dot1dStpPortDesignatedPort>)
 
-"The Port Identifier of the port on the Designated Bridge for this port's segment."
+"The Port Identifier of the port on the Designated Bridge for this port's
+segment."
+
+=item $bridge->i_stp_port()
+
+Returns the mapping of (B<dot1dStpPortDesignatedPort>) to the interface
+index (iid).
+
+=item $bridge->i_stp_id()
+
+Returns the mapping of (B<dot1dStpPort>) to the interface index (iid).
+
+=item $bridge->i_stp_bridge()
+
+Returns the mapping of (B<dot1dStpPortDesignatedBridge>) to the interface
+index (iid).
 
 =back
 
+=head2 Q-BRIDGE Port VLAN Table (dot1qPortVlanTable)
+
+=over
+
+=item $bridge->qb_i_vlan()
+
+The PVID, the VLAN ID assigned to untagged frames or Priority-Tagged frames
+received on this port.
+
+(B<dot1qPvid>)
+
+=item $bridge->qb_i_vlan_type()
+
+Either C<admitAll> or C<admitOnlyVlanTagged>.  This is a good spot to find
+trunk ports.
+
+(B<dot1qPortAcceptableFrameTypes>)
+
+=item $bridge->qb_i_vlan_in_flt()
+
+When this is C<true> the device will discard incoming frames for VLANs which
+do not include this Port in its Member set.  When C<false>, the port will
+accept all incoming frames.
+
+(B<dot1qPortIngressFiltering>)
+
+=back
+
+=head2 Q-BRIDGE VLAN Current Table (dot1qVlanCurrentTable)
+
+=over
+
+=item $bridge->qb_cv_egress()
+
+The set of ports which are assigned to the egress list for this VLAN.
+
+(B<dot1qVlanCurrentEgressPorts>)
+
+=item $bridge->qb_cv_untagged()
+
+The set of ports which should transmit egress packets for this VLAN as
+untagged. 
+
+(B<dot1qVlanCurrentUntaggedPorts>)
+
+=item $bridge->qb_cv_stat()
+
+Status of the VLAN, other, permanent, or dynamicGvrp.
+
+(B<dot1qVlanStatus>)
+
+=back
+
+=head2 Q-BRIDGE VLAN Static Table (dot1qVlanStaticTable)
+
+=over
+
+=item $bridge->qb_v_name()
+
+Human-entered name for vlans.
+
+(B<dot1qVlanStaticName>)
+
+=item $bridge->qb_v_egress()
+
+The set of ports which are assigned to the egress list for this VLAN.
+
+(B<dot1qVlanStaticEgressPorts>)
+
+=item $bridge->qb_v_fbdn_egress()
+
+The set of ports which are prohibited from being included in the egress list
+for this VLAN.
+
+(B<dot1qVlanForbiddenEgressPorts>)
+
+=item $bridge->qb_v_untagged()
+
+The set of ports which should transmit egress packets for this VLAN as
+untagged. 
+
+(B<dot1qVlanStaticUntaggedPorts>)
+
+=item $bridge->qb_v_stat()
+
+uhh. C<active> !
+
+(B<dot1qVlanStaticRowStatus>)
+
+=back
+
+=head2 Q-BRIDGE Filtering Database Table (dot1qFdbTable)
+
+=over
+
+=item $bridge->qb_fw_mac()
+
+Returns reference to hash of forwarding table MAC Addresses
+
+(B<dot1qTpFdbAddress>)
+
+=item $bridge->qb_fw_port()
+
+Returns reference to hash of forwarding table entries port interface
+identifier (iid)
+
+(B<dot1qTpFdbPort>)
+
+=item $bridge->qb_fw_status()
+
+Returns reference to hash of forwading table entries status
+
+(B<dot1qTpFdbStatus>)
+
+=back
+
+=head1 SET METHODS
+
+These are methods that provide SNMP set functionality for overridden methods or
+provide a simpler interface to complex set operations.  See
+L<SNMP::Info/"SETTING DATA VIA SNMP"> for general information on set operations. 
+
+=over
+
+=item $bridge->set_i_vlan(vlan, ifIndex)
+
+Changes an access (untagged) port VLAN, must be supplied with the numeric VLAN
+ID and port ifIndex.  This method will modify the port's VLAN membership and
+PVID (default VLAN).  This method should only be used on end station
+(non-trunk) ports.
+
+  Example:
+  my %if_map = reverse %{$bridge->interfaces()};
+  $bridge->set_i_vlan('2', $if_map{'1.1'}) 
+    or die "Couldn't change port VLAN. ",$bridge->error(1);
+
+=item $bridge->set_i_pvid(pvid, ifIndex)
+
+Sets port PVID or default VLAN, must be supplied with the numeric VLAN ID and
+port ifIndex.  This method only changes the PVID, to modify an access (untagged)
+port use set_i_vlan() instead.
+
+  Example:
+  my %if_map = reverse %{$bridge->interfaces()};
+  $bridge->set_i_pvid('2', $if_map{'1.1'}) 
+    or die "Couldn't change port PVID. ",$bridge->error(1);
+
+=item $bridge->set_add_i_vlan_tagged(vlan, ifIndex)
+
+Adds the port to the egress list of the VLAN, must be supplied with the numeric
+VLAN ID and port ifIndex.
+
+  Example:
+  my %if_map = reverse %{$bridge->interfaces()};
+  $bridge->set_add_i_vlan_tagged('2', $if_map{'1.1'}) 
+    or die "Couldn't add port to egress list. ",$bridge->error(1);
+
+=item $bridge->set_remove_i_vlan_tagged(vlan, ifIndex)
+
+Removes the port from the egress list of the VLAN, must be supplied with the
+numeric VLAN ID and port ifIndex.
+
+  Example:
+  my %if_map = reverse %{$bridge->interfaces()};
+  $bridge->set_remove_i_vlan_tagged('2', $if_map{'1.1'}) 
+    or die "Couldn't add port to egress list. ",$bridge->error(1);
+
 =cut

Info/CDP.pm

@@ -1,5 +1,8 @@
 # SNMP::Info::CDP
-# Max Baker <max@warped.org>
+# Max Baker
+#
+# Changes since Version 0.7 Copyright (c) 2004 Max Baker 
+# All rights reserved.  
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
@@ -28,27 +31,22 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::CDP;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 
 use strict;
 
 use Exporter;
 use SNMP::Info;
-use Carp;
 
 @SNMP::Info::CDP::ISA = qw/SNMP::Info Exporter/;
 @SNMP::Info::CDP::EXPORT_OK = qw//;
 
-use vars qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MIBS_V1 %MUNGE $INIT/;
-# Debug
-$DEBUG=0;
-$SNMP::debugging=$DEBUG;
+use vars qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT/;
 
 # Five data structures required by SNMP::Info
-$INIT = 0;
 %MIBS    = ( 'CISCO-CDP-MIB' => 'cdpGlobalRun' );
-%MIBS_V1 = ( 'CISCO-CDP-MIB-V1SMI' => 'cdpGlobalRun' );
+
 # Notice we dont inherit the default GLOBALS and FUNCS
 # only the default MUNGE.
 %GLOBALS = (
@@ -61,7 +59,7 @@ $INIT = 0;
 %FUNCS  = (
             'c_index'        => 'cdpCacheIfIndex',
             'c_proto'        => 'cdpCacheAddressType',
-            'c_ip'           => 'cdpCacheAddress',
+            'c_addr'         => 'cdpCacheAddress',
             'c_ver'          => 'cdpCacheVersion',
             'c_id'           => 'cdpCacheDeviceId',
             'c_port'         => 'cdpCacheDevicePort',
@@ -69,14 +67,29 @@ $INIT = 0;
             'c_capabilities' => 'cdpCacheCapabilities',
             'c_domain'       => 'cdpCacheVTPMgmtDomain',
             'c_vlan'         => 'cdpCacheNativeVLAN',
-            'c_duplex'       => 'cdpCacheDuplex'
+            'c_duplex'       => 'cdpCacheDuplex',
+            'c_power'        => 'cdpCachePowerConsumption',
           );
 
 %MUNGE = (
           'c_capabilities' => \&munge_caps,
-          'c_ip'           => \&SNMP::Info::munge_ip
+          'c_platform'     => \&munge_null,
+          'c_domain'       => \&munge_null,
+          'c_port'         => \&munge_null,
+          'c_id'           => \&munge_null,
+          'c_ver'          => \&munge_null,
+          'c_ip'           => \&SNMP::Info::munge_ip,
+          'c_power'        => \&munge_power,
+
          );
 
+# munge_null() - removes nulls (\0)
+sub munge_null {
+    my $text = shift || return;
+    
+    $text =~ s/\0//g;
+    return $text;
+}
 
 sub munge_caps {
     my $caps = shift;
@@ -84,9 +97,15 @@ sub munge_caps {
 
     my $bits = substr(unpack("B*",$caps),-7);
     return $bits;
-    
-    
 }
+
+sub munge_power {
+    my $power = shift;
+    my $decimal = substr($power, -3);
+    $power =~ s/$decimal$/\.$decimal/;
+    return $power;
+}
+
 sub hasCDP {
     my $cdp = shift;
 
@@ -114,8 +133,7 @@ sub c_if {
     # Nope, didn't think so. Now we fake it.
     my $c_ip = $cdp->c_ip();
     unless (defined $c_ip){
-        $cdp->{error} = "SNMP::Info::CDP::c_if() - Device doesn't have c_ip() data.  Can't fake c_index()";
-        $DEBUG and carp($cdp->error(1));
+        $cdp->error_throw("SNMP::Info::CDP:c_if() - Device doesn't have cdp_ip() data.  Can't fake cdp_index()");
         return undef;
     }
 
@@ -131,16 +149,36 @@ sub c_if {
     return \%c_if;
 }
 
+sub c_ip {
+    my $cdp = shift;
+    my $partial = shift;
+
+    my $c_addr  = $cdp->c_addr($partial) || {};
+    my $c_proto = $cdp->c_proto($partial) || {};
+    
+    my %c_ip;    
+    foreach my $key (keys %$c_addr) {
+        my $addr  = $c_addr->{$key};
+        my $proto = $c_proto->{$key};
+        next unless defined $addr;
+        next if (defined $proto and $proto ne 'ip');
+
+        my $ip = join('.',unpack('C4',$addr));
+        $c_ip{$key} = $ip;
+    }
+    return \%c_ip;
+}
+
 1;
 __END__
 
 =head1 NAME
 
-SNMP::Info::CDP - Perl5 Interface to Cisco Discovery Protocol (CDP) using SNMP
+SNMP::Info::CDP - SNMP Interface to Cisco Discovery Protocol (CDP) using SNMP
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
@@ -338,7 +376,14 @@ See c_if() entry.
 
 =item  $cdp->c_ip()
 
-Returns remote IP address
+If $cdp->c_proto() is supported, returns remote IPV4 address only.  Otherwise
+it will return all addresses.
+
+(B<cdpCacheAddress>)
+
+=item  $cdp->c_addr()
+
+Returns remote address
 
 (B<cdpCacheAddress>)
 

Info/CiscoConfig.pm

@@ -0,0 +1,446 @@
+# SNMP::Info::CiscoConfig
+# Justin Hunter, Eric Miller
+# $Id$
+#
+# 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::CiscoConfig;
+$VERSION = '1.07';
+
+use strict;
+
+use Exporter;
+use SNMP::Info;
+
+@SNMP::Info::CiscoConfig::ISA       = qw/SNMP::Info Exporter/;
+@SNMP::Info::CiscoConfig::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+
+%MIBS = (
+         'CISCO-CONFIG-COPY-MIB' => 'ccCopyTable',
+         'CISCO-FLASH-MIB'       => 'ciscoFlashCopyTable',
+         'OLD-CISCO-SYS-MIB'     => 'writeMem',
+        );
+
+%GLOBALS = (
+            # OLD-CISCO-SYS-MIB
+            'old_write_mem'             => 'writeMem',
+            'old_write_net'             => 'writeNet',
+            );
+
+%FUNCS = (
+          # CISCO-COPY-CONFIG-MIB::ccCopyTable
+          'config_protocol'           => 'ccCopyProtocol',
+          'config_source_type'        => 'ccCopySourceFileType',
+          'config_dest_type'          => 'ccCopyDestFileType',
+          'config_server_addr'        => 'ccCopyServerAddress',
+          'config_filename'           => 'ccCopyFileName',
+          'config_username'           => 'ccCopyUserName',
+          'config_password'           => 'ccCopyUserPassword',
+          'config_notify_complete'    => 'ccCopyNotificationOnCompletion',
+          'config_copy_state'         => 'ccCopyState',
+          'config_copy_start_time'    => 'ccCopyTimeStarted',
+          'config_copy_complete_time' => 'ccCopyTimeCompleted',
+          'config_fail_cause'         => 'ccCopyFailCause',
+          'config_row_status'         => 'ccCopyEntryRowStatus',
+          # CISCO-FLASH-MIB::ciscoFlashCopyTable
+          'flash_copy_cmd'            => 'ciscoFlashCopyCommand',
+          'flash_copy_protocol'       => 'ciscoFlashCopyProtocol',
+          'flash_copy_address'        => 'ciscoFlashCopyServerAddress',
+          'flash_copy_source'         => 'ciscoFlashCopySourceName',
+          'flash_copy_dest'           => 'ciscoFlashCopyDestinationName',
+          'flash_copy_row_status'     => 'ciscoFlashCopyEntryStatus',
+         );
+
+%MUNGE = (
+          );
+
+sub copy_run_tftp {
+    my $ciscoconfig = shift;
+    my ( $tftphost, $tftpfile ) = @_;
+
+    srand( time() ^ ( $$ + ( $$ << 15 ) ) );
+    my $rand = int( rand( 1 << 24 ) );
+
+    print "Saving running config to $tftphost as $tftpfile\n" if $ciscoconfig->debug();
+
+    #Try new method first fall back to old method 
+    if ( $ciscoconfig->set_config_protocol( 1, $rand ) ) {
+        print "Using new method, row iid: $rand\n" if $ciscoconfig->debug();
+        #Check each set, delete created row if any fail
+        unless ( $ciscoconfig->set_config_source_type( 4, $rand ) ) {
+            $ciscoconfig->error_throw("Setting source type failed");
+            unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
+                $ciscoconfig->error_throw("Setting source type failed and failed to delete row $rand");
+            }
+            return undef;
+        }
+        unless ( $ciscoconfig->set_config_dest_type( 1, $rand ) ) {
+            $ciscoconfig->error_throw("Setting destination type failed");
+            unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
+                $ciscoconfig->error_throw("Setting dest type failed and failed to delete row $rand");
+            }
+            return undef;
+        }
+        unless ( $ciscoconfig->set_config_server_addr( $tftphost, $rand ) ) {
+            $ciscoconfig->error_throw("Setting tftp server failed");
+            unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
+                $ciscoconfig->error_throw("Setting tftp server failed and failed to delete row $rand");
+            }
+            return undef;
+        }
+        unless ( $ciscoconfig->set_config_filename( $tftpfile, $rand ) ) {
+            $ciscoconfig->error_throw("Setting file name failed");
+            unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
+                $ciscoconfig->error_throw("Setting file name failed and failed to delete row $rand");
+            }
+            return undef;
+        }
+        unless ( $ciscoconfig->set_config_row_status( 1, $rand ) ) {
+            $ciscoconfig->error_throw("Initiating transfer failed");
+            unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
+                $ciscoconfig->error_throw("Initiating transfer failed and failed to delete row $rand");
+            }
+            return undef;
+        }            
+        my $status = 0;
+        my $timer  = 0;
+        # Hard-coded timeout of approximately 5 minutes, we can wrap this in an
+        # option later if needed
+        my $timeout = 300; 
+        while ( $status !~ /successful|failed/ ) {
+            my $t = $ciscoconfig->config_copy_state($rand);
+            $status = $t->{$rand};
+            last if $status =~ /successful|failed/;
+            $timer += 1;
+            if ($timer >= $timeout) {
+                $status = 'failed';
+                last;
+            }
+            sleep 1;
+        }  
+
+        unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
+                print "Failed deleting row, iid $rand\n" if $ciscoconfig->debug();
+        }
+
+        if ( $status eq 'successful' ) {
+            print "Save operation successful\n" if $ciscoconfig->debug();
+            return 1;
+        }        
+        if ( $status eq 'failed' ) {
+            $ciscoconfig->error_throw("Save operation failed");
+            return undef;
+        }
+
+    }
+
+    print "Using old method\n" if $ciscoconfig->debug();
+    unless ( $ciscoconfig->set_old_write_net( $tftpfile, $tftphost ) ) {
+            $ciscoconfig->error_throw("Save operation failed");
+            return undef;
+    }
+
+    return 1;
+}
+
+sub copy_run_start {
+    my $ciscoconfig = shift;
+
+    srand( time() ^ ( $$ + ( $$ << 15 ) ) );
+    my $rand = int( rand( 1 << 24 ) );
+
+    print "Saving running config to memory\n" if $ciscoconfig->debug();
+
+    if ( $ciscoconfig->set_config_source_type( 4, $rand ) ) {
+        print "Using new method, row iid: $rand\n" if $ciscoconfig->debug();
+        #Check each set, delete created row if any fail
+        unless ( $ciscoconfig->set_config_dest_type( 3, $rand ) ) {
+            $ciscoconfig->error_throw("Setting dest type failed");
+            unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
+                $ciscoconfig->error_throw("Setting dest type failed and failed to delete row $rand");
+            }
+            return undef;
+        }
+        unless ( $ciscoconfig->set_config_row_status( 1, $rand ) ) {
+            $ciscoconfig->error_throw("Initiating save failed");
+            unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
+                $ciscoconfig->error_throw("Initiating save failed and failed to delete row $rand");
+                }
+            return undef;
+        }
+        my $status = 0;
+        my $timer  = 0;
+        # Hard-coded timeout of approximately 5 minutes, we can wrap this in an
+        # option later if needed
+        my $timeout = 300; 
+        while ( $status !~ /successful|failed/ ) {
+            my $t = $ciscoconfig->config_copy_state($rand);
+            $status = $t->{$rand};
+            last if $status =~ /successful|failed/;
+            $timer += 1;
+            if ($timer >= $timeout) {
+                $status = 'failed';
+                last;
+            }
+            sleep 1;
+        }
+
+        unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
+                print "Failed deleting row, iid $rand\n" if $ciscoconfig->debug();
+        }
+
+        if ( $status eq 'successful' ) {
+            print "Save operation successful\n" if $ciscoconfig->debug();
+            return 1;
+        }        
+        if ( $status eq 'failed' ) {
+            $ciscoconfig->error_throw("Save operation failed");
+            return undef;
+        }
+
+    }
+
+    print "Using old method\n" if $ciscoconfig->debug();
+    unless ( $ciscoconfig->set_old_write_mem( 1 ) ) {
+            $ciscoconfig->error_throw("Save operation failed");
+            return undef;
+    }
+
+    return 1;
+}
+
+1;
+__END__
+
+
+=head1 NAME
+
+SNMP::Info::CiscoConfig - SNMP Interface to Cisco Configuration Files
+
+=head1 AUTHOR
+
+Justin Hunter, Eric Miller
+
+=head1 SYNOPSIS
+
+    my $ciscoconfig = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+
+    or die "Can't connect to DestHost.\n";
+
+    my $class = $ciscoconfig->class();
+    print " Using device sub class : $class\n";
+
+=head1 DESCRIPTION
+
+SNMP::Info::CiscoConfig is a subclass of SNMP::Info that provides an interface
+to C<CISCO-CONFIG-COPY-MIB>, C<CISCO-FLASH-MIB>, and C<OLD-CISCO-SYS-MIB>.
+These MIBs facilitate the writing of configuration files.
+
+Use or create a subclass of SNMP::Info that inherits this one.
+Do not use directly.
+
+=head2 Inherited Classes
+
+=over
+
+None.
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item CISCO-CONFIG-COPY-MIB
+
+=item CISCO-FLASH-MIB
+
+=item OLD-CISCO-SYS-MIB
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $ciscoconfig->old_write_mem()
+
+(B<writeMem>)
+
+=item $ciscoconfig->old_write_net()
+
+(B<writeNet>)
+
+=back
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=over
+
+=back
+
+=head2 Config Copy Request Table  (B<ccCopyTable>)
+
+=over
+
+=item $ciscoconfig->config_protocol()
+
+(B<ccCopyProtocol>)
+
+=item $ciscoconfig->config_source_type()
+
+(B<ccCopySourceFileType>)
+
+=item $ciscoconfig->config_dest_type()
+
+(B<ccCopyDestFileType>)
+
+=item $ciscoconfig->config_server_addr()
+
+(B<ccCopyServerAddress>)
+
+=item $ciscoconfig->config_filename()
+
+(B<ccCopyFileName>)
+
+=item $ciscoconfig->config_username()
+
+(B<ccCopyUserName>)
+
+=item $ciscoconfig->config_password()
+
+(B<ccCopyUserPassword>)
+
+=item $ciscoconfig->config_notify_complete()
+
+(B<ccCopyNotificationOnCompletion>)
+
+=item $ciscoconfig->config_copy_state()
+
+(B<ccCopyState>)
+
+=item $ciscoconfig->config_copy_start_time()
+
+(B<ccCopyTimeStarted>)
+
+=item $ciscoconfig->config_copy_complete_time()
+
+(B<ccCopyTimeCompleted>)
+
+=item $ciscoconfig->config_fail_cause()
+
+(B<ccCopyFailCause>)
+
+=item $ciscoconfig->config_row_status()
+
+(B<ccCopyEntryRowStatus>)
+
+=back
+
+=head2 Flash Copy Table (B<ciscoFlashCopyTable>)
+
+Table of Flash copy operation entries.
+
+=over
+
+=item $ciscoconfig->flash_copy_cmd()
+
+(B<ciscoFlashCopyCommand>)
+
+=item $ciscoconfig->flash_copy_protocol()
+
+(B<ciscoFlashCopyProtocol>)
+
+=item $ciscoconfig->flash_copy_address()
+
+(B<ciscoFlashCopyServerAddress>)
+
+=item $ciscoconfig->flash_copy_source()
+
+(B<ciscoFlashCopySourceName>)
+
+=item $ciscoconfig->flash_copy_dest()
+
+(B<ciscoFlashCopyDestinationName>)
+
+=item $ciscoconfig->flash_copy_row_status()
+
+(B<ciscoFlashCopyEntryStatus>)
+
+=back
+
+=head1 SET METHODS
+
+These are methods that provide SNMP set functionality for overridden methods or
+provide a simpler interface to complex set operations.  See
+L<SNMP::Info/"SETTING DATA VIA SNMP"> for general information on set operations. 
+
+=over
+
+=item $ciscoconfig->copy_run_tftp (tftpserver, tftpfilename )
+
+Store the running configuration on a TFTP server.  Equivalent to the CLI
+commands "copy running-config tftp" or "write net".
+
+This method attempts to use newer "copy running-config tftp" procedure first
+and then the older "write net" procedure if that fails.  The newer procedure is
+supported Cisco devices with the CISCO-CONFIG-COPY-MIB available, Cisco IOS
+software release 12.0 or on some devices as early as release 11.2P.  The
+older procedure has been depreciated by Cisco and is utilized only to support
+devices running older code revisions.
+
+ Example:
+ $ciscoconfig->copy_run_tftp('1.2.3.4', 'myconfig') 
+    or die Couldn't save config. ",$ciscoconfig->error(1);
+
+=item $ciscoconfig->copy_run_start()
+
+Copy the running configuration to the startup configuration.  Equivalent to
+the CLI command "copy running-config startup-config" or "write mem".
+
+This method attempts to use newer "copy running-config startup-config"
+procedure first and then the older "write mem" procedure if that fails.  The
+newer procedure is supported Cisco devices with the CISCO-CONFIG-COPY-MIB
+available, Cisco IOS software release 12.0 or on some devices as early as
+release 11.2P.  The older procedure has been depreciated by Cisco and is
+utilized only to support devices running older code revisions.
+
+ Example:
+ $ciscoconfig->copy_run_start()
+    or die "Couldn't save config. ",$ciscoconfig->error(1);
+
+=cut

Info/CiscoImage.pm

@@ -0,0 +1,118 @@
+package SNMP::Info::CiscoImage;
+#$Id$
+
+# Copyright (c) 2005 Matt Tuttle
+#
+# 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.
+
+use strict;
+
+use Exporter;
+use SNMP::Info;
+
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+$VERSION = '1.07';
+
+@SNMP::Info::CiscoImage::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::CiscoImage::EXPORT_OK = qw//;
+
+%MIBS    = (
+            'CISCO-IMAGE-MIB' => 'ciscoImageString',
+           );
+
+%GLOBALS = (
+           );
+
+%FUNCS   = (
+            'ci_images'         => 'ciscoImageString',
+           );
+
+%MUNGE   = (
+           );
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::CiscoImage - SNMP Interface to image strings for Cisco Devices
+
+=head1 AUTHOR
+
+Matt Tuttle (C<mtuttle@americanhebrewacademy.org>)
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you.
+ my $ci = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        )
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $ci->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+SNMP::Info::CiscoImage is a subclass of SNMP::Info that provides access to
+image strings embedded in an image running on Cisco Devices.
+
+Use or create in a subclass of SNMP::Info.  Do not use directly.
+
+=head2 Inherited Classes
+
+None.
+
+=head2 Required MIBs
+
+=over
+
+=item CISCO-IMAGE-MIB
+
+=back
+
+MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
+
+=head1 GLOBALS
+
+None.
+
+=head1 TABLE METHODS
+
+=over
+
+=item $ci->ci_images()
+
+Returns the table of image strings.
+
+B<ciscoImageString>
+
+=back
+
+=cut

Info/CiscoPortSecurity.pm

@@ -0,0 +1,328 @@
+# SNMP::Info::CiscoPortSecurity
+# Eric Miller
+#
+# Copyright (c) 2006 Eric Miller 
+#
+# 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::CiscoPortSecurity;
+$VERSION = '1.07';
+# $Id$
+
+use strict;
+
+use Exporter;
+
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+@SNMP::Info::CiscoPortSecurity::ISA = qw/Exporter/;
+@SNMP::Info::CiscoPortSecurity::EXPORT_OK = qw//;
+
+%MIBS    = (
+            'CISCO-PORT-SECURITY-MIB' => 'ciscoPortSecurityMIB',
+           );
+
+%GLOBALS = (
+            # CISCO-PORT-SECURITY-MIB
+            'cps_clear'     => 'cpsGlobalClearSecureMacAddresses',
+            'cps_notify'    => 'cpsGlobalSNMPNotifControl',
+            'cps_rate'      => 'cpsGlobalSNMPNotifRate',
+            'cps_enable'    => 'cpsGlobalPortSecurityEnable',
+            'cps_mac_count' => 'cpsGlobalTotalSecureAddress',
+            'cps_mac_max'   => 'cpsGlobalMaxSecureAddress',
+           );
+
+%FUNCS   = (
+            # CISCO-PORT-SECURITY-MIB::cpsIfConfigTable
+            'cps_i_limit_val'  => 'cpsIfInvalidSrcRateLimitValue',
+            'cps_i_limit'      => 'cpsIfInvalidSrcRateLimitEnable',
+            'cps_i_sticky'     => 'cpsIfStickyEnable',
+            'cps_i_clear_type' => 'cpsIfClearSecureMacAddresses',
+            'cps_i_shutdown'   => 'cpsIfShutdownTimeout',
+            'cps_i_flood'      => 'cpsIfUnicastFloodingEnable',
+            'cps_i_clear'      => 'cpsIfClearSecureAddresses',
+            'cps_i_mac'        => 'cpsIfSecureLastMacAddress',
+            'cps_i_count'      => 'cpsIfViolationCount',
+            'cps_i_action'     => 'cpsIfViolationAction',
+            'cps_i_mac_static' => 'cpsIfStaticMacAddrAgingEnable',
+            'cps_i_mac_type'   => 'cpsIfSecureMacAddrAgingType',
+            'cps_i_mac_age'    => 'cpsIfSecureMacAddrAgingTime',
+            'cps_i_mac_count'  => 'cpsIfCurrentSecureMacAddrCount',
+            'cps_i_mac_max'    => 'cpsIfMaxSecureMacAddr',
+            'cps_i_status'     => 'cpsIfPortSecurityStatus',
+            'cps_i_enable'     => 'cpsIfPortSecurityEnable',
+            # CISCO-PORT-SECURITY-MIB::cpsIfVlanTable
+            'cps_i_v_mac_count' => 'cpsIfVlanCurSecureMacAddrCount',
+            'cps_i_v_mac_max'   => 'cpsIfVlanMaxSecureMacAddr',
+            'cps_i_v'           => 'cpsIfVlanIndex',
+            # CISCO-PORT-SECURITY-MIB::cpsIfVlanSecureMacAddrTable
+            'cps_i_v_mac_status' => 'cpsIfVlanSecureMacAddrRowStatus',
+            'cps_i_v_mac_age'    => 'cpsIfVlanSecureMacAddrRemainAge',
+            'cps_i_v_mac_type'   => 'cpsIfVlanSecureMacAddrType',
+            'cps_i_v_vlan'       => 'cpsIfVlanSecureVlanIndex',
+            'cps_i_v_mac'        => 'cpsIfVlanSecureMacAddress',
+            # CISCO-PORT-SECURITY-MIB::cpsSecureMacAddressTable
+            'cps_m_status' => 'cpsSecureMacAddrRowStatus',
+            'cps_m_age' => 'cpsSecureMacAddrRemainingAge',
+            'cps_m_type' => 'cpsSecureMacAddrType',
+            'cps_m_mac' => 'cpsSecureMacAddress',
+           );
+
+%MUNGE   = (
+            'cps_i_mac'      => \&SNMP::Info::munge_mac, 
+            'cps_m_mac'      => \&SNMP::Info::munge_mac,
+            'cps_i_v_mac'    => \&SNMP::Info::munge_mac,
+           );
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::CiscoPortSecurity - SNMP Interface to data from
+CISCO-PORT-SECURITY-MIB
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $cps = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $cps->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+SNMP::Info::CiscoPortSecurity is a subclass of SNMP::Info that provides
+an interface to the C<CISCO-PORT-SECURITY-MIB>.  This MIB is used across
+the Catalyst family under CatOS and IOS.
+
+Use or create in a subclass of SNMP::Info.  Do not use directly.
+
+=head2 Inherited Classes
+
+None.
+
+=head2 Required MIBs
+
+=over
+
+=item CISCO-PORT-SECURITY-MIB
+
+=back
+
+MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz or from
+Netdisco-mib package at netdisco.org. 
+
+=head1 GLOBALS
+
+These are methods that return scalar values from SNMP
+
+=over
+
+=back
+
+=head2 CISCO-PORT-SECURITY-MIB globals
+
+=over
+
+=item $stack->cps_clear()
+
+(B<cpsGlobalClearSecureMacAddresses>)
+
+=item $stack->cps_notify()
+
+(B<cpsGlobalSNMPNotifControl>)
+
+=item $stack->cps_rate()
+
+(B<cpsGlobalSNMPNotifRate>)
+
+=item $stack->cps_enable()
+
+(B<cpsGlobalPortSecurityEnable>)
+
+=item $stack->cps_mac_count()
+
+(B<cpsGlobalTotalSecureAddress>)
+
+=item $stack->cps_mac_max()
+
+(B<cpsGlobalMaxSecureAddress>)
+
+=back
+
+=head1 TABLE METHODS
+
+=head2 CISCO-PORT-SECURITY-MIB - Interface Config Table
+
+=over
+
+=item $stack->cps_i_limit_val()
+
+(B<cpsIfInvalidSrcRateLimitValue>)
+
+=item $stack->cps_i_limit()
+
+(B<cpsIfInvalidSrcRateLimitEnable>)
+
+=item $stack->cps_i_sticky()
+
+(B<cpsIfStickyEnable>)
+
+=item $stack->cps_i_clear_type()
+
+(B<cpsIfClearSecureMacAddresses>)
+
+=item $stack->cps_i_shutdown()
+
+(B<cpsIfShutdownTimeout>)
+
+=item $stack->cps_i_flood()
+
+(B<cpsIfUnicastFloodingEnable>)
+
+=item $stack->cps_i_clear()
+
+(B<cpsIfClearSecureAddresses>)
+
+=item $stack->cps_i_mac()
+
+(B<cpsIfSecureLastMacAddress>)
+
+=item $stack->cps_i_count()
+
+(B<cpsIfViolationCount>)
+
+=item $stack->cps_i_action()
+
+(B<cpsIfViolationAction>)
+
+=item $stack->cps_i_mac_static()
+
+(B<cpsIfStaticMacAddrAgingEnable>)
+
+=item $stack->cps_i_mac_type()
+
+(B<cpsIfSecureMacAddrAgingType>)
+
+=item $stack->cps_i_mac_age()
+
+(B<cpsIfSecureMacAddrAgingTime>)
+
+=item $stack->cps_i_mac_count()
+
+(B<cpsIfCurrentSecureMacAddrCount>)
+
+=item $stack->cps_i_mac_max()
+
+(B<cpsIfMaxSecureMacAddr>)
+
+=item $stack->cps_i_status()
+
+(B<cpsIfPortSecurityStatus>)
+
+=item $stack->cps_i_enable()
+
+(B<cpsIfPortSecurityEnable>)
+
+=back
+
+=head2 CISCO-PORT-SECURITY-MIB::cpsIfVlanTable
+
+=over
+
+=item $stack->cps_i_v_mac_count()
+
+(B<cpsIfVlanCurSecureMacAddrCount>)
+
+=item $stack->cps_i_v_mac_max()
+
+(B<cpsIfVlanMaxSecureMacAddr>)
+
+=item $stack->cps_i_v()
+
+(B<cpsIfVlanIndex>)
+
+=back
+
+=head2 CISCO-PORT-SECURITY-MIB::cpsIfVlanSecureMacAddrTable
+
+=over
+
+=item $stack->cps_i_v_mac_status()
+
+(B<cpsIfVlanSecureMacAddrRowStatus>)
+
+=item $stack->cps_i_v_mac_age()
+
+(B<cpsIfVlanSecureMacAddrRemainAge>)
+
+=item $stack->cps_i_v_mac_type()
+
+(B<cpsIfVlanSecureMacAddrType>)
+
+=item $stack->cps_i_v_vlan()
+
+(B<cpsIfVlanSecureVlanIndex>)
+
+=item $stack->cps_i_v_mac()
+
+(B<cpsIfVlanSecureMacAddress>)
+
+=back
+
+=head2 CISCO-PORT-SECURITY-MIB::cpsSecureMacAddressTable
+
+=over
+
+=item $stack->cps_m_status()
+
+(B<cpsSecureMacAddrRowStatus>)
+
+=item $stack->cps_m_age()
+
+(B<cpsSecureMacAddrRemainingAge>)
+
+=item $stack->cps_m_type()
+
+(B<cpsSecureMacAddrType>)
+
+=item $stack->cps_m_mac()
+
+(B<cpsSecureMacAddress>)
+
+=back
+
+=cut

Info/CiscoPower.pm

@@ -0,0 +1,147 @@
+# SNMP::Info::CiscoPower
+# Bill Fenner
+#
+# Copyright (c) 2007 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::CiscoPower;
+$VERSION = '1.07';
+# $Id$
+
+use strict;
+
+use Exporter;
+use SNMP::Info;
+
+use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
+@SNMP::Info::CiscoPower::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::CiscoPower::EXPORT_OK = qw//;
+
+%MIBS    = ('CISCO-POWER-ETHERNET-EXT-MIB' => 'cpeExtPsePortEntPhyIndex');
+
+%GLOBALS = (
+           );
+
+%FUNCS   = (
+	    'cpeth_ent_phy'    => 'cpeExtPsePortEntPhyIndex',
+           );
+
+%MUNGE   = (
+           );
+
+# Cisco overcame the limitation of the module.port index of the
+# pethPsePortTable by adding another mapping table, which maps
+# a pethPsePortTable row to an entPhysicalTable index, which can
+# then be mapped to ifIndex.
+sub peth_port_ifindex {
+    my $cpeth = shift;
+    my $partial = shift;
+
+    my $ent_phy = $cpeth->cpeth_ent_phy($partial);
+    my $e_port = $cpeth->e_port();
+
+    my $peth_port_ifindex = {};
+    foreach my $i (keys %$ent_phy) {
+	if ($e_port->{$ent_phy->{$i}}) {
+	    $peth_port_ifindex->{$i} = $e_port->{$ent_phy->{$i}};
+	}
+    }
+    return $peth_port_ifindex;
+}
+
+1;
+
+=head1 NAME
+
+SNMP::Info::CiscoPower - SNMP Interface to data stored in CISCO-POWER-ETHERNET-EXT-MIB.
+
+=head1 AUTHOR
+
+Bill Fenner
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $poe = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $poe->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+The Info::PowerEthernet class needs a per-device helper function to
+properly map the pethPsePortTable to ifIndex values.  This class
+provides that helper, using CISCO-POWER-ETHERNET-EXT-MIB.
+It does not define any helpers for the extra values that this MIB
+contains.
+
+Create or use a device subclass that inherit this class.  Do not use directly.
+
+For debugging purposes you can call this class directly as you would SNMP::Info
+
+ my $poe = new SNMP::Info::CiscoPower (...);
+
+=head2 Inherited Classes
+
+none.
+
+Note that it requires that the device inherits from Info::Entity.
+
+=head2 Required MIBs
+
+=over
+
+=item CISCO-POWER-ETHERNET-EXT-MIB
+
+=back
+
+=head1 GLOBALS
+
+none.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Power Port Table
+
+=over
+
+=item $poe->peth_port_ifindex()
+
+Maps the pethPsePortTable to ifIndex by way of the ENTITY-MIB.
+
+=back
+
+=cut

Info/CiscoQOS.pm

@@ -0,0 +1,217 @@
+# SNMP::Info::CiscoQOS
+# Alexander Hartmaier <alexander.hartmaier@t-systems.at>
+#
+# Copyright (c) 2005 Alexander Hartmaier
+#
+# 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::CiscoQOS;
+$VERSION = '1.07';
+
+# $Id$
+use strict;
+
+use Exporter;
+use SNMP::Info;
+
+@SNMP::Info::CiscoQOS::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::CiscoQOS::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+
+%MIBS    = (
+            'CISCO-CLASS-BASED-QOS-MIB'      => 'cbQosIfIndex',
+           );
+
+%GLOBALS = (
+           );
+
+%FUNCS   = (
+            # CISCO-CLASS-BASED-QOS-MIB::cbQosServicePolicyTable
+            'qos_i_index'             => 'cbQosIfIndex',
+            'qos_i_type'              => 'cbQosIfType',
+            'qos_pol_direction'       => 'cbQosPolicyDirection',
+            # CISCO-CLASS-BASED-QOS-MIB::cbQosObjectsTable
+            'qos_obj_conf_index'      => 'cbQosConfigIndex',
+            'qos_obj_type'            => 'cbQosObjectsType',
+            'qos_obj_parent'          => 'cbQosParentObjectsIndex',
+            # CISCO-CLASS-BASED-QOS-MIB::cbQosCMCfgTable
+            'qos_cm_name'             => 'cbQosCMName',
+            'qos_cm_desc'             => 'cbQosCMDesc',
+            'qos_cm_info'             => 'cbQosCMInfo',
+            # CISCO-CLASS-BASED-QOS-MIB::cbQosCMStatsTable
+            'qos_octet_pre'           => 'cbQosCMPrePolicyByte',
+            'qos_octet_post'          => 'cbQosCMPostPolicyByte',
+            # CISCO-CLASS-BASED-QOS-MIB::cbQosQueueingCfgTable
+            'qos_queueingcfg_bw'        => 'cbQosQueueingCfgBandwidth',
+            'qos_queueingcfg_bw_units'  => 'cbQosQueueingCfgBandwidthUnits',
+           );
+
+%MUNGE   = (
+           );
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::CiscoQOS - SNMP Interface to Cisco's Quality of Service MIBs
+
+=head1 AUTHOR
+
+Alexander Hartmaier
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $qos = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $qos->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+SNMP::Info::CiscoQOS is a subclass of SNMP::Info that provides 
+information about a cisco device's QoS config.
+
+Use or create in a subclass of SNMP::Info.  Do not use directly.
+
+=head2 Inherited Classes
+
+none.
+
+=head2 Required MIBs
+
+=over
+
+=item CISCO-CLASS-BASED-QOS-MIB
+
+=back
+
+MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
+
+=head1 GLOBALS
+
+=over
+
+=item none
+
+=back
+
+=head1 TABLE METHODS
+
+=head2 ServicePolicy Table (B<cbQosServicePolicyTable>)
+
+This table describes the interfaces/media types and the policymap that are
+attached to it.
+
+=over
+
+=item $qos->qos_i_index()
+
+(B<cbQosIfIndex>)
+
+=item $qos->qos_i_type()
+
+(B<cbQosIfType>)
+
+=item $qos->qos_pol_direction()
+
+(B<cbQosPolicyDirection>)
+
+=back
+
+=head2 ClassMap Objects Table (B<cbQosObjectsTable>)
+
+=over
+
+=item $qos->qos_obj_index()
+
+(B<cbQosConfigIndex>)
+
+=item $qos->qos_obj_type()
+
+(B<cbQosObjectsType>)
+
+=item $qos->qos_obj_parent()
+
+(B<cbQosParentObjectsIndex>)
+
+=back
+
+=head2 ClassMap Configuration Table (B<cbQosCMCfgTable>)
+
+=over
+
+=item $qos->qos_cm_name()
+
+(B<cbQosCMName>)
+
+=item $qos->qos_cm_desc()
+
+(B<cbQosCMDesc>)
+
+=item $qos->qos_cm_info()
+
+(B<cbQosCMInfo>)
+
+=back
+
+=head2 ClassMap Stats Table (B<cbQosCMStatsTable>)
+
+=over
+
+=item $qos->qos_octet_pre()
+
+(B<cbQosCMPrePolicyByte>)
+
+=item $qos->qos_octet_post()
+
+(B<cbQosCMPostPolicyByte>)
+
+=back
+
+=head2 Queueing Configuration Table (B<cbQosQueueingCfgTable>)
+
+=over
+
+=item $qos->qos_queueingcfg_bw()
+
+(B<cbQosQueueingCfgBandwidth>)
+
+=item $qos->qos_queueingcfg_bw_units()
+
+(B<cbQosQueueingCfgBandwidthUnits>)
+
+=cut

Info/CiscoRTT.pm

@@ -0,0 +1,143 @@
+# SNMP::Info::CiscoRTT
+# Alexander Hartmaier <alexander.hartmaier@t-systems.at>
+# $Id$
+#
+# Copyright (c) 2005 Alexander Hartmaier
+#
+# 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::CiscoRTT;
+$VERSION = '1.07';
+
+use strict;
+
+use Exporter;
+use SNMP::Info;
+
+@SNMP::Info::CiscoRTT::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::CiscoRTT::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+
+%MIBS    = (
+            'CISCO-RTTMON-MIB'      => 'rttMonCtrlAdminOwner',
+           );
+
+%GLOBALS = (
+           );
+
+%FUNCS   = (
+            # CISCO-RTTMON-MIB
+            'rtt_desc'              => 'rttMonCtrlAdminOwner',
+            'rtt_last'              => 'rttMonLatestRttOperCompletionTime',
+           );
+
+%MUNGE   = (
+           );
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::CiscoRTT - SNMP Interface to Cisco's Round Trip Time MIBs
+
+=head1 AUTHOR
+
+Alexander Hartmaier
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $rtt = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $rtt->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+SNMP::Info::CiscoRTT is a subclass of SNMP::Info that provides 
+information about a cisco device's RTT values.
+
+Use or create in a subclass of SNMP::Info.  Do not use directly.
+
+=head2 Inherited Classes
+
+none.
+
+=head2 Required MIBs
+
+=over
+
+=item CISCO-RTTMON-MIB
+
+=back
+
+MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
+
+=head1 GLOBALS
+
+=over
+
+None
+
+=back
+
+=head1 TABLE METHODS
+
+=head2 Overall Control Group Table
+
+This table is from CISCO-RTTMAN-MIB::rttMonCtrlAdminTable
+
+=over
+
+=item $rtt->rtt_desc()
+
+(B<rttMonCtrlAdminOwner>)
+
+=back
+
+=head2 Overall Control Group Table
+
+This table is from CISCO-RTTMON-MIB::rttMonCtrl
+
+=over
+
+=item $rtt->rtt_last()
+
+(B<rttMonLatestRttOperCompletionTime>)
+
+=back
+
+=cut

Info/CiscoStack.pm

@@ -0,0 +1,609 @@
+# SNMP::Info::CiscoStack
+# Max Baker
+#
+# Copyright (c)2003,2004,2006 Max Baker 
+# 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::CiscoStack;
+$VERSION = '1.07';
+# $Id$
+
+use strict;
+
+use Exporter;
+use SNMP::Info;
+
+use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT $INIT/;
+@SNMP::Info::CiscoStack::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::CiscoStack::EXPORT_OK = qw//;
+
+%MIBS    = (
+            'CISCO-STACK-MIB'         => 'ciscoStackMIB',
+           );
+
+%GLOBALS = (
+            'sysip'       => 'sysIpAddr',    
+            'netmask'     => 'sysNetMask',    
+            'broadcast'   => 'sysBroadcast',
+            'serial1'     => 'chassisSerialNumber',    
+            'serial2'     => 'chassisSerialNumberString',
+            'model1'      => 'chassisModel',    
+            'ps1_type'    => 'chassisPs1Type',    
+            'ps1_status'  => 'chassisPs1Status',    
+            'ps2_type'    => 'chassisPs2Type',    
+            'ps2_status'  => 'chassisPs2Status',    
+            'slots'       => 'chassisNumSlots',    
+            'fan'         => 'chassisFanStatus',
+           );
+
+%FUNCS   = (
+            # CISCO-STACK-MIB::moduleEntry
+            #   These are blades in a catalyst device
+            'm_type'         => 'moduleType',
+            'm_model'        => 'moduleModel',
+            'm_serial'       => 'moduleSerialNumber',
+            'm_status'       => 'moduleStatus',
+            'm_name'         => 'moduleName',
+            'm_ports'        => 'moduleNumPorts',
+            'm_ports_status' => 'modulePortStatus',
+            'm_hwver'        => 'moduleHwVersion',
+            'm_fwver'        => 'moduleFwVersion',
+            'm_swver'        => 'moduleSwVersion',
+            # Router Blades :
+            'm_ip'           => 'moduleIPAddress',
+            'm_sub1'         => 'moduleSubType',
+            'm_sub2'         => 'moduleSubType2',
+            # CISCO-STACK-MIB::portEntry 
+            'p_name'    => 'portName',
+            'p_type'    => 'portType',
+            'p_status'  => 'portOperStatus',
+            'p_status2' => 'portAdditionalStatus',
+            'p_speed'   => 'portAdminSpeed',
+            'p_duplex'  => 'portDuplex',
+            'p_port'    => 'portIfIndex',
+            'p_rx_flow_control' => 'portOperRxFlowControl',
+            'p_tx_flow_control' => 'portOperTxFlowControl',
+            'p_rx_flow_control_admin' => 'portAdminRxFlowControl',
+            'p_tx_flow_control_admin' => 'portAdminTxFlowControl',
+            'p_oidx'    => 'portCrossIndex',
+            # CISCO-STACK-MIB::PortCpbEntry
+            'p_speed_admin'  => 'portCpbSpeed',
+            'p_duplex_admin' => 'portCpbDuplex',
+           );
+
+%MUNGE   = (
+            'm_ports_status' => \&munge_port_status,
+            'p_duplex_admin' => \&SNMP::Info::munge_bits,
+           );
+
+%PORTSTAT = (1 => 'other',
+             2 => 'ok',
+             3 => 'minorFault',
+             4 => 'majorFault');
+
+# Changes binary byte describing each port into ascii, and returns
+# an ascii list separated by spaces.
+sub munge_port_status {
+    my $status = shift;
+    my @vals = map($PORTSTAT{$_},unpack('C*',$status));
+    return join(' ',@vals);
+}
+
+sub serial {
+    my $stack = shift;
+    my $serial1 = $stack->serial1();
+    my $serial2 = $stack->serial2();
+
+    return $serial1 if defined $serial1;
+    return $serial2 if defined $serial2;
+    return undef;
+}
+
+# Rules for older CatOS devices using CiscoStack
+#
+# You can configure Ethernet and Fast Ethernet interfaces to either full
+# duplex or half duplex. 
+#
+# You cannot configure the duplex mode on Gigabit Ethernet ports (they are
+# always in full-duplex mode).
+#
+# If you set the port speed to auto, duplex mode is automatically set to auto. 
+#
+# For operational duplex if portCpbDuplex is all zeros the port is a gigabit
+# port and duplex is always full.  If the port is not operational and auto
+# return value will be undef since we don't know the operational status.
+#
+# Newer devices use ETHERLIKE-MIB to report operational duplex, this will be
+# checked in the device class.
+
+sub i_duplex {
+    my $stack = shift;
+    my $partial = shift;
+
+    my $p_port       = $stack->p_port()   || {};
+    my $p_duplex     = $stack->p_duplex() || {};
+    my $p_duplex_cap = $stack->p_duplex_admin() || {};
+
+    my $i_duplex = {};
+    foreach my $port (keys %$p_duplex) {
+        my $iid = $p_port->{$port};
+        next unless defined $iid;
+        next if (defined $partial and $iid !~ /^$partial$/);
+        # Test for gigabit 
+        if ($p_duplex_cap->{$port} == 0) {
+            $i_duplex->{$iid} = 'full';
+        }
+        # Auto is not a valid operational state
+        elsif ($p_duplex->{$port} eq 'auto') {
+            next;
+        }
+        else {
+            $i_duplex->{$iid} = $p_duplex->{$port};
+        }
+    }
+    return $i_duplex; 
+}
+
+# For administrative duplex if portCpbDuplex is all zeros the port is a gigabit
+# port and duplex is always full.  If portAdminSpeed is set to auto then the
+# duplex will be auto, otherwise use portDuplex.
+
+sub i_duplex_admin {
+    my $stack = shift;
+    my $partial = shift;
+
+    my $p_port       = $stack->p_port()   || {};
+    my $p_duplex     = $stack->p_duplex() || {};
+    my $p_duplex_cap = $stack->p_duplex_admin() || {};
+    my $p_speed      = $stack->p_speed() || {};
+
+    my $i_duplex_admin = {};
+    foreach my $port (keys %$p_duplex) {
+        my $iid = $p_port->{$port};
+        next unless defined $iid;
+        next if (defined $partial and $iid !~ /^$partial$/);
+        # Test for gigabit 
+        if ($p_duplex_cap->{$port} == 0) {
+            $i_duplex_admin->{$iid} = 'full';
+        }
+        # Check admin speed for auto
+        elsif ($p_speed->{$port} =~ /auto/) {
+            $i_duplex_admin->{$iid} = 'auto';
+        }
+        else {
+            $i_duplex_admin->{$iid} = $p_duplex->{$port};
+        }
+    }
+    return $i_duplex_admin; 
+}
+
+sub i_speed_admin {
+    my $stack = shift;
+    my $partial = shift;
+
+    my %i_speed_admin;
+    my $p_port  = $stack->p_port();
+    my %mapping = reverse %$p_port;
+    my $p_speed = $stack->p_speed($mapping{$partial});
+
+    my %speeds = ('autoDetect'      => 'auto',
+                  'autoDetect10100' => 'auto',
+                  's10000000'       => '10 Mbps',
+                  's100000000'      => '100 Mbps',
+                  's1000000000'     => '1.0 Gbps',
+                  's10G'            => '10 Gbps',
+                 );
+
+    %i_speed_admin = map { $p_port->{$_} => $speeds{$p_speed->{$_}} } keys %$p_port;
+
+    return \%i_speed_admin;
+}
+
+sub set_i_speed_admin {
+    # map speeds to those the switch will understand
+    my %speeds = qw/auto 1 10 10000000 100 100000000 1000 1000000000/;
+
+    my $stack = shift;
+    my ($speed, $iid) = @_;
+    my $p_port  = $stack->p_port() || {};
+    my %reverse_p_port = reverse %$p_port;
+
+    $speed = lc($speed);
+
+    return 0 unless defined $speeds{$speed};
+
+    $iid = $reverse_p_port{$iid};
+
+    return $stack->set_p_speed_admin($speeds{$speed}, $iid);
+}
+
+sub set_i_duplex_admin {
+    # map a textual duplex to an integer one the switch understands
+    my %duplexes = qw/half 1 full 2 auto 4/;
+
+    my $stack = shift;
+    my ($duplex, $iid) = @_;
+    if ($duplex eq 'auto') {
+        $stack->error_throw("Software doesn't support setting auto duplex with
+                            set_i_duplex_admin() you must use
+                            set_i_speed_admin() and set both speed and duplex
+                            to auto");
+        return 0;
+    }
+
+    my $p_port  = $stack->p_port() || {};
+    my %reverse_p_port = reverse %$p_port;
+
+    $duplex = lc($duplex);
+
+    return 0 unless defined $duplexes{$duplex};
+
+    $iid = $reverse_p_port{$iid};
+
+    return $stack->set_p_duplex($duplexes{$duplex}, $iid);
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SNMP::Info::CiscoStack - SNMP Inteface to data from CISCO-STACK-MIB and
+CISCO-PORT-SECURITY-MIB
+
+=head1 AUTHOR
+
+Max Baker
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $ciscostats = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $ciscostats->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+SNMP::Info::CiscoStack is a subclass of SNMP::Info that provides
+an interface to the C<CISCO-STACK-MIB>.  This MIB is used across
+the Catalyst family under CatOS and IOS.
+
+Use or create in a subclass of SNMP::Info.  Do not use directly.
+
+=head2 Inherited Classes
+
+none.
+
+=head2 Required MIBs
+
+=over
+
+=item CISCO-STACK-MIB
+
+=back
+
+MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz or from
+Netdisco-mib package at netdisco.org. 
+
+=head1 GLOBALS
+
+=over
+
+=item $stack->broadcast()
+
+(B<sysBroadcast>)
+
+=item $stack->fan()
+
+(B<chassisFanStatus>)
+
+=item $stack->model()
+
+(B<chassisModel>)
+
+=item $stack->netmask()
+
+(B<sysNetMask>)
+
+=item $stack->ps1_type()
+
+(B<chassisPs1Type>)
+
+=item $stack->ps2_type()
+
+(B<chassisPs2Type>)
+
+=item $stack->ps1_status()
+
+(B<chassisPs1Status>)
+
+=item $stack->ps2_status()
+
+(B<chassisPs2Status>)
+
+=item $stack->serial()
+
+(B<chassisSerialNumberString>) or (B<chassisSerialNumber>)
+
+=item $stack->slots()
+
+(B<chassisNumSlots>)
+
+=back
+
+=head1 TABLE METHODS
+
+=head2 Interface Tables
+
+=over
+
+=item $stack->i_physical()
+
+Returns a map to IID for ports that are physical ports, not vlans, etc.
+
+=item $stack->i_type()
+
+Crosses p_port() with p_type() and returns the results. 
+
+Overrides with ifType if p_type() isn't available.
+
+=item $stack->i_duplex()
+
+Returns reference to hash of iid to current link duplex setting.
+
+First checks for fixed gigabit ports which are always full duplex.  Next, if
+the port is not operational and reported port duplex (B<portDuplex>) is auto
+then the operational duplex can not be determined.  Otherwise it uses the
+reported port duplex (B<portDuplex>).
+
+=item $stack->i_duplex_admin()
+
+Returns reference to hash of iid to administrative duplex setting.
+
+First checks for fixed gigabit ports which are always full duplex. Next checks
+the port administrative speed (B<portAdminSpeed>) which if set to
+autonegotiate then the duplex will also autonegotiate, otherwise it uses the
+reported port duplex (B<portDuplex>).
+
+=item $stack->set_i_speed_admin(speed, ifIndex)
+
+    Sets port speed, must be supplied with speed and port ifIndex
+
+    Speed choices are 'auto', '10', '100', '1000'
+
+    Crosses $stack->p_port() with $stack->p_duplex() to
+    utilize port ifIndex.
+
+    Example:
+    my %if_map = reverse %{$stack->interfaces()};
+    $stack->set_i_speed_admin('auto', $if_map{'FastEthernet0/1'}) 
+        or die "Couldn't change port speed. ",$stack->error(1);
+
+=item $stack->set_i_duplex_admin(duplex, ifIndex)
+
+    Sets port duplex, must be supplied with duplex and port ifIndex
+
+    Speed choices are 'auto', 'half', 'full'
+
+    Crosses $stack->p_port() with $stack->p_duplex() to
+    utilize port ifIndex.
+
+    Example:
+    my %if_map = reverse %{$stack->interfaces()};
+    $stack->set_i_duplex_admin('auto', $if_map{'FastEthernet0/1'}) 
+        or die "Couldn't change port duplex. ",$stack->error(1);
+
+=back
+
+=head2 Module table
+
+This table holds configuration information for each of the blades installed in
+the Catalyst device.
+
+=over
+
+=item $stack->m_type()
+
+(B<moduleType>)
+
+=item $stack->m_model()
+
+(B<moduleModel>)
+
+=item $stack->m_serial()
+
+(B<moduleSerialNumber>)
+
+=item $stack->m_status()
+
+(B<moduleStatus>)
+
+=item $stack->m_name()
+
+(B<moduleName>)
+
+=item $stack->m_ports()
+
+(B<moduleNumPorts>)
+
+=item $stack->m_ports_status()
+
+Returns a list of space separated status strings for the ports.
+
+To see the status of port 4 :
+
+    @ports_status = split(' ', $stack->m_ports_status() );
+    $port4 = $ports_status[3];
+
+(B<modulePortStatus>)
+
+=item $stack->m_ports_hwver()
+
+(B<moduleHwVersion>)
+
+=item $stack->m_ports_fwver()
+
+(B<moduleFwVersion>)
+
+=item $stack->m_ports_swver()
+
+(B<moduleSwVersion>)
+
+=item $stack->m_ports_ip()
+
+(B<moduleIPAddress>)
+
+=item $stack->m_ports_sub1()
+
+(B<moduleSubType>)
+
+=item $stack->m_ports_sub2()
+
+(B<moduleSubType2>)
+
+=back
+
+=head2 Modules - Router Blades
+
+=over
+
+=item $stack->m_ip()
+
+(B<moduleIPAddress>)
+
+=item $stack->m_sub1()
+
+(B<moduleSubType>)
+
+=item $stack->m_sub2()
+
+(B<moduleSubType2>)
+
+=back
+
+=head2 Port Entry Table (CISCO-STACK-MIB::portTable)
+
+=over
+
+=item $stack->p_name()
+
+(B<portName>)
+
+=item $stack->p_type()
+
+(B<portType>)
+
+=item $stack->p_status()
+
+(B<portOperStatus>)
+
+=item $stack->p_status2()
+
+(B<portAdditionalStatus>)
+
+=item $stack->p_speed()
+
+(B<portAdminSpeed>)
+
+=item $stack->p_duplex()
+
+(B<portDuplex>)
+
+=item $stack->p_port()
+
+(B<portIfIndex>)
+
+=item $stack->p_rx_flow_control()
+
+Can be either C<on> C<off> or C<disagree>
+
+"Indicates the receive flow control operational status of the port. If the port
+could not agree with the far end on a link protocol, its operational status
+will be disagree(3)."
+
+B<portOperRxFlowControl>
+
+=item $stack->p_tx_flow_control()
+
+Can be either C<on> C<off> or C<disagree>
+
+"Indicates the transmit flow control operational status of the port. If the
+port could not agree with the far end on a link protocol, its operational
+status will be disagree(3)."
+
+B<portOperTxFlowControl>
+
+=item $stack->p_rx_flow_control_admin()
+
+Can be either C<on> C<off> or C<desired>
+
+"Indicates the receive flow control administrative status set on the port. If
+the status is set to on(1), the port will require the far end to send flow
+control. If the status is set to off(2), the port will not allow far end to
+send flow control.  If the status is set to desired(3), the port will allow the
+far end to send the flow control."
+
+B<portAdminRxFlowControl>
+
+=item $stack->p_tx_flow_control_admin()
+
+Can be either C<on> C<off> or C<desired>
+
+"Indicates the transmit flow control administrative status set on the port.  If
+the status is set to on(1), the port will send flow control to the far end.  If
+the status is set to off(2), the port will not send flow control to the far
+end. If the status is set to desired(3), the port will send flow control to the
+far end if the far end supports it."
+
+B<portAdminTxFlowControl>
+
+=back
+
+=head2 Port Capability Table (CISCO-STACK-MIB::portCpbTable)
+
+=over
+
+=item $stack->p_speed_admin()
+
+(B<portCpbSpeed>)
+
+=item $stack->p_duplex_admin()
+
+(B<portCpbDuplex>)
+
+=back
+
+=cut

Info/CiscoStats.pm

@@ -1,5 +1,8 @@
 # SNMP::Info::CiscoStats
-# Max Baker <max@warped.org>
+# Max Baker
+#
+# Changes since Version 0.7 Copyright (c) 2004 Max Baker 
+# All rights reserved.  
 #
 # Copyright (c) 2003 Regents of the University of California
 # All rights reserved.
@@ -28,7 +31,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::CiscoStats;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 
 use strict;
@@ -40,14 +43,16 @@ use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
 @SNMP::Info::CiscoStats::ISA = qw/SNMP::Info Exporter/;
 @SNMP::Info::CiscoStats::EXPORT_OK = qw//;
 
-$DEBUG=0;
-$SNMP::debugging=$DEBUG;
-
-$INIT    = 0;
 %MIBS    = (
-            'RFC1213-MIB'           => 'sysDescr',
-            'CISCO-PROCESS-MIB'     => 'cpmCPUTotal5sec',
-            'CISCO-MEMORY-POOL-MIB' => 'ciscoMemoryPoolUsed' 
+            'SNMPv2-MIB'                       => 'sysDescr',
+            'CISCO-PROCESS-MIB'               => 'cpmCPUTotal5sec',
+            'CISCO-MEMORY-POOL-MIB'           => 'ciscoMemoryPoolUsed',
+            'OLD-CISCO-SYSTEM-MIB'            => 'writeMem',
+            'CISCO-PRODUCTS-MIB'              => 'sysName',
+            # some older catalysts live here
+            'CISCO-STACK-MIB'                 => 'wsc1900sysID',    
+            'CISCO-ENTITY-VENDORTYPE-OID-MIB' => 'cevChassis',
+            'CISCO-FLASH-MIB'                 => 'ciscoFlashDeviceSize',
            );
 
 %GLOBALS = (
@@ -62,12 +67,16 @@ $INIT    = 0;
             'cat_cpu'      => 'cpmCPUTotal5sec.9',
             'cat_cpu_1min' => 'cpmCPUTotal1min.9',
             'cat_cpu_5min' => 'cpmCPUTotal5min.9',
-            # CISCO-MEMORY-POOL-MIB
-            'mem_free'     => 'ciscoMemoryPoolFree.1',
-            'mem_used'     => 'ciscoMemoryPoolUsed.1',
+            # OLD-CISCO-SYSTEM-MIB
+            'write_mem'    => 'writeMem',
            );
 
 %FUNCS   = (
+            # CISCO-MEMORY-POOL-MIB::ciscoMemoryPoolTable
+            'cisco_mem_free'    => 'ciscoMemoryPoolFree',
+            'cisco_mem_used'    => 'ciscoMemoryPoolUsed',
+            # CISCO-FLASH-MIB::ciscoFlashDeviceTable
+            'cisco_flash_size'  => 'ciscoFlashDeviceSize',
            );
 
 %MUNGE   = (
@@ -75,10 +84,11 @@ $INIT    = 0;
 
 sub os {
     my $l2 = shift;
-    my $descr = $l2->description();
+    my $descr = $l2->description() || '';
 
-    return 'catalyst' if ($descr =~ /catalyst/i);
+    # order here matters - there are Catalysts that run IOS and have catalyst in their description field.
     return 'ios'      if ($descr =~ /IOS/);
+    return 'catalyst' if ($descr =~ /catalyst/i);
     return undef;
 }
 
@@ -88,12 +98,12 @@ sub os_ver {
     my $descr = $l2->description();
     
     # Older Catalysts
-    if ($os eq 'catalyst' and $descr =~ m/V(\d{1}\.\d{2}\.\d{2})/){
+    if (defined $os and $os eq 'catalyst' and defined $descr and $descr =~ m/V(\d{1}\.\d{2}\.\d{2})/){
         return $1;
     }
-
+    
     # Newer Catalysts and IOS devices
-    if ($descr =~ m/Version (\d+\.\d+\([^)]+\)[^,\s]*)(,|\s)+/ ){
+    if (defined $descr and $descr =~ m/Version (\d+\.\d+\([^)]+\)[^,\s]*)(,|\s)+/ ){
         return $1;
     } 
     return undef;
@@ -123,12 +133,62 @@ sub cpu_5min {
     return $cat_cpu_5min;
 }
 
+sub mem_free {
+    my $self = shift;
+
+    my $mem_free;
+
+    my $cisco_mem_free = $self->cisco_mem_free() || {};
+
+    foreach my $mem_free_val (values %$cisco_mem_free) {
+        $mem_free += $mem_free_val;
+    }
+
+    return $mem_free;
+}
+
+sub mem_used {
+    my $self = shift;
+
+    my $mem_used;
+
+    my $cisco_mem_used = $self->cisco_mem_used() || {};
+ 
+    foreach my $mem_used_val (values %$cisco_mem_used) {
+        $mem_used += $mem_used_val;
+    }
+
+    return $mem_used;
+}
+
 sub mem_total {
     my $self = shift;
-    my $mem_free = $self->mem_free();
-    my $mem_used = $self->mem_used();
-    return undef unless defined $mem_free and defined $mem_used;
-    return $mem_free + $mem_used;
+
+    my $mem_total;
+
+    my $cisco_mem_free = $self->cisco_mem_free() || {};
+    my $cisco_mem_used = $self->cisco_mem_used() || {};
+
+    foreach my $mem_entry (keys %$cisco_mem_free){
+        my $mem_free = $cisco_mem_free->{$mem_entry} || 0;
+        my $mem_used = $cisco_mem_used->{$mem_entry} || 0;
+        $mem_total += ($mem_free + $mem_used);
+    }
+    return $mem_total;
+}
+
+sub flashmem_total {
+    my $self = shift;
+
+    my $flashmem_total;
+
+    my $flash_sizes = $self->cisco_flash_size;
+
+    foreach my $flash_index (keys %$flash_sizes) {
+        $flashmem_total += $flash_sizes->{$flash_index};
+    }
+
+    return $flashmem_total;
 }
 
 1;
@@ -140,7 +200,7 @@ SNMP::Info::CiscoStats - Perl5 Interface to CPU and Memory stats for Cisco Devic
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
@@ -167,17 +227,27 @@ Use or create in a subclass of SNMP::Info.  Do not use directly.
 
 =head2 Inherited Classes
 
-none.
+None.
 
 =head2 Required MIBs
 
 =over
 
+=item CISCO-PRODUCTS-MIB
+
 =item CISCO-PROCESS-MIB
 
 =item CISCO-MEMORY-POOL-MIB
 
-=item RFC1213-MIB
+=item SNMPv2-MIB
+
+=item OLD-CISCO-SYSTEM-MIB
+
+=item CISCO-STACK-MIB
+
+=item CISCO-ENTITY-VENDORTYPE-OID-MIB
+
+=item CISCO-FLASH-MIB
 
 =back
 
@@ -213,57 +283,98 @@ Trys to parse device operating system version from description()
 
 =item $ciscostats->ios_cpu()
 
-Current CPU usage in percents of device.
+Current CPU usage in percent.
 
 B<1.3.6.1.4.1.9.2.1.56.0> = 
 B<OLD-CISCO-CPU-MIB:avgBusyPer>
 
 =item $ciscostats->ios_cpu_1min()
 
-Average CPU Usage in percents of device over last minute.
+Average CPU Usage in percent over the last minute.
 
 B<1.3.6.1.4.1.9.2.1.57.0>
 
 =item $ciscostats->ios_cpu_5min()
 
-Average CPU Usage in percents of device over last 5 minutes.
+Average CPU Usage in percent over the last 5 minutes.
 
 B<1.3.6.1.4.1.9.2.1.58.0>
 
 =item $ciscostats->cat_cpu()
 
-Current CPU usage in percents of device.
+Current CPU usage in percent.
 
 B<CISCO-PROCESS-MIB::cpmCPUTotal5sec.9>
 
 =item $ciscostats->cat_cpu_1min()
 
-Average CPU Usage in percents of device over last minute.
+Average CPU Usage in percent over the last minute.
 
 B<CISCO-PROCESS-MIB::cpmCPUTotal1min.9>
 
 =item $ciscostats->cat_cpu_5min()
 
-Average CPU Usage in percents of device over last 5 minutes.
+Average CPU Usage in percent over the last 5 minutes.
 
 B<CISCO-PROCESS-MIB::cpmCPUTotal5min.9>
 
 =item $ciscostats->mem_free()
 
-Main DRAM free in device.  In bytes.
+Main DRAM free of the device in bytes.
 
-B<CISCO-MEMORY-POOL-MIB::ciscoMemoryPoolFree.1>
+B<CISCO-MEMORY-POOL-MIB::ciscoMemoryPoolFree>
 
 =item $ciscostats->mem_used()
 
-Main DRAM used in device.  In bytes.
+Main DRAM used of the device in bytes.
 
-B<CISCO-MEMORY-POOL-MIB::ciscoMemoryPoolUsed.1>
+B<CISCO-MEMORY-POOL-MIB::ciscoMemoryPoolUsed>
+
+=item $ciscostats->mem_total()
+
+Main DRAM of the device in bytes.
+
+B<CISCO-MEMORY-POOL-MIB::ciscoMemoryPoolFree> + B<CISCO-MEMORY-POOL-MIB::ciscoMemoryPoolUsed>
+
+=item $ciscostats->flashmem_total()
+
+Flash memory of the device in bytes.
+
+B<CISCO-FLASH-MIB::ciscoFlashDeviceSize>
 
 =back
 
 =head1 TABLE METHODS
 
-None.
+=head2 Cisco Memory Pool Table (B<ciscoMemoryPoolTable>)
+
+=over
+
+=item $ciscostats->cisco_mem_free()
+
+The number of bytes from the memory pool that are currently unused on the
+managed device.
+
+(B<ciscoMemoryPoolFree>)
+
+=item $ciscostats->cisco_mem_used()
+
+The number of bytes from the memory pool that are currently in use by
+applications on the managed device.
+
+(B<ciscoMemoryPoolUsed>)
+
+=back
+
+=head2 Cisco Flash Device Table (B<ciscoFlashDeviceTable>)
+
+=over
+
+=item $ciscostats->cisco_flash_size()
+
+Total size of the Flash device.  For a removable device, the size will be
+zero if the device has been removed.
+
+(B<ciscoFlashDeviceSize>)
 
 =cut

Info/CiscoVTP.pm

@@ -0,0 +1,825 @@
+# SNMP::Info::CiscoVTP
+# Max Baker
+#
+# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
+#
+# Copyright (c) 2003 Regents of the University of California
+# 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::CiscoVTP;
+$VERSION = '1.07';
+# $Id$
+
+use strict;
+
+use Exporter;
+use SNMP::Info;
+ 
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+@SNMP::Info::CiscoVTP::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::CiscoVTP::EXPORT_OK = qw//;
+
+%MIBS    = (
+            'CISCO-VTP-MIB'                       => 'vtpVlanName',
+            'CISCO-VLAN-MEMBERSHIP-MIB'           => 'vmMembershipEntry',
+            'CISCO-VLAN-IFTABLE-RELATIONSHIP-MIB' => 'cviRoutedVlanIfIndex',
+           );
+
+%GLOBALS = (
+            'vtp_version'           => 'vtpVersion',
+            'vtp_maxstore'          => 'vtpMaxVlanStorage',
+            'vtp_notify'            => 'vtpNotificationsEnabled',
+            'vtp_notify_create'     => 'vtpVlanCreatedNotifEnabled',
+            'vtp_notify_delete'     => 'vtpVlanDeletedNotifEnabled',
+            'vtp_trunk_set_serial'  => 'vlanTrunkPortSetSerialNo',
+           );
+
+%FUNCS   = (
+            # CISCO-VTP-MIB::managementDomainTable
+            'vtp_d_index'     => 'managementDomainIndex',
+            'vtp_d_name'      => 'managementDomainName',
+            'vtp_d_mode'      => 'managementDomainLocalMode',
+            'vtp_d_rev'       => 'managementDomainConfigRevNumber',
+            'vtp_d_updater'   => 'managementDomainLastUpdater',
+            'vtp_d_last'      => 'managementDomainLastChange',
+            'vtp_d_status'    => 'managementDomainRowStatus',
+            'vtp_d_tftp'      => 'managementDomainTftpServer',
+            'vtp_d_tftp_path' => 'managementDomainTftpPathname',
+            'vtp_d_pruning'   => 'managementDomainPruningState',
+            'vtp_d_ver'       => 'managementDomainVersionInUse',
+            # CISCO-VTP-MIB::vtpVlanTable
+            'v_state'    => 'vtpVlanState',
+            'v_type'     => 'vtpVlanType',
+            'v_name'     => 'vtpVlanName',
+            'v_mtu'      => 'vtpVlanMtu',
+            'v_said'     => 'vtpVlanDot10Said',
+            'v_ring'     => 'vtpVlanRingNumber',
+            'v_bridge'   => 'vtpVlanBridgeNumber',
+            'v_stp'      => 'vtpVlanStpType',
+            'v_parent'   => 'vtpVlanParentVlan',
+            'v_trans1'   => 'vtpVlanTranslationalVlan1',
+            'v_trans2'   => 'vtpVlanTranslationalVlan2',
+            'v_btype'    => 'vtpVlanBridgeType',
+            'v_hop_are'  => 'vtpVlanAreHopCount',
+            'v_hop_ste'  => 'vtpVlanSteHopCount',
+            'v_crf'      => 'vtpVlanIsCRFBackup',
+            'v_type_ext' => 'vtpVlanTypeExt',
+            'v_if'       => 'vtpVlanIfIndex',
+            # CISCO-VLAN-MEMBERSHIP-MIB::vmMembershipTable
+            'i_vlan_type' => 'vmVlanType',
+            'i_vlan2'     => 'vmVlan',
+            'i_vlan_stat' => 'vmPortStatus',
+            'i_vlan_1'    => 'vmVlans',
+            'i_vlan_2'    => 'vmVlans2k',
+            'i_vlan_3'    => 'vmVlans3k',
+            'i_vlan_4'    => 'vmVlans4k',
+            # CISCO-VLAN-MEMBERSHIP-MIB::vmVoiceVlanTable
+            'i_voice_vlan' => 'vmVoiceVlanId',
+            # CISCO-VLAN-IFTABLE-RELATIONSHIP-MIB
+            'v_cvi_if'    => 'cviRoutedVlanIfIndex',
+            # CISCO-VTP-MIB::vlanTrunkPortTable
+            'vtp_trunk_mgmt_dom' => 'vlanTrunkPortManagementDomain',
+            'vtp_trunk_encaps_t' => 'vlanTrunkPortEncapsulationType',
+            'vtp_trunk_vlans'    => 'vlanTrunkPortVlansEnabled',
+            'vtp_trunk_vlans_2k' => 'vlanTrunkPortVlansEnabled2k',
+            'vtp_trunk_vlans_3k' => 'vlanTrunkPortVlansEnabled3k',
+            'vtp_trunk_vlans_4k' => 'vlanTrunkPortVlansEnabled4k',
+            'vtp_trunk_native'   => 'vlanTrunkPortNativeVlan',
+            'i_pvid'             => 'vlanTrunkPortNativeVlan',
+            'vtp_trunk_rstat'    => 'vlanTrunkPortRowStatus',
+            'vtp_trunk_dyn'      => 'vlanTrunkPortDynamicState',
+            'vtp_trunk_dyn_stat' => 'vlanTrunkPortDynamicStatus',
+            'vtp_trunk_vtp'      => 'vlanTrunkPortVtpEnabled',
+            'vtp_trunk_encaps'  => 'vlanTrunkPortEncapsulationOperType',
+            # TODO Add these tables if someone wants them..
+            # vtpEditControlTable
+            # vtpVlanEditTable
+            # vtpStatsTable
+           );
+
+%MUNGE   = (
+           );
+
+sub v_index {
+    my $vtp = shift;
+    my $partial = shift;
+
+    my $v_name = $vtp->v_name($partial);
+    my %v_index;
+    foreach my $idx (keys %$v_name) {
+        my ($mgmtdomain, $vlan) = split(/\./, $idx);
+        $v_index{$idx} = $vlan;
+    }
+    return \%v_index;
+}
+
+sub i_vlan {
+    my $vtp = shift;
+    my $partial = shift;
+
+    my $port_vlan = $vtp->vtp_trunk_native($partial) || {};
+    my $i_vlan = $vtp->i_vlan2($partial) || {};
+    my $trunk_dyn_stat = $vtp->vtp_trunk_dyn_stat($partial) || {};
+
+    my %i_vlans;
+    # Get access ports
+    foreach my $port (keys %$i_vlan) {
+        my $vlan = $i_vlan->{$port};
+        next unless defined $vlan;
+        
+        $i_vlans{$port} = $vlan;
+    }
+
+    # Get trunk ports
+    foreach my $port (keys %$port_vlan) {
+        my $vlan = $port_vlan->{$port};
+        next unless defined $vlan;
+        my $stat = $trunk_dyn_stat->{$port};
+        if ( defined $stat and $stat =~ /^trunking/ ) {
+            $i_vlans{$port} = $vlan;
+        }
+    }
+
+    # Check in CISCO-VLAN-IFTABLE-RELATION-MIB
+    # Is this only for Aironet???  If so, it needs
+    # to be removed from this class
+    
+    my $v_cvi_if = $vtp->v_cvi_if();
+    if ( defined $v_cvi_if ) {
+
+        # Translate vlan.physical_interface -> iid
+        #       to iid -> vlan
+        foreach my $i (keys %$v_cvi_if){
+            my ($vlan,$phys) = split(/\./,$i);
+            my $iid = $v_cvi_if->{$i};
+
+            $i_vlans{$iid} = $vlan;
+        }
+    }
+
+    return \%i_vlans;
+}
+
+sub i_vlan_membership {
+    my $vtp = shift;
+    my $partial = shift;
+
+    my $ports_vlans    = $vtp->vtp_trunk_vlans($partial) || {};
+    my $ports_vlans_2k = $vtp->vtp_trunk_vlans_2k($partial) || {};
+    my $ports_vlans_3k = $vtp->vtp_trunk_vlans_3k($partial) || {};
+    my $ports_vlans_4k = $vtp->vtp_trunk_vlans_4k($partial) || {};
+    my $voice_vlans    = $vtp->i_voice_vlan($partial) || {};
+    my $vtp_vlans      = $vtp->v_state();
+    my $i_vlan         = $vtp->i_vlan2($partial) || {};
+    my $trunk_dyn_stat = $vtp->vtp_trunk_dyn_stat($partial) || {};
+
+    my $i_vlan_membership = {};
+
+    # Get access ports
+    foreach my $port (keys %$i_vlan) {
+        my $vlan = $i_vlan->{$port};
+        next unless defined $vlan;
+        my $stat = $trunk_dyn_stat->{$port};
+        if ( defined $stat and $stat =~ /notTrunking/ ) {
+            push(@{$i_vlan_membership->{$port}}, $vlan);
+        }
+    }
+
+    # Get special voice VLANs (0 and 4096)
+    foreach my $port (keys %$voice_vlans) {
+        my $vlan = $voice_vlans->{$port};
+        next unless defined $vlan;
+        # Going to assume we would catch regular VLANs with the other methods
+        next unless ($vlan == 0 or $vlan == 4096);
+            push(@{$i_vlan_membership->{$port}}, $vlan);
+    }
+
+    # Get trunk ports
+
+    my %oper_vlans;
+    foreach my $iid (keys %$vtp_vlans) {
+        my $vlan = 0;
+        my $vtp_dom =0;
+        my $state = $vtp_vlans->{$iid};
+        next unless defined $state;
+        next if $state !~ /operational/;
+        if ($iid =~ /(\d+)\.(\d+)/ ) {
+            $vtp_dom = $1;
+            $vlan    = $2;
+        }
+        $oper_vlans{$vlan}++;
+    }
+
+    foreach my $port (keys %$ports_vlans) {
+        my $stat = $trunk_dyn_stat->{$port};
+        if ( defined $stat and $stat =~ /^trunking/ ) {
+            my $k = 0;
+            foreach my $list ("$ports_vlans->{$port}", "$ports_vlans_2k->{$port}",
+                          "$ports_vlans_3k->{$port}", "$ports_vlans_4k->{$port}") {
+                my $vlanlist = [split(//, unpack("B*", $list))];
+                my $offset = 1024 * $k;
+                foreach my $vlan (keys %oper_vlans) {            
+                    push(@{$i_vlan_membership->{$port}}, $vlan) if (@$vlanlist[$vlan]-$offset);
+                }
+                $k++;
+            }
+        }
+    }
+
+    return $i_vlan_membership;
+}
+
+sub set_i_pvid {
+    my $vtp = shift;
+    my ($vlan_id, $ifindex) = @_;
+
+    return undef unless ( $vtp->validate_vlan_param ($vlan_id, $ifindex) );
+
+    my $native_vlan = $vtp->vtp_trunk_native($ifindex);
+    if (defined $native_vlan) {
+
+        print "Changing native VLAN from $native_vlan->{$ifindex} to $vlan_id on IfIndex: $ifindex\n" if $vtp->debug();
+
+        my $rv = $vtp->set_vtp_trunk_native($vlan_id, $ifindex);
+        unless ($rv) {
+            $vtp->error_throw("Unable to change native VLAN to $vlan_id on IfIndex: $ifindex");
+            return undef;
+        }
+        return $rv;
+    }
+    $vtp->error_throw("Can't find ifIndex: $ifindex - Is it a trunk port?");
+    return undef;
+}
+
+sub set_i_vlan {
+    my $vtp = shift;
+    my ($vlan_id, $ifindex) = @_;
+
+    return undef unless ( $vtp->validate_vlan_param ($vlan_id, $ifindex) );
+
+    my $i_vlan = $vtp->i_vlan2($ifindex);
+    if (defined $i_vlan) {
+
+        print "Changing VLAN from $i_vlan->{$ifindex} to $vlan_id on IfIndex: $ifindex\n" if $vtp->debug();
+
+        my $rv = $vtp->set_i_vlan2($vlan_id, $ifindex);
+        unless ($rv) {
+            $vtp->error_throw("Unable to change VLAN to $vlan_id on IfIndex: $ifindex");
+            return undef;
+        }
+        return $rv;
+    }
+    $vtp->error_throw("Can't find ifIndex: $ifindex - Is it an access port?");
+    return undef;
+}
+
+sub set_add_i_vlan_tagged {
+    my $vtp = shift;
+    my ($vlan_id, $ifindex) = @_;
+
+    return undef unless ( $vtp->validate_vlan_param ($vlan_id, $ifindex) );
+
+    print "Adding VLAN: $vlan_id to ifIndex: $ifindex\n" if $vtp->debug();
+
+    my $trunk_serial = $vtp->load_vtp_trunk_set_serial();
+    my $trunk_members   = $vtp->vtp_trunk_vlans($ifindex);
+
+    unless (defined $trunk_members) {
+        $vtp->error_throw("Can't find ifIndex: $ifindex - Is it a trunk port?");
+        return undef;
+    }
+
+    my @member_list = split(//, unpack("B*", $trunk_members->{$ifindex}));
+    
+    print "Original vlan list for ifIndex: $ifindex: @member_list \n" if $vtp->debug();
+    $member_list[$vlan_id] = '1';
+    print "Modified vlan list for ifIndex: $ifindex: @member_list \n" if $vtp->debug();
+    my $new_list = pack("B*", join('', @member_list));
+    #Add VLAN to member list
+    my $list_rv = $vtp->set_vtp_trunk_vlans($new_list, $ifindex);
+    unless ($list_rv) {
+        $vtp->error_throw("Unable to add VLAN: $vlan_id to ifIndex: $ifindex member list");
+        return undef;
+    }
+    #Make sure no other SNMP manager was making modifications at the same time.
+    my $serial_rv = $vtp->set_vtp_trunk_set_serial($trunk_serial);
+    unless ($serial_rv) {
+        $vtp->error_throw("Unable to increment trunk set serial number - check configuration!");
+        return undef;
+    }
+    return 1;
+}
+
+sub set_remove_i_vlan_tagged {
+    my $vtp = shift;
+    my ($vlan_id, $ifindex) = @_;
+
+    return undef unless ( $vtp->validate_vlan_param ($vlan_id, $ifindex) );
+
+    print "Removing VLAN: $vlan_id from ifIndex: $ifindex\n" if $vtp->debug();
+
+    my $trunk_serial   = $vtp->load_vtp_trunk_set_serial();
+    my $trunk_members  = $vtp->vtp_trunk_vlans($ifindex);
+
+    unless (defined $trunk_members) {
+        $vtp->error_throw("Can't find ifIndex: $ifindex - Is it a trunk port?");
+        return undef;
+    }
+
+    my @member_list = split(//, unpack("B*", $trunk_members->{$ifindex}));
+    
+    print "Original vlan list for ifIndex: $ifindex: @member_list \n" if $vtp->debug();
+    $member_list[$vlan_id] = '0';
+    print "Modified vlan list for ifIndex: $ifindex: @member_list \n" if $vtp->debug();
+    my $new_list = pack("B*", join('', @member_list));
+    #Remove VLAN to member list
+    my $list_rv = $vtp->set_vtp_trunk_vlans($new_list, $ifindex);
+    unless ($list_rv) {
+        $vtp->error_throw("Error: Unable to remove VLAN: $vlan_id from ifIndex: $ifindex member list");
+        return undef;
+    }
+    #Make sure no other manager was making modifications at the same time.
+    my $serial_rv = $vtp->set_vtp_trunk_set_serial($trunk_serial);
+    unless ($serial_rv) {
+        $vtp->error_throw("Error: Unable to increment trunk set serial number - check configuration!");
+        return undef;
+    }
+    return 1;
+}
+
+#
+# These are internal methods and are not documented.  Do not use directly. 
+#
+sub validate_vlan_param {
+    my $vtp = shift;
+    my ($vlan_id, $ifindex) = @_;
+
+    # VID and ifIndex should both be numeric
+    unless ( defined $vlan_id and defined $ifindex and $vlan_id =~ /^\d+$/ and $ifindex =~ /^\d+$/ ) {
+        $vtp->error_throw("Invalid parameter");
+        return undef;
+    }
+    
+    # Check that ifIndex exists on device
+    my $index = $vtp->interfaces($ifindex);
+
+    unless ( exists $index->{$ifindex} ) {
+        $vtp->error_throw("ifIndex $ifindex does not exist");
+        return undef;
+    }
+
+    #Check that VLAN exists on device
+    my $vtp_vlans   = $vtp->v_state();
+    my $vlan_exists = 0;
+    
+    foreach my $iid (keys %$vtp_vlans) {
+        my $vlan = 0;
+        my $vtp_dom =0;
+        my $state = $vtp_vlans->{$iid};
+        next unless defined $state;
+        next if $state !~ /operational/;
+        if ($iid =~ /(\d+)\.(\d+)/ ) {
+            $vtp_dom = $1;
+            $vlan    = $2;
+        }
+        
+        $vlan_exists = 1 if ( $vlan_id eq $vlan );
+    }
+    unless ( $vlan_exists ) {
+        $vtp->error_throw("VLAN $vlan_id does not exist or is not operational");
+        return undef;
+    }
+
+    return 1;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::CiscoVTP - SNMP Interface to Cisco's VLAN Management MIBs
+
+=head1 AUTHOR
+
+Max Baker
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $vtp = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $vtp->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+SNMP::Info::CiscoVTP is a subclass of SNMP::Info that provides 
+information about a Cisco device's VLAN and VTP Domain memebership.
+
+Use or create in a subclass of SNMP::Info.  Do not use directly.
+
+=head2 Inherited Classes
+
+None.
+
+=head2 Required MIBs
+
+=over
+
+=item CISCO-VTP-MIB
+
+=item CISCO-VLAN-MEMBERSHIP-MIB
+
+=item CISCO-VLAN-IFTABLE-RELATIONSHIP-MIB
+
+=back
+
+MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
+
+=head1 GLOBALS
+
+=over
+
+=item $vtp->vtp_version()
+
+(B<vtpVersion>)
+
+=item $vtp->vtp_maxstore()
+
+(B<vtpMaxVlanStorage>)
+
+=item $vtp->vtp_notify()
+
+(B<vtpNotificationsEnabled>)
+
+=item $vtp->vtp_notify_create()
+
+(B<vtpVlanCreatedNotifEnabled>)
+
+=item $vtp->vtp_notify_delete()
+
+(B<vtpVlanDeletedNotifEnabled>)
+
+=item $vtp->vtp_trunk_set_serial()
+
+(B<vlanTrunkPortSetSerialNo>)
+
+=back
+
+=head1 TABLE METHODS
+
+Your device will only implement a subset of these methods.
+
+=over
+
+=item $vtp->i_vlan()
+
+Returns a mapping between ifIndex and assigned VLAN ID for access ports and the
+default VLAN ID for trunk ports.
+
+=item $vtp->i_vlan_membership()
+
+Returns reference to hash of arrays: key = ifIndex, value = array of VLAN IDs.
+These are the VLANs which are members of enabled VLAN list for the port.
+
+  Example:
+  my $interfaces = $vtp->interfaces();
+  my $vlans      = $vtp->i_vlan_membership();
+  
+  foreach my $iid (sort keys %$interfaces) {
+    my $port = $interfaces->{$iid};
+    my $vlan = join(',', sort(@{$vlans->{$iid}}));
+    print "Port: $port VLAN: $vlan\n";
+  }
+
+=back
+
+=head2 VLAN Table (B<CISCO-VTP-MIB::vtpVlanTable>)
+
+See ftp://ftp.cisco.com/pub/mibs/supportlists/wsc5000/wsc5000-communityIndexing.html
+for a good treaty of how to connect to the VLANs
+
+=over
+
+=item $vtp->v_index()
+
+(B<vtpVlanIndex>)
+
+=item $vtp->v_state()
+
+(B<vtpVlanState>)
+
+=item $vtp->v_type()
+
+(B<vtpVlanType>)
+
+=item $vtp->v_name()
+
+(B<vtpVlanName>)
+
+=item $vtp->v_mtu()
+
+(B<vtpVlanMtu>)
+
+=item $vtp->v_said()
+
+(B<vtpVlanDot10Said>)
+
+=item $vtp->v_ring()
+
+(B<vtpVlanRingNumber>)
+
+=item $vtp->v_bridge()
+
+(B<vtpVlanBridgeNumber>)
+
+=item $vtp->v_stp()
+
+(B<vtpVlanStpType>)
+
+=item $vtp->v_parent()
+
+(B<vtpVlanParentVlan>)
+
+=item $vtp->v_trans1()
+
+(B<vtpVlanTranslationalVlan1>)
+
+=item $vtp->v_trans2()
+
+(B<vtpVlanTranslationalVlan2>)
+
+=item $vtp->v_btype()
+
+(B<vtpVlanBridgeType>)
+
+=item $vtp->v_hop_are()
+
+(B<vtpVlanAreHopCount>)
+
+=item $vtp->v_hop_ste()
+
+(B<vtpVlanSteHopCount>)
+
+=item $vtp->v_crf()
+
+(B<vtpVlanIsCRFBackup>)
+
+=item $vtp->v_type_ext()
+
+(B<vtpVlanTypeExt>)
+
+=item $vtp->v_if()
+
+(B<vtpVlanIfIndex>)
+
+=back
+
+=head2 VLAN Membership Table (B<CISCO-VLAN-MEMBERSHIP-MIB::vmMembershipTable>)
+
+=over
+
+=item $vtp->i_vlan_type()
+
+Static, Dynamic, or multiVlan.  
+
+(B<vmVlanType>)
+
+=item $vtp->i_vlan2()
+
+The VLAN that an access port is assigned to.
+
+(B<vmVlan>)
+
+=item $vtp->i_vlan_stat()
+
+Inactive, active, shutdown.
+
+(B<vmPortStatus>)
+
+=item $vtp->i_vlan_1()
+
+Each bit represents a VLAN.  This is 0 through 1023
+
+(B<vmVlans>)
+
+=item $vtp->i_vlan_2()
+
+Each bit represents a VLAN.  This is 1024 through 2047
+
+(B<vmVlans2k>)
+
+=item $vtp->i_vlan_3()
+
+Each bit represents a VLAN.  This is 2048 through 3071
+
+(B<vmVlans3k>)
+
+=item $vtp->i_vlan_4()
+
+Each bit represents a VLAN.  This is 3072 through 4095
+
+(B<vmVlans4k>)
+
+=back
+
+=head2 VLAN Membership Voice VLAN Table (B<CISCO-VLAN-MEMBERSHIP-MIB::vmVoiceVlanTable>)
+
+=over
+
+=item $vtp->i_voice_vlan() 
+
+(B<vmVoiceVlanId>)
+
+=back
+
+=head2 Managment Domain Table (B<CISCO-VTP-MIB::managementDomainTable>)
+
+=over
+
+=item $vtp->vtp_d_index()
+
+(B<managementDomainIndex>)
+
+=item $vtp->vtp_d_name()
+
+(B<managementDomainName>)
+
+=item $vtp->vtp_d_mode()
+
+(B<managementDomainLocalMode>)
+
+=item $vtp->vtp_d_rev()
+
+(B<managementDomainConfigRevNumber>)
+
+=item $vtp->vtp_d_updater()
+
+(B<managementDomainLastUpdater>)
+
+=item $vtp->vtp_d_last()
+
+(B<managementDomainLastChange>)
+
+=item $vtp->vtp_d_status()
+
+(B<managementDomainRowStatus>)
+
+=item $vtp->vtp_d_tftp()
+
+(B<managementDomainTftpServer>)
+
+=item $vtp->vtp_d_tftp_path()
+
+(B<managementDomainTftpPathname>)
+
+=item $vtp->vtp_d_pruning()
+
+(B<managementDomainPruningState>)
+
+=item $vtp->vtp_d_ver()
+
+(B<managementDomainVersionInUse>)
+
+=back
+
+=head2 VLAN Trunk Port Table (B<CISCO-VTP-MIB::vlanTrunkPortTable>)
+
+=over
+
+=item $vtp->vtp_trunk_mgmt_dom()
+
+(B<vlanTrunkPortManagementDomain>)
+
+=item $vtp->vtp_trunk_encaps_t()
+
+(B<vlanTrunkPortEncapsulationType>)
+
+=item $vtp->vtp_trunk_vlans()
+
+(B<vlanTrunkPortVlansEnabled>)
+
+=item $vtp->vtp_trunk_vlans_2k()
+
+(B<vlanTrunkPortVlansEnabled2k>)
+
+=item $vtp->vtp_trunk_vlans_3k()
+
+(B<vlanTrunkPortVlansEnabled3k>)
+
+=item $vtp->vtp_trunk_vlans_4k()
+
+(B<vlanTrunkPortVlansEnabled4k>)
+
+=item $vtp->vtp_trunk_native()
+
+(B<vlanTrunkPortNativeVlan>)
+
+=item $vtp->i_pvid()
+
+(B<vlanTrunkPortNativeVlan>)
+
+=item $vtp->vtp_trunk_rstat()
+
+(B<vlanTrunkPortRowStatus>)
+
+=item $vtp->vtp_trunk_dyn()
+
+(B<vlanTrunkPortDynamicState>)
+
+=item $vtp->vtp_trunk_dyn_stat()
+
+(B<vlanTrunkPortDynamicStatus>)
+
+=item $vtp->vtp_trunk_vtp()
+
+(B<vlanTrunkPortVtpEnabled>)
+
+=item $vtp->vtp_trunk_encaps()
+
+(B<vlanTrunkPortEncapsulationOperType>)
+
+=back
+
+=head1 SET METHODS
+
+These are methods that provide SNMP set functionality for overridden methods or
+provide a simpler interface to complex set operations.  See
+L<SNMP::Info/"SETTING DATA VIA SNMP"> for general information on set operations. 
+
+=over
+
+=item $vtp->set_i_vlan ( vlan, ifIndex )
+
+Changes an access (untagged) port VLAN, must be supplied with the numeric
+VLAN ID and port ifIndex.  This method should only be used on end station
+(non-trunk) ports.
+
+  Example:
+  my %if_map = reverse %{$vtp->interfaces()};
+  $vtp->set_i_vlan('2', $if_map{'FastEthernet0/1'}) 
+    or die "Couldn't change port VLAN. ",$vtp->error(1);
+
+=item $vtp->set_i_pvid ( pvid, ifIndex )
+
+Sets port default VLAN, must be supplied with the numeric VLAN ID and
+port ifIndex.  This method should only be used on trunk ports.
+
+  Example:
+  my %if_map = reverse %{$vtp->interfaces()};
+  $vtp->set_i_pvid('2', $if_map{'FastEthernet0/1'}) 
+    or die "Couldn't change port default VLAN. ",$vtp->error(1);
+
+=item $vtp->set_add_i_vlan_tagged ( vlan, ifIndex )
+
+Adds the VLAN to the enabled VLANs list of the port, must be supplied with the
+numeric VLAN ID and port ifIndex.
+
+  Example:
+  my %if_map = reverse %{$vtp->interfaces()};
+  $vtp->set_add_i_vlan_tagged('2', $if_map{'FastEthernet0/1'}) 
+    or die "Couldn't add port to egress list. ",$vtp->error(1);
+
+=item $vtp->set_remove_i_vlan_tagged ( vlan, ifIndex )
+
+Removes the VLAN from the enabled VLANs list of the port, must be supplied
+with the numeric VLAN ID and port ifIndex.
+
+  Example:
+  my %if_map = reverse %{$vtp->interfaces()};
+  $vtp->set_remove_i_vlan_tagged('2', $if_map{'FastEthernet0/1'}) 
+    or die "Couldn't add port to egress list. ",$vtp->error(1);
+
+=cut

Info/Entity.pm

@@ -1,5 +1,7 @@
 # SNMP::Info::Entity
-# Max Baker <max@warped.org>
+# Max Baker
+#
+# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2003 Regents of the University of California
 # All rights reserved.
@@ -28,7 +30,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::Entity;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 
 use strict;
@@ -40,32 +42,59 @@ use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
 @SNMP::Info::Entity::ISA = qw/SNMP::Info Exporter/;
 @SNMP::Info::Entity::EXPORT_OK = qw//;
 
-$INIT    = 0;
 %MIBS    = ('ENTITY-MIB' => 'entPhysicalSerialNum');
 
 %GLOBALS = (
            );
 
 %FUNCS   = (
+            'e_alias'   => 'entPhysicalAlias',
             'e_class'   => 'entPhysicalClass',
             'e_descr'   => 'entPhysicalDescr',
             'e_fwver'   => 'entPhysicalFirmwareRev',
+            'e_fru'     => 'entPhysicalIsFRU',
             'e_hwver'   => 'entPhysicalHardwareRev',
+            'e_id'      => 'entPhysicalAssetID',
             'e_map'     => 'entAliasMappingIdentifier',
             'e_model'   => 'entPhysicalModelName',
             'e_name'    => 'entPhysicalName',
             'e_parent'  => 'entPhysicalContainedIn',
+            'e_pos'     => 'entPhysicalParentRelPos',
             'e_serial'  => 'entPhysicalSerialNum',
             'e_swver'   => 'entPhysicalSoftwareRev',
             'e_type'    => 'entPhysicalVendorType',
+            'e_vendor'  => 'entPhysicalMfgName',
            );
 
 %MUNGE   = (
+            'e_type'    => \&munge_e_type,
            );
 
+# entPhysicalIndex is not-accessible.  Create to facilitate emulation methods
+# in other classes
+
+sub e_index {
+    my $entity = shift;
+    my $partial = shift;
+
+    # Force use of MIB leaf to avoid inheritance issues in psuedo classes
+    my $e_descr  = $entity->entPhysicalDescr($partial);
+
+    return undef unless ($e_descr);
+    
+    my %e_index;
+
+    foreach my $iid (keys %$e_descr) {
+        $e_index{$iid} = $iid;
+    }
+    return \%e_index;
+}
+
 sub e_port {
     my $entity = shift;
-    my $e_map  = $entity->e_map();
+    my $partial = shift;
+
+    my $e_map  = $entity->e_map($partial);
 
     my %e_port;
 
@@ -81,15 +110,23 @@ sub e_port {
 
     return \%e_port;
 }
+
+sub munge_e_type {
+    my $oid = shift;
+
+    my $name = &SNMP::translateObj($oid);
+    return $name if defined($name);
+    return $oid;
+}
 1;
 
 =head1 NAME
 
-SNMP::Info::Entity - Perl5 Interface to SNMP data stored in ENTITY-MIB.
+SNMP::Info::Entity - SNMP Interface to data stored in ENTITY-MIB. RFC 2737
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
@@ -109,7 +146,9 @@ Max Baker (C<max@warped.org>)
 
 =head1 DESCRIPTION
 
-ENTITY-MIB is used by some Layer 2 devices like HP Switches and Aironet Access Points
+ENTITY-MIB is used by Layer 2 devices from HP,Aironet,Foundry,Cisco and more.
+
+See RFC 2737 for full details.
 
 Create or use a device subclass that inherit this class.  Do not use directly.
 
@@ -144,36 +183,72 @@ to a hash.
 
 =over
 
+=item $entity->e_index()
+
+Index
+
+(C<entPhysicalIndex>)
+
+=item $entity->e_alias()
+
+Human entered, not usually used.
+
+(C<entPhysicalAlias>)
+
 =item $entity->e_class()
 
+Stack, Module, Container, Port ...
+
 (C<entPhysicalClass>)
 
 =item $entity->e_descr()
 
+Human Friendly
+
 (C<entPhysicalClass>)
 
 =item $entity->e_fwver()
 
 (C<entPhysicalFirmwareRev>)
 
+=item $entity->e_fru()
+
+BOOLEAN. Field Replaceable unit?
+
+(C<entPhysicalFRU>)
+
 =item $entity->e_hwver()
 
 (C<entPhysicalHardwareRev>)
 
+=item $entity->e_id()
+
+This is human entered and not normally used.
+
+(C<entPhysicalAssetID>)
+
 =item $entity->e_map()
 
+See MIB.
+
 (C<entAliasMappingIdentifier>)
 
 =item $entity->e_model()
 
+Model Name of Entity.
+
 (C<entPhysicalModelName>)
 
 =item $entity->e_name()
 
+More computer friendly name of entity.  Parse me.
+
 (C<entPhysicalName>)
 
 =item $entity->e_parent()
 
+0 if root.
+
 (C<entPhysicalContainedIn>)
 
 =item $entity->e_port()
@@ -181,6 +256,12 @@ to a hash.
 Maps EntityTable entries to the Interface Table (IfTable) using
 $entity->e_map()
 
+=item $entity->e_pos()
+
+The relative position among all entities sharing the same parent.
+
+(C<entPhysicalParentRelPos>)
+
 =item $entity->e_serial()
 
 (C<entPhysicalSerialNum>)
@@ -191,8 +272,16 @@ $entity->e_map()
 
 =item $entity->e_type()
 
+This is an OID.
+
 (C<entPhysicalVendorType>)
 
+=item $entity->e_vendor()
+
+Vendor of Module.
+
+(C<entPhysicalMfgName>)
+
 =back
 
 =cut

Info/EtherLike.pm

@@ -1,5 +1,7 @@
 # SNMP::Info::EtherLike
-# Max Baker <max@warped.org>
+# Max Baker
+#
+# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
@@ -28,7 +30,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::EtherLike;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 
 use strict;
@@ -40,13 +42,9 @@ use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
 @SNMP::Info::EtherLike::ISA = qw/SNMP::Info Exporter/;
 @SNMP::Info::EtherLike::EXPORT_OK = qw//;
 
-$DEBUG=0;
-$SNMP::debugging=$DEBUG;
-
-$INIT = 0;
-
-# Same info in both rfc1398 and this?
-%MIBS = ('ETHERLIKE-MIB' => 'etherMIB' );
+%MIBS = (
+         'ETHERLIKE-MIB' => 'etherMIB'
+         );
 
 %GLOBALS = ();
 
@@ -73,7 +71,19 @@ $INIT = 0;
           'el_coll_freq'       => 'dot3CollFrequencies'
           );
 
-%MUNGE = ( %SNMP::Info::MUNGE );
+%MUNGE = (
+          %SNMP::Info::MUNGE,
+          'el_duplex' => \&munge_el_duplex,
+         );
+
+sub munge_el_duplex {
+    my $duplex = shift;
+    return unless defined $duplex;
+
+    $duplex =~ s/Duplex$//;
+    return $duplex;
+}
+
 
 1;
 __END__
@@ -81,11 +91,11 @@ __END__
 
 =head1 NAME
 
-SNMP::Info::EtherLike - Perl5 Interface to SNMP ETHERLIKE-MIB 
+SNMP::Info::EtherLike - SNMP Interface to SNMP ETHERLIKE-MIB RFC 1398
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
@@ -110,10 +120,6 @@ Max Baker (C<max@warped.org>)
     my $iid    = $el_index->{$el_port};
     my $port   = $interfaces->{$iid};
 
-    $duplex = 'half' if $duplex =~/half/i;
-    $duplex = 'full' if $duplex =~/full/i;
-    $duplex = 'auto' if $duplex =~/auto/i;
-
     print "PORT:$port set to duplex:$duplex\n";
  }
 
@@ -122,6 +128,8 @@ Max Baker (C<max@warped.org>)
 SNMP::Info::EtherLike is a subclass of SNMP::Info that supplies 
 access to the ETHERLIKE-MIB used by some Layer 3 Devices such as Cisco routers.
 
+See RFC 1398 for more details.
+
 Use or create a subclass of SNMP::Info that inherits this one.  Do not use directly.
 
 =head2 Inherited Classes

Info/FDP.pm

@@ -0,0 +1,393 @@
+# SNMP::Info::FDP
+# Bruce Rodger
+# $Id$
+#
+# (c) 2004 Bruce Rodger, Max Baker 
+# All rights reserved.  
+#
+# Copyright (c) 2002,2003 Regents of the University of California
+# 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::FDP;
+
+use strict;
+
+use Exporter;
+use SNMP::Info;
+
+@SNMP::Info::FDP::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::FDP::EXPORT_OK = qw//;
+
+use vars qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT/;
+$VERSION = '1.07';
+
+%MIBS 	= (
+           'FOUNDRY-SN-SWITCH-GROUP-MIB' => 'snFdpGlobalRun'
+           );
+
+%GLOBALS = (
+            # CDP-Compatibility
+            'cdp_interval' => 'snFdpGlobalMessageInterval',
+            'cdp_holdtime' => 'snFdpGlobalHoldTime',
+            'cdp_id'       => 'snFdpGlobalDeviceId',
+            #
+            'fdp_run'      => 'snFdpGlobalRun',
+            'fdp_interval' => 'snFdpGlobalMessageInterval',
+            'fdp_holdtime' => 'snFdpGlobalHoldTime',
+            'fdp_id'       => 'snFdpGlobalDeviceId',
+           );
+
+%FUNCS  = (
+            'c_index'        => 'snFdpCacheIfIndex',
+            'c_proto'        => 'snFdpCacheAddressType',
+            'c_ip'           => 'snFdpCacheAddress',
+            'c_ver'          => 'snFdpCacheVersion',
+            'c_id'           => 'snFdpCacheDeviceId',
+            'c_port'         => 'snFdpCacheDevicePort',
+            'c_platform'     => 'snFdpCachePlatform',
+            'c_capabilities' => 'snFdpCacheCapabilities',
+            'c_domain'       => 'snFdpCacheVTPMgmtDomain',
+            'c_vlan'         => 'snFdpCacheNativeVLAN',
+            'c_duplex'       => 'snFdpCacheDuplex',
+          );
+
+%MUNGE = (
+          'c_capabilities' => \&munge_caps,
+          'c_ip'           => \&SNMP::Info::munge_ip
+         );
+
+
+sub munge_caps {
+    my $caps = shift;
+    return undef unless defined $caps;
+
+    my $bits = substr(unpack("B*",$caps),-7);
+    return $bits;
+}
+
+sub cdp_run {
+    my $fdp = shift;
+    my $fdp_run = $fdp->fdp_run();
+
+    # if fdp_run isn't implemented on device, assume FDP is on
+    return $fdp_run if defined $fdp_run;
+    return 1;
+}
+
+sub hasFDP {
+    my $fdp = shift;
+
+    my $ver = $fdp->{_version};
+    #my $ver = $fdp->fdp_ver;
+
+    # SNMP v1 clients dont have the globals
+    if (defined $ver and $ver == 1){
+        my $fdp_ip = $fdp->fdp_ip();
+        # See if anything in fdp cache, if so we have fdp
+        return 1 if (defined $fdp_ip and scalar(keys %$fdp_ip)) ;
+        return undef;
+    }
+    
+    return $fdp->fdp_run();
+}
+
+sub c_if {
+    my $fdp  = shift;
+
+    # See if by some miracle Cisco implemented the fdpCacheIfIndex entry
+    my $fdp_index     = $fdp->fdp_index();
+    return $fdp_index if defined $fdp_index;
+
+    # Nope, didn't think so. Now we fake it.
+    my $fdp_ip = $fdp->c_ip();
+    unless (defined $fdp_ip){
+        $fdp->error_throw("SNMP::Info::FDP:fdp_if() - Device doesn't have fdp_ip() data.  Can't fake fdp_index()");
+        return undef;
+    }
+
+    my %fdp_if;
+    foreach my $key (keys %$fdp_ip){
+      next unless defined $key;
+      my $iid = $key;
+      # Truncate .1 from fdp cache entry
+      $iid =~ s/\.\d+$//;
+      $fdp_if{$key} = $iid;
+    }
+
+    return \%fdp_if;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::FDP - SNMP Interface to Foundry Discovery Protocol (FDP) using SNMP
+
+=head1 AUTHOR
+
+Bruce Rodger, Max Baker
+
+=head1 SYNOPSIS
+
+ my $fdp = new SNMP::Info ( 
+                             AutoSpecify => 1,
+                             Debug       => 1,
+                             DestHost    => 'router', 
+                             Community   => 'public',
+                             Version     => 2
+                           );
+
+ my $class = $fdp->class();
+ print " Using device sub class : $class\n";
+
+ $hasfdp   = $fdp->hasFDP() ? 'yes' : 'no';
+
+ # Print out a map of device ports with FDP neighbors:
+ my $interfaces = $fdp->interfaces();
+ my $fdp_if       = $fdp->fdp_if();
+ my $fdp_ip       = $fdp->fdp_ip();
+ my $fdp_port     = $fdp->fdp_port();
+
+ foreach my $fdp_key (keys %$fdp_ip){
+    my $iid           = $fdp_if->{$fdp_key};
+    my $port          = $interfaces->{$iid};
+    my $neighbor      = $fdp_ip->{$fdp_key};
+    my $neighbor_port = $fdp_port->{$fdp_key};
+    print "Port : $port connected to $neighbor / $neighbor_port\n";
+ }
+
+=head1 DESCRIPTION
+
+SNMP::Info::FDP is a subclass of SNMP::Info that provides an object oriented 
+interface to FDP information through SNMP.
+
+FDP is a Layer 2 protocol that supplies topology information of
+devices that also speak FDP, mostly switches and routers.  It has
+similar functionality to Cisco's CDP, and the SNMP interface is
+virtually identical.  FDP is implemented in Foundry devices, including
+the Bigiron and Fastiron range.
+
+Create or use a device subclass that inherits this class.  Do not use directly.
+
+Each device implements a subset of the global and cache entries. 
+Check the return value to see if that data is held by the device.
+
+=head2 Inherited Classes
+
+None.
+
+=head2 Required MIBs
+
+=over
+
+=item FOUNDRY-SN-SWITCH-GROUP-MIB
+
+Needs a reasonably recent MIB. Works OK with B2R07604A.mib, but doesn't
+work with B2R07600C. 
+
+
+=back
+
+MIBs are normally distributed with each code update. Contact your vendor,
+or trawl through google...
+
+=head1 GLOBAL METHODS
+
+These are methods that return scalar values from SNMP
+
+=over
+
+=item  $fdp->hasFDP()
+
+Is FDP is active in this device?  
+
+Accounts for SNMP version 1 devices which may have FDP but not fdp_run()
+
+=item $fdp->fdp_run()
+
+Is FDP enabled on this device?  
+
+(B<fdpGlobalRun>)
+
+=item $fdp->fdp_interval()
+
+Interval in seconds at which FDP messages are generated.
+
+(B<fdpGlobalMessageInterval>)
+
+=item $fdp->fdp_holdtime()
+
+Time in seconds that FDP messages are kept. 
+
+(B<fdpGlobalHoldTime>)
+
+=item  $fdp->fdp_id() 
+
+Returns FDP device ID.  
+
+This is the device id broadcast via FDP to other devices, and is what is retrieved from remote devices with $fdp->id().
+
+(B<fdpGlobalDeviceId>)
+
+=back
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 FDP CACHE ENTRIES
+
+=over
+
+=item $fdp->fdp_capabilities()
+
+Returns Device Functional Capabilities.  Results are munged into an ascii
+binary string, 7 digits long, MSB.  Each digit represents a bit from the
+table below.
+
+From L<http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm#18843>:
+
+(Bit) - Description
+
+=over
+
+=item (0x40) - Provides level 1 functionality.
+
+=item (0x20) - The bridge or switch does not forward IGMP Report packets on nonrouter ports.
+
+=item (0x10) - Sends and receives packets for at least one network layer protocol. If the device is routing the protocol, this bit should not be set.
+
+=item (0x08) - Performs level 2 switching. The difference between this bit and bit 0x02 is that a switch does not run the Spanning-Tree Protocol. This device is assumed to be deployed in a physical loop-free topology.
+
+=item (0x04) - Performs level 2 source-route bridging. A source-route bridge would set both this bit and bit 0x02.
+
+=item (0x02) - Performs level 2 transparent bridging.
+
+=item (0x01) - Performs level 3 routing for at least one network layer protocol.
+
+=back
+
+Thanks to Martin Lorensen C<martin -at- lorensen.dk> for a pointer to this information.
+
+(B<fdpCacheCapabilities>)
+
+=item $fdp->fdp_domain()
+
+The CDP version of this returns remote VTP Management Domain as defined in CISCO-VTP-MIB::managementDomainName
+
+(B<fdpCacheVTPMgmtDomain>)
+
+=item $fdp->fdp_duplex() 
+
+Returns the port duplex status from remote devices.
+
+(B<fdpCacheDuplex>)
+
+=item $fdp->fdp_id()
+
+Returns remote device id string
+
+(B<fdpCacheDeviceId>)
+
+=item $fdp->fdp_if()
+
+Returns the mapping to the SNMP Interface Table.
+
+Note that a lot devices don't implement $fdp->fdp_index(),  So if it isn't around,
+we fake it. 
+
+In order to map the fdp table entry back to the interfaces() entry, we truncate the last number
+off of it :
+
+  # it exists, yay.
+  my $fdp_index     = $device->fdp_index();
+  return $fdp_index if defined $fdp_index;
+
+  # if not, let's fake it
+  my $fdp_ip       = $device->fdp_ip();
+    
+  my %fdp_if
+  foreach my $key (keys %$fdp_ip){
+      $iid = $key;
+      ## Truncate off .1 from fdp response
+      $iid =~ s/\.\d+$//;
+      $fdp_if{$key} = $iid;
+  }
+ 
+  return \%fdp_if;
+
+
+=item $fdp->fdp_index()
+
+Returns the mapping to the SNMP2 Interface table for FDP Cache Entries. 
+
+Most devices don't implement this, so you probably want to use $fdp->fdp_if() instead.
+
+See fdp_if() entry.
+
+(B<fdpCacheIfIndex>)
+
+=item  $fdp->fdp_ip()
+
+Returns remote IP address
+
+(B<fdpCacheAddress>)
+
+=item $fdp->fdp_platform() 
+
+Returns remote platform id 
+
+(B<fdpCachePlatform>)
+
+=item $fdp->fdp_port()
+
+Returns remote port ID
+
+(B<fdpDevicePort>)
+
+=item  $fdp->fdp_proto()
+
+Returns remote address type received.  Usually IP.
+
+(B<fdpCacheAddressType>)
+
+=item $fdp->fdp_ver() 
+
+Returns remote hardware version
+
+(B<fdpCacheVersion>)
+
+=item $fdp->fdp_vlan()
+
+Returns the remote interface native VLAN.
+
+(B<fdpCacheNativeVLAN>)
+
+=back
+
+=cut

Info/IEEE802dot11.pm

@@ -0,0 +1,397 @@
+# SNMP::Info::IEEE802dot11
+# Eric Miller
+# $Id$
+#
+# Copyright (c) 2006 Eric Miller
+#
+# 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::IEEE802dot11;
+$VERSION = '1.07';
+use strict;
+
+use Exporter;
+
+@SNMP::Info::IEEE802dot11::ISA = qw/Exporter/;
+@SNMP::Info::IEEE802dot11::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+
+%MIBS    = (
+            'IEEE802dot11-MIB'     => 'dot11DesiredSSID',
+            );
+
+%GLOBALS = (
+            );
+
+%FUNCS   = (
+            # dot11PhyOFDMTable
+            'dot11_cur_freq'  => 'dot11CurrentFrequency',
+            # dot11PhyDSSSTable
+            'dot11_cur_ch'    => 'dot11CurrentChannel',
+            # dot11PhyOperationTable
+            'dot11_phy_type'  => 'dot11PHYType',
+            'dot11_reg_dom'   => 'dot11CurrentRegDomain',
+            # dot11ResourceInfoTable
+            'dot11_prod_ver'  => 'dot11manufacturerProductVersion',
+            'dot11_prod_name' => 'dot11manufacturerProductName',
+            'dot11_man_name'  => 'dot11manufacturerName',
+            # dot11OperationTable
+            'dot11_mac'       => 'dot11MACAddress',
+            # dot11StationConfigTable
+            'dot11_bss_type'  => 'dot11DesiredBSSType',
+            'i_ssidlist'      => 'dot11DesiredSSID',
+            'dot11_pwr_mode'  => 'dot11PowerManagementMode',
+            'dot11_sta_id'    => 'dot11StationID',
+            # dot11PhyTxPowerTable
+            'dot11_cur_tx_pwr'     => 'dot11CurrentTxPowerLevel',
+            'dot11_tx_pwr_level_1' => 'dot11TxPowerLevel1',
+            'dot11_tx_pwr_level_2' => 'dot11TxPowerLevel2',
+            'dot11_tx_pwr_level_3' => 'dot11TxPowerLevel3',
+            'dot11_tx_pwr_level_4' => 'dot11TxPowerLevel4',
+            'dot11_tx_pwr_level_5' => 'dot11TxPowerLevel5',
+            'dot11_tx_pwr_level_6' => 'dot11TxPowerLevel6',
+            'dot11_tx_pwr_level_7' => 'dot11TxPowerLevel7',
+            'dot11_tx_pwr_level_8' => 'dot11TxPowerLevel8',
+            );
+
+%MUNGE   = (
+            'dot11_mac'    => \&SNMP::Info::munge_mac,
+            'dot11_sta_id' => \&SNMP::Info::munge_mac,
+            );
+
+sub vendor {
+    my $dot11 = shift;
+
+    my $names = $dot11->dot11_man_name();
+    
+    foreach my $iid (keys %$names){
+        my $vendor = $names->{$iid};
+        next unless defined $vendor;
+        if ( $vendor =~ /^(\S+)/ ) {
+            return lc($1);
+        }
+    }
+    
+    return undef;
+}
+
+sub model {
+    my $dot11 = shift;
+
+    my $names = $dot11->dot11_prod_name();
+    
+    foreach my $iid (keys %$names){
+        my $prod = $names->{$iid};
+        next unless defined $prod;
+        return lc($prod);
+        }
+    return undef;
+}
+
+sub os_ver {
+    my $dot11 = shift;
+
+    my $versions = $dot11->dot11_prod_ver();
+    
+    foreach my $iid (keys %$versions){
+        my $ver = $versions->{$iid};
+        next unless defined $ver;
+        if ( $ver =~ /([\d\.]+)/ ) {
+            return $1;
+        }
+    }
+    
+    return undef;
+}
+
+sub i_80211channel {
+    my $dot11 = shift;
+
+    my $phy_type = $dot11->dot11_phy_type() || {};
+    my $cur_freq = $dot11->dot11_cur_freq() || {};
+    my $cur_ch   = $dot11->dot11_cur_ch() || {};
+
+    my %i_80211channel;
+    foreach my $iid (keys %$phy_type){
+        my $type = $phy_type->{$iid};
+        next unless defined $type;
+        if ($type =~ /dsss/) {
+            my $ch = $cur_ch->{$iid};
+            next unless defined $ch;
+            $i_80211channel{$iid} = $ch;
+        }
+        elsif ($type =~ /ofdm/) {
+            my $ch = $cur_freq->{$iid};
+            next unless defined $ch;
+            $i_80211channel{$iid} = $ch;
+        }
+        else {
+            next;
+        }
+    }
+
+    return \%i_80211channel;
+}
+
+sub dot11_cur_tx_pwr_mw {
+    my $dot11 = shift;
+    my $partial = shift;
+    my $cur = $dot11->dot11_cur_tx_pwr($partial);
+    my $dot11_cur_tx_pwr_mw = {};
+    foreach my $idx (keys %$cur) {
+        my $pwr = $cur->{$idx};
+        if ($pwr >= 1 && $pwr <= 8) {
+            my $mw = eval "\$dot11->dot11_tx_pwr_level_$pwr(\$idx)";
+            $dot11_cur_tx_pwr_mw->{$idx} = $mw->{$idx};
+        } else {
+            next;
+        }
+    }
+    return $dot11_cur_tx_pwr_mw;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SNMP::Info::IEEE802dot11 - SNMP Interface to data from IEEE802dot11-MIB
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+    my $dot11 = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+
+    or die "Can't connect to DestHost.\n";
+
+    my $class = $dot11->class();
+    print " Using device sub class : $class\n";
+
+=head1 DESCRIPTION
+
+SNMP::Info::IEEE802dot11 is a subclass of SNMP::Info that provides an interface
+to C<IEEE802dot11-MIB>.  This MIB is used in standards based 802.11 wireless
+devices.
+
+Use or create a subclass of SNMP::Info that inherits this one.
+Do not use directly.
+
+=head2 Inherited Classes
+
+=over
+
+None.
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item IEEE802dot11-MIB
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $dot11->vendor()
+
+Trys to discover the vendor from dot11_man_name() - returns lower case
+of the first word in the first instance found.
+
+=item $dot11->model()
+
+Trys to discover the model from dot11_prod_name() - returns lower case
+of the first instance found.
+
+=item $dot11->os_ver()
+
+Trys to discover the operating system version from dot11_prod_ver() - returns
+string of numeric and decimals in the first instance found.
+
+=back
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=over
+
+=item $dot11->i_ssidlist()
+
+Returns reference to hash.  SSID's recognized by the radio interface.
+
+(B<dot11DesiredSSID>)
+
+=item $dot11->i_80211channel()
+
+Returns reference to hash.  Current operating frequency channel of the radio
+interface.
+
+=item $dot11->dot11_cur_tx_pwr_mw()
+
+Returns reference to hash.  Current transmit power, in milliwats, of the radio
+interface.
+
+=back
+
+=head2 Dot11 Phy OFDM Table  (B<dot11PhyOFDMTable>)
+
+=over
+
+=item $dot11->dot11_cur_freq()
+
+(B<dot11CurrentFrequency>)
+
+=back
+
+=head2 Dot11 Phy DSSS Table  (B<dot11PhyDSSSTable>)
+
+=over
+
+=item $dot11->dot11_cur_ch()
+
+(B<dot11CurrentChannel>)
+
+=back
+
+=head2 Dot11 Phy Operation Table  (B<dot11PhyOperationTable>)
+
+=over
+
+=item $dot11->dot11_phy_type()
+
+(B<dot11PHYType>)
+
+=item $dot11->dot11_reg_dom()
+
+(B<dot11CurrentRegDomain>)
+
+=back
+
+=head2 Dot11 Resource Information Table  (B<dot11ResourceInfoTable>)
+
+=over
+
+=item $dot11->dot11_prod_ver()
+
+(B<dot11manufacturerProductVersion>)
+
+=item $dot11->dot11_prod_name()
+
+(B<dot11manufacturerProductName>)
+
+=item $dot11->dot11_man_name()
+
+(B<dot11manufacturerName>)
+
+=back
+
+=head2 Dot11 Operation Table  (B<dot11OperationTable>)
+
+=over
+
+=item $dot11->dot11_mac()
+
+(B<dot11MACAddress>)
+
+=back
+
+=head2 Dot11 Station Configuration Table  (B<dot11StationConfigTable>)
+
+=over
+
+=item $dot11->dot11_bss_type()
+
+(B<dot11DesiredBSSType>)
+
+=item $dot11->dot11_pwr_mode()
+
+(B<dot11PowerManagementMode>)
+
+=item $dot11->dot11_sta_id()
+
+(B<dot11StationID>)
+
+=back
+
+=head2 Dot11 Transmission Power Table  (B<dot11PhyTxPowerTable>)
+
+=over
+
+=item $dot11->dot11_cur_tx_pwr()
+
+(B<dot11CurrentTxPowerLevel>)
+
+=item $dot11->dot11_tx_pwr_level_1()
+
+(B<dot11TxPowerLevel1>)
+
+=item $dot11->dot11_tx_pwr_level_2()
+
+(B<dot11TxPowerLevel2>)
+
+=item $dot11->dot11_tx_pwr_level_3()
+
+(B<dot11TxPowerLevel3>)
+
+=item $dot11->dot11_tx_pwr_level_4()
+
+(B<dot11TxPowerLevel4>)
+
+=item $dot11->dot11_tx_pwr_level_5()
+
+(B<dot11TxPowerLevel5>)
+
+=item $dot11->dot11_tx_pwr_level_6()
+
+(B<dot11TxPowerLevel6>)
+
+=item $dot11->dot11_tx_pwr_level_7()
+
+(B<dot11TxPowerLevel7>)
+
+=item $dot11->dot11_tx_pwr_level_8()
+
+(B<dot11TxPowerLevel8>)
+
+=back
+
+=cut

Info/LLDP.pm

@@ -0,0 +1,508 @@
+# SNMP::Info::LLDP
+#
+# Eric Miller
+#
+# Copyright (c) 2007 Eric Miller
+# 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.
+#
+# 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::LLDP;
+$VERSION = '1.07';
+# $Id$
+
+use strict;
+
+use Exporter;
+use SNMP::Info;
+ 
+@SNMP::Info::LLDP::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::LLDP::EXPORT_OK = qw//;
+
+use vars qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT/;
+
+%MIBS    = (
+            'LLDP-MIB'          => 'lldpLocSysCapEnabled',
+            'LLDP-EXT-DOT1-MIB' => 'lldpXdot1MIB',
+            'LLDP-EXT-DOT3-MIB' => 'lldpXdot3MIB',            
+            );
+
+%GLOBALS = (
+            'lldp_sysname'   => 'lldpLocSysName',
+            'lldp_sysdesc'   => 'lldpLocSysDesc',
+            'lldp_sys_cap'   => 'lldpLocSysCapEnabled',
+           );
+
+%FUNCS  = (
+           # LLDP-MIB::lldpLocManAddrTable
+           'lldp_lman_addr'     => 'lldpLocManAddrIfId',
+           # LLDP-MIB::lldpRemTable
+           'lldp_rem_id_type'   => 'lldpRemChassisIdSubtype',
+           'lldp_rem_id'        => 'lldpRemChassisId',
+           'lldp_rem_pid_type'  => 'lldpRemPortIdSubtype',
+           'lldp_rem_pid'       => 'lldpRemPortId',
+           'lldp_rem_desc'      => 'lldpRemPortDesc',
+           'lldp_rem_sysname'   => 'lldpRemSysName',
+           'lldp_rem_sysdesc'   => 'lldpRemSysDesc',
+           'lldp_rem_sys_cap'   => 'lldpRemSysCapEnabled',
+           # LLDP-MIB::lldpRemManAddrTable
+           'lldp_rman_addr'     => 'lldpRemManAddrIfSubtype',
+          );
+
+
+%MUNGE = (
+          'lldp_sysdesc'        => \&munge_null,
+          'lldp_sysname'        => \&munge_null,
+          'lldp_rem_sysname'    => \&munge_null,
+          'lldp_rem_sysdesc'    => \&munge_null,
+          'lldp_rem_port_desc'  => \&munge_null,
+          'lldp_sys_cap'        => \&munge_caps,
+          'lldp_rem_sys_cap'    => \&munge_caps,
+         );
+
+sub munge_null {
+    my $text = shift || return;
+    
+    $text =~ s/\0//g;
+    return $text;
+}
+
+sub munge_caps {
+    my $caps = shift;
+    return undef unless defined $caps;
+
+    my $bits = unpack("b*",$caps);
+    return $bits;
+}
+
+sub hasLLDP {
+    my $lldp = shift;
+
+    # We may be have LLDP, but nothing in lldpRemoteSystemsData Tables
+    # so we could be running LLDP but not return any useful information
+    my $lldp_cap = $lldp->lldp_sys_cap();
+
+    return 1 if defined $lldp_cap;
+    return undef;
+}
+
+sub lldp_if {
+    my $lldp    = shift;
+    my $partial = shift;
+
+    my $addr = $lldp->lldp_rem_pid($partial) || {};
+    
+    my %lldp_if;
+    foreach my $key (keys %$addr) {
+        my @aOID = split ('\.',$key);
+	my $port = $aOID[1];
+	$lldp_if{$key} = $port;
+    }
+    return \%lldp_if;
+}
+
+sub lldp_ip {
+    my $lldp = shift;
+    my $partial = shift;
+
+    my $rman_addr = $lldp->lldp_rman_addr($partial) || {};
+    
+    my %lldp_ip;    
+    foreach my $key (keys %$rman_addr) {
+        my($index, $proto, $addr) = _lldp_addr_index($key);
+        next unless defined $index;
+        next unless $proto == 1;
+        $lldp_ip{$index} = $addr;
+    }
+    return \%lldp_ip;
+}
+
+sub lldp_addr {
+    my $lldp = shift;
+    my $partial = shift;
+
+    my $rman_addr = $lldp->lldp_rman_addr($partial) || {};
+    
+    my %lldp_ip;    
+    foreach my $key (keys %$rman_addr) {
+        my($index, $proto, $addr) = _lldp_addr_index($key);
+        next unless defined $index;
+        $lldp_ip{$index} = $addr;
+    }
+    return \%lldp_ip;
+}
+
+sub lldp_port {
+    my $lldp = shift;
+    my $partial = shift;
+
+    my $pdesc  = $lldp->lldp_rem_desc($partial) || {};
+    my $pid    = $lldp->lldp_rem_pid($partial) || {};
+    my $ptype  = $lldp->lldp_rem_pid_type($partial) || {};
+
+    my %lldp_port;    
+    foreach my $key (sort keys %$pid) {
+        my $port = $pdesc->{$key};
+	unless ($port) {
+            $port = $pid->{$key};
+            next unless $port;
+	    my $type = $ptype->{$key};
+            next unless $type;
+            # May need to format other types in the future, i.e. Network address
+            if ($type =~ /mac/) {
+                $port = join(':',map { sprintf "%02x",$_ } unpack('C*',$port));
+            }
+        }
+
+        # Nortel lldpRemPortDesc doesn't match ifDescr, but we can still
+        # figure out slot.port based upon lldpRemPortDesc 
+        if ( $port =~ /^(Unit\s+(\d+)\s+)?Port\s+(\d+)$/ ) {
+            $port = defined $1 ? "$2.$3" : "$3";
+        }
+
+        $lldp_port{$key} = $port;
+    }
+    return \%lldp_port;
+}
+
+sub lldp_id {
+    my $lldp = shift;
+    my $partial = shift;
+    
+    my $ch_type = $lldp->lldp_rem_id_type($partial) || {};
+    my $ch = $lldp->lldp_rem_id($partial) || {};
+
+    my %lldp_id;    
+    foreach my $key (keys %$ch) {
+	my $id = $ch->{$key};
+        next unless $id;
+	my $type = $ch_type->{$key};
+        next unless $type;
+        # May need to format other types in the future
+        if ($type =~ /mac/) {
+            $id = join(':',map { sprintf "%02x",$_ } unpack('C*',$id));
+        }
+        $lldp_id{$key} = $id;
+    }
+    return \%lldp_id;
+}
+
+#sub root_ip {
+#    my $lldp = shift;
+#
+#    my $man_addr = $lldp->lldp_lman_addr() || {};
+#
+#    foreach my $key (keys %$man_addr) {
+#        my @oids   = split(/\./, $key);
+#        my $proto  = shift(@oids);
+#        my $length = shift(@oids);
+#        # IPv4
+#        if ($proto == 1) {
+#            my $addr = join('.',@oids);
+#            return $addr if (defined $addr and $lldp->snmp_connect_ip($addr));
+#        }
+#    }
+#    return undef;
+#}
+
+# Break up the lldpRemManAddrTable INDEX into common index, protocol,
+# and address.
+sub _lldp_addr_index {
+    my $idx = shift;
+    my @oids   = split(/\./, $idx);
+    my $index  = join('.', splice(@oids, 0, 3));
+    my $proto  = shift(@oids);
+    my $length = shift(@oids);
+    # IPv4
+    if ($proto == 1) {
+        return ($index, $proto, join('.',@oids));
+    }
+    # MAC
+    elsif ($proto == 6) {
+        return ($index, $proto, join(':',map { sprintf "%02x",$_ } @oids));
+    }
+    # TODO - Need to handle other protocols, i.e. IPv6
+    else {
+        return undef;
+    }
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::LLDP - SNMP Interface to the Link Layer Discovery Protocol (LLDP)
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ my $lldp = new SNMP::Info ( 
+                             AutoSpecify => 1,
+                             Debug       => 1,
+                             DestHost    => 'router', 
+                             Community   => 'public',
+                             Version     => 2
+                           );
+
+ my $class = $lldp->class();
+ print " Using device sub class : $class\n";
+
+ $haslldp   = $lldp->hasLLDP() ? 'yes' : 'no';
+
+ # Print out a map of device ports with LLDP neighbors:
+ my $interfaces    = $lldp->interfaces();
+ my $lldp_if       = $lldp->lldp_if();
+ my $lldp_ip       = $lldp->lldp_ip();
+ my $lldp_port     = $lldp->lldp_port();
+
+ foreach my $lldp_key (keys %$lldp_ip){
+    my $iid           = $lldp_if->{$lldp_key};
+    my $port          = $interfaces->{$iid};
+    my $neighbor      = $lldp_ip->{$lldp_key};
+    my $neighbor_port = $lldp_port->{$lldp_key};
+    print "Port : $port connected to $neighbor / $neighbor_port\n";
+ }
+
+=head1 DESCRIPTION
+
+SNMP::Info::LLDP is a subclass of SNMP::Info that provides an object oriented 
+interface to LLDP information through SNMP.
+
+LLDP is a Layer 2 protocol that allows a network device to advertise its
+identity and capabilities on the local network providing topology information.
+The protocol is defined in the IEEE standard 802.1AB.
+
+Create or use a device subclass that inherits this class.  Do not use directly.
+
+=head2 Inherited Classes
+
+None.
+
+=head2 Required MIBs
+
+=over
+
+=item LLDP-MIB
+
+=item LLDP-EXT-DOT1-MIB
+
+=item LLDP-EXT-DOT3-MIB  
+
+=back
+
+=head1 GLOBAL METHODS
+
+These are methods that return scalar values from SNMP
+
+=over
+
+=item $lldp->hasLLDP()
+
+Is LLDP is active in this device?  
+
+Note:  LLDP may be active, but nothing in B<lldpRemoteSystemsData> Tables so
+the device would not return any useful topology information.
+
+=item $lldp->lldp_sysname()
+
+The string value used to identify the system name of the local system.  If the
+local agent supports IETF RFC 3418, B<lldpLocSysName> object should have the
+same value of B<sysName> object.
+
+Nulls are removed before the value is returned. 
+
+(B<lldpLocSysName>)
+
+=item $lldp->lldp_sysdesc()
+
+The string value used to identify the system description of the local system.
+If the local agent supports IETF RFC 3418, B<lldpLocSysDesc> object should have
+the same value of B<sysDesc> object.
+ 
+Nulls are removed before the value is returned.
+
+(B<lldpLocSysDesc>)
+
+=item  $lldp->lldp_sys_cap() 
+
+Returns which system capabilities are enabled on the local system.  Results
+are munged into an ascii binary string, LSB.  Each digit represents a bit
+from the table below:
+
+=over
+
+=item Bit 'other(0)' indicates that the system has capabilities other than
+those listed below.
+
+=item Bit 'repeater(1)' indicates that the system has repeater capability.
+
+=item Bit 'bridge(2)' indicates that the system has bridge capability.
+
+=item Bit 'wlanAccessPoint(3)' indicates that the system has WLAN access
+point capability.
+
+=item Bit 'router(4)' indicates that the system has router capability.
+
+=item Bit 'telephone(5)' indicates that the system has telephone capability.
+
+=item Bit 'docsisCableDevice(6)' indicates that the system has DOCSIS Cable
+Device capability (IETF RFC 2669 & 2670).
+
+=item Bit 'stationOnly(7)' indicates that the system has only station
+capability and nothing else."
+
+=back
+
+(B<lldpLocSysCapEnabled>)
+
+=back
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=over
+
+=item $lldp->lldp_id()
+
+Returns the string value used to identify the chassis component	associated
+with the remote system.
+
+(B<lldpRemChassisId>)
+
+=item $lldp->lldp_if()
+
+Returns the mapping to the SNMP Interface Table.
+
+=item  $lldp->lldp_ip()
+
+Returns remote IPv4 address.  Returns undef for all other address types, use
+lldp_addr if you want any return address type.
+
+=item  $lldp->lldp_addr()
+
+Returns remote address.  Type may be any IANA Address Family Number.  Currently
+only returns IPv4 or MAC addresses.
+
+=item $lldp->lldp_port()
+
+Returns remote port ID
+
+=back
+
+=head2 LLDP Remote Table (B<lldpRemTable>)
+
+=over
+
+=item $lldp->lldp_rem_id_type()
+
+Returns the type of encoding used to identify the chassis associated with
+the remote system.
+
+(B<lldpRemChassisIdSubtype>)
+
+=item $lldp->lldp_rem_id()
+
+Returns the string value used to identify the chassis component	associated
+with the remote system.
+
+(B<lldpRemChassisId>)
+
+=item $lldp->lldp_rem_pid_type()
+
+Returns the type of port identifier encoding used in the associated
+B<lldpRemPortId> object.
+
+(B<lldpRemPortIdSubtype>)
+
+=item $lldp->lldp_rem_pid()
+
+Returns the string value used to identify the port component associated with
+the remote system.
+
+(B<lldpRemPortId>)
+
+=item $lldp->lldp_rem_desc()
+
+Returns the string value used to identify the description of the given port
+associated with the remote system.
+
+Nulls are removed before the value is returned. 
+
+(B<lldpRemPortDesc>)
+
+=item $lldp->lldp_rem_sysname()
+
+Returns the string value used to identify the system name of the remote system.
+
+Nulls are removed before the value is returned. 
+
+(B<lldpRemSysName>)
+
+=item $lldp->lldp_rem_sysdesc()
+
+Returns the string value used to identify the system description of the
+remote system.
+
+Nulls are removed before the value is returned. 
+
+(B<lldpRemSysDesc>)
+
+=item  $lldp->lldp_rem_sys_cap() 
+
+Returns which system capabilities are enabled on the local system.  Results
+are munged into an ascii binary string, LSB.  Each digit
+represents a bit from the table below:
+
+=over
+
+=item Bit 'other(0)' indicates that the system has capabilities other than
+those listed below.
+
+=item Bit 'repeater(1)' indicates that the system has repeater capability.
+
+=item Bit 'bridge(2)' indicates that the system has bridge capability.
+
+=item Bit 'wlanAccessPoint(3)' indicates that the system has WLAN access
+point capability.
+
+=item Bit 'router(4)' indicates that the system has router capability.
+
+=item Bit 'telephone(5)' indicates that the system has telephone capability.
+
+=item Bit 'docsisCableDevice(6)' indicates that the system has DOCSIS Cable
+Device capability (IETF RFC 2669 & 2670).
+
+=item Bit 'stationOnly(7)' indicates that the system has only station
+capability and nothing else."
+
+=back
+
+(B<lldpRemSysCapEnabled>)
+
+=back
+
+=cut

Info/Layer1.pm

@@ -1,5 +1,7 @@
 # SNMP::Info::Layer1 - SNMP Interface to Layer1 Devices 
-# Max Baker <max@warped.org>
+# Max Baker
+#
+# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
@@ -28,7 +30,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::Layer1;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 
 use strict;
@@ -36,18 +38,11 @@ use strict;
 use Exporter;
 use SNMP::Info;
 
-use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE $INIT/;
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;
 
 @SNMP::Info::Layer1::ISA = qw/SNMP::Info Exporter/;
 @SNMP::Info::Layer1::EXPORT_OK = qw//;
 
-$DEBUG=0;
-$SNMP::debugging=$DEBUG;
-
-# See SNMP::Info for the details of these data structures and 
-#       the interworkings.
-$INIT = 0;
-
 %MIBS = ( %SNMP::Info::MIBS, 
           'SNMP-REPEATER-MIB' => 'rptrPortGroupIndex'
         );
@@ -61,18 +56,18 @@ $INIT = 0;
 
 %FUNCS   = (
             %SNMP::Info::FUNCS,
-            'i_up2'         => 'ifOperStatus',
-            'i_up_admin2'   => 'ifAdminStatus',
             'rptr_ports'    => 'rptrGroupPortCapacity',
             'rptr_port'     => 'rptrPortIndex',
             'rptr_slot'     => 'rptrPortGroupIndex',
             'rptr_up_admin' => 'rptrPortAdminStatus',
             'rptr_up'       => 'rptrPortOperStatus',
+            'rptr_last_src' => 'rptrAddrTrackNewLastSrcAddress',
            );
 
 %MUNGE = (
             # Inherit all the built in munging
             %SNMP::Info::MUNGE,
+            'rptr_last_src'=> \&SNMP::Info::munge_mac,
          );
 
 # Method OverRides
@@ -121,8 +116,10 @@ sub vendor {
 # By Default we'll use the description field
 sub interfaces {
     my $l1 = shift;
-    my $interfaces = $l1->i_index();
-    my $rptr_port  = $l1->rptr_port();
+    my $partial = shift;
+
+    my $interfaces = $l1->i_index($partial) || {};
+    my $rptr_port  = $l1->rptr_port($partial) || {};
 
     foreach my $port (keys %$rptr_port){
         $interfaces->{$port} = $port;
@@ -132,9 +129,10 @@ sub interfaces {
 
 sub i_up_admin {
     my $l1 = shift;
+    my $partial = shift;
 
-    my $i_up_admin = $l1->i_up_admin2();
-    my $rptr_up_admin = $l1->rptr_up_admin();
+    my $i_up_admin = $l1->SUPER::i_up_admin($partial) || {};
+    my $rptr_up_admin = $l1->rptr_up_admin($partial) || {};
 
     foreach my $key (keys %$rptr_up_admin){
         my $up = $rptr_up_admin->{$key};
@@ -147,8 +145,10 @@ sub i_up_admin {
 
 sub i_up {
     my $l1 = shift;
-    my $i_up = $l1->i_up2();
-    my $rptr_up = $l1->rptr_up();
+    my $partial = shift;
+
+    my $i_up = $l1->SUPER::i_up($partial) || {};
+    my $rptr_up = $l1->rptr_up($partial) || {};
 
     foreach my $key (keys %$rptr_up){
         my $up = $rptr_up->{$key};
@@ -156,18 +156,18 @@ sub i_up {
     }
 
     return $i_up;
-    
 }
+
 1;
 __END__
 
 =head1 NAME
 
-SNMP::Info::Layer1 - Perl5 Interface to network devices serving Layer1 only.
+SNMP::Info::Layer1 - SNMP Interface to network devices serving Layer1 only.
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
@@ -182,7 +182,7 @@ Max Baker (C<max@warped.org>)
                         ) 
     or die "Can't connect to DestHost.\n";
 
- my $class      = $l1->class();
+ my $class = $l1->class();
  print "SNMP::Info determined this device to fall under subclass : $class\n";
 
  # Let's get some basic Port information
@@ -199,14 +199,15 @@ Max Baker (C<max@warped.org>)
 
 =head1 DESCRIPTION
 
-This class is usually used as a superclass for more specific device classes listed under 
-SNMP::Info::Layer1::*   Please read all docs under SNMP::Info first.
+This class is usually used as a superclass for more specific device classes
+listed under SNMP::Info::Layer1::*   Please read all docs under SNMP::Info
+first.
 
 Provides abstraction to the configuration information obtainable from a 
 Layer1 device through SNMP.  Information is stored in a number of MIBs.
 
-For speed or debugging purposes you can call the subclass directly, but not after determining
-a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
 
  my $l1 = new SNMP::Info::Layer1(...);
 
@@ -224,13 +225,14 @@ a more specific class using the method above.
 
 =item SNMP-REPEATER-MIB
 
-=item Inherited Classes
-
-MIBs required for SNMP::Info
-
 =back
 
-SNMP-REPEATER-MIB needs to be extracted from ftp://ftp.cisco.com/pub/mibs/v1/v1.tar.gz
+MIBs required for L<SNMP::Info/"Required MIBs">
+
+See L<SNMP::Info/"Required MIBs"> for its MIB requirements.
+
+SNMP-REPEATER-MIB needs to be extracted from
+ftp://ftp.cisco.com/pub/mibs/v1/v1.tar.gz
 
 =head1 GLOBALS
 
@@ -266,11 +268,11 @@ Number of 'groups' in the Repeater MIB
 
 =back
 
-=head2 Globals imported from SNMP::Info
+=head2 Global Methods imported from SNMP::Info
 
-See documentation in SNMP::Info for details.
+See documentation in L<SNMP::Info/"GLOBALS"> for details.
 
-=head1 TABLE ENTRIES
+=head1 TABLE METHODS
 
 These are methods that return tables of information in the form of a reference
 to a hash.
@@ -317,10 +319,14 @@ Group (slot) Number for given port.
 
 (B<rptrPortOperStatus>)
 
+=item $l1->rptr_last_src()
+
+(B<rptrAddrTrackNewLastSrcAddress>)
+
 =back
 
 =head2 Table Methods imported from SNMP::Info
 
-See documentation in SNMP::Info for details.
+See documentation in L<SNMP::Info/"TABLE METHODS"> for details.
 
 =cut

Info/Layer1/Allied.pm

@@ -1,5 +1,7 @@
 # SNMP::Info::Layer1::Allied
-# Max Baker <max@warped.org>
+# Max Baker
+#
+# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
@@ -28,7 +30,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::Layer1::Allied;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 use strict;
 
@@ -47,7 +49,6 @@ use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
             );
 
 %FUNCS   = (%SNMP::Info::Layer1::FUNCS,
-            'i_name2'    => 'ifName',
             'ati_p_name' => 'portName',
             'ati_up'     => 'linkTestLED',
             );
@@ -90,10 +91,10 @@ sub model {
 
 sub i_name{
     my $allied = shift;
+    my $partial = shift;
 
-    my $i_name = $allied->i_name2();
-
-    my $ati_p_name = $allied->ati_p_name();
+    my $i_name = $allied->orig_i_name($partial) || {};
+    my $ati_p_name = $allied->ati_p_name($partial) || {};
 
     foreach my $port (keys %$ati_p_name){
         my $name = $ati_p_name->{$port};
@@ -105,9 +106,10 @@ sub i_name{
 
 sub i_up {
     my $allied = shift;
+    my $partial = shift;
 
-    my $i_up = SNMP::Info::Layer1::i_up($allied);
-    my $ati_up = $allied->ati_up();
+    my $i_up = SNMP::Info::Layer1::i_up($allied, $partial);
+    my $ati_up = $allied->ati_up($partial) || {};
 
     foreach my $port (keys %$ati_up){
         my $up = $ati_up->{$port};
@@ -126,7 +128,7 @@ SNMP::Info::Layer1::Allied - SNMP Interface to old Allied Hubs
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
@@ -141,7 +143,7 @@ Max Baker (C<max@warped.org>)
                         ) 
     or die "Can't connect to DestHost.\n";
 
- my $class      = $l1->class();
+ my $class = $allied->class();
  print "SNMP::Info determined this device to fall under subclass : $class\n";
 
 =head1 DESCRIPTION
@@ -166,12 +168,12 @@ inherited methods.
 
 Download for your device from http://www.allied-telesyn.com/allied/support/
 
-=item Inherited Classes
-
-MIBs listed in SNMP::Info::Layer1 and its inherited classes.
-
 =back
 
+=head2 Inherited MIBs
+
+See L<SNMP::Info::Layer1/"Required MIBs"> for its MIB requirements.
+
 =head1 GLOBALS
 
 These are methods that return scalar value from SNMP
@@ -206,9 +208,9 @@ Trys to cull out AT-nnnnX out of the description field.
 
 =head2 Global Methods imported from SNMP::Info::Layer1
 
-See documentation in SNMP::Info::Layer1 for details.
+See L<SNMP::Info::Layer1/"GLOBALS"> for details.
 
-=head1 TABLE ENTRIES
+=head1 TABLE METHODS
 
 =head2 Overrides
 
@@ -241,6 +243,6 @@ the values of ati_up() to 'up' and 'down'.
 
 =head2 Table Methods imported from SNMP::Info::Layer1
 
-See documentation in SNMP::Info::Layer1 for details.
+See L<SNMP::Info::Layer1/"TABLE METHODS"> for details.
 
 =cut

Info/Layer1/Asante.pm

@@ -1,5 +1,7 @@
 # SNMP::Info::Layer1::Asante
-# Max Baker <max@warped.org>
+# Max Baker
+#
+# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
@@ -28,7 +30,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::Layer1::Asante;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 use strict;
 
@@ -46,10 +48,6 @@ use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
             );
 
 %FUNCS   = (%SNMP::Info::Layer1::FUNCS,
-            'i_speed2'     => 'ifSpeed',
-            'i_mac2'       => 'ifPhysAddress',
-            'i_descr2'     => 'ifDescr',
-            'i_name2'      => 'ifName',
             'asante_port'  => 'ePortIndex',
             'asante_group' => 'ePortGrpIndex',
             'i_type'       => 'ePortStateType',
@@ -61,15 +59,15 @@ use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
             'ASANTE-HUB1012-MIB' => 'asante'
             );
 
-%MUNGE   = (%SNMP::Info::Layer1::MUNGE,
-            'i_mac2' => \&SNMP::Info::munge_mac,
-            'i_speed2' => \&SNMP::Info::munge_speed,
+%MUNGE   = (
+            %SNMP::Info::Layer1::MUNGE,
             );
 
 sub interfaces {
     my $asante = shift;
+    my $partial = shift;
 
-    my $rptr_port = $asante->rptr_port();
+    my $rptr_port = $asante->rptr_port($partial) || {};
 
     my %interfaces;
 
@@ -108,8 +106,9 @@ sub model {
 
 sub i_up {
     my $asante = shift;
+    my $partial = shift;
 
-    my $asante_up = $asante->asante_up();
+    my $asante_up = $asante->asante_up($partial) || {};
 
     my $i_up = {};
     foreach my $port (keys %$asante_up){
@@ -123,8 +122,9 @@ sub i_up {
 
 sub i_speed {
     my $asante = shift;
+    my $partial = shift;
 
-    my $i_speed = $asante->i_speed2();
+    my $i_speed = $asante->orig_i_speed($partial) || {};
 
     my %i_speed;
 
@@ -135,8 +135,9 @@ sub i_speed {
 
 sub i_mac {
     my $asante = shift;
+    my $partial = shift;
 
-    my $i_mac = $asante->i_mac2();
+    my $i_mac = $asante->orig_i_mac($partial) || {};
 
     my %i_mac;
 
@@ -151,8 +152,9 @@ sub i_description {
 
 sub i_name {
     my $asante = shift;
+    my $partial = shift;
 
-    my $i_name = $asante->i_descr2();
+    my $i_name = $asante->orig_i_descr($partial) || {};
 
     my %i_name;
 
@@ -169,7 +171,7 @@ SNMP::Info::Layer1::Asante - SNMP Interface to old Asante 1012 Hubs
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
@@ -184,7 +186,7 @@ Max Baker (C<max@warped.org>)
                         ) 
     or die "Can't connect to DestHost.\n";
 
- my $class      = $asante->class();
+ my $class = $asante->class();
  print "SNMP::Info determined this device to fall under subclass : $class\n";
 
 =head1 DESCRIPTION
@@ -208,10 +210,12 @@ Asante device through SNMP.
 
 Download from http://www.mibdepot.com
 
-=item MIBs listed in SNMP::Info::Layer1
-
 =back
 
+=head2 Inherited MIBs
+
+See L<SNMP::Info::Layer1/"Required MIBs"> for its MIB requirements.
+
 =head1 GLOBALS
 
 =head2 Overrides
@@ -230,23 +234,18 @@ Culls software version from description()
 
 Returns 'asante' :)
 
-=item $asante->root_ip()
-
-Returns IP Address of Managed Hub.
-
-(B<actualIpAddr>)
-
 =item $asante->model()
 
-Trys to cull out AT-nnnnX out of the description field.
+Cross references $asante->id() to the ASANTE-HUB1012-MIB and returns
+the results.
 
 =back
 
-=head2 Globals inherited from SNMP::Info::Layer1
+=head2 Global Methods imported from SNMP::Info::Layer1
 
-See documentation in SNMP::Info::Layer1 for details.
+See L<SNMP::Info::Layer1/"GLOBALS"> for details.
 
-=head1 TABLE ENTRIES
+=head1 TABLE METHODS
 
 =head2 Overrides
 
@@ -259,7 +258,7 @@ Returns reference to map of IIDs to human-set port name.
 =item $asante->i_up()
 
 Returns reference to map of IIDs to link status.  Changes
-the values of ati_up() to 'up' and 'down'.
+the values of asante_up() to 'up' and 'down'.
 
 =back
 
@@ -279,6 +278,6 @@ the values of ati_up() to 'up' and 'down'.
 
 =head2 Table Methods imported from SNMP::Info::Layer1
 
-See documentation in SNMP::Info::Layer1 for details.
+See L<SNMP::Info::Layer1/"TABLE METHODS"> for details.
 
 =cut

Info/Layer1/Bayhub.pm

@@ -0,0 +1,714 @@
+# SNMP::Info::Layer1::Bayhub
+# Eric Miller
+# $Id$
+#
+# Copyright (c) 2004 Eric Miller, Max Baker
+#
+# 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::Layer1::Bayhub;
+$VERSION = '1.07';
+use strict;
+
+use Exporter;
+use SNMP::Info::SONMP;
+use SNMP::Info::NortelStack;
+use SNMP::Info::Layer2;
+
+@SNMP::Info::Layer1::Bayhub::ISA = qw/SNMP::Info::SONMP SNMP::Info::NortelStack  SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer1::Bayhub::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+
+%MIBS    = (
+            %SNMP::Info::Layer2::MIBS,
+            %SNMP::Info::NortelStack::MIBS,            
+            %SNMP::Info::SONMP::MIBS,
+            'S5-ETHERNET-COMMON-MIB'     => 's5EnPortTable',
+            'S5-COMMON-STATS-MIB'        => 's5CmStat',
+            );
+
+%GLOBALS = (
+            %SNMP::Info::Layer2::GLOBALS,
+            %SNMP::Info::NortelStack::GLOBALS,
+            %SNMP::Info::SONMP::GLOBALS,
+            );
+
+%FUNCS   = (
+            %SNMP::Info::Layer2::FUNCS,
+            %SNMP::Info::NortelStack::FUNCS,
+            %SNMP::Info::SONMP::FUNCS,
+            # S5-ETHERNET-COMMON-MIB::s5EnPortTable
+            'bayhub_pb_index'        => 's5EnPortBrdIndx',
+            'bayhub_pp_index'        => 's5EnPortIndx',
+            'bayhub_up_admin'        => 's5EnPortPartStatus',
+            'bayhub_up'              => 's5EnPortLinkStatus',
+            # S5-ETHERNET-COMMON-MIB::s5EnPortExtTable
+            'bayhub_p_speed'        => 's5EnPortExtActiveSpeed',
+            'bayhub_p_cap'          => 's5EnPortExtHwCapability',
+            'bayhub_p_adv'          => 's5EnPortExtAutoNegAdv',
+            # S5-COMMON-STATS-MIB::s5CmSNodeTable
+            'bayhub_nb_index'        => 's5CmSNodeBrdIndx',
+            'bayhub_np_index'        => 's5CmSNodePortIndx',
+            'fw_mac'                 => 's5CmSNodeMacAddr',
+            );
+
+%MUNGE   = (
+            %SNMP::Info::Layer2::MUNGE,
+            %SNMP::Info::NortelStack::MUNGE,
+            %SNMP::Info::SONMP::MUNGE,
+            );
+
+sub layers {
+    return '00000011';
+}
+
+sub os {
+    return 'bay_hub';
+}
+
+sub vendor {
+    return 'nortel';
+}
+
+sub model {
+    my $bayhub = shift;
+    my $id = $bayhub->id();
+    return undef unless defined $id;
+    my $model = &SNMP::translateObj($id);
+    return $id unless defined $model;
+    $model =~ s/^sreg-//i;
+
+    return 'Baystack Hub' if ($model =~ /BayStack/);
+    return '5000' if ($model =~ /5000/);
+    return '5005' if ($model =~ /5005/);
+    return $model;
+}
+
+# Hubs do not support ifMIB requirements for get MAC
+# and port status
+
+sub i_index {
+    my $bayhub = shift;
+    my $partial = shift;
+
+    my $b_index = $bayhub->bayhub_pb_index($partial) || {};
+    my $p_index = $bayhub->bayhub_pp_index($partial) || {};
+    my $model = $bayhub->model() || 'Baystack Hub';
+
+    my %i_index;
+    foreach my $iid (keys %$b_index){
+        my $board = $b_index->{$iid};
+        next unless defined $board;
+        my $port = $p_index->{$iid}||0;
+
+        if ($model eq 'Baystack Hub') {
+            my $comidx = $board;
+               if (! ($comidx % 5)) {
+                  $board = ($board / 5);
+               } elsif ($comidx =~ /[16]$/) {
+                  $board = int($board/5);
+                  $port = 25;          
+               } elsif ($comidx =~ /[27]$/) {
+                  $board = int($board/5);
+                  $port = 26;          
+               }
+          }
+
+        my $index = ($board*256)+$port;
+
+        $i_index{$iid} = $index;
+    }
+    return \%i_index;
+}
+
+# Partials don't really help in this class, but implemented
+# for consistency
+
+sub interfaces {
+    my $bayhub = shift;
+    my $partial = shift;
+
+    my $i_index = $bayhub->i_index() || {};
+
+    my %if;
+    foreach my $iid (keys %$i_index){
+        my $index = $i_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);
+
+        # Index numbers are deterministic slot * 256 + port
+        my $port = $index % 256;
+        my $slot = int($index / 256);
+
+        my $slotport = "$slot.$port";
+    
+        $if{$index} = $slotport;
+    }
+
+    return \%if;
+}
+
+sub i_duplex {
+    my $bayhub = shift;
+    my $partial = shift;
+
+    my $port_index  = $bayhub->i_index() || {};
+
+    my %i_duplex;
+    foreach my $iid (keys %$port_index){
+        my $index = $port_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);
+    
+        my $duplex = 'half';
+        $i_duplex{$index}=$duplex; 
+    }
+    return \%i_duplex;
+}
+
+sub i_duplex_admin {
+    my $bayhub = shift;
+    my $partial = shift;
+
+    my $port_index  = $bayhub->i_index() || {};
+
+    my %i_duplex_admin;
+    foreach my $iid (keys %$port_index){
+        my $index = $port_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);
+    
+        my $duplex = 'half';
+        $i_duplex_admin{$index}=$duplex; 
+    }
+    return \%i_duplex_admin;
+}
+
+sub i_speed {
+    my $bayhub = shift;
+    my $partial = shift;
+
+    my $port_index  = $bayhub->i_index() || {};
+    my $port_speed  = $bayhub->bayhub_p_speed() || {};
+
+    my %i_speed;
+    foreach my $iid (keys %$port_index){
+        my $index = $port_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);
+        my $speed = $port_speed->{$iid} || '10 Mbps';
+
+        $speed = '10 Mbps' if $speed =~ /bps10M/i;
+        $speed = '100 Mbps' if $speed =~ /bps100M/i;
+        $i_speed{$index}=$speed; 
+    }
+    return \%i_speed;
+}
+
+sub i_up {
+    my $bayhub = shift;
+    my $partial = shift;
+
+    my $port_index = $bayhub->i_index() || {};
+    my $link_stat = $bayhub->bayhub_up() || {};
+   
+    my %i_up;
+    foreach my $iid (keys %$port_index){
+        my $index = $port_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);
+        my $link_stat = $link_stat->{$iid};
+        next unless defined $link_stat;
+        
+        $link_stat = 'up' if $link_stat =~ /on/i;
+        $link_stat = 'down' if $link_stat =~ /off/i;
+             
+        $i_up{$index}=$link_stat; 
+    }
+    return \%i_up;
+}
+
+sub i_up_admin {
+    my $bayhub = shift;
+    my $partial = shift;
+
+    my $i_index = $bayhub->i_index() || {};
+    my $link_stat = $bayhub->bayhub_up_admin() || {};
+ 
+    my %i_up_admin;
+    foreach my $iid (keys %$i_index){
+        my $index = $i_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);
+        my $link_stat = $link_stat->{$iid};
+        next unless defined $link_stat;
+ 
+        $i_up_admin{$index}=$link_stat; 
+    }
+    return \%i_up_admin;
+}
+
+sub set_i_up_admin {
+    # map setting to those the hub will understand
+    my %setting = qw/up 2 down 3/;
+
+    my $bayhub = shift;
+    my ($setting, $iid) = @_;
+
+    my $i_index  = $bayhub->i_index();
+    my %reverse_i_index = reverse %$i_index;
+
+    $setting = lc($setting);
+
+    return 0 unless defined $setting{$setting};
+
+    $iid = $reverse_i_index{$iid};
+
+    return $bayhub->set_bayhub_up_admin($setting{$setting}, $iid);
+}
+
+# Hubs do not support the standard Bridge MIB
+sub bp_index {
+    my $bayhub = shift;
+    my $partial = shift;
+
+    my $b_index = $bayhub->bayhub_nb_index() || {};
+    my $p_index = $bayhub->bayhub_np_index() || {};
+    my $model = $bayhub->model() || 'Baystack Hub';
+
+    my %bp_index;
+    foreach my $iid (keys %$b_index){
+        my $board = $b_index->{$iid};
+        next unless defined $board;
+        my $port = $p_index->{$iid}||0;
+                
+        if ($model eq 'Baystack Hub') {
+            my $comidx = $board;
+               if (! ($comidx % 5)) {
+                  $board = ($board / 5);
+               } elsif ($comidx =~ /[16]$/) {
+                  $board = int($board/5);
+                  $port = 25;          
+               } elsif ($comidx =~ /[27]$/) {
+                  $board = int($board/5);
+                  $port = 26;          
+               }
+          }
+
+        my $index = ($board*256)+$port;
+        next if (defined $partial and $index !~ /^$partial$/);
+
+        $bp_index{$index} = $index;
+    }
+    return \%bp_index;
+}
+
+sub fw_port {
+    my $bayhub = shift;
+    my $partial = shift;
+
+    my $b_index = $bayhub->bayhub_nb_index($partial) || {};
+    my $p_index = $bayhub->bayhub_np_index($partial) || {};
+    my $model = $bayhub->model() || 'Baystack Hub';
+
+    my %fw_port;
+    foreach my $iid (keys %$b_index){
+        my $board = $b_index->{$iid};
+        next unless defined $board;
+        my $port = $p_index->{$iid}||0;
+
+      if ($model eq 'Baystack Hub') {
+          my $comidx = $board;
+             if (! ($comidx % 5)) {
+                $board = ($board / 5);
+             } elsif ($comidx =~ /[16]$/) {
+                $board = int($board/5);
+                $port = 25;          
+             } elsif ($comidx =~ /[27]$/) {
+                $board = int($board/5);
+                $port = 26;          
+             }
+       }
+        
+        my $index = ($board*256)+$port;
+
+      $fw_port{$iid} = $index;
+    }
+    return \%fw_port;
+}
+
+sub index_factor {
+    return 256;
+}
+
+sub slot_offset {
+    return 0;
+}
+
+
+# Devices do not support ENTITY-MIB use proprietary methods.
+
+sub e_index {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->ns_e_index($partial);
+}
+
+sub e_class {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->ns_e_class($partial);
+}
+
+sub e_descr {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->ns_e_descr($partial);
+}
+
+sub e_name {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->ns_e_name($partial);
+}
+
+sub e_fwver {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->ns_e_fwver($partial);
+}
+
+sub e_hwver {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->ns_e_hwver($partial);
+}
+
+sub e_parent {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->ns_e_parent($partial);
+}
+
+sub e_pos {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->ns_e_pos($partial);
+}
+
+sub e_serial {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->ns_e_serial($partial);
+}
+
+sub e_swver {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->ns_e_swver($partial);
+}
+
+sub e_type {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->ns_e_type($partial);
+}
+
+sub e_vendor {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->ns_e_vendor($partial);
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer1::Bayhub - SNMP Interface to Bay / Nortel Hubs
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+    #Let SNMP::Info determine the correct subclass for you.
+
+    my $bayhub = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+
+    or die "Can't connect to DestHost.\n";
+
+    my $class = $bayhub->class();
+    print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from a 
+Bayhub device through SNMP.  Also provides device MAC to port mapping through the proprietary MIB. 
+
+For speed or debugging purposes you can call the subclass directly, but not after determining
+a more specific class using the method above. 
+
+my $bayhub = new SNMP::Info::Layer1::Bayhub(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+=item SNMP::Info::NortelStack
+
+=item SNMP::Info::SONMP
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item S5-ETHERNET-COMMON-MIB
+
+=item S5-COMMON-STATS-MIB
+
+=back
+
+=head2 Inherited MIBs
+
+See L<SNMP::Info::Layer2/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::NortelStack/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::SONMP/"Required MIBs"> for its MIB requirements.
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $bayhub->vendor()
+
+Returns 'nortel'
+
+=item $bayhub->os()
+
+Returns 'bay_hub'
+
+=item $bayhub->model()
+
+Cross references $bayhub->id() to the SYNOPTICS-MIB and returns
+the results.
+
+Removes either Baystack Hub, 5000, or 5005 depending on the model.
+
+=back
+
+=head2 Overrides
+
+=over
+
+=item $bayhub->layers()
+
+Returns 00000011.  Class emulates Layer 2 functionality through proprietary MIBs.
+
+=item  $bayhub->index_factor()
+
+Required by SNMP::Info::SONMP.  Number representing the number of ports
+reserved per slot within the device MIB.  Returns 256.
+
+=item $bayhub->slot_offset()
+
+Required by SNMP::Info::SONMP.  Offset if slot numbering does not
+start at 0.  Returns 0.
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer2
+
+See L<SNMP::Info::Layer2/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::NortelStack
+
+See L<SNMP::Info::NortelStack/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::SONMP
+
+See L<SNMP::Info::SONMP/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item $bayhub->i_index()
+
+Returns reference to map of IIDs to Interface index. 
+
+Since hubs do not support ifIndex, the interface index is created using the
+formula (board * 256 + port).
+
+=item $bayhub->interfaces()
+
+Returns reference to map of IIDs to physical ports. 
+
+=item $bayhub->i_duplex()
+
+Returns half, hubs do not support full duplex. 
+
+=item $bayhub->i_duplex_admin()
+
+Returns half, hubs do not support full duplex.
+
+=item $bayhub->i_speed()
+
+Returns interface speed.
+
+=item $bayhub->i_up()
+
+Returns (B<s5EnPortLinkStatus>) for each port.  Translates on/off to up/down.
+
+=item $bayhub->i_up_admin()
+
+Returns (B<s5EnPortPartStatus>) for each port.
+
+=item $bayhub->set_i_up_admin(state, ifIndex)
+
+Sets port state, must be supplied with state and port ifIndex
+
+State choices are 'up'or 'down'
+
+Example:
+  my %if_map = reverse %{$bayhub->interfaces()};
+  $bayhub->set_i_up_admin('down', $if_map{'1.1'}) 
+      or die "Couldn't change port state. ",$bayhub->error(1);
+
+=item $bayhub->bp_index()
+
+Simulates bridge MIB by returning reference to a hash containing the index for
+both the keys and values.
+
+=item $bayhub->fw_port()
+
+Returns reference to map of IIDs of the S5-COMMON-STATS-MIB::s5CmSNodeTable
+to the Interface index.
+
+=item $bayhub->fw_mac()
+
+(B<s5CmSNodeMacAddr>)
+
+=back
+
+=head2 Pseudo ENTITY-MIB Information
+
+These devices do not support ENTITY-MIB.  These methods emulate Physical Table
+methods using S5-CHASSIS-MIB.  See L<SNMP::Info::NortelStack/"TABLE METHODS">
+for details.
+
+=over
+
+=item $bayhub->e_index() 
+
+Returns ns_e_index().
+
+=item $bayhub->e_class() 
+
+Returns ns_e_class().
+
+=item $bayhub->e_descr() 
+
+Returns ns_e_descr().
+
+=item $bayhub->e_fwver() 
+
+Returns ns_e_fwver().
+
+=item $bayhub->e_hwver() 
+
+Returns ns_e_hwver().
+
+=item $bayhub->e_parent() 
+
+Returns ns_e_parent().
+
+=item $bayhub->e_pos() 
+
+Returns ns_e_pos().
+
+=item $bayhub->e_serial() 
+
+Returns ns_e_serial().
+
+=item $bayhub->e_swver() 
+
+Returns ns_e_swver().
+
+=item $bayhub->e_type() 
+
+Returns ns_e_type().
+
+=item $bayhub->e_vendor() 
+
+Returns ns_e_vendor().
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer2
+
+See L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::NortelStack
+
+See L<SNMP::Info::NortelStack/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::SONMP
+
+See L<SNMP::Info::SONMP/"TABLE METHODS"> for details.
+
+=cut

Info/Layer1/Cyclades.pm

@@ -0,0 +1,441 @@
+# SNMP::Info::Layer1::Cyclades
+# Eric Miller
+# $Id$
+#
+# Copyright (c) 2006 Eric Miller
+#
+# 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::Layer1::Cyclades;
+$VERSION = '1.07';
+use strict;
+
+use Exporter;
+use SNMP::Info::Layer1;
+
+@SNMP::Info::Layer1::Cyclades::ISA = qw/SNMP::Info::Layer1 Exporter/;
+@SNMP::Info::Layer1::Cyclades::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/;
+
+%MIBS    = (
+            %SNMP::Info::Layer1::MIBS,
+            'CYCLADES-ACS-SYS-MIB'   => 'cyACSversion',
+            'CYCLADES-ACS-CONF-MIB'  => 'cyEthIPaddr',
+            'CYCLADES-ACS-INFO-MIB'  => 'cyISPortTty',
+            );
+
+%GLOBALS = (
+            # CYCLADES-ACS-SYS-MIB
+            %SNMP::Info::Layer1::GLOBALS,
+            'os_ver'     => 'cyACSversion',
+            'cy_model'   => 'cyACSpname',
+            'serial'     => 'cyACSDevId',
+            'root_ip'    => 'cyEthIPaddr',
+            'ps1_status' => 'cyACSPw1',
+            'ps2_status' => 'cyACSPw2',
+            );
+
+%FUNCS   = (
+            %SNMP::Info::Layer1::FUNCS,
+            # CYCLADES-ACS-INFO-MIB::cyInfoSerialTable
+            'cy_port_tty'    => 'cyISPortTty',
+            'cy_port_name'   => 'cyISPortName',
+            'cy_port_speed'  => 'cyISPortSpeed',
+            'cy_port_cd'     => 'cyISPortSigCD',
+            # CYCLADES-ACS-CONF-MIB::cySerialPortTable
+            'cy_port_socket' => 'cySPortSocketPort',
+            );
+
+%MUNGE   = (
+            %SNMP::Info::Layer1::MUNGE,
+            );
+
+# These devices don't have a FDB and we probably don't want to poll for ARP
+# cache so turn off reported L2/L3.
+sub layers {
+    return '01000001';
+}
+
+sub os {
+    return 'cyclades';
+}
+
+sub vendor {
+    return 'cyclades';
+}
+
+sub model {
+    my $cyclades = shift;
+
+    my $model = $cyclades->cy_model();
+
+    return undef unless defined $model;
+
+    return lc($model);
+}
+
+# Extend interface methods to include serial ports
+#
+# Partials don't really help in this class, but implemented
+# for consistency
+
+sub i_index {
+    my $cyclades = shift;
+    my $partial  = shift;
+
+    my $orig_index = $cyclades->orig_i_index($partial) || {};
+    my $cy_index   = $cyclades->cy_port_socket() || {};
+
+    my %i_index;
+    foreach my $iid (keys %$orig_index){
+        my $index = $orig_index->{$iid};
+        next unless defined $index;
+
+        $i_index{$iid} = $index;
+    }
+
+    # Use alternative labeling system for the serial port, listening socket
+    # to avoid conflicts with ifIndex.
+    foreach my $iid (keys %$cy_index){
+        my $index = $cy_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);
+
+        $i_index{$index} = $index;
+    }
+    
+    return \%i_index;
+}
+
+sub interfaces {
+    my $cyclades = shift;
+    my $partial  = shift;
+
+    my $i_descr   = $cyclades->orig_i_description($partial) || {};
+    my $cy_index  = $cyclades->cy_port_socket() || {};
+    my $cy_p_tty  = $cyclades->cy_port_tty() || {};
+
+    my %if;
+    foreach my $iid (keys %$i_descr){
+        my $descr = $i_descr->{$iid};
+        next unless defined $descr;
+    
+        $if{$iid} = $descr;
+    }
+
+    foreach my $iid (keys %$cy_p_tty){
+        my $index = $cy_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);        
+        my $name = $cy_p_tty->{$iid};
+        next unless defined $name;
+    
+        $if{$index} = $name;
+    }
+
+    return \%if;
+}
+
+sub i_speed {
+    my $cyclades = shift;
+    my $partial  = shift;
+
+    my $i_speed     = $cyclades->orig_i_speed($partial) || {};
+    my $cy_index    = $cyclades->cy_port_socket() || {};
+    my $cy_p_speed  = $cyclades->cy_port_speed() || {};
+
+    my %i_speed;
+    foreach my $iid (keys %$i_speed){
+        my $speed = $i_speed->{$iid};
+        next unless defined $speed;
+    
+        $i_speed{$iid} = $speed;
+    }
+
+    foreach my $iid (keys %$cy_p_speed){
+        my $index = $cy_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);        
+        my $speed = $cy_p_speed->{$iid};
+        next unless defined $speed;
+    
+        $i_speed{$index} = $speed;
+    }
+
+    return \%i_speed;
+}
+
+sub i_up {
+    my $cyclades = shift;
+    my $partial  = shift;
+
+    my $i_up     = $cyclades->orig_i_up($partial) || {};
+    my $cy_index = $cyclades->cy_port_socket() || {};
+    my $cy_p_up  = $cyclades->cy_port_cd() || {};
+
+    my %i_up;
+    foreach my $iid (keys %$i_up){
+        my $up = $i_up->{$iid};
+        next unless defined $up;
+    
+        $i_up{$iid} = $up;
+    }
+
+    foreach my $iid (keys %$cy_p_up){
+        my $index = $cy_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);        
+        my $up = $cy_p_up->{$iid};
+        next unless defined $up;
+    
+        $i_up{$index} = $up;
+    }
+
+    return \%i_up;
+}
+
+sub i_description {
+    my $cyclades = shift;
+    my $partial  = shift;
+
+    my $i_desc    = $cyclades->orig_i_description($partial) || {};
+    my $cy_index  = $cyclades->cy_port_socket() || {};
+    my $cy_p_desc = $cyclades->cy_port_name() || {};
+
+    my %descr;
+    foreach my $iid (keys %$i_desc){
+        my $desc = $i_desc->{$iid};
+        next unless defined $desc;
+    
+        $descr{$iid} = $desc;
+    }
+
+    foreach my $iid (keys %$cy_p_desc){
+        my $index = $cy_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);        
+        my $desc = $cy_p_desc->{$iid};
+        next unless defined $desc;
+    
+        $descr{$index} = $desc;
+    }
+
+    return \%descr;
+}
+
+sub i_name {
+    my $cyclades = shift;
+    my $partial  = shift;
+
+    my $i_name    = $cyclades->orig_i_name($partial) || {};
+    my $cy_index  = $cyclades->cy_port_socket() || {};
+    my $cy_p_desc = $cyclades->cy_port_name() || {};
+
+    my %i_name;
+    foreach my $iid (keys %$i_name){
+        my $name = $i_name->{$iid};
+        next unless defined $name;
+    
+        $i_name{$iid} = $name;
+    }
+
+    foreach my $iid (keys %$cy_p_desc){
+        my $index = $cy_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);        
+        my $name = $cy_p_desc->{$iid};
+        next unless defined $name;
+    
+        $i_name{$index} = $name;
+    }
+
+    return \%i_name;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer1::Cyclades - SNMP Interface to Cyclades terminal servers
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+    #Let SNMP::Info determine the correct subclass for you.
+
+    my $cyclades = 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 = $cyclades->class();
+    print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from a 
+Cyclades device through SNMP.
+
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
+
+my $cyclades = new SNMP::Info::Layer1::Cyclades(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer1
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item CYCLADES-ACS-SYS-MIB
+
+=item CYCLADES-ACS-CONF-MIB
+
+=item CYCLADES-ACS-INFO-MIB
+
+=back
+
+=head2 Inherited MIBs
+
+See L<SNMP::Info::Layer1/"Required MIBs"> for its MIB requirements.
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $cyclades->os_ver()
+
+(B<cyACSversion>)
+
+=item $cyclades->serial()
+
+(B<cyACSDevId>)
+
+=item $cyclades->root_ip()
+
+(B<cyEthIPaddr>)
+
+=item $cyclades->ps1_status()
+
+(B<cyACSPw1>)
+
+=item $cyclades->ps2_status()
+
+(B<cyACSPw2>)
+
+=back
+
+=head2 Overrides
+
+=over
+
+=item $cyclades->layers()
+
+Returns 01000001.  These devices don't have a FDB and we probably don't want to
+poll for an ARP cache so turn off reported Layer 2 and Layer 3.
+
+=item $cyclades->vendor()
+
+Returns 'cyclades'
+
+=item $cyclades->os()
+
+Returns 'cyclades'
+
+=item $cyclades->model()
+
+Returns lower case (B<cyACSpname>)
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer1
+
+See L<SNMP::Info::Layer1/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item $cyclades->i_index()
+
+Returns reference to map of IIDs to Interface index. 
+
+Extended to include serial ports.  Serial ports are indexed with the
+alternative labeling system for the serial port, the listening socket port
+B<cySPortSocketPort> to avoid conflicts with B<ifIndex>.  
+
+=item $cyclades->interfaces()
+
+Returns reference to map of IIDs to physical ports.  Extended to include
+serial ports, B<cyISPortTty>.
+
+=item $cyclades->i_speed()
+
+Returns interface speed.  Extended to include serial ports, B<cyISPortSpeed>. 
+
+=item $cyclades->i_up()
+
+Returns link status for each port.  Extended to include serial ports,
+B<cyISPortSigCD>.
+
+=item $cyclades->i_description()
+
+Returns description of each port.  Extended to include serial ports,
+B<cyISPortName>.
+
+=item $cyclades->i_name()
+
+Returns name of each port.  Extended to include serial ports, B<cyISPortName>.
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer1
+
+See L<SNMP::Info::Layer1/"TABLE METHODS"> for details.
+
+=cut

Info/Layer1/S3000.pm

@@ -0,0 +1,536 @@
+# SNMP::Info::Layer1::S3000
+# Eric Miller
+# $Id$
+#
+# Copyright (c) 2006 Eric Miller
+#
+# 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::Layer1::S3000;
+$VERSION = '1.07';
+use strict;
+
+use Exporter;
+use SNMP::Info::Layer2;
+
+@SNMP::Info::Layer1::S3000::ISA = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer1::S3000::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+
+%MIBS    = (
+            %SNMP::Info::Layer2::MIBS,
+            'SYNOPTICS-ETHERNET-MIB'     => 's3EnetPortTable',
+            'SYNOPTICS-COMMON-MIB'       => 's3AgentType',
+            );
+
+%GLOBALS = (
+            %SNMP::Info::Layer2::GLOBALS,
+            # From SYNOPTICS-COMMON-MIB
+            'os_bin'            => 's3AgentFwVer',
+            's3000_major_ver'   => 's3AgentSwMajorVer',
+            's3000_minor_ver'   => 's3AgentSwMinorVer',
+            's3000_maint_ver'   => 's3AgentSwMaintVer',
+            );
+
+%FUNCS   = (
+            %SNMP::Info::Layer2::FUNCS,
+            # SYNOPTICS-ETHERNET-MIB::s3EnetPortTable
+            's3000_pb_index'        => 's3EnetPortBoardIndex',
+            's3000_pp_index'        => 's3EnetPortIndex',
+            's3000_up_admin'        => 's3EnetPortPartStatus',
+            's3000_up'              => 's3EnetPortLinkStatus',
+            # SYNOPTICS-ETHERNET-MIB::s3EnetShowNodesTable
+            's3000_nb_index'        => 's3EnetShowNodesSlotIndex',
+            's3000_np_index'        => 's3EnetShowNodesPortIndex',
+            'fw_mac'                => 's3EnetShowNodesMacAddress',
+            # SYNOPTICS-ETHERNET-MIB::s3EnetTopNmmTable
+            's3000_topo_port'       => 's3EnetTopNmmPort',
+            's3000_topo_mac'        => 's3EnetTopNmmMacAddr',
+            );
+
+%MUNGE   = (
+            %SNMP::Info::Layer2::MUNGE,
+            's3000_topo_mac'        => \&SNMP::Info::munge_mac
+            );
+
+sub layers {
+    return '00000011';
+}
+
+sub os {
+    return 'synoptics';
+}
+
+sub vendor {
+    return 'nortel';
+}
+
+sub model {
+    my $s3000 = shift;
+    my $id = $s3000->id();
+    return undef unless defined $id;
+    my $model = &SNMP::translateObj($id);
+    return $id unless defined $model;
+    $model =~ s/^s3reg-//i;
+
+    return $1 if ($model =~ /((\d+){3}[\dX])/);
+    return $model;
+}
+
+sub os_ver {
+    my $s3000 = shift;
+    my $major_ver = $s3000->s3000_major_ver() || 0;
+    my $minor_ver = $s3000->s3000_minor_ver() || 0;
+    my $maint_ver = $s3000->s3000_maint_ver() || 0;
+
+   my $ver = "$major_ver.$minor_ver.$maint_ver"; 
+   return $ver;
+}
+
+sub mac {
+    my $s3000 = shift;
+    my $topo_port = $s3000->s3000_topo_port();
+    my $topo_mac = $s3000->s3000_topo_mac();
+    
+    foreach my $entry (keys %$topo_port){
+        my $port = $topo_port->{$entry};
+        next unless $port == 0;
+        my $mac = $topo_mac->{$entry};
+        return $mac;
+    }
+    # Topology turned off, not supported.
+    return undef;
+}
+
+# Hubs do not support ifMIB requirements for get MAC
+# and port status
+
+sub i_index {
+    my $s3000 = shift;
+    my $partial = shift;
+
+    my $b_index = $s3000->s3000_pb_index($partial) || {};
+    my $p_index = $s3000->s3000_pp_index($partial) || {};
+
+    my %i_index;
+    foreach my $iid (keys %$b_index){
+        my $board = $b_index->{$iid};
+        next unless defined $board;
+        my $port = $p_index->{$iid}||0;
+
+        # We need to make up an index for multiple board instances.
+        my $index = ($board*256)+$port;
+
+        $i_index{$iid} = $index;
+    }
+    return \%i_index;
+}
+
+# Partials don't really help in this class, but implemented
+# for consistency
+
+sub interfaces {
+    my $s3000 = shift;
+    my $partial = shift;
+
+    my $i_index = $s3000->i_index() || {};
+
+    my %if;
+    foreach my $iid (keys %$i_index){
+        my $index = $i_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);
+
+        # Index numbers are deterministic slot * 256 + port - see i_index()
+        my $port = $index % 256;
+        my $slot = int($index / 256);
+
+        my $slotport = "$slot.$port";
+    
+        $if{$index} = $slotport;
+    }
+
+    return \%if;
+}
+
+sub i_duplex {
+    my $s3000 = shift;
+    my $partial = shift;
+
+    my $port_index  = $s3000->i_index() || {};
+
+    my %i_duplex;
+    foreach my $iid (keys %$port_index){
+        my $index = $port_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);
+
+        # Hubs only function half duplex
+        my $duplex = 'half';
+        $i_duplex{$index}=$duplex; 
+    }
+    return \%i_duplex;
+}
+
+sub i_duplex_admin {
+    my $s3000 = shift;
+    my $partial = shift;
+
+    my $port_index  = $s3000->i_index() || {};
+
+    my %i_duplex_admin;
+    foreach my $iid (keys %$port_index){
+        my $index = $port_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);
+
+        # Hubs only function half duplex    
+        my $duplex = 'half';
+        $i_duplex_admin{$index}=$duplex; 
+    }
+    return \%i_duplex_admin;
+}
+
+sub i_speed {
+    my $s3000 = shift;
+    my $partial = shift;
+
+    my $port_index  = $s3000->i_index() || {};
+
+    my %i_speed;
+    foreach my $iid (keys %$port_index){
+        my $index = $port_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);
+
+        # These hubs only support 10Mbs      
+        my $speed = '10000000';
+        $i_speed{$index}=$speed; 
+    }
+    return \%i_speed;
+}
+
+sub i_up {
+    my $s3000 = shift;
+    my $partial = shift;
+
+    my $port_index = $s3000->i_index() || {};
+    my $link_stat = $s3000->s3000_up() || {};
+   
+    my %i_up;
+    foreach my $iid (keys %$port_index){
+        my $index = $port_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);
+        my $link_stat = $link_stat->{$iid};
+        next unless defined $link_stat;
+        
+        $link_stat = 'up' if $link_stat =~ /on/i;
+        $link_stat = 'down' if $link_stat =~ /off/i;
+             
+        $i_up{$index}=$link_stat; 
+    }
+    return \%i_up;
+}
+
+sub i_up_admin {
+    my $s3000 = shift;
+    my $partial = shift;
+
+    my $i_index = $s3000->i_index() || {};
+    my $link_stat = $s3000->s3000_up_admin() || {};
+ 
+    my %i_up_admin;
+    foreach my $iid (keys %$i_index){
+        my $index = $i_index->{$iid};
+        next unless defined $index;
+        next if (defined $partial and $index !~ /^$partial$/);
+        my $link_stat = $link_stat->{$iid};
+        next unless defined $link_stat;
+ 
+        $i_up_admin{$index}=$link_stat; 
+    }
+    return \%i_up_admin;
+}
+
+sub set_i_up_admin {
+    # map setting to those the hub will understand
+    my %setting = qw/up 2 down 3/;
+
+    my $s3000 = shift;
+    my ($setting, $iid) = @_;
+
+    my $i_index  = $s3000->i_index() || {};
+    my %reverse_i_index = reverse %$i_index;
+
+    $setting = lc($setting);
+
+    return 0 unless defined $setting{$setting};
+
+    $iid = $reverse_i_index{$iid};
+
+    return $s3000->set_s3000_up_admin($setting{$setting}, $iid);
+}
+
+# Hubs do not support the standard Bridge MIB
+sub bp_index {
+    my $s3000 = shift;
+    my $partial = shift;
+
+    my $b_index = $s3000->s3000_nb_index() || {};
+    my $p_index = $s3000->s3000_np_index() || {};
+    my $model = $s3000->model();
+
+    my %bp_index;
+    foreach my $iid (keys %$b_index){
+        my $board = $b_index->{$iid};
+        next unless defined $board;
+        my $port = $p_index->{$iid}||0;
+                
+        my $index = ($board*256)+$port;
+        next if (defined $partial and $index !~ /^$partial$/);
+
+        $bp_index{$index} = $index;
+    }
+    return \%bp_index;
+}
+
+sub fw_port {
+    my $s3000 = shift;
+    my $partial = shift;
+
+    my $b_index = $s3000->s3000_nb_index($partial) || {};
+    my $p_index = $s3000->s3000_np_index($partial) || {};
+    my $model = $s3000->model();
+
+    my %fw_port;
+    foreach my $iid (keys %$b_index){
+        my $board = $b_index->{$iid};
+        next unless defined $board;
+        my $port = $p_index->{$iid}||0;
+
+        my $index = ($board*256)+$port;
+
+      $fw_port{$iid} = $index;
+    }
+    return \%fw_port;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer1::S3000 - SNMP Interface to Synoptics / Nortel Hubs
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+    #Let SNMP::Info determine the correct subclass for you.
+
+    my $s3000 = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+
+    or die "Can't connect to DestHost.\n";
+
+    my $class = $s3000->class();
+    print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from a 
+Bayhub device through SNMP.  Also provides device MAC to port mapping through the proprietary MIB.
+
+For speed or debugging purposes you can call the subclass directly, but not after determining
+a more specific class using the method above. 
+
+my $s3000 = new SNMP::Info::Layer1::S3000(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item SYNOPTICS-COMMON-MIB
+
+=item SYNOPTICS-ETHERNET-MIB
+
+=back
+
+=head2 Inherited MIBs
+
+See L<SNMP::Info::Layer2/"Required MIBs"> for its MIB requirements.
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $s3000->vendor()
+
+Returns 'nortel'
+
+=item $s3000->os()
+
+Returns 'synoptics'
+
+=item $s3000->model()
+
+Cross references $s3000->id() to the SYNOPTICS-MIB and returns
+the results.
+
+Removes sreg- from the model name and returns only the numeric model identifier.
+
+=item $stack->os_ver()
+
+Returns the software version specified as major.minor.maint.
+
+(B<s3AgentSwMajorVer>).(B<s3AgentSwMinorVer>).(B<s3AgentSwMaintVer>)
+
+=item $stack->os_bin()
+
+Returns the firmware version. (B<s3AgentFwVer>)
+
+=item $s3000->mac()
+
+Returns MAC of the advertised IP address of the device. 
+
+=back
+
+=head2 Overrides
+
+=over
+
+=item $s3000->layers()
+
+Returns 00000011.  Class emulates Layer 2 functionality through proprietary MIBs.
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer2
+
+See L<SNMP::Info::Layer2/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item $s3000->i_index()
+
+Returns reference to map of IIDs to Interface index. 
+
+Since hubs do not support ifIndex, the interface index is created using the
+formula (board * 256 + port).  This is required to support devices with more than one module.
+
+=item $s3000->interfaces()
+
+Returns reference to map of IIDs to physical ports. 
+
+=item $s3000->i_duplex()
+
+Returns half, hubs do not support full duplex. 
+
+=item $s3000->i_duplex_admin()
+
+Returns half, hubs do not support full duplex.
+
+=item $s3000->i_speed()
+
+Returns 10000000.  The hubs only support 10Mbs Ethernet.
+
+=item $s3000->i_up()
+
+Returns (B<s3EnetPortLinkStatus>) for each port.  Translates on/off to up/down.
+
+=item $s3000->i_up_admin()
+
+Returns (B<s3EnetPortPartStatus>) for each port.
+
+=item $s3000->set_i_up_admin(state, ifIndex)
+
+Sets port state, must be supplied with state and port ifIndex
+
+State choices are 'up'or 'down'
+
+Example:
+  my %if_map = reverse %{$s3000->interfaces()};
+  $s3000->set_i_up_admin('down', $if_map{'1.1'}) 
+      or die "Couldn't change port state. ",$s3000->error(1);
+
+=item $s3000->bp_index()
+
+Simulates bridge MIB by returning reference to a hash containing the index for
+both the keys and values.
+
+=item $s3000->fw_port()
+
+Returns reference to map of IIDs of the SYNOPTICS-ETHERNET-MIB::s3EnetShowNodesTable
+to the Interface index.
+
+=item $s3000->fw_mac()
+
+(B<s3EnetShowNodesMacAddress>)
+
+=item $s3000->s3000_topo_port()
+
+Returns reference to hash.  Key: Table entry, Value:Port Number (interface iid)
+
+(B<s3EnetTopNmmPort>)
+
+=item $s3000->s3000_topo_mac()
+
+(B<s3EnetTopNmmMacAddr>)
+
+Returns reference to hash.  Key: Table entry, Value:Remote MAC address
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer2
+
+See L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=cut

Info/Layer2.pm

@@ -1,5 +1,7 @@
 # SNMP::Info::Layer2 - SNMP Interface to Layer2 Devices 
-# Max Baker <max@warped.org>
+# Max Baker
+#
+# Copyright (c) 2004,2005 Max Baker -- All changes from Version 0.7 on
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
@@ -28,7 +30,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::Layer2;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 
 use strict;
@@ -36,49 +38,41 @@ use strict;
 use Exporter;
 use SNMP::Info;
 use SNMP::Info::Bridge;
-use SNMP::Info::CDP;
-use SNMP::Info::CiscoStats;
+use SNMP::Info::Entity;
+use SNMP::Info::PowerEthernet;
 
 use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE $INIT/;
 
-@SNMP::Info::Layer2::ISA = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::CDP SNMP::Info::CiscoStats Exporter/;
+@SNMP::Info::Layer2::ISA = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::Entity SNMP::Info::PowerEthernet Exporter/;
 @SNMP::Info::Layer2::EXPORT_OK = qw//;
 
-$DEBUG=0;
-$SNMP::debugging=$DEBUG;
-
-# See SNMP::Info for the details of these data structures and 
-#       the interworkings.
-$INIT = 0;
-
-%MIBS = ( %SNMP::Info::MIBS, 
-          %SNMP::Info::Bridge::MIBS,
-          %SNMP::Info::CDP::MIBS,
-          %SNMP::Info::CiscoStats::MIBS,
-          'CISCO-PRODUCTS-MIB' => 'sysName',
-          'CISCO-STACK-MIB'    => 'wsc1900sysID',
+%MIBS = (   %SNMP::Info::MIBS, 
+            %SNMP::Info::Bridge::MIBS,
+            %SNMP::Info::Entity::MIBS,
+            %SNMP::Info::PowerEthernet::MIBS,
         );
 
 %GLOBALS = (
             %SNMP::Info::GLOBALS,
             %SNMP::Info::Bridge::GLOBALS,
-            %SNMP::Info::CDP::GLOBALS,
-            %SNMP::Info::CiscoStats::GLOBALS,
+            %SNMP::Info::Entity::GLOBALS,
+            %SNMP::Info::PowerEthernet::GLOBALS,
+            'serial1'   => '.1.3.6.1.4.1.9.3.6.3.0', # OLD-CISCO-CHASSIS-MIB::chassisId.0
             );
 
 %FUNCS   = (
             %SNMP::Info::FUNCS,
             %SNMP::Info::Bridge::FUNCS,
-            %SNMP::Info::CDP::FUNCS,
-            %SNMP::Info::CiscoStats::FUNCS,
+            %SNMP::Info::Entity::FUNCS,
+            %SNMP::Info::PowerEthernet::FUNCS,
            );
 
 %MUNGE = (
             # Inherit all the built in munging
             %SNMP::Info::MUNGE,
             %SNMP::Info::Bridge::MUNGE,
-            %SNMP::Info::CDP::MUNGE,
-            %SNMP::Info::CiscoStats::MUNGE,
+            %SNMP::Info::Entity::MUNGE,
+            %SNMP::Info::PowerEthernet::MUNGE,
          );
 
 # Method OverRides
@@ -88,8 +82,8 @@ $INIT = 0;
 sub model {
     my $l2 = shift;
     my $id = $l2->id();
-    my $model = &SNMP::translateObj($id);
-    
+    my $model = &SNMP::translateObj($id) || $id || '';
+   
     # HP
     $model =~ s/^hpswitch//i;
 
@@ -106,7 +100,7 @@ sub vendor {
     my $model = $l2->model();
     my $descr = $l2->description();
 
-    if ($model =~ /hp/i or $descr =~ /hp/i) {
+    if ($model =~ /hp/i or $descr =~ /\bhp\b/i) {
         return 'hp';
     }
 
@@ -116,47 +110,56 @@ sub vendor {
 
 }
 
+sub serial {
+    my $l2 = shift;
+    
+    my $serial1   = $l2->serial1();
+    my $e_descr   = $l2->e_descr()  || {};
+    my $e_serial  = $l2->e_serial() || {};
+    
+    my $serial2   = $e_serial->{1}  || undef;
+    my $chassis   = $e_descr->{1}   || undef;
+
+    # precedence
+    #   serial2,chassis parse,serial1
+    return $serial2 if (defined $serial2 and $serial2 !~ /^\s*$/);
+    return $1 if (defined $chassis and $chassis =~ /serial#?:\s*([a-z0-9]+)/i);
+    return $serial1 if (defined $serial1 and $serial1 !~ /^\s*$/);
+
+    return undef;
+}
+
 sub i_ignore {
     my $l2 = shift;
+    my $partial = shift;
 
-    my $i_type = $l2->i_type();
+    my $i_type = $l2->i_type($partial) || {};
 
     my %i_ignore = ();
 
     foreach my $if (keys %$i_type){
         my $type = $i_type->{$if};
         $i_ignore{$if}++ 
-            if $type =~ /(loopback|propvirtual|other|cpu)/i;
+            if $type =~ /(loopback|other|cpu)/i;
     }
 
     return \%i_ignore;
 }    
 
-# By Default we'll use the description field
 sub interfaces {
     my $l2 = shift;
-    my $interfaces = $l2->i_index();
-    my $i_descr    = $l2->i_description(); 
-    my $i_name     = $l2->i_name();
+    my $partial = shift;
 
-    my %if;
-    foreach my $iid (keys %$interfaces){
+    my $interfaces = $l2->i_index($partial) || {};
+    my $i_descr    = $l2->i_description($partial) || {};
+
+    # Replace the Index with the ifDescr field.
+    foreach my $iid (keys %$i_descr){
         my $port = $i_descr->{$iid};
-        my $name = $i_name->{$iid};
-        $port = $name if (defined $name and $name !~ /^\s*$/);
         next unless defined $port;
-
-        # Cisco 1900 has a space in some of its port descr.
-        # get rid of any weird characters
-        $port =~ s/[^\d\/,()\w]+//gi;
-    
-        # Translate Cisco 2926,etc. from 1/5 to 1.5
-        $port =~ s/\//\./ if ($port =~ /^\d+\/\d+$/);
-
-        $if{$iid} = $port;
+        $interfaces->{$iid} = $port;
     }
-
-    return \%if
+    return $interfaces;
 }
 
 1;
@@ -164,11 +167,11 @@ __END__
 
 =head1 NAME
 
-SNMP::Info::Layer2 - Perl5 Interface to network devices serving Layer2 only.
+SNMP::Info::Layer2 - SNMP Interface to network devices serving Layer2 only.
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
@@ -199,14 +202,15 @@ Max Baker (C<max@warped.org>)
 
 =head1 DESCRIPTION
 
-This class is usually used as a superclass for more specific device classes listed under 
-SNMP::Info::Layer2::*   Please read all docs under SNMP::Info first.
+This class is usually used as a superclass for more specific device classes
+listed under SNMP::Info::Layer2::*   Please read all docs under SNMP::Info
+first.
 
 Provides abstraction to the configuration information obtainable from a 
 Layer2 device through SNMP.  Information is stored in a number of MIBs.
 
-For speed or debugging purposes you can call the subclass directly, but not after determining
-a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
 
  my $l2 = new SNMP::Info::Layer2(...);
 
@@ -218,9 +222,7 @@ a more specific class using the method above.
 
 =item SNMP::Info::Bridge
 
-=item SNMP::Info::CDP
-
-=item SNMP::Info::CiscoStats
+=item SNMP::Info::Entity
 
 =back
 
@@ -228,21 +230,13 @@ a more specific class using the method above.
 
 =over
 
-=item CISCO-PRODUCTS-MIB 
-
-Needed for ID of Cisco Products
-
-=item CISCO-STACK-MIB
-
-Needed for ID of Cisco Products
-
 =item Inherited Classes
 
 MIBs required by the inherited classes listed above.
 
 =back
 
-MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
+MIBs can be found in netdisco-mibs package.
 
 =head1 GLOBALS
 
@@ -269,19 +263,15 @@ Trys to discover the vendor from $l2->model() and $l2->description()
 
 =head2 Globals imported from SNMP::Info
 
-See documentation in SNMP::Info for details.
+See documentation in L<SNMP::Info/"GLOBALS"> for details.
 
 =head2 Globals imported from SNMP::Info::Bridge
 
-See documentation in SNMP::Info::Bridge for details.
+See documentation in L<SNMP::Info::Bridge/"GLOBALS"> for details.
 
-=head2 Globals imported from SNMP::Info::CDP
+=head2 Globals imported from SNMP::Info::Entity
 
-See documentation in SNMP::Info::CDP for details.
-
-=head2 Globals imported from SNMP::Info::CiscoStats
-
-See documentation in SNMP::Info::CiscoStats for details.
+See documentation in L<SNMP::Info::Entity/"GLOBALS"> for details.
 
 =head1 TABLE METHODS
 
@@ -308,18 +298,14 @@ Ignores ports with B<ifType> of loopback,propvirtual,other, and cpu
 
 =head2 Table Methods imported from SNMP::Info
 
-See documentation in SNMP::Info for details.
+See documentation in L<SNMP::Info/"TABLE METHODS"> for details.
 
 =head2 Table Methods imported from SNMP::Info::Bridge
 
-See documentation in SNMP::Info::Bridge for details.
+See documentation in L<SNMP::Info::Bridge/"TABLE METHODS"> for details.
 
-=head2 Table Methods imported from SNMP::Info::CDP
+=head2 Table Methods imported from SNMP::Info::Entity
 
-See documentation in SNMP::Info::CDP for details.
-
-=head2 Table Methods imported from SNMP::Info::CiscoStats
-
-See documentation in SNMP::Info::CiscoStats for details.
+See documentation in L<SNMP::Info::Entity/"TABLE METHODS"> for details.
 
 =cut

Info/Layer2/Airespace.pm

@@ -0,0 +1,211 @@
+# SNMP::Info::Layer2::Airespace
+# Eric Miller
+# $Id$
+#
+# Copyright (c) 2007 Eric Miller
+#
+# 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::Layer2::Airespace;
+$VERSION = '1.07';
+use strict;
+
+use Exporter;
+use SNMP::Info::Bridge;
+use SNMP::Info::CDP;
+use SNMP::Info::Airespace;
+
+@SNMP::Info::Layer2::Airespace::ISA = qw/SNMP::Info::Airespace SNMP::Info::CDP SNMP::Info::Bridge Exporter/;
+@SNMP::Info::Layer2::Airespace::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+
+%MIBS    = (
+            %SNMP::Info::MIBS,
+            %SNMP::Info::Bridge::MIBS,
+            %SNMP::Info::CDP::MIBS,
+            %SNMP::Info::Airespace::MIBS,
+            );
+
+%GLOBALS = (
+            %SNMP::Info::GLOBALS,
+            %SNMP::Info::Bridge::GLOBALS,
+            %SNMP::Info::CDP::GLOBALS,
+            %SNMP::Info::Airespace::GLOBALS,
+            );
+
+%FUNCS   = (
+            %SNMP::Info::FUNCS,
+            %SNMP::Info::Bridge::FUNCS,
+            %SNMP::Info::CDP::FUNCS,
+            %SNMP::Info::Airespace::FUNCS,
+            );
+
+%MUNGE   = (
+          %SNMP::Info::MUNGE,
+          %SNMP::Info::Bridge::MUNGE,
+          %SNMP::Info::CDP::MUNGE,
+          %SNMP::Info::Airespace::MUNGE,
+            );
+
+sub os {
+    return 'cisco';
+}
+
+sub vendor {
+    return 'cisco';
+}
+
+sub model {
+    my $airespace = shift;
+    my $model = $airespace->airespace_model();
+    return undef unless defined $model;
+
+    return $model;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Airespace - SNMP Interface to Cisco (Airespace) Wireless
+Controllers
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+    #Let SNMP::Info determine the correct subclass for you.
+
+    my $airespace = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+
+    or die "Can't connect to DestHost.\n";
+
+    my $class = $airespace->class();
+    print " Using device sub class : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from 
+Cisco (Airespace) Wireless Controllers through SNMP.
+
+For speed or debugging purposes you can call the subclass directly, but not after
+determining a more specific class using the method above. 
+
+my $airespace = new SNMP::Info::Layer2::Airespace(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Airespace
+
+=item SNMP::Info::CDP
+
+=item SNMP::Info::Bridge
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Airespace/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CDP/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::Bridge/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $airespace->vendor()
+
+Returns 'cisco'
+
+=item $airespace->os()
+
+Returns 'cisco'
+
+=item $airespace->model()
+
+(B<agentInventoryMachineModel>)
+
+=back
+
+=head2 Global Methods imported from SNMP::Info::Airespace
+
+See documentation in L<SNMP::Info::Airespace/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::CDP
+
+See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::Bridge
+
+See documentation in L<SNMP::Info::Bridge/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item None
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Airespace
+
+See documentation in L<SNMP::Info::Airespace/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CDP
+
+See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::Bridge
+
+See documentation in L<SNMP::Info::Bridge/"TABLE METHODS"> for details.
+
+=cut

Info/Layer2/Aironet.pm

@@ -1,5 +1,7 @@
 # SNMP::Info::Layer2::Aironet
-# Max Baker <max@warped.org>
+# Max Baker
+#
+# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2003 Regents of the University of California
 # All rights reserved.
@@ -28,7 +30,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::Layer2::Aironet;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 use strict;
 
@@ -36,35 +38,54 @@ use Exporter;
 use SNMP::Info::Layer2;
 use SNMP::Info::Entity;
 use SNMP::Info::EtherLike;
+use SNMP::Info::CiscoStats;
+use SNMP::Info::CiscoVTP;
+use SNMP::Info::CDP;
 
-@SNMP::Info::Layer2::Aironet::ISA = qw/SNMP::Info::Layer2 SNMP::Info::Entity SNMP::Info::EtherLike Exporter/;
+@SNMP::Info::Layer2::Aironet::ISA = qw/SNMP::Info::Layer2 SNMP::Info::Entity SNMP::Info::EtherLike 
+                                       SNMP::Info::CiscoStats SNMP::Info::CiscoVTP SNMP::Info::CDP Exporter/;
 @SNMP::Info::Layer2::Aironet::EXPORT_OK = qw//;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
 
-# Set for No CDP
 %GLOBALS = (
             %SNMP::Info::Layer2::GLOBALS,
             %SNMP::Info::Entity::GLOBALS,
             %SNMP::Info::EtherLike::GLOBALS,
+            %SNMP::Info::CiscoStats::GLOBALS,
+            %SNMP::Info::CiscoVTP::GLOBALS,
+            %SNMP::Info::CDP::GLOBALS,
             'serial' => 'entPhysicalSerialNum.1',
             'descr'  => 'sysDescr'
             );
 
 %FUNCS   = (%SNMP::Info::Layer2::FUNCS,
             %SNMP::Info::Entity::FUNCS,
-            %SNMP::Info::EtherLike::FUNCS
+            %SNMP::Info::EtherLike::FUNCS,
+            %SNMP::Info::CiscoStats::FUNCS,
+            %SNMP::Info::CiscoVTP::FUNCS,
+            %SNMP::Info::CDP::FUNCS,
+            'i_ssidlist' => 'cd11IfAuxSsid',
+            'i_ssidbcast' => 'cd11IfAuxSsidBroadcastSsid',
+            'i_80211channel' => 'cd11IfPhyDsssCurrentChannel',
             );
 
 %MIBS    = (
             %SNMP::Info::Layer2::MIBS,
             %SNMP::Info::Entity::MIBS,
-            %SNMP::Info::EtherLike::MIBS
+            %SNMP::Info::EtherLike::MIBS,
+            %SNMP::Info::CiscoStats::MIBS,
+            %SNMP::Info::CiscoVTP::MIBS,
+            %SNMP::Info::CDP::MIBS,
+            'CISCO-DOT11-IF-MIB' => 'cd11IfAuxSsid',
             );
 
 %MUNGE   = (%SNMP::Info::Layer2::MUNGE,
             %SNMP::Info::Entity::MUNGE,
-            %SNMP::Info::EtherLike::MUNGE
+            %SNMP::Info::EtherLike::MUNGE,
+            %SNMP::Info::CiscoStats::MUNGE,
+            %SNMP::Info::CiscoVTP::MUNGE,
+            %SNMP::Info::CDP::MUNGE,
             );
 
 
@@ -75,7 +96,9 @@ sub vendor {
 
 sub interfaces {
     my $aironet = shift;
-    my $i_description = $aironet->i_description();
+    my $partial = shift;
+
+    my $i_description = $aironet->i_description($partial);
 
     return $i_description;
 }
@@ -94,7 +117,9 @@ sub description {
 # Fetch duplex from EtherLike
 sub i_duplex {
     my $aironet = shift;
-    my $el_duplex = $aironet->el_duplex();
+    my $partial = shift;
+
+    my $el_duplex = $aironet->el_duplex($partial);
 
     my %i_duplex;
     foreach my $d (keys %$el_duplex){
@@ -116,7 +141,7 @@ SNMP::Info::Layer2::Aironet - SNMP Interface to Cisco Aironet devices running IO
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
@@ -167,6 +192,8 @@ my $aironet = new SNMP::Info::Layer2::Aironet(...);
 
 =item SNMP::Info::EtherLike
 
+=item SNMP::Info::CiscoVTP
+
 =back
 
 =head2 Required MIBs
@@ -197,17 +224,17 @@ Adds info from method e_descr() from SNMP::Info::Entity
 
 =head2 Globals imported from SNMP::Info::Layer2
 
-See documentation in SNMP::Info::Layer2 for details.
+See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
 
 =head2 Globals imported from SNMP::Info::Entity
 
-See documentation in SNMP::Info::Entity for details.
+See documentation in L<SNMP::Info::Entity/"GLOBALS"> for details.
 
 =head2 Globals imported from SNMP::Info::EtherLike
 
-See documentation in SNMP::Info::EtherLike for details.
+See documentation in L<SNMP::Info::EtherLike/"GLOBALS"> for details.
 
-=head1 TABLE ENTRIES
+=head1 TABLE METHODS
 
 =head2 Overrides
 
@@ -225,14 +252,14 @@ Crosses information from SNMP::Info::EtherLike to get duplex info for interfaces
 
 =head2 Table Methods imported from SNMP::Info::Layer2
 
-See documentation in SNMP::Info::Layer2 for details.
+See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
 
 =head2 Table Methods imported from SNMP::Info::Entity
 
-See documentation in SNMP::Info::Entity for details.
+See documentation in L<SNMP::Info::Entity/"TABLE METHODS"> for details.
 
 =head2 Table Methods imported from SNMP::Info::EtherLike
 
-See documentation in SNMP::Info::EtherLike for details.
+See documentation in L<SNMP::Info::EtherLike/"TABLE METHODS"> for details.
 
 =cut

Info/Layer2/Allied.pm

@@ -0,0 +1,242 @@
+# SNMP::Info::Layer2::Allied
+# Max Baker, Dmitry Sergienko <dmitry@trifle.net>
+#
+# Copyright (c) 2004 Max Baker
+# 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 Netdisco 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::Layer2::Allied;
+$VERSION = '1.07';
+# $Id$
+use strict;
+
+use Exporter;
+use SNMP::Info::Layer2;
+use SNMP::Info::Layer1;
+
+@SNMP::Info::Layer2::Allied::ISA = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Allied::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+
+%GLOBALS = (
+            %SNMP::Info::Layer2::GLOBALS
+           );
+
+%FUNCS   = (
+            %SNMP::Info::Layer2::FUNCS,
+            'ip_adresses'=> 'atNetAddress',
+            'ip_mac'     => 'atPhysAddress',
+           );
+
+%MIBS    = (
+            %SNMP::Info::Layer2::MIBS,
+            'AtiSwitch-MIB'    => 'atiswitchProductType',
+            'AtiStackInfo-MIB' => 'atiswitchEnhancedStacking',
+           );
+
+%MUNGE   = (
+            %SNMP::Info::Layer2::MUNGE,
+           );
+
+sub vendor {
+    return 'allied';
+}
+
+sub os {
+    return 'allied';
+}
+
+sub os_ver {
+    my $allied = shift;
+    my $descr = $allied->description();
+    
+    if ($descr =~ m/version (\d+\.\d+)/){
+        return $1;
+    }
+}
+
+sub model {
+    my $allied = shift;
+
+    my $desc = $allied->description();
+
+    if ($desc =~ /(AT-80\d{2}\S*)/){
+        return $1;
+    }
+    return undef;
+}
+
+sub root_ip {
+    my $allied = shift;
+    my $ip_hash = $allied->ip_addresses();
+    my $ip;
+    my $found_ip;
+    
+    foreach $ip (values %{$ip_hash}) {
+        my $found_ip = SNMP::Info::munge_ip($ip) if (defined $ip);
+        last; # this is only one IP address
+    }
+    return $found_ip;
+}
+
+sub mac{
+    my $allied = shift;
+    my $mac_hash = $allied->ip_mac();
+    my $mac;
+    my $found_mac;
+    
+    foreach $mac (values %{$mac_hash}) {
+        $found_mac = SNMP::Info::munge_mac($mac);
+        last; # this is only one MAC address
+    }
+    return $found_mac;
+}
+
+sub i_up {
+    my $allied = shift;
+    my $partial = shift;
+
+    my $i_up  = SNMP::Info::Layer1::i_up($allied, $partial);
+
+    foreach my $port (keys %$i_up){
+        my $up = $i_up->{$port};
+        $i_up->{$port} = 'down' if $up eq 'linktesterror';
+        $i_up->{$port} = 'up' if $up eq 'nolinktesterror';
+    }
+    
+    return $i_up;
+}
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Allied - SNMP Interface to Allied Telesyn switches
+
+=head1 AUTHOR
+
+Max Baker, Dmitry Sergienko <dmitry@trifle.net>
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $allied = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myhub',
+                          Community   => 'public',
+                          Version     => 1
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $allied->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from a 
+Allied device through SNMP. See inherited classes' documentation for 
+inherited methods.
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item AtiSwitch-MIB
+
+=item AtiStackInfo-MIB
+
+Download for your device from ftp://ftp.allied-telesyn.com/pub/switches/mibs/
+
+=back
+
+=head2 Inherited MIBs
+
+See L<SNMP::Info::Layer2/"Required MIBs"> for its MIB requirements.
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=head2 Overrides
+
+=over
+
+=item $allied->vendor()
+
+Returns 'allied' :)
+
+=item $allied->os()
+
+Returns 'allied' 
+
+=item $allied->os_ver()
+
+Culls Version from description()
+
+=item $allied->root_ip()
+
+Returns IP Address of Managed Device.
+
+(B<actualIpAddr>)
+
+=item $allied->model()
+
+Trys to cull out AT-nnnnX out of the description field.
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer2
+
+See L<SNMP::Info::Layer2/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+=head2 Overrides
+
+=over
+
+=item $allied->i_up()
+
+Returns reference to map of IIDs to link status.  Changes
+the values of ati_up() to 'up' and 'down'.
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer2
+
+See L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=cut

Info/Layer2/Aruba.pm

@@ -0,0 +1,548 @@
+# SNMP::Info::Layer2::Aruba
+# Eric Miller
+# $Id$
+#
+# Copyright (c) 2005 Eric Miller
+#
+# 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::Layer2::Aruba;
+$VERSION = '1.07';
+use strict;
+
+use Exporter;
+use SNMP::Info::Layer2;
+
+@SNMP::Info::Layer2::Aruba::ISA = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Aruba::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+
+%MIBS    = (
+            %SNMP::Info::Layer2::MIBS,           
+            'WLSX-SWITCH-MIB'  => 'wlsxHostname',
+            'WLSR-AP-MIB'      => 'wlsrHideSSID',
+            );
+
+%GLOBALS = (
+            %SNMP::Info::Layer2::GLOBALS,
+            );
+
+%FUNCS   = (
+            %SNMP::Info::Layer2::FUNCS,
+            # WLSX-SWITCH-MIB::wlsxSwitchAccessPointTable
+            # Table index leafs do not return information
+            # therefore unable to use apBSSID.  We extract
+            # the information from the IID instead.
+            'aruba_ap_name'      => 'apLocation',
+            'aruba_ap_ip'        => 'apIpAddress',
+            'aruba_ap_essid'     => 'apESSID',
+            'aruba_ap_ssidbcast' => 'wlsrHideSSID',
+            # WLSR-AP-MIB::wlsrConfigTable
+            'aruba_ap_channel'   => 'apCurrentChannel',
+            # WLSX-SWITCH-MIB::wlsxSwitchStationMgmtTable
+            # Table index leafs do not return information
+            # therefore unable to use staAccessPointBSSID
+            # or staPhyAddress.  We extract the information from
+            # the IID instead.
+            #'fw_port'             => 'staAccessPointBSSID',
+            #'fw_mac'              => 'staPhyAddress',
+            'fw_user'             => 'staUserName',
+            );
+
+%MUNGE   = (
+           %SNMP::Info::Layer2::MUNGE,
+            );
+
+sub layers {
+    return '00000011';
+}
+
+sub os {
+    return 'airos';
+}
+
+sub vendor {
+    return 'aruba';
+}
+
+sub os_ver {
+    my $aruba = shift;
+    my $descr = $aruba->description();
+    return undef unless defined $descr;
+
+    if ($descr =~ m/Version\s+(\d+\.\d+\.\d+\.\d+)/){
+        return $1;
+    }
+
+    return undef;
+}
+
+sub model {
+    my $aruba = shift;
+    my $id = $aruba->id();
+    return undef unless defined $id;
+    my $model = &SNMP::translateObj($id);
+    return $id unless defined $model;
+
+    return $model;
+}
+
+# Thin APs do not support ifMIB requirement
+
+sub i_index {
+    my $aruba = shift;
+    my $partial = shift;
+
+    my $i_index   = $aruba->orig_i_index($partial) || {};
+    my $ap_index  = $aruba->aruba_ap_name($partial) || {};
+    
+    my %if_index;
+    foreach my $iid (keys %$i_index){
+        my $index = $i_index->{$iid};
+        next unless defined $index;
+
+        $if_index{$iid} = $index;
+    }
+
+    # Get Attached APs as Interfaces
+    foreach my $ap_id (keys %$ap_index){
+        # Convert the 0.254.123.456 index entry to a MAC address.
+        my $mac = join(':',map {sprintf("%02x",$_)} split(/\./,$ap_id));
+
+        $if_index{$ap_id} = $mac;
+    }
+    return \%if_index;
+}
+
+sub interfaces {
+    my $aruba  = shift;
+    my $partial = shift;
+
+    my $i_index    = $aruba->i_index($partial) || {};
+    my $i_descr    = $aruba->i_description($partial) || {};
+
+    my %if;
+    foreach my $iid (keys %$i_index){
+        my $index = $i_index->{$iid};
+        next unless defined $index;
+
+        if ($index =~ /^\d+$/ ) {
+        # Replace the Index with the ifDescr field.
+          my $port = $i_descr->{$iid};
+          next unless defined $port;
+          $if{$iid} = $port;
+        }
+
+        elsif ($index =~ /(?:[0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/) {
+          $if{$index} = $index;
+        }           
+
+        else {
+            next;
+        }
+    }
+    return \%if;
+}
+
+sub i_name {
+    my $aruba  = shift;
+    my $partial = shift;
+
+    my $i_index    = $aruba->i_index($partial) || {};
+    my $i_name2    = $aruba->orig_i_name($partial) || {};
+    my $ap_name    = $aruba->aruba_ap_name($partial) || {};
+    
+    my %i_name;
+    foreach my $iid (keys %$i_index){
+        my $index = $i_index->{$iid};
+        next unless defined $index;
+
+        if ($index =~ /^\d+$/ ) {
+          my $name = $i_name2->{$iid};
+          next unless defined $name;
+          $i_name{$index} = $name;
+        }
+
+        elsif ($index =~ /(?:[0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/) {
+          my $name = $ap_name->{$iid};
+          next unless defined $name;
+          $i_name{$index} = $name;
+        }           
+        else {
+            next;
+        }
+    }
+  return \%i_name;
+}
+
+sub i_ssidlist {
+    my $aruba  = shift;
+    my $partial = shift;
+
+    my $i_index    = $aruba->i_index($partial) || {};
+    my $ap_ssid    = $aruba->aruba_ap_essid($partial) || {};
+    
+    my %i_ssid;
+    foreach my $iid (keys %$i_index){
+        my $index = $i_index->{$iid};
+        next unless defined $index;
+
+        if ($index =~ /(?:[0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/) {
+          my $ssid = $ap_ssid->{$iid};
+          next unless defined $ssid;
+          $i_ssid{$index} = $ssid;
+        }           
+        else {
+            next;
+        }
+    }
+  return \%i_ssid;
+}
+
+sub i_80211channel {
+    my $aruba  = shift;
+    my $partial = shift;
+
+    my $i_index  = $aruba->i_index($partial) || {};
+    my $ap_ch    = $aruba->aruba_ap_channel($partial) || {};
+    
+    my %i_ch;
+    foreach my $iid (keys %$i_index){
+        my $index = $i_index->{$iid};
+        next unless defined $index;
+
+        if ($index =~ /(?:[0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/) {
+          my $ch = $ap_ch->{$iid};
+          next unless defined $ch;
+          $i_ch{$index} = $ch;
+        }           
+        else {
+            next;
+        }
+    }
+  return \%i_ch;
+}
+
+sub i_ssidbcast {
+    my $aruba  = shift;
+    my $partial = shift;
+
+    my $i_index  = $aruba->i_index($partial) || {};
+    my $ap_bc    = $aruba->aruba_ap_ssidbcast($partial) || {};
+    
+    my %i_bc;
+    foreach my $iid (keys %$i_index){
+        my $index = $i_index->{$iid};
+        next unless defined $index;
+
+        if ($index =~ /(?:[0-9A-Fa-f]{2}:){5}[0-9A-Fa-f]{2}/) {
+          my $bc = $ap_bc->{$iid};
+          next unless defined $bc;
+          $bc = ($bc ? 0 : 1);
+          $i_bc{$index} = $bc;
+        }           
+        else {
+            next;
+        }
+    }
+  return \%i_bc;
+}
+
+
+# Wireless switches do not support the standard Bridge MIB
+sub bp_index {
+    my $aruba = shift;
+    my $partial = shift;
+
+    my $i_index   = $aruba->orig_i_index($partial) || {};
+    my $ap_index  = $aruba->aruba_ap_name($partial) || {};
+    
+    my %bp_index;
+    foreach my $iid (keys %$i_index){
+        my $index = $i_index->{$iid};
+        next unless defined $index;
+
+        $bp_index{$iid} = $index;
+    }
+
+    # Get Attached APs as Interfaces
+    foreach my $ap_id (keys %$ap_index){
+        # Convert the 0.254.123.456 index entry to a MAC address.
+        my $mac = join(':',map {sprintf("%02x",$_)} split(/\./,$ap_id));
+
+        $bp_index{$mac} = $mac;
+    }
+    return \%bp_index;
+}
+
+sub fw_port {
+    my $aruba = shift;
+    my $partial = shift;
+
+    my $fw_idx = $aruba->fw_user($partial) || {};
+
+    my %fw_port;
+    foreach my $iid (keys %$fw_idx){
+      if ($iid =~ /(\d+\.\d+\.\d+\.\d+\.\d+\.\d+).(\d+\.\d+\.\d+\.\d+\.\d+\.\d+)/) {
+        my $port = join(':',map {sprintf("%02x",$_)} split(/\./,$2));
+        $fw_port{$iid} = $port;
+      }
+      else {
+        next;
+      }
+    }
+    return \%fw_port;
+}
+
+sub fw_mac {
+    my $aruba = shift;
+    my $partial = shift;
+
+    my $fw_idx = $aruba->fw_user($partial) || {};
+
+    my %fw_mac;
+    foreach my $iid (keys %$fw_idx){
+      if ($iid =~ /(\d+\.\d+\.\d+\.\d+\.\d+\.\d+).(\d+\.\d+\.\d+\.\d+\.\d+\.\d+)/) {
+        my $mac = join(':',map {sprintf("%02x",$_)} split(/\./,$1));
+        $fw_mac{$iid} = $mac;
+      }
+      else {
+        next;
+      }
+    }
+    return \%fw_mac;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Aruba - SNMP Interface to Aruba wireless switches
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+    my $aruba = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+
+    or die "Can't connect to DestHost.\n";
+
+    my $class = $aruba->class();
+    print " Using device sub class : $class\n";
+
+=head1 DESCRIPTION
+
+SNMP::Info::Layer2::Aruba is a subclass of SNMP::Info that provides an interface
+to Aruba wireless switches.  The Aruba platform utilizes intelligent wireless
+switches which control thin access points.  The thin access points themselves
+are unable to be polled for end station information.
+
+This class emulates bridge functionality for the wireless switch. This enables
+end station MAC addresses collection and correlation to the thin access point
+the end station is using for communication.
+
+For speed or debugging purposes you can call the subclass directly, but not after
+determining a more specific class using the method above. 
+
+ my $aruba = new SNMP::Info::Layer2::Aruba(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item WLSX-SWITCH-MIB
+
+=item WLSR-AP-MIB
+
+=back
+
+=head2 Inherited MIBs
+
+See L<SNMP::Info::Layer2/"Required MIBs"> for its MIB requirements.
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $aruba->model()
+
+Returns model type.  Cross references $aruba->id() with product IDs in the 
+Aruba MIB.
+
+=item $aruba->vendor()
+
+Returns 'aruba'
+
+=item $aruba->os()
+
+Returns 'airos'
+
+=item $aruba->os_ver()
+
+Returns the software version extracted from B<sysDescr>
+
+=back
+
+=head2 Overrides
+
+=over
+
+=item $aruba->layers()
+
+Returns 00000011.  Class emulates Layer 2 functionality for Thin APs through
+proprietary MIBs.
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer2
+
+See L<SNMP::Info::Layer2/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item $aruba->i_index()
+
+Returns reference to map of IIDs to Interface index. 
+
+Extends 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.
+
+=item $aruba->i_name()
+
+Interface name.  Returns (B<ifName>) for Ethernet interfaces and (B<apLocation>)
+for thin AP interfaces.
+
+=item $aruba->bp_index()
+
+Simulates bridge MIB by returning reference to a hash containing the index for
+both the keys and values.
+
+=item $aruba->fw_port()
+
+(B<staAccessPointBSSID>) as extracted from the IID.
+
+=item $aruba->fw_mac()
+
+(B<staPhyAddress>) as extracted from the IID.
+
+=item $aruba->i_ssidlist()
+
+Returns reference to hash.  SSID's recognized by the radio interface.
+
+(B<apESSID>)
+
+=item $aruba->i_ssidbcast()
+
+Returns reference to hash.  Indicates whether the SSID is broadcast, true or false.
+
+(B<wlsrHideSSID>)
+
+=item $aruba->i_80211channel()
+
+Returns reference to hash.  Current operating frequency channel of the radio
+interface.
+
+(B<apCurrentChannel>)
+
+=back
+
+=head2 Aruba Switch AP Table  (B<wlsxSwitchAccessPointTable>)
+
+=over
+
+=item $aruba->aruba_ap_name()
+
+(B<apLocation>)
+
+=item $aruba->aruba_ap_ip()
+
+(B<apIpAddress>)
+
+=item $aruba->aruba_ap_essid()
+
+(B<apESSID>)
+
+=item $aruba->aruba_ap_ssidbcast()
+
+(B<wlsrHideSSID>)
+
+=back
+
+=head2 Aruba Switch Station Management Table (B<wlsxSwitchStationMgmtTable>)
+
+=over
+
+=item $aruba->fw_user()
+
+(B<staUserName>)
+
+=back
+
+=head2 Aruba Wireless AP Configuration Table (B<wlsrConfigTable>)
+
+=over
+
+=item $aruba->aruba_ap_channel()
+
+(B<apCurrentChannel>)
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer2
+
+See L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=cut

Info/Layer2/Bay.pm

@@ -1,5 +1,8 @@
 # SNMP::Info::Layer2::Bay
-# Max Baker <max@warped.org>
+# Max Baker 
+# This module depricated.  See Layer2::BayStack
+#
+# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
@@ -28,7 +31,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::Layer2::Bay;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 use strict;
 
@@ -196,7 +199,7 @@ sub c_ip {
     foreach my $entry (keys %$bay_topo_ip){
         my $port = $bay_topo_port->{$entry};
         next unless defined $port;
-        next if $port == 0;
+        next if ($port =~ /^[\d\.]+$/ and $port == 0);
         my $ip   = $bay_topo_ip->{$entry};
         push(@{$ip_port{$port}},$ip);
     }
@@ -247,7 +250,7 @@ sub c_platform {
 
     my %c_platform;
     foreach my $entry (keys %$bay_topo_platform){
-        my $port = $bay_topo_port->{$entry};
+        my $port = $bay_topo_port->{$entry} || 0;
         next if $port == 0;
 
         # For fake remotes (multiple IPs for a c_ip), use first found
@@ -261,7 +264,7 @@ sub c_platform {
     return \%c_platform;
 }
 
-
+1;
 __END__
 
 =head1 NAME
@@ -270,23 +273,11 @@ SNMP::Info::Layer2::Bay - SNMP Interface to old Bay Network BayStack Switches
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
- # Let SNMP::Info determine the correct subclass for you. 
- my $bay = new SNMP::Info(
-                          AutoSpecify => 1,
-                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
-                          DestHost    => 'myswitch',
-                          Community   => 'public',
-                          Version     => 2
-                        ) 
-    or die "Can't connect to DestHost.\n";
-
- my $class      = $bay->class();
- print "SNMP::Info determined this device to fall under subclass : $class\n";
+This module is Depricated.  Please use Layer2::BayStack instead.
 
 =head1 DESCRIPTION
 
@@ -316,7 +307,7 @@ a more specific class using the method above.
 
 =item Inherited classes
 
-MIBs required by SNMP::Info::Layer2 and its superclasses.
+MIBs required by L<SNMP::Info::Layer2/"Required MIBs"> and its superclasses.
 
 =back
 
@@ -363,9 +354,9 @@ Returns if the S5-ETH-MULTISEG-TOPOLOGY info is on for this device.
 
 =head2 Globals imported from SNMP::Info::Layer2
 
-See documentation in SNMP::Info::Layer2 for details.
+See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
 
-=head1 TABLE ENTRIES
+=head1 TABLE METHODS
 
 These are methods that return tables of information in the form of a reference
 to a hash.
@@ -478,6 +469,6 @@ Returns reference to hash.  Key: Table entry, Value:Boolean, if bay_topo_seg() i
 
 =head2 Table Methods imported from SNMP::Info::Layer2
 
-See documentation in SNMP::Info::Layer2 for details.
+See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
 
 =cut

Info/Layer2/Baystack.pm

@@ -0,0 +1,741 @@
+# SNMP::Info::Layer2::Baystack
+# Eric Miller
+#
+# Copyright (c) 2004-6 Max Baker changes from version 0.8 and beyond.
+# 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::Layer2::Baystack;
+$VERSION = '1.07';
+
+# $Id$
+use strict;
+
+use Exporter;
+use SNMP::Info::SONMP;
+use SNMP::Info::NortelStack;
+use SNMP::Info::RapidCity;
+use SNMP::Info::LLDP;
+use SNMP::Info::Layer3;
+
+@SNMP::Info::Layer2::Baystack::ISA = qw/SNMP::Info::SONMP SNMP::Info::NortelStack
+                                      SNMP::Info::RapidCity SNMP::Info::LLDP
+                                      SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer2::Baystack::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+
+%MIBS    = (
+            %SNMP::Info::Layer3::MIBS,
+            %SNMP::Info::LLDP::MIBS,
+            %SNMP::Info::RapidCity::MIBS,
+            %SNMP::Info::NortelStack::MIBS,
+            %SNMP::Info::SONMP::MIBS,
+           );
+
+%GLOBALS = ( 
+            %SNMP::Info::Layer3::GLOBALS,
+            %SNMP::Info::LLDP::GLOBALS,
+            %SNMP::Info::RapidCity::GLOBALS,
+            %SNMP::Info::NortelStack::GLOBALS,
+            %SNMP::Info::SONMP::GLOBALS,
+           );
+
+%FUNCS   = (
+            %SNMP::Info::Layer3::FUNCS,
+            %SNMP::Info::LLDP::FUNCS,
+            %SNMP::Info::RapidCity::FUNCS,
+            %SNMP::Info::NortelStack::FUNCS,
+            %SNMP::Info::SONMP::FUNCS,
+            );
+
+# 450's report full duplex as speed = 20mbps?!
+$SNMP::Info::SPEED_MAP{20_000_000} = '10 Mbps';
+$SNMP::Info::SPEED_MAP{200_000_000} = '100 Mbps';
+$SNMP::Info::SPEED_MAP{2_000_000_000} = '1.0 Gbps';
+
+%MUNGE   = (
+            %SNMP::Info::Layer3::MUNGE,
+            %SNMP::Info::LLDP::MUNGE,
+            %SNMP::Info::RapidCity::MUNGE,
+            %SNMP::Info::NortelStack::MUNGE,
+            %SNMP::Info::SONMP::MUNGE,
+            );
+
+sub os {
+    my $baystack = shift;
+    my $descr = $baystack->description();
+    my $model = $baystack->model();
+
+    if ((defined $model and $model =~ /(325|420|425|470|460|BPS|2500|3510|4524|4526|4548|4550|5510|5520|5530)/) and (defined $descr and $descr =~ m/SW:v[3-5]/i)) {
+       return 'boss';
+    }
+    if ((defined $descr and $descr =~ /Business Ethernet Switch.*SW:v/i)) {
+       return 'bes';
+    }
+    return 'baystack';
+}
+
+sub os_bin {
+    my $baystack = shift;
+    my $descr = $baystack->description();
+    return undef unless defined $descr;
+
+    # 303 / 304
+    if ($descr =~ m/Rev: \d+\.(\d+\.\d+\.\d+)-\d+\.\d+\.\d+\.\d+/){
+        return $1;
+    }
+
+    # 450
+    if ($descr =~ m/FW:V(\d+\.\d+)/){
+        return $1;
+    }
+
+    if ($descr =~ m/FW:(\d+\.\d+\.\d+\.\d+)/i){
+        return $1;
+    }
+    return undef;
+}
+
+sub vendor {
+    return 'nortel';
+}
+
+sub model {
+    my $baystack = shift;
+    my $id = $baystack->id();
+    return undef unless defined $id;
+    my $model = &SNMP::translateObj($id);
+    return $id unless defined $model;
+
+    my $descr = $baystack->description();
+
+    return '303' if (defined $descr and $descr =~ /\D303\D/);
+    return '304' if (defined $descr and $descr =~ /\D304\D/);
+    return 'BPS' if ($model =~ /BPS2000/i);
+    return $2 if ($model =~ /(ES|ERS|BayStack|EthernetRoutingSwitch|EthernetSwitch)-?(\d+)/);
+    
+    return $model;
+}
+
+sub interfaces {
+    my $baystack = shift;
+    my $partial = shift;
+
+    my $i_index = $baystack->i_index($partial) || {};
+    my $index_factor = $baystack->index_factor();
+    my $slot_offset = $baystack->slot_offset();
+    
+    my %if;
+    foreach my $iid (keys %$i_index){
+        my $index = $i_index->{$iid};
+        next unless defined $index;
+        # Ignore cascade ports
+        next if $index > 513;
+
+        my $port = ($index % $index_factor);
+        my $slot = (int($index / $index_factor)) + $slot_offset;
+
+        my $slotport = "$slot.$port";
+        $if{$iid} = $slotport;
+    }
+    return \%if;
+}
+
+sub i_mac { 
+    my $baystack = shift;
+    my $partial = shift;
+
+    my $i_mac = $baystack->orig_i_mac($partial) || {};
+
+    my %i_mac;
+    # Baystack 303's with a hw rev < 2.11.4.5 report the mac as all zeros
+    foreach my $iid (keys %$i_mac){
+        my $mac = $i_mac->{$iid};
+        next unless defined $mac;
+        next if $mac eq '00:00:00:00:00:00';
+        $i_mac{$iid}=$mac;
+    }
+    return \%i_mac;
+}
+
+sub i_name {
+    my $baystack = shift;
+    my $partial = shift;
+
+    my $i_index = $baystack->i_index($partial) || {};
+    my $i_alias = $baystack->i_alias($partial) || {};
+    my $i_name2  = $baystack->orig_i_name($partial) || {};
+
+    my %i_name;
+    foreach my $iid (keys %$i_name2){
+        my $name = $i_name2->{$iid};
+        my $alias = $i_alias->{$iid};
+        $i_name{$iid} = (defined $alias and $alias !~ /^\s*$/) ?
+                        $alias : 
+                        $name;
+    }
+
+    return \%i_name;
+}
+
+sub index_factor {
+    my $baystack   = shift;
+    my $model   = $baystack->model();
+    my $os      = $baystack->os();
+    my $op_mode = $baystack->ns_op_mode();
+    
+    $op_mode = 'pure' unless defined $op_mode;
+
+    my $index_factor = 32;
+    $index_factor = 64 if ((defined $model and $model =~ /(470)/) or ($os =~ m/(boss|bes)/) and ($op_mode eq 'pure'));
+    
+    return $index_factor;
+}
+
+#  Use SONMP and/or LLDP
+
+sub hasCDP {
+    my $baystack = shift;
+
+    return $baystack->hasLLDP() || $baystack->SUPER::hasCDP();
+}
+
+sub c_ip {
+    my $baystack = shift;
+    my $partial = shift;
+
+    my $cdp  = $baystack->SUPER::c_ip($partial) || {};
+    my $lldp = $baystack->lldp_ip($partial) || {};
+
+    my %c_ip;
+    foreach my $iid (keys %$cdp){
+        my $ip = $cdp->{$iid};
+        next unless defined $ip;
+
+        $c_ip{$iid} = $ip;
+    }
+
+    foreach my $iid (keys %$lldp){
+        my $ip = $lldp->{$iid};
+        next unless defined $ip;
+
+        $c_ip{$iid} = $ip;
+    }
+    return \%c_ip;
+}
+
+sub c_if {
+    my $baystack = shift;
+    my $partial = shift;
+
+    my $lldp = $baystack->lldp_if($partial) || {};;
+    my $cdp  = $baystack->SUPER::c_if($partial) || {};
+    
+    my %c_if;
+    foreach my $iid (keys %$cdp){
+        my $if = $cdp->{$iid};
+        next unless defined $if;
+
+        $c_if{$iid} = $if;
+    }
+
+    foreach my $iid (keys %$lldp){
+        my $if = $lldp->{$iid};
+        next unless defined $if;
+
+        $c_if{$iid} = $if;
+    }
+    return \%c_if;
+}
+
+sub c_port {
+    my $baystack = shift;
+    my $partial = shift;
+
+    my $lldp = $baystack->lldp_port($partial) || {};
+    my $cdp  = $baystack->SUPER::c_port($partial) || {};
+    
+    my %c_port;
+    foreach my $iid (keys %$cdp){
+        my $port = $cdp->{$iid};
+        next unless defined $port;
+
+        $c_port{$iid} = $port;
+    }
+
+    foreach my $iid (keys %$lldp){
+        my $port = $lldp->{$iid};
+        next unless defined $port;
+
+        $c_port{$iid} = $port;
+    }
+    return \%c_port;
+}
+
+sub c_id {
+    my $baystack = shift;
+    my $partial = shift;
+
+    my $lldp = $baystack->lldp_id($partial) || {};
+    my $cdp  = $baystack->SUPER::c_id($partial) || {};
+
+    my %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;
+    }
+    return \%c_id;
+}
+
+sub c_platform {
+    my $baystack = shift;
+    my $partial = shift;
+
+    my $lldp = $baystack->lldp_rem_sysdesc($partial) || {};
+    my $cdp  = $baystack->SUPER::c_platform($partial) || {};
+
+    my %c_platform;
+    foreach my $iid (keys %$cdp){
+        my $platform = $cdp->{$iid};
+        next unless defined $platform;
+
+        $c_platform{$iid} = $platform;
+    }
+
+    foreach my $iid (keys %$lldp){
+        my $platform = $lldp->{$iid};
+        next unless defined $platform;
+
+        $c_platform{$iid} = $platform;
+    }
+    return \%c_platform;
+}
+
+# Newer devices support ENTITY-MIB, use if available otherwise use proprietary
+# methods.
+
+sub e_index {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->SUPER::e_index($partial) || $stack->ns_e_index($partial);
+}
+
+sub e_class {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->SUPER::e_class($partial) || $stack->ns_e_class($partial);
+}
+
+sub e_descr {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->SUPER::e_descr($partial) || $stack->ns_e_descr($partial);
+}
+
+sub e_name {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->SUPER::e_name($partial) || $stack->ns_e_name($partial);
+}
+
+sub e_fwver {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->SUPER::e_fwver($partial) || $stack->ns_e_fwver($partial);
+}
+
+sub e_hwver {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->SUPER::e_hwver($partial) || $stack->ns_e_hwver($partial);
+}
+
+sub e_parent {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->SUPER::e_parent($partial) || $stack->ns_e_parent($partial);
+}
+
+sub e_pos {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->SUPER::e_pos($partial) || $stack->ns_e_pos($partial);
+}
+
+sub e_serial {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->SUPER::e_serial($partial) || $stack->ns_e_serial($partial);
+}
+
+sub e_swver {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->SUPER::e_swver($partial) || $stack->ns_e_swver($partial);
+}
+
+sub e_type {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->SUPER::e_type($partial) || $stack->ns_e_type($partial);
+}
+
+sub e_vendor {
+    my $stack   = shift;
+    my $partial = shift;
+
+    return $stack->SUPER::e_vendor($partial) || $stack->ns_e_vendor($partial);
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Baystack - SNMP Interface to Nortel Ethernet (Baystack) Switches
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you.
+ my $baystack = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+  or die "Can't connect to DestHost.\n";
+
+ my $class = $baystack->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from a Nortel 
+Ethernet Switch (Baystack) through SNMP. 
+
+For speed or debugging purposes you can call the subclass directly, but not after determining
+a more specific class using the method above. 
+
+my $baystack = new SNMP::Info::Layer2::Baystack(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::SONMP
+
+=item SNMP::Info::NortelStack
+
+=item SNMP::Info::RapidCity
+
+=item SNMP::Info::LLDP
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=back
+
+=head2 Inherited MIBs
+
+See L<SNMP::Info::SONMP/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::NortelStack/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::RapidCity/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::LLDP/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its MIB requirements.
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $baystack->vendor()
+
+Returns 'nortel'
+
+=item $baystack->model()
+
+Cross references $baystack->id() to the SYNOPTICS-MIB and returns
+the results.  303s and 304s have the same ID, so we have a hack
+to return depending on which it is.
+
+Returns BPS for Business Policy Switch
+
+For BayStack, EthernetRoutingSwitch, or EthernetSwitch extracts and returns
+the switch numeric designation.
+
+=item $baystack->os()
+
+Returns 'baystack' or 'boss' depending on software version.
+
+=item $baystack->os_bin()
+
+Returns the firmware version extracted from B<sysDescr>.
+
+=back
+
+=head2 Overrides
+
+=over
+
+=item  $baystack->index_factor()
+
+Required by SNMP::Info::SONMP.  Number representing the number of ports
+reserved per slot within the device MIB.
+
+Index factor on the Baystack switches are determined by the formula: Index
+Factor = 64 if (model = 470 or (os eq 'boss' and operating in pure mode))
+or else Index factor = 32.
+
+Returns either 32 or 64 based upon the formula.
+
+=back
+
+=head2 Global Methods imported from SNMP::Info::SONMP
+
+See L<SNMP::Info::SONMP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::NortelStack
+
+See L<SNMP::Info::NortelStack/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::RapidCity
+
+See L<SNMP::Info::RapidCity/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::Layer3
+
+See 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.
+
+=head2 Overrides
+
+=over
+
+=item $baystack->interfaces()
+
+Returns reference to the map between IID and physical Port.
+
+  Slot and port numbers on the Baystack switches are determined by the formula:
+  
+  port = (Interface index % Index factor)
+  slot = (int(Interface index / Index factor)) + Slot offset
+ 
+  The physical port name is returned as slot.port.
+
+=item $baystack->i_ignore()
+
+Returns reference to hash of IIDs to ignore.
+
+=item $baystack->i_mac()
+
+Returns the B<ifPhysAddress> table entries. 
+
+Removes all entries matching '00:00:00:00:00:00' -- Certain 
+revisions of Baystack firmware report all zeros for each port mac.
+
+=item $baystack->i_name()
+
+Crosses ifName with ifAlias and returns the human set port name if exists.
+
+=back
+
+=head2 ENTITY-MIB Information
+
+For older devices which do not support ENTITY-MIB, these methods emulate
+Physical Table methods using S5-CHASSIS-MIB.  See
+L<SNMP::Info::NortelStack/"TABLE METHODS"> for details on ns_e_* methods.
+
+=over
+
+=item $baystack->e_index() 
+
+If the device doesn't support B<entPhysicalDescr>, this will try ns_e_index().
+Note that this is based on B<entPhysicalDescr> due to implementation
+details of SNMP::Info::Entity::e_index().
+
+=item $baystack->e_class() 
+
+If the device doesn't support B<entPhysicalClass>, this will try ns_e_class().
+
+=item $baystack->e_descr() 
+
+If the device doesn't support B<entPhysicalDescr>, this will try ns_e_descr().
+
+=item $baystack->e_fwver() 
+
+If the device doesn't support B<entPhysicalFirmwareRev>, this will try
+ns_e_fwver().
+
+=item $baystack->e_hwver() 
+
+If the device doesn't support B<entPhysicalHardwareRev>, this will try
+ns_e_hwver().
+
+=item $baystack->e_parent() 
+
+If the device doesn't support B<entPhysicalContainedIn>, this will try
+ns_e_parent().
+
+=item $baystack->e_pos() 
+
+If the device doesn't support B<entPhysicalParentRelPos>, this will try
+ns_e_pos().
+
+=item $baystack->e_serial() 
+
+If the device doesn't support B<entPhysicalSerialNum>, this will try
+ns_e_serial().
+
+=item $baystack->e_swver() 
+
+If the device doesn't support B<entPhysicalSoftwareRev>, this will try
+ns_e_swver().
+
+=item $baystack->e_type() 
+
+If the device doesn't support B<entPhysicalVendorType>, this will try
+ns_e_type().
+
+=item $baystack->e_vendor() 
+
+If the device doesn't support B<entPhysicalMfgName>, this will try
+ns_e_vendor().
+
+=back
+
+=head2 Topology information
+
+Based upon the software version devices may support SynOptics Network
+Management Protocol (SONMP) and Link Layer Discovery Protocol (LLDP). These
+methods will query both and return the combination of all information. As a
+result, there may be identical topology information returned from the two
+protocols causing duplicate entries.  It is the calling program's
+responsibility to identify any duplicate entries and de-duplicate if necessary.
+
+=over
+
+=item $baystack->hasCDP()
+
+Returns true if the device is running either SONMP or LLDP.
+
+=item $baystack->c_if()
+
+Returns reference to hash.  Key: iid Value: local device port (interfaces)
+
+=item $baystack->c_ip()
+
+Returns reference to hash.  Key: iid Value: remote IPv4 address
+
+If multiple entries exist with the same local port, c_if(), with the same IPv4
+address, c_ip(), it may be a duplicate entry.
+
+If multiple entries exist with the same local port, c_if(), with different IPv4
+addresses, c_ip(), there is either a non-SONMP/LLDP device in between two or
+more devices or multiple devices which are not directly connected.  
+
+Use the data from the Layer2 Topology Table below to dig deeper.
+
+=item $baystack->c_port()
+
+Returns reference to hash. Key: iid Value: remote port (interfaces)
+
+=item $baystack->c_id()
+
+Returns reference to hash. Key: iid Value: string value used to identify the
+chassis component associated with the remote system.
+
+=item $baystack->c_platform()
+
+Returns reference to hash.  Key: iid Value: Remote Device Type
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::SONMP
+
+See L<SNMP::Info::SONMP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::NortelStack
+
+See L<SNMP::Info::NortelStack/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::RapidCity
+
+See L<SNMP::Info::RapidCity/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=cut

Info/Layer2/C1900.pm

@@ -1,77 +1,100 @@
 # SNMP::Info::Layer2::C1900
-# Max Baker <max@warped.org>
+# Max Baker
+#
+# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without 
+#
+# 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 
+#     * 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 
+# 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; 
+# (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 
+# 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::Layer2::C1900;
-$VERSION = 0.4;
+$VERSION = '1.07';
+
 # $Id$
 use strict;
 
 use Exporter;
+use SNMP::Info::CDP;
+use SNMP::Info::CiscoStats;
+use SNMP::Info::CiscoConfig;
 use SNMP::Info::Layer2;
 
-@SNMP::Info::Layer2::C1900::ISA = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::C1900::ISA = qw/SNMP::Info::CDP SNMP::Info::CiscoStats
+                                    SNMP::Info::CiscoConfig SNMP::Info::Layer2
+                                    Exporter/;
 @SNMP::Info::Layer2::C1900::EXPORT_OK = qw//;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
 
-# Set for No CDP
 %GLOBALS = (
-            %SNMP::Info::Layer2::GLOBALS,
-            'c1900_flash_status'    => 'upgradeFlashBankStatus',
-            );
+             %SNMP::Info::Layer2::GLOBALS,
+             %SNMP::Info::CiscoConfig::GLOBALS,
+             %SNMP::Info::CiscoStats::GLOBALS,
+             %SNMP::Info::CDP::GLOBALS,
+             'c1900_flash_status' => 'upgradeFlashBankStatus',
+           );
 
-%FUNCS   = (%SNMP::Info::Layer2::FUNCS,
-            'i_type2'              => 'ifType',
-            'i_name2'              => 'ifName',
-            # ESSWITCH-MIB
-            'c1900_p_index'        => 'swPortIndex',
-            'c1900_p_ifindex'      => 'swPortIfIndex',
-            'c1900_p_duplex'       => 'swPortDuplexStatus', 
-            'c1900_p_duplex_admin' => 'swPortFullDuplex', 
-            'c1900_p_name'         => 'swPortName', 
-            'c1900_p_up_admin'     => 'swPortAdminStatus', 
-            'c1900_p_type'         => 'swPortMediaCapability',
-            'c1900_p_media'        => 'swPortConnectorType',
-            );
+%FUNCS = (
+           %SNMP::Info::Layer2::FUNCS,
+           %SNMP::Info::CiscoConfig::FUNCS,
+           %SNMP::Info::CiscoStats::FUNCS,
+           %SNMP::Info::CDP::FUNCS,
+           # ESSWITCH-MIB
+           'c1900_p_index'        => 'swPortIndex',
+           'c1900_p_ifindex'      => 'swPortIfIndex',
+           'c1900_p_duplex'       => 'swPortDuplexStatus',
+           'c1900_p_duplex_admin' => 'swPortFullDuplex',
+           'c1900_p_name'         => 'swPortName',
+           'c1900_p_up_admin'     => 'swPortAdminStatus',
+           'c1900_p_type'         => 'swPortMediaCapability',
+           'c1900_p_media'        => 'swPortConnectorType',
+         );
 
-%MIBS    = (
-            %SNMP::Info::Layer2::MIBS,
-            # Also known as the ESSWITCH-MIB
-            'STAND-ALONE-ETHERNET-SWITCH-MIB' =>  'series2000'
-            );
+%MIBS = (
+          %SNMP::Info::Layer2::MIBS,
+          %SNMP::Info::CiscoConfig::MIBS,
+          %SNMP::Info::CiscoStats::MIBS,
+          %SNMP::Info::CDP::MIBS,
+          # Also known as the ESSWITCH-MIB
+          'STAND-ALONE-ETHERNET-SWITCH-MIB' => 'series2000'
+        );
 
-%MUNGE   = (%SNMP::Info::Layer2::MUNGE,
-            );
+%MUNGE = (
+           %SNMP::Info::Layer2::MUNGE,
+           %SNMP::Info::CiscoConfig::MUNGE,
+           %SNMP::Info::CiscoStats::MUNGE,
+           %SNMP::Info::CDP::MUNGE,
+         );
+
+sub bulkwalk_no         { 1; }
+sub cisco_comm_indexing { 1; }
 
 sub vendor {
     return 'cisco';
 }
+
 sub os {
     return 'catalyst';
 }
@@ -82,122 +105,162 @@ sub os_ver {
     # Check for superclass one
     my $os_ver = $c1900->SUPER::os_ver();
     return $os_ver if defined $os_ver;
-    
+
     my $c1900_flash_status = $c1900->c1900_flash_status();
     return undef unless defined $c1900_flash_status;
 
-    if ($c1900_flash_status =~ m/V(\d+\.\d+(\.\d+)?)/){
+    if ( $c1900_flash_status =~ m/V(\d+\.\d+(\.\d+)?)/ ) {
         return $1;
-    }  
+    }
     return undef;
 }
 
 sub interfaces {
-    my $c1900 = shift;
-    my $i_descr = $c1900->i_description();
+    my $c1900   = shift;
+    my $partial = shift;
 
-    foreach my $iid (keys %$i_descr){
+    my $i_descr = $c1900->i_description($partial) || {};
+
+    foreach my $iid ( keys %$i_descr ) {
         $i_descr->{$iid} =~ s/\s*$//;
     }
     return $i_descr;
 }
 
 sub i_duplex {
-    my $c1900 = shift;
-    
-    my $interfaces     = $c1900->interfaces();
-    my $c1900_p_index  = $c1900->c1900_p_index();
-    my $c1900_p_duplex = $c1900->c1900_p_duplex();
- 
+    my $c1900   = shift;
+    my $partial = shift;
 
-    my %reverse_1900 = reverse %$c1900_p_index;
+    my $c1900_p_duplex = $c1900->c1900_p_duplex($partial) || {};
 
     my %i_duplex;
-    foreach my $if (keys %$interfaces){
-        my $port_1900 = $reverse_1900{$if};
-        next unless defined $port_1900;
-        my $duplex = $c1900_p_duplex->{$port_1900};
-        next unless defined $duplex; 
-    
+    foreach my $if ( keys %$c1900_p_duplex ) {
+        my $duplex = $c1900_p_duplex->{$if};
+        next unless defined $duplex;
+
         $duplex = 'half' if $duplex =~ /half/i;
         $duplex = 'full' if $duplex =~ /full/i;
-        $i_duplex{$if}=$duplex; 
+        $i_duplex{$if} = $duplex;
     }
     return \%i_duplex;
 }
 
 sub i_duplex_admin {
-    my $c1900 = shift;
-    
-    my $interfaces     = $c1900->interfaces();
-    my $c1900_p_index  = $c1900->c1900_p_index();
-    my $c1900_p_admin  = $c1900->c1900_p_duplex_admin();
- 
+    my $c1900   = shift;
+    my $partial = shift;
 
-    my %reverse_1900 = reverse %$c1900_p_index;
+    my $c1900_p_admin = $c1900->c1900_p_duplex_admin($partial) || {};
 
     my %i_duplex_admin;
-    foreach my $if (keys %$interfaces){
-        my $port_1900 = $reverse_1900{$if};
-        next unless defined $port_1900;
-        my $duplex = $c1900_p_admin->{$port_1900};
-        next unless defined $duplex; 
-    
+    foreach my $if ( keys %$c1900_p_admin ) {
+        my $duplex = $c1900_p_admin->{$if};
+        next unless defined $duplex;
+
         $duplex = 'half' if $duplex =~ /disabled/i;
         $duplex = 'full' if $duplex =~ /flow control/i;
         $duplex = 'full' if $duplex =~ /enabled/i;
         $duplex = 'auto' if $duplex =~ /auto/i;
-        $i_duplex_admin{$if}=$duplex; 
+        $i_duplex_admin{$if} = $duplex;
     }
     return \%i_duplex_admin;
 }
 
-sub i_type {
-    my $c1900 = shift;
-
-    my $i_type        = $c1900->i_type2();
-    my $c1900_p_index = $c1900->c1900_p_index();
-    my $c1900_p_type  = $c1900->c1900_p_type();
-    my $c1900_p_media = $c1900->c1900_p_media();
-
-    foreach my $p_iid (keys %$c1900_p_index){
-        my $port  = $c1900_p_index->{$p_iid};
-        my $type  = $c1900_p_type->{$p_iid};
-        my $media = $c1900_p_media->{$p_iid};
-
-        next unless defined $port;
-        next unless defined $type;
-        next unless defined $media;
-
-        $i_type->{$port} = "$type $media";
-    }
-
-    return $i_type;
-}
-
 sub i_name {
-    my $c1900 = shift;
-    my $i_name = $c1900->i_name2();
-    my $c1900_p_name = $c1900->c1900_p_name();
-    
-    foreach my $port (keys %$c1900_p_name){
+    my $c1900   = shift;
+    my $partial = shift;
+
+    my $i_name       = $c1900->orig_i_name($partial)  || {};
+    my $c1900_p_name = $c1900->c1900_p_name($partial) || {};
+
+    foreach my $port ( keys %$c1900_p_name ) {
         my $name = $c1900_p_name->{$port};
         next unless defined $name;
         next unless $name !~ /^\s*$/;
         $i_name->{$port} = $name;
     }
-    
+
     return $i_name;
 }
+
+sub set_i_duplex_admin {
+    my $c1900 = shift;
+    my ( $duplex, $port ) = @_;
+
+    # map a textual duplex to an integer one the switch understands
+    my %duplexes = qw/full 1 half 2 auto 3/;
+
+    my $iid = $c1900->c1900_p_ifindex($port);
+
+    $duplex = lc($duplex);
+
+    return 0 unless defined $duplexes{$duplex};
+
+    return $c1900->set_c1900_p_duplex_admin( $duplexes{$duplex}, $iid );
+}
+
+sub i_vlan {
+    my $c1900 = shift;
+    my $partial = shift;    
+
+    # Overlap allows more than one VLAN per port.  Unable to determine default    
+    my $overlap = $c1900->bridgeGroupAllowMembershipOverlap() ||
+                  $c1900->vlanAllowMembershipOverlap() || 'disabled';
+    
+    if ($overlap eq 'enabled') {
+        return undef;
+    }
+
+    my $member_of = $c1900->bridgeGroupMemberPortOfBridgeGroup() ||
+                    $c1900->vlanMemberPortOfVlan();
+
+    my $i_pvid = {};
+    foreach my $idx (keys %$member_of) {
+        my @values = split(/\./, $idx);
+        my ($vlan, $port) = @values;
+        next unless $vlan;
+        next unless $port;
+        next if (defined $partial and $port !~ /^$partial$/);
+        my $value = $member_of->{$idx};
+        next if ($value eq 'false');
+        
+        $i_pvid->{$port} = $vlan;
+    }
+    return $i_pvid;
+}
+
+sub i_vlan_membership {
+    my $c1900 = shift;
+    my $partial = shift;
+
+    my $member_of = $c1900->bridgeGroupMemberPortOfBridgeGroup() ||
+                    $c1900->vlanMemberPortOfVlan();
+
+    my $i_vlan_membership = {};
+    foreach my $idx (keys %$member_of) {
+        my @values = split(/\./, $idx);
+        my ($vlan, $port) = @values;
+        next unless $vlan;
+        next unless $port;
+        next if (defined $partial and $port !~ /^$partial$/);
+        my $value = $member_of->{$idx};
+        next if ($value eq 'false');
+
+        push(@{$i_vlan_membership->{$port}}, $vlan);
+    }
+    return $i_vlan_membership;
+}
+
+1;
 __END__
 
 =head1 NAME
 
-SNMP::Info::Layer2::C1900 - Perl5 Interface to SNMP data from Cisco Catlyst 1900 Network Switches running CatOS
+SNMP::Info::Layer2::C1900 - SNMP Interface to data from Cisco Catlyst 1900
+Network Switches running CatOS
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
@@ -217,13 +280,13 @@ Max Baker (C<max@warped.org>)
 
 =head1 DESCRIPTION
 
-Provides abstraction to the configuration information obtainable from a Catalyst 1900 device through SNMP. 
-See SNMP::Info for full documentation
+Provides abstraction to the configuration information obtainable from a
+Catalyst 1900 device through SNMP.  See SNMP::Info for full documentation
 
 Note that most of these devices only talk SNMP version 1, but not all.
 
-For speed or debugging purposes you can call the subclass directly, but not after determining
-a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
 
  my $c1900 = new SNMP::Info::Layer2::C1900(...);
 
@@ -231,6 +294,12 @@ a more specific class using the method above.
 
 =over
 
+=item SNMP::Info::CDP
+
+=item SNMP::Info::CiscoStats
+
+=item SNMP::Info::CiscoConfig
+
 =item SNMP::Info::Layer2
 
 =back
@@ -245,12 +314,18 @@ ESSWITCH-MIB is included in the Version 1 MIBS from Cisco.
 
 They can be found at ftp://ftp.cisco.com/pub/mibs/v1/v1.tar.gz
 
-=item Inherited Classes' MIBs
-
-MIBs listed in SNMP::Info::Layer2
-
 =back
 
+=head2 Inherited MIBs
+
+See L<SNMP::Info::CDP/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::CiscoStats/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::CiscoConfig/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::Layer2/"Required MIBs"> for its MIB requirements.
+
 =head1 GLOBALS
 
 These are methods that return scalar value from SNMP
@@ -281,11 +356,36 @@ Returns 'cisco' :)
 
 =back
 
+=head2 Overrides
+
+=over
+
+=item $c1900->bulkwalk_no
+
+Return C<1>.  Bulkwalk is turned off for this class.
+
+=back
+
+=head2 Globals imported from SNMP::Info::CDP
+
+See L<SNMP::Info::CDP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoStats
+
+See L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoConfig
+
+See L<SNMP::Info::CiscoConfig/"GLOBALS"> for details.
+
 =head2 Globals imported from SNMP::Info::Layer2
 
-See documentation in SNMP::Info::Layer2 for details.
+See L<SNMP::Info::Layer2/"GLOBALS"> for details.
 
-=head1 TABLE ENTRIES
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
 
 =head2 Overrides
 
@@ -295,25 +395,34 @@ See documentation in SNMP::Info::Layer2 for details.
 
 Returns reference to map of IIDs to current link duplex
 
-Crosses $c1900->c1900_p_index() with $c1900->c1900_p_duplex;
-
 =item $c1900->i_duplex_admin()
 
 Returns reference to hash of IIDs to admin duplex setting
 
-Crosses $c1900->c1900_p_index() with $c1900->c1900_p_duplex_admin;
-
 =item $c1900->i_name()
 
-Crosses ifName with c1900_p_name() and returns the human set port name if exists.
+Crosses ifName with $c1900->c1900_p_name() and returns the human set port name
+if exists.
 
-=item $c1900->i_type()
+=item $c1900->i_vlan()
 
-Returns reference to hash of IID to port type
+Returns a mapping between the interface and the VLAN / bridge group if overlap
+is not enabled.
 
-Takes the default ifType and overrides it with 
+=item $c1900->i_vlan_membership()
 
-c1900_p_type() and c1900_p_media()  if they exist.
+Returns reference to hash of arrays: key = interface, value = array of VLAN /
+bridge group IDs.
+
+  Example:
+  my $interfaces = $c1900->interfaces();
+  my $vlans      = $c1900->i_vlan_membership();
+  
+  foreach my $iid (sort keys %$interfaces) {
+    my $port = $interfaces->{$iid};
+    my $vlan = join(',', sort(@{$vlans->{$iid}}));
+    print "Port: $port VLAN: $vlan\n";
+  }
 
 =back
 
@@ -331,42 +440,72 @@ B<swPortIfIndex>
 
 Gives Port Duplex Info
 
-B<swPortDuplexStatus>
+(B<swPortDuplexStatus>)
 
 =item $c1900->c1900_p_duplex_admin()
 
 Gives admin setting for Duplex Info
 
-B<swPortFullDuplex>
+(B<swPortFullDuplex>)
 
 =item $c1900->c1900_p_name()
 
 Gives human set name for port 
 
-B<swPortName>
+(B<swPortName>)
 
 =item $c1900->c1900_p_up_admin()
 
 Gives Admin status of port enabled.
 
-B<swPortAdminStatus>
+(B<swPortAdminStatus>)
 
 =item $c1900->c1900_p_type()
 
 Gives Type of port, ie. "general-ethernet"
 
-B<swPortMediaCapability>
+(B<swPortMediaCapability>)
 
 =item $c1900->c1900_p_media()
 
 Gives the media of the port , ie "fiber-sc"
 
-B<swPortConnectorType>
+(B<swPortConnectorType>)
 
 =back
 
+=head2 Table Methods imported from SNMP::Info::CDP
+
+See L<SNMP::Info::CDP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoStats
+
+See L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoConfig
+
+See L<SNMP::Info::CiscoConfig/"TABLE METHODS"> for details.
+
 =head2 Table Methods imported from SNMP::Info::Layer2
 
-See documentation in SNMP::Info::Layer2 for details.
+See L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=head1 SET METHODS
+
+These are methods that provide SNMP set functionality for overridden methods or
+provide a simpler interface to complex set operations.  See
+L<SNMP::Info/"SETTING DATA VIA SNMP"> for general information on set operations. 
+
+=over
+
+=item $c1900->set_i_duplex_admin(duplex, ifIndex)
+
+Sets port duplex, must be supplied with duplex and port ifIndex.  Speed choices
+are 'auto', 'half', 'full'.
+
+  Example:
+  my %if_map = reverse %{$c1900->interfaces()};
+  $c1900->set_i_duplex_admin('auto', $if_map{'1'}) 
+    or die "Couldn't change port duplex. ",$c1900->error(1);
 
 =cut

Info/Layer2/C2900.pm

@@ -1,5 +1,7 @@
 # SNMP::Info::Layer2::C2900
-# Max Baker <max@warped.org>
+# Max Baker
+#
+# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
@@ -28,50 +30,78 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::Layer2::C2900;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 use strict;
 
 use Exporter;
+use SNMP::Info::CiscoVTP;
+use SNMP::Info::CDP;
+use SNMP::Info::CiscoStats;
+use SNMP::Info::CiscoConfig;
 use SNMP::Info::Layer2;
 
-@SNMP::Info::Layer2::C2900::ISA = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::C2900::ISA = qw/SNMP::Info::CiscoVTP SNMP::Info::CDP
+                                    SNMP::Info::CiscoStats SNMP::Info::CiscoConfig
+                                    SNMP::Info::Layer2 Exporter/;
 @SNMP::Info::Layer2::C2900::EXPORT_OK = qw//;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
 
-# Set for No CDP
 %GLOBALS = (
-            %SNMP::Info::Layer2::GLOBALS
+            %SNMP::Info::Layer2::GLOBALS,
+            %SNMP::Info::CiscoConfig::GLOBALS,
+            %SNMP::Info::CiscoStats::GLOBALS,
+            %SNMP::Info::CDP::GLOBALS,
+            %SNMP::Info::CiscoVTP::GLOBALS,
             );
 
-%FUNCS   = (%SNMP::Info::Layer2::FUNCS,
+%FUNCS   = (
+            %SNMP::Info::Layer2::FUNCS,
+            %SNMP::Info::CiscoConfig::FUNCS,
+            %SNMP::Info::CiscoStats::FUNCS,
+            %SNMP::Info::CDP::FUNCS,
+            %SNMP::Info::CiscoVTP::FUNCS,
+            'i_name'               => 'ifAlias',
             # C2900PortEntry
-            'c2900_p_index' => 'c2900PortIfIndex',
-            'c2900_p_duplex'   => 'c2900PortDuplexStatus',
-            'c2900_p_duplex_admin'   => 'c2900PortDuplexState',
-            'c2900_p_speed_admin'   => 'c2900PortAdminSpeed',
-            );
+            'c2900_p_index'        => 'c2900PortIfIndex',
+            'c2900_p_duplex'       => 'c2900PortDuplexStatus',
+            'c2900_p_duplex_admin' => 'c2900PortDuplexState',
+            'c2900_p_speed_admin'  => 'c2900PortAdminSpeed',
+           );
 
 %MIBS    = (
             %SNMP::Info::Layer2::MIBS,
-            'CISCO-C2900-MIB' =>  'ciscoC2900MIB'
-            );
+            %SNMP::Info::CiscoConfig::MIBS,
+            %SNMP::Info::CiscoStats::MIBS,
+            %SNMP::Info::CDP::MIBS,
+            %SNMP::Info::CiscoVTP::MIBS,
+            'CISCO-C2900-MIB' => 'ciscoC2900MIB',
+           );
 
-%MUNGE   = (%SNMP::Info::Layer2::MUNGE,
-            );
+%MUNGE   = (
+            %SNMP::Info::Layer2::MUNGE,
+            %SNMP::Info::CiscoConfig::MUNGE,
+            %SNMP::Info::CiscoStats::MUNGE,
+            %SNMP::Info::CDP::MUNGE,
+            %SNMP::Info::CiscoVTP::MUNGE,
+           );
 
 sub vendor {
     return 'cisco';
 }
 
+sub cisco_comm_indexing {
+    1;
+}
+
 sub i_duplex {
     my $c2900 = shift;
+    my $partial = shift;
     
-    my $interfaces     = $c2900->interfaces();
+    my $interfaces     = $c2900->interfaces($partial);
     my $c2900_p_index  = $c2900->c2900_p_index();
     my $c2900_p_duplex = $c2900->c2900_p_duplex();
- 
 
     my %reverse_2900 = reverse %$c2900_p_index;
 
@@ -91,11 +121,11 @@ sub i_duplex {
 
 sub i_duplex_admin {
     my $c2900 = shift;
+    my $partial = shift;
     
-    my $interfaces     = $c2900->interfaces();
+    my $interfaces     = $c2900->interfaces($partial);
     my $c2900_p_index  = $c2900->c2900_p_index();
     my $c2900_p_admin = $c2900->c2900_p_duplex_admin();
- 
 
     my %reverse_2900 = reverse %$c2900_p_index;
 
@@ -114,11 +144,53 @@ sub i_duplex_admin {
     return \%i_duplex_admin;
 }
 
+sub set_i_speed_admin {
+    my $c2900 = shift;
+    my ($speed, $iid) = @_;
+    
+    # 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;
+
+    $speed = lc($speed);
+
+    return undef unless defined $speeds{$speed};
+
+    # account for weirdness of c2900 mib
+    $iid = $reverse_2900{$iid};
+
+    return $c2900->set_c2900_p_speed_admin($speeds{$speed}, $iid);
+}
+
+sub set_i_duplex_admin {
+    my $c2900 = shift;
+    my ($duplex, $iid) = @_;
+
+    # 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;
+
+    $duplex = lc($duplex);
+
+    return undef unless defined $duplexes{$duplex};
+
+    # account for weirdness of c2900 mib
+    $iid = $reverse_2900{$iid};
+
+    return $c2900->set_c2900_p_duplex_admin($duplexes{$duplex}, $iid);
+}
+
 # Use i_descritption for port key, cuz i_name can be manually entered.
 sub interfaces {
     my $c2900 = shift;
-    my $interfaces = $c2900->i_index();
-    my $i_descr    = $c2900->i_description(); 
+    my $partial = shift;
+
+    my $interfaces = $c2900->i_index($partial) || {};
+    my $i_descr    = $c2900->i_description($partial) || {}; 
 
     my %if;
     foreach my $iid (keys %$interfaces){
@@ -134,6 +206,7 @@ sub interfaces {
     return \%if
 }
 
+1;
 __END__
 
 =head1 NAME
@@ -142,22 +215,22 @@ SNMP::Info::Layer2::C2900 - SNMP Interface to Cisco Catalyst 2900 Switches runni
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
  # Let SNMP::Info determine the correct subclass for you. 
  my $c2900 = new SNMP::Info(
-                          AutoSpecify => 1,
-                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
-                          DestHost    => 'myswitch',
-                          Community   => 'public',
-                          Version     => 2
+                        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      = $c2900->class();
+ my $class = $c2900->class();
  print "SNMP::Info determined this device to fall under subclass : $class\n";
 
 =head1 DESCRIPTION
@@ -165,8 +238,8 @@ Max Baker (C<max@warped.org>)
 Provides abstraction to the configuration information obtainable from a 
 C2900 device through SNMP. 
 
-For speed or debugging purposes you can call the subclass directly, but not after determining
-a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
 
  my $c2900 = new SNMP::Info::Layer2::C2900(...);
 
@@ -174,6 +247,14 @@ a more specific class using the method above.
 
 =over
 
+=item SNMP::Info::CiscoVTP
+
+=item SNMP::Info::CDP
+
+=item SNMP::Info::CiscoStats
+
+=item SNMP::Info::CiscoConfig
+
 =item SNMP::Info::Layer2
 
 =back
@@ -188,6 +269,18 @@ Part of the v2 MIBs from Cisco.
 
 =back
 
+=head2 Inherited MIBs
+
+See L<SNMP::Info::CiscoVTP/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::CDP/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::CiscoStats/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::CiscoConfig/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::Layer2/"Required MIBs"> for its MIB requirements.
+
 =head1 GLOBALS
 
 These are methods that return scalar value from SNMP
@@ -198,15 +291,31 @@ These are methods that return scalar value from SNMP
 
 =item $c2900->vendor()
 
-    Returns 'cisco' :)
+Returns 'cisco' :)
 
 =back
 
+=head2 Globals imported from SNMP::Info::CiscoVTP
+
+See L<SNMP::Info::CiscoVTP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CDP
+
+See L<SNMP::Info::CDP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoStats
+
+See L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoConfig
+
+See L<SNMP::Info::CiscoConfig/"GLOBALS"> for details.
+
 =head2 Globals imported from SNMP::Info::Layer2
 
-See documentation in SNMP::Info::Layer2 for details.
+See L<SNMP::Info::Layer2/"GLOBALS"> for details.
 
-=head1 TABLE ENTRIES
+=head1 TABLE METHODS
 
 These are methods that return tables of information in the form of a reference
 to a hash.
@@ -217,28 +326,27 @@ to a hash.
 
 =item $c2900->interfaces()
 
-    Returns reference to the map between IID and physical Port.
+Returns reference to the map between IID and physical Port.
 
-    On the 2900 devices i_name isn't reliable, so we override to just the description.
+On the 2900 devices i_name isn't reliable, so we override to just the description.
 
-    Next all dots are changed for forward slashes so that the physical port name 
-    is the same as the broadcasted CDP port name. 
-        (Ethernet0.1 -> Ethernet0/1)
+Next all dots are changed for forward slashes so that the physical port name 
+is the same as the broadcasted CDP port name. 
+    (Ethernet0.1 -> Ethernet0/1)
 
-    Also, any weird characters are removed, as I saw a few pop up.
+Also, any weird characters are removed, as I saw a few pop up.
 
 =item $c2900->i_duplex()
 
-    Returns reference to map of IIDs to current link duplex
+Returns reference to map of IIDs to current link duplex
 
-    Crosses $c2900->c2900_p_index() with $c2900->c2900_p_duplex;
+Crosses $c2900->c2900_p_index() with $c2900->c2900_p_duplex()
 
 =item $c2900->i_duplex_admin()
 
-    Returns reference to hash of IIDs to admin duplex setting
-    
-    Crosses $c2900->c2900_p_index() with $c2900->c2900_p_duplex_admin;
-    
+Returns reference to hash of IIDs to admin duplex setting
+
+Crosses $c2900->c2900_p_index() with $c2900->c2900_p_duplex_admin()
 
 =back
 
@@ -248,33 +356,84 @@ to a hash.
 
 =item $c2900->c2900_p_index()
 
-    Maps the Switch Port Table to the IID
+Maps the Switch Port Table to the IID
 
-    B<c2900PortIfIndex>
+(B<c2900PortIfIndex>)
 
 =item $c2900->c2900_p_duplex()
 
-    Gives Port Duplex Info
+Gives Port Duplex Info
 
-    B<c2900PortDuplexStatus>
+(B<c2900PortDuplexStatus>)
 
 =item $c2900->c2900_p_duplex_admin()
 
-    Gives admin setting for Duplex Info
-
-    B<c2900PortDuplexState>
+Gives admin setting for Duplex Info
 
+(B<c2900PortDuplexState>)
 
 =item $c2900->c2900_p_speed_admin()
 
-    Gives Admin speed of port 
+Gives Admin speed of port 
 
-    B<c2900PortAdminSpeed>
+(B<c2900PortAdminSpeed>)
 
 =back
 
+=head2 Table Methods imported from SNMP::Info::CiscoVTP
+
+See L<SNMP::Info::CiscoVTP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CDP
+
+See L<SNMP::Info::CDP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoStats
+
+See L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoConfig
+
+See L<SNMP::Info::CiscoConfig/"TABLE METHODS"> for details.
+
 =head2 Table Methods imported from SNMP::Info::Layer2
 
-See documentation in SNMP::Info::Layer2 for details.
+See L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=head1 SET METHODS
+
+These are methods that provide SNMP set functionality for overridden methods or
+provide a simpler interface to complex set operations.  See
+L<SNMP::Info/"SETTING DATA VIA SNMP"> for general information on set operations. 
+
+=over
+
+=item $c2900->set_i_speed_admin(speed, ifIndex)
+
+Sets port speed, must be supplied with speed and port ifIndex
+
+Speed choices are 'auto', '10', '100'
+
+Crosses $c2900->c2900_p_index() with $c2900->c2900_p_speed_admin() to utilize
+port ifIndex.
+
+    Example:
+    my %if_map = reverse %{$c2900->interfaces()};
+    $c2900->set_i_speed_admin('auto', $if_map{'FastEthernet0/1'}) 
+        or die "Couldn't change port speed. ",$c2900->error(1);
+
+=item $c2900->set_i_duplex_admin(duplex, ifIndex)
+
+Sets port duplex, must be supplied with duplex and port ifIndex
+
+Speed choices are 'auto', 'half', 'full'
+
+Crosses $c2900->c2900_p_index() with $c2900->c2900_p_duplex_admin() to utilize
+port ifIndex.
+
+    Example:
+    my %if_map = reverse %{$c2900->interfaces()};
+    $c2900->set_i_duplex_admin('auto', $if_map{'FastEthernet0/1'}) 
+        or die "Couldn't change port duplex. ",$c2900->error(1);
 
 =cut

Info/Layer2/Catalyst.pm

@@ -1,7 +1,8 @@
 # SNMP::Info::Layer2::Catalyst
-# Max Baker <max@warped.org>
+# Max Baker
 #
 # Copyright (c) 2002,2003 Regents of the University of California
+# Copyright (c) 2003,2004 Max Baker changes from version 0.8 and beyond
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without 
@@ -28,100 +29,61 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::Layer2::Catalyst;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 
 use strict;
 
 use Exporter;
+use SNMP::Info::CiscoStack;
+use SNMP::Info::CiscoVTP;
+use SNMP::Info::CDP;
+use SNMP::Info::CiscoStats;
+use SNMP::Info::CiscoPortSecurity;
 use SNMP::Info::Layer2;
 
-use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE $INIT/ ;
-@SNMP::Info::Layer2::Catalyst::ISA = qw/SNMP::Info::Layer2 Exporter/;
+use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
+@SNMP::Info::Layer2::Catalyst::ISA = qw/SNMP::Info::CiscoStack SNMP::Info::CiscoVTP 
+                                        SNMP::Info::CDP SNMP::Info::CiscoStats
+                                        SNMP::Info::CiscoPortSecurity
+                                        SNMP::Info::Layer2 Exporter/;
 @SNMP::Info::Layer2::Catalyst::EXPORT_OK = qw//;
 
-$DEBUG=0;
-
-# See SNMP::Info for the details of these data structures and 
-#       the interworkings.
-$INIT = 0;
-
-%MIBS =    ( %SNMP::Info::Layer2::MIBS, 
-             'CISCO-STACK-MIB' => 'moduleType',
-             'CISCO-VTP-MIB'   => 'vtpVlanIndex'
-           );
+%MIBS =    (
+            %SNMP::Info::Layer2::MIBS,
+            %SNMP::Info::CiscoPortSecurity::MIBS,
+            %SNMP::Info::CiscoStats::MIBS,
+            %SNMP::Info::CDP::MIBS,
+            %SNMP::Info::CiscoVTP::MIBS,
+            %SNMP::Info::CiscoStack::MIBS,
+            );
 
 %GLOBALS = (
             %SNMP::Info::Layer2::GLOBALS,
-            # these are in CISCO-STACK-MIB
-            'sysip'       => 'sysIpAddr',    
-            'netmask'     => 'sysNetMask',    
-            'broadcast'   => 'sysBroadcast',
-            'serial'      => 'chassisSerialNumber',    
-            'model'       => 'chassisModel',    
-            'ps1_type'    => 'chassisPs1Type',    
-            'ps1_status'  => 'chassisPs1Status',    
-            'ps2_type'    => 'chassisPs2Type',    
-            'ps2_status'  => 'chassisPs2Status',    
-            'slots'       => 'chassisNumSlots',    
-            'fan'         => 'chassisFanStatus',
-           );
+            %SNMP::Info::CiscoPortSecurity::GLOBALS,
+            %SNMP::Info::CiscoStats::GLOBALS,
+            %SNMP::Info::CDP::GLOBALS,
+            %SNMP::Info::CiscoVTP::GLOBALS,
+            %SNMP::Info::CiscoStack::GLOBALS,
+            );
 
 %FUNCS =   (
             %SNMP::Info::Layer2::FUNCS,
-            'i_type2'        => 'ifType',
-            # CISCO-STACK-MIB::moduleEntry
-            #   These are blades in a catalyst device
-            'm_type'         => 'moduleType',
-            'm_model'        => 'moduleModel',
-            'm_serial'       => 'moduleSerialNumber',
-            'm_status'       => 'moduleStatus',
-            'm_name'         => 'moduleName',
-            'm_ports'        => 'moduleNumPorts',
-            'm_ports_status' => 'modulePortStatus',
-            'm_hwver'        => 'moduleHwVersion',
-            'm_fwver'        => 'moduleFwVersion',
-            'm_swver'        => 'moduleSwVersion',
-            # Router Blades :
-            'm_ip'           => 'moduleIPAddress',
-            'm_sub1'         => 'moduleSubType',
-            'm_sub2'         => 'moduleSubType2',
-            # CISCO-STACK-MIB::portEntry 
-            'p_name'    => 'portName',
-            'p_type'    => 'portType',
-            'p_status'  => 'portOperStatus',
-            'p_status2' => 'portAdditionalStatus',
-            'p_speed'   => 'portAdminSpeed',
-            'p_duplex'  => 'portDuplex',
-            'p_port'    => 'portIfIndex',
-            # CISCO-STACK-MIB::PortCpbEntry
-            'p_speed_admin'  => 'portCpbSpeed',
-            'p_duplex_admin' => 'portCpbDuplex',
-            # CISCO-VTP-MIB::VtpVlanEntry 
-            'v_state'   => 'vtpVlanState',
-            'v_type'    => 'vtpVlanType',
-            'v_name'    => 'vtpVlanName',
-            'v_mtu'     => 'vtpVlanMtu',
+            %SNMP::Info::CiscoPortSecurity::FUNCS,
+            %SNMP::Info::CiscoStats::FUNCS,
+            %SNMP::Info::CDP::FUNCS,
+            %SNMP::Info::CiscoVTP::FUNCS,
+            %SNMP::Info::CiscoStack::FUNCS,
            );
 
 %MUNGE =   (
             %SNMP::Info::Layer2::MUNGE,
-            'm_ports_status' => \&munge_port_status,
-            'p_duplex_admin' => \&SNMP::Info::munge_bits,
-           );
-
-%PORTSTAT = (1 => 'other',
-             2 => 'ok',
-             3 => 'minorFault',
-             4 => 'majorFault');
-
-# Changes binary byte describing each port into ascii, and returns
-# an ascii list separated by spaces.
-sub munge_port_status {
-    my $status = shift;
-    my @vals = map($PORTSTAT{$_},unpack('C*',$status));
-    return join(' ',@vals);
-}
+            %SNMP::Info::CiscoPortSecurity::MUNGE,
+            %SNMP::Info::CiscoStats::MUNGE,
+            %SNMP::Info::CDP::MUNGE,
+            %SNMP::Info::CiscoVTP::MUNGE,
+            %SNMP::Info::CiscoStack::MUNGE,
+            );
 
 # Overidden Methods
 
@@ -139,98 +101,6 @@ sub i_physical {
     return \%i_physical;
 }
 
-sub i_type {
-    my $cat = shift;
-
-    my $p_port = $cat->p_port();
-    my $p_type  = $cat->p_type();
-
-    # Get more generic port types from IF-MIB
-    my $i_type  = $cat->i_type2();
-
-    # Now Override w/ port entries
-    foreach my $port (keys %$p_type) {
-        my $iid = $p_port->{$port};
-        $i_type->{$iid} = $p_type->{$port};  
-    }
-
-    return $i_type;
-}
-
-# p_* functions are indexed to physical port.  let's index these
-#   to snmp iid
-sub i_name {
-    my $cat = shift;
-
-    my $p_port = $cat->p_port();
-    my $p_name  = $cat->p_name();
-
-    my %i_name;
-    foreach my $port (keys %$p_name) {
-        my $iid = $p_port->{$port};
-        next unless defined $iid;
-        $i_name{$iid} = $p_name->{$port};
-    }
-    return \%i_name; 
-}
-
-sub i_duplex {
-    my $cat = shift;
-
-    my $p_port = $cat->p_port();
-    my $p_duplex  = $cat->p_duplex();
-
-    my %i_duplex;
-    foreach my $port (keys %$p_duplex) {
-        my $iid = $p_port->{$port};
-        $i_duplex{$iid} = $p_duplex->{$port};
-    }
-    return \%i_duplex; 
-}
-
-sub i_duplex_admin {
-    my $cat = shift;
-
-    my $p_port          = $cat->p_port();
-    my $p_duplex_admin  = $cat->p_duplex_admin();
-
-    my %i_duplex_admin;
-    foreach my $port (keys %$p_duplex_admin) {
-        my $iid = $p_port->{$port};
-        next unless defined $iid;
-        my $duplex = $p_duplex_admin->{$port};
-        next unless defined $duplex;
-
-        my $string = 'other';
-        # see CISCO-STACK-MIB for a description of the bits
-        $string = 'half' if ($duplex =~ /001$/ or $duplex =~ /0100.$/);
-        $string = 'full' if ($duplex =~ /010$/ or $duplex =~ /100.0$/);
-        # we'll call it auto if both full and half are turned on, or if the
-        #   specifically 'auto' flag bit is set.
-        $string = 'auto' 
-            if ($duplex =~ /1..$/ or $duplex =~ /110..$/ or $duplex =~ /..011$/);
-       
-        $i_duplex_admin{$iid} = $string;
-    }
-    return \%i_duplex_admin; 
-}
-
-# $cat->interfaces() - Maps the ifIndex table to a physical port
-sub interfaces {
-    my $self = shift;
-    my $interfaces = $self->i_index();
-    my $portnames  = $self->p_port();
-    my %portmap = reverse %$portnames;
-
-    my %interfaces = ();
-    foreach my $iid (keys %$interfaces) {
-        my $if = $interfaces->{$iid};
-        $interfaces{$if} = $portmap{$iid};
-    }
-
-    return \%interfaces;
-}
-
 sub vendor {
     return 'cisco';
 }
@@ -252,16 +122,73 @@ sub os_ver {
     return undef;
 }
 
+# Workaround for incomplete bp_index
+sub bp_index {
+    my $cat = shift;
+    my $p_index = $cat->p_port();
+    my $b_index = $cat->p_oidx();
+
+    my %bp_index;
+    foreach my $iid (keys %$p_index){
+        my $ifidx = $p_index->{$iid};
+        next unless defined $ifidx;
+        my $bpidx = $b_index->{$iid}||0;
+
+        $bp_index{$bpidx} = $ifidx;
+    }
+    return \%bp_index;
+}
+
+sub cisco_comm_indexing {
+    1;
+}
+
+sub interfaces {
+    my $cat = shift;
+    my $partial = shift;
+
+    my $i_index    = $cat->i_index($partial);
+    my $portnames  = $cat->p_port() || {};
+    my %portmap    = reverse %$portnames;
+
+    my %interfaces = ();
+    foreach my $iid (keys %$i_index) {
+        next unless defined $iid;
+        my $if   = $i_index->{$iid};
+        my $port = $portmap{$iid};
+        $interfaces{$iid} = $port || $if;
+    }
+    return \%interfaces;
+}
+
+sub i_name {
+    my $cat = shift; 	 
+    my $partial = shift;
+
+    my $p_port = $cat->p_port() || {};
+    my $p_name = $cat->p_name() || {};
+
+    my %i_name;
+    foreach my $port (keys %$p_name) {
+        my $iid = $p_port->{$port};
+        next unless defined $iid;
+        next if (defined $partial and $iid !~ /^$partial$/);
+        $i_name{$iid} = $p_name->{$port};
+    }
+    return \%i_name; 
+}
+
 1;
 __END__
 
 =head1 NAME
 
-SNMP::Info::Layer2::Catalyst - Perl5 Interface to Cisco devices running Catalyst OS 
+SNMP::Info::Layer2::Catalyst - SNMP Interface to Cisco Catalyst devices
+running Catalyst OS.
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
@@ -281,18 +208,24 @@ Max Baker (C<max@warped.org>)
 
 =head1 DESCRIPTION
 
-SNMP::Info subclass to provide information for Cisco Catalyst switches running CatOS.
+SNMP::Info subclass to provide information for Cisco Catalyst series switches
+running CatOS.
 
-This subclass is not for all devices that have the name Catalyst.  Note that some Catalyst
-switches run IOS, like the 2900 and 3550 families.  Cisco Catalyst 1900 switches use their
-own MIB and have a separate subclass.  Use the method above to have SNMP::Info determine the
-appropriate subclass before using this class directly.
+This class includes the Catalyst 2920, 4000, 5000, 6000 (hybrid mode) families.
 
-Note:  Some older Catalyst switches will only talk SNMP version 1.  Some newer ones will not
-return all their data if connected via Version 1.
+This subclass is not for all devices that have the name Catalyst.  Note that
+some Catalyst switches run IOS, like the 2900 and 3550 families.  Cisco
+Catalyst 1900 switches use their own MIB and have a separate subclass.  Use
+the method above to have SNMP::Info determine the appropriate subclass before
+using this class directly.
 
-For speed or debugging purposes you can call the subclass directly, but not after determining
-a more specific class using the method above. 
+See SNMP::Info::device_type() for specifics.
+
+Note:  Some older Catalyst switches will only talk SNMP version 1.  Some
+newer ones will not return all their data if connected via Version 1.
+
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
 
  my $cat = new SNMP::Info::Layer2::Catalyst(...);
 
@@ -300,6 +233,16 @@ a more specific class using the method above.
 
 =over
 
+=item SNMP::Info::CiscoStack
+
+=item SNMP::Info::CiscoVTP
+
+=item SNMP::Info::CDP
+
+=item SNMP::Info::CiscoStats
+
+=item SNMP::Info::CiscoPortSecurity
+
 =item SNMP::Info::Layer2
 
 =back
@@ -308,13 +251,19 @@ a more specific class using the method above.
 
 =over
 
-=item CISCO-STACK-MIB
-
-=item CISCO-VTP-MIB
-
 =item Inherited Classes' MIBs
 
-See SNMP::Info::Layer2 for its own MIB requirements.
+See L<SNMP::Info::CiscoStack/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoVTP/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CDP/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoStats/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoPortSecurity/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::Layer2/"Required MIBs"> for its own MIB requirements.
 
 =back
 
@@ -326,22 +275,6 @@ These are methods that return scalar value from SNMP
 
 =over
 
-=item $cat->broadcast()
-
-(B<sysBroadcast>)
-
-=item $cat->fan()
-
-(B<chassisFanStatus>)
-
-=item $cat->model()
-
-(B<chassisModel>)
-
-=item $cat->netmask()
-
-(B<sysNetMask>)
-
 =item $cat->os()
 
 Returns 'catalyst'
@@ -351,41 +284,37 @@ Returns 'catalyst'
 Tries to use the value from SNMP::Info::CiscoStats->os_ver() and if it fails 
 it grabs $cat->m_swver()->{1} and uses that.
 
-=item $cat->ps1_type()
-
-(B<chassisPs1Type>)
-
-=item $cat->ps2_type()
-
-(B<chassisPs2Type>)
-
-=item $cat->ps1_status()
-
-(B<chassisPs1Status>)
-
-=item $cat->ps2_status()
-
-(B<chassisPs2Status>)
-
-=item $cat->serial()
-
-(B<chassisSerialNumberString>)
-
-=item $cat->slots()
-
-(B<chassisNumSlots>)
-
 =item $cat->vendor()
 
 Returns 'cisco'
 
 =back
 
+=head2 Global Methods imported from SNMP::Info::CiscoStack
+
+See documentation in L<SNMP::Info::CiscoStack/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoVTP
+
+See documentation in L<SNMP::Info::CiscoVTP/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::CDP
+
+See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::CiscoStats
+
+See documentation in L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::CiscoPortSecurity
+
+See documentation in L<SNMP::Info::CiscoPortSecurity/"GLOBALS"> for details.
+
 =head2 Globals imported from SNMP::Info::Layer2
 
-See documentation in SNMP::Info::Layer2 for details.
+See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
 
-=head1 TABLE ENTRIES
+=head1 TABLE METHODS
 
 These are methods that return tables of information in the form of a reference
 to a hash.
@@ -396,195 +325,47 @@ to a hash.
 
 =item $cat->interfaces()
 
-Crosses p_port() with i_index() to get physical names.
-
-=item $cat->i_physical()
-
-Returns a map to IID for ports that are physical ports, not vlans, etc.
-
-=item $cat->i_type()
-
-Crosses p_port() with p_type() and returns the results. 
-
-Overrides with ifType if p_type() isn't available.
+Returns the map between SNMP Interface Identifier (iid) and physical port name. 
 
 =item $cat->i_name()
 
-Crosses p_name with p_port and returns results.
+Returns reference to hash of iid to human set name. 
 
-=item $cat->i_duplex()
+B<portName>
 
-Crosses p_duplex with p_port and returns results.
+=item $cat->bp_index()
 
-=item $cat->i_duplex_admin()
+Returns reference to hash of bridge port table entries map back to interface
+identifier (iid)
 
-Crosses p_duplex_admin with p_port.
-
-Munges bit_string returned from p_duplex_admin to get duplex settings.
+Crosses (B<portCrossIndex>) to (B<portIfIndex>) since some devices seem to have
+problems with BRIDGE-MIB
 
 =back
 
-=head2 Module table
+=head2 Table Methods imported from SNMP::Info::CiscoStack
 
-This table holds configuration information for each of the blades installed in
-the Catalyst device.
+See documentation in L<SNMP::Info::CiscoStack/"TABLE METHODS"> for details.
 
-=over
+=head2 Table Methods imported from SNMP::Info::CiscoVTP
 
-=item $cat->m_type()
+See documentation in L<SNMP::Info::CiscoVTP/"TABLE METHODS"> for details.
 
-(B<moduleType>)
+=head2 Table Methods imported from SNMP::Info::CDP
 
-=item $cat->m_model()
+See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.
 
-(B<moduleModel>)
+=head2 Table Methods imported from SNMP::Info::CiscoStats
 
-=item $cat->m_serial()
+See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
 
-(B<moduleSerialNumber>)
+=head2 Table Methods imported from SNMP::Info::CiscoPortSecurity
 
-=item $cat->m_status()
-
-(B<moduleStatus>)
-
-=item $cat->m_name()
-
-(B<moduleName>)
-
-=item $cat->m_ports()
-
-(B<moduleNumPorts>)
-
-=item $cat->m_ports_status()
-
-Returns a list of space separated status strings for the ports.
-
-To see the status of port 4 :
-
-    @ports_status = split(' ', $cat->m_ports_status() );
-    $port4 = $ports_status[3];
-
-(B<modulePortStatus>)
-
-=item $cat->m_ports_hwver()
-
-(B<moduleHwVersion>)
-
-=item $cat->m_ports_fwver()
-
-(B<moduleFwVersion>)
-
-=item $cat->m_ports_swver()
-
-(B<moduleSwVersion>)
-
-=item $cat->m_ports_ip()
-
-(B<moduleIPAddress>)
-
-=item $cat->m_ports_sub1()
-
-(B<moduleSubType>)
-
-=item $cat->m_ports_sub2()
-
-(B<moduleSubType2>)
-
-=back
-
-=head2 Modules - Router Blades
-
-=over
-
-=item $cat->m_ip()
-
-(B<moduleIPAddress>)
-
-=item $cat->m_sub1()
-
-(B<moduleSubType>)
-
-=item $cat->m_sub2()
-
-(B<moduleSubType2>)
-
-=back
-
-=head2 Port Entry Table (CISCO-STACK-MIB::portTable)
-
-=over
-
-=item $cat->p_name()
-
-(B<portName>)
-
-=item $cat->p_type()
-
-(B<portType>)
-
-=item $cat->p_status()
-
-(B<portOperStatus>)
-
-=item $cat->p_status2()
-
-(B<portAdditionalStatus>)
-
-=item $cat->p_speed()
-
-(B<portAdminSpeed>)
-
-=item $cat->p_duplex()
-
-(B<portDuplex>)
-
-=item $cat->p_port()
-
-(B<portIfIndex>)
-
-=back
-
-=head2 Port Capability Table (CISCO-STACK-MIB::portCpbTable)
-
-=over
-
-=item $cat->p_speed_admin()
-
-(B<portCpbSpeed>)
-
-=item $cat->p_duplex_admin()
-
-(B<portCpbDuplex>)
-
-=back
-
-=head2 VLAN Entry Table
-
-See ftp://ftp.cisco.com/pub/mibs/supportlists/wsc5000/wsc5000-communityIndexing.html
-for a good treaty of how to connect to the VLANs
-
-=over
-
-=item $cat->v_state()
-
-(B<vtpVlanState>)
-
-=item $cat->v_type()
-
-(B<vtpVlanType>)
-
-=item $cat->v_name()
-
-(B<vtpVlanName>)
-
-=item $cat->v_mtu()
-
-(B<vtpVlanMtu>)
-
-=back
+See documentation in L<SNMP::Info::CiscoPortSecurity/"TABLE METHODS"> for
+details.
 
 =head2 Table Methods imported from SNMP::Info::Layer2
 
-See documentation in SNMP::Info::Layer2 for details.
+See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
 
 =cut

Info/Layer2/Centillion.pm

@@ -0,0 +1,521 @@
+# SNMP::Info::Layer2::Centillion
+# Eric Miller
+# $Id$
+#
+# Copyright (c) 2004 Eric Miller
+#
+# 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::Layer2::Centillion;
+$VERSION = '1.07';
+
+use strict;
+
+use Exporter;
+use SNMP::Info;
+use SNMP::Info::Bridge;
+use SNMP::Info::NortelStack;
+use SNMP::Info::SONMP;
+
+@SNMP::Info::Layer2::Centillion::ISA = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::NortelStack SNMP::Info::SONMP Exporter/;
+@SNMP::Info::Layer2::Centillion::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+
+%MIBS    = (
+            %SNMP::Info::MIBS,
+            %SNMP::Info::Bridge::MIBS,
+            %SNMP::Info::NortelStack::MIBS,
+            %SNMP::Info::SONMP::MIBS,
+            'CENTILLION-DOT3-EXTENSIONS-MIB' => 'cnDot3ExtnTable',
+            'S5-COMMON-STATS-MIB'            => 's5CmStat',
+            'CENTILLION-VLAN-MIB'            => 'cnVlanENETMgt',
+            'CENTILLION-CONFIG-MIB'          => 'sysTFTPStart',
+            );
+
+%GLOBALS = (
+            %SNMP::Info::GLOBALS,
+            %SNMP::Info::Bridge::GLOBALS,
+            %SNMP::Info::NortelStack::GLOBALS,
+            %SNMP::Info::SONMP::GLOBALS,
+            'tftp_action'  => 'sysTFTPStart',
+            'tftp_host'    => 'sysTFTPIpAddress',
+            'tftp_file'    => 'sysTFTPFileName',
+            'tftp_type'    => 'sysTFTPFileType',
+            'tftp_result'  => 'sysTFTPResult',
+            );
+
+%FUNCS   = (
+            %SNMP::Info::FUNCS,
+            %SNMP::Info::Bridge::FUNCS,
+            %SNMP::Info::NortelStack::FUNCS,
+            %SNMP::Info::SONMP::FUNCS,
+        # CENTILLION-DOT3-EXTENSIONS-MIB::cnDot3ExtnTable
+            'centillion_p_index'        => 'cnDot3ExtnIfIndex',
+            'centillion_p_duplex'       => 'cnDot3ExtnIfOperConnectionType',
+            'centillion_p_duplex_admin' => 'cnDot3ExtnIfAdminConnectionType',
+        # S5-COMMON-STATS-MIB::s5CmSNodeTable
+            'fw_mac'     => 's5CmSNodeMacAddr',
+            'fw_port'    => 's5CmSNodeIfIndx',
+        # CENTILLION-VLAN-MIB::cnVlanPortMemberTable
+            'centillion_i_vlan_index'    => 'cnVlanPortMemberIfIndex',
+            'centillion_i_vlan'        => 'cnVlanPortMemberVID',
+            'centillion_i_vlan_type'    => 'cnVlanPortMemberIngressType',        
+            );
+
+%MUNGE   = (
+            # Inherit all the built in munging
+            %SNMP::Info::MUNGE,
+            %SNMP::Info::Bridge::MUNGE,
+            %SNMP::Info::NortelStack::MUNGE,
+            %SNMP::Info::SONMP::MUNGE,
+            );
+
+sub os {
+    return 'centillion';
+}
+
+sub vendor {
+    return 'nortel';
+}
+
+sub i_ignore {
+    my $centillion = shift;
+    my $descr = $centillion->i_description();
+
+    my %i_ignore;
+    foreach my $if (keys %$descr){
+        my $type = $descr->{$if};
+      # Skip virtual interfaces  
+        $i_ignore{$if}++ if $type =~ /(VE|VID|vc|lp)/i;
+    }
+    return \%i_ignore;
+}
+
+sub interfaces {
+    my $centillion = shift;
+    my $i_index = $centillion->i_index();
+    my $i_descr = $centillion->i_description();
+
+    my %if;
+    foreach my $iid (keys %$i_index){
+        my $index = $i_index->{$iid};
+        next unless defined $index;
+      my $descr = $i_descr->{$iid};
+      # Skip ATM and virtual interfaces
+      next if $descr =~ /(VE|VID|vc|lp)/i;
+
+      # Index numbers are deterministic slot * 256 + port
+    my $port = $index % 256;
+        my $slot = int($index / 256);
+        my $slotport = "$slot.$port";
+
+    $slotport = "$descr" if $descr =~ /(mcp)/i;
+    
+        $if{$index} = $slotport;
+    }
+
+    return \%if;
+}
+
+sub i_duplex {
+    my $centillion = shift;
+    
+    my $port_index  = $centillion->centillion_p_index();
+    my $port_duplex = $centillion->centillion_p_duplex();
+
+    my %i_duplex;
+    foreach my $iid (keys %$port_index){
+        my $index = $port_index->{$iid};
+        next unless defined $index;
+        my $duplex = $port_duplex->{$iid};
+        next unless defined $duplex; 
+    
+        $duplex = 'half' if $duplex =~ /half/i;
+        $duplex = 'full' if $duplex =~ /full/i;
+        $i_duplex{$index}=$duplex; 
+    }
+    return \%i_duplex;
+}
+
+sub i_duplex_admin {
+    my $centillion = shift;
+    
+    my $port_index = $centillion->centillion_p_index();
+    my $port_admin = $centillion->centillion_p_duplex_admin();
+
+    my %i_duplex_admin;
+    foreach my $iid (keys %$port_index){
+        my $index = $port_index->{$iid};
+        next unless defined $index;
+        my $duplex = $port_admin->{$iid};
+        next unless defined $duplex; 
+    
+        $duplex = 'half' if $duplex =~ /half/i;
+        $duplex = 'full' if $duplex =~ /full/i;
+        $duplex = 'auto' if $duplex =~ /auto/i;
+        $i_duplex_admin{$index}=$duplex; 
+    }
+    return \%i_duplex_admin;
+}
+
+sub i_vlan {
+    my $centillion = shift;
+    
+    my $cn_vlan_index = $centillion->centillion_i_vlan_index();
+    my $cn_vlan = $centillion->centillion_i_vlan();
+
+    my %i_vlan;
+    foreach my $iid (keys %$cn_vlan_index){
+        my $index = $cn_vlan_index->{$iid};
+        next unless defined $index;
+        my $vlan = $cn_vlan->{$iid};
+        next unless defined $vlan; 
+    
+        $i_vlan{$index}=$vlan; 
+    }
+    return \%i_vlan;
+}
+
+sub model {
+    my $centillion = shift;
+    my $id = $centillion->id();
+    return undef unless defined $id;
+    my $model = &SNMP::translateObj($id);
+    return $id unless defined $model;
+    $model =~ s/^sreg-//i;
+
+    return '5000BH' if ($model =~ /5000BH/);
+    return '5005BH' if ($model =~ /5005BH/);
+    return 'C100' if ($model =~ /Centillion100/);
+    return 'C50N' if ($model =~ /Centillion50N/);
+    return 'C50T' if ($model =~ /Centillion50T/);
+    return $model;
+}
+
+sub bp_index {
+    my $centillion = shift;
+    my $index = $centillion->fw_port();
+
+    my %bp_index;
+    foreach my $iid (keys %$index){
+        my $b_index = $index->{$iid};
+        next unless defined $b_index;
+
+    #Index value is the same as ifIndex    
+        $bp_index{$b_index} = $b_index;
+    }
+
+    return \%bp_index;
+}
+
+sub index_factor {
+    return 256;
+}
+
+sub slot_offset {
+    return 0;
+}
+
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Centillion - SNMP Interface to Nortel Centillion based ATM Switches
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $centillion = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $centillion->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from a 
+Centillion device through SNMP. 
+
+For speed or debugging purposes you can call the subclass directly, but not after determining
+a more specific class using the method above. 
+
+ my $centillion = new SNMP::Info::Layer2::centillion(...);
+ 
+Note:  This class supports version 4.X and 5.X which are VLAN based rather
+than bridge group based.
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info
+
+=item SNMP::Info::Bridge
+
+=item SNMP::Info::NortelStack
+
+=item SNMP::Info::SONMP
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item CENTILLION-DOT3-EXTENSIONS-MIB
+
+=item S5-COMMON-STATS-MIB
+
+=item CENTILLION-VLAN-MIB
+
+=item CENTILLION-CONFIG-MIB
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::Bridge/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::NortelStack/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::SONMP/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+MIBs can be found on the CD that came with your product.
+
+Or, they can be downloaded directly from Nortel Networks regardless of support
+contract status.
+
+Go to http://www.nortelnetworks.com Techninal Support, Browse Technical Support,
+Select by Product Families, Centillion, Centillion C100-C50 ATM Speed Modules,
+Software.  Filter on mibs and download the latest version's archive.
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $centillion->vendor()
+
+Returns 'Nortel'
+
+=item $centillion->model()
+
+Cross references $centillion->id() to the SYNOPTICS-MIB and returns
+the results.
+
+Removes sreg- from the model name
+
+=item $centillion->os()
+
+Returns 'Centillion'
+
+=item $centillion->tftp_action()
+
+(B<sysTFTPStart>)
+
+=item $centillion->tftp_host()
+
+(B<sysTFTPIpAddress>)
+
+=item $centillion->tftp_file()
+
+(B<sysTFTPFileName>)
+
+=item $centillion->tftp_type()
+
+(B<sysTFTPFileType>)
+
+=item $centillion->tftp_result()
+
+(B<sysTFTPResult>)
+
+=back
+
+=head2 Overrides
+
+=over
+
+=item $centillion->layers()
+
+Returns 00000011.  Class emulates Layer 2 functionality through proprietary MIBs.
+
+=item  $centillion->index_factor()
+
+Required by SNMP::Info::SONMP.  Number representing the number of ports
+reserved per slot within the device MIB.  Returns 256.
+
+=item $centillion->slot_offset()
+
+Required by SNMP::Info::SONMP.  Offset if slot numbering does not
+start at 0.  Returns 0.
+
+=back
+
+=head2 Globals imported from SNMP::Info
+
+See documentation in L<SNMP::Info/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::Bridge
+
+See documentation in L<SNMP::Info::Bridge/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::NortelStack
+
+See documentation in L<SNMP::Info::NortelStack/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::SONMP
+
+See documentation in L<SNMP::Info::SONMP/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item $centillion->interfaces()
+
+    Returns reference to the map between IID and physical Port.
+
+    Slot and port numbers on the Passport switches are determined by the formula:
+      port = index % 256
+      slot = int(index / 256)
+ 
+    The physical port name is returned as slot.port.
+
+=item $centillion->i_duplex()
+
+Returns reference to map of IIDs to current link duplex
+
+=item $centillion->i_duplex_admin()
+
+Returns reference to hash of IIDs to admin duplex setting
+
+=item $centillion->i_ignore()
+
+Returns reference to hash of IIDs to ignore.
+
+=item $centillion->fw_mac()
+
+(B<s5CmSNodeMacAddr>)
+
+=item $centillion->fw_port()
+
+(B<s5CmSNodeIfIndx>)
+
+=item $centillion->bp_index()
+
+Returns a mapping between ifIndex and the Bridge Table.
+
+=item $centillion->i_vlan()
+
+Returns a mapping between ifIndex and the VLAN.
+
+=back
+
+=head2 Centillion 802.3 Extension Table (B<cnDot3ExtnTable>)
+
+=over
+
+=item $centillion->centillion_p_index()
+
+Returns reference to hash.  Maps table IIDs to Interface IIDs 
+
+(B<cnDot3ExtnIfIndex>)
+
+=item $centillion->centillion_p_duplex()
+
+Returns reference to hash.  Maps port operational duplexes to IIDs 
+
+(B<cnDot3ExtnIfOperConnectionType>)
+
+=item $centillion->rc_centillion_p_duplex_admin()
+
+Returns reference to hash.  Maps port admin duplexes to IIDs
+
+(B<cnDot3ExtnIfAdminConnectionType>)
+
+=back
+
+=head2 Centillion VLAN Table (B<cnVlanPortMemberTable>)
+
+=over
+
+=item $centillion->centillion_i_vlan_index()
+
+Returns reference to hash.  Key: Table entry, Value: Index 
+
+(B<cnVlanPortMemberIfIndex>)
+
+=item $centillion->centillion_i_vlan()
+
+Returns reference to hash.  Key: Table entry, Value: VLAN ID 
+
+(B<cnVlanPortMemberVID>)
+
+=item $centillion->centillion_i_vlan_type()
+
+Returns reference to hash.  Key: Table entry, Value: VLAN Type 
+
+(B<cnVlanPortMemberIngressType>)
+
+=back
+
+=head2 Table Methods imported from SNMP::Info
+
+See documentation in L<SNMP::Info/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::Bridge
+
+See documentation in L<SNMP::Info::Bridge/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::NortelStack
+
+See documentation in L<SNMP::Info::NortelStack/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::SONMP
+
+See documentation in L<SNMP::Info::SONMP/"TABLE METHODS"> for details.
+
+=cut

Info/Layer2/Cisco.pm

@@ -0,0 +1,256 @@
+# SNMP::Info::Layer2::Cisco
+# Max Baker
+#
+# Copyright (c) 2006 Max Baker
+# 
+# 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::Layer2::Cisco;
+# $Id$
+
+use strict;
+
+use Exporter;
+use SNMP::Info::CiscoVTP;
+use SNMP::Info::CDP;
+use SNMP::Info::CiscoStats;
+use SNMP::Info::CiscoImage;
+use SNMP::Info::CiscoRTT;
+use SNMP::Info::CiscoQOS;
+use SNMP::Info::CiscoConfig;
+use SNMP::Info::Layer2;
+
+use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
+$VERSION = '1.07';
+@SNMP::Info::Layer2::Cisco::ISA = qw/SNMP::Info::CiscoVTP SNMP::Info::CDP  
+                                     SNMP::Info::CiscoStats SNMP::Info::CiscoImage 
+                                     SNMP::Info::CiscoRTT SNMP::Info::CiscoQOS 
+                                     SNMP::Info::CiscoConfig SNMP::Info::Layer2
+                                     Exporter/;
+@SNMP::Info::Layer2::Cisco::EXPORT_OK = qw//;
+
+%MIBS = (
+            %SNMP::Info::Layer2::MIBS,  
+            %SNMP::Info::CiscoConfig::MIBS,
+            %SNMP::Info::CiscoQOS::MIBS,
+            %SNMP::Info::CiscoRTT::MIBS,
+            %SNMP::Info::CiscoImage::MIBS,
+            %SNMP::Info::CiscoStats::MIBS,
+            %SNMP::Info::CDP::MIBS,
+            %SNMP::Info::CiscoVTP::MIBS,
+        );
+
+%GLOBALS = (
+            %SNMP::Info::Layer2::GLOBALS,  
+            %SNMP::Info::CiscoConfig::GLOBALS,
+            %SNMP::Info::CiscoQOS::GLOBALS,
+            %SNMP::Info::CiscoRTT::GLOBALS,
+            %SNMP::Info::CiscoImage::GLOBALS,
+            %SNMP::Info::CiscoStats::GLOBALS,
+            %SNMP::Info::CDP::GLOBALS,
+            %SNMP::Info::CiscoVTP::GLOBALS,
+           );
+
+%FUNCS = (
+            %SNMP::Info::Layer2::FUNCS,  
+            %SNMP::Info::CiscoConfig::FUNCS,
+            %SNMP::Info::CiscoQOS::FUNCS,
+            %SNMP::Info::CiscoRTT::FUNCS,
+            %SNMP::Info::CiscoImage::FUNCS,
+            %SNMP::Info::CiscoStats::FUNCS,
+            %SNMP::Info::CDP::FUNCS,
+            %SNMP::Info::CiscoVTP::FUNCS,
+         );
+
+%MUNGE = (
+            %SNMP::Info::Layer2::MUNGE,  
+            %SNMP::Info::CiscoConfig::MUNGE,
+            %SNMP::Info::CiscoQOS::MUNGE,
+            %SNMP::Info::CiscoRTT::MUNGE,
+            %SNMP::Info::CiscoImage::MUNGE,
+            %SNMP::Info::CiscoStats::MUNGE,
+            %SNMP::Info::CDP::MUNGE,
+            %SNMP::Info::CiscoVTP::MUNGE,
+         );
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Cisco - SNMP Interface to L3 and L2+L3 IOS Cisco Device
+that are not covered in other classes.
+
+=head1 AUTHOR
+
+Max Baker
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $cisco = 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      = $cisco->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Generic Cisco Routers running IOS
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::CiscoVTP
+
+=item SNMP::Info::CDP
+
+=item SNMP::Info::CiscoStats
+
+=item SNMP::Info::CiscoImage
+
+=item SNMP::Info::CiscoRTT
+
+=item SNMP::Info::CiscoQOS
+
+=item SNMP::Info::CiscoConfig
+
+=item SNMP::Info::Layer2
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::CiscoVTP/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoStats/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CDP/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoImage/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoRTT/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoQOS/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoConfig/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::Layer2/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $cisco->vendor()
+
+    Returns 'cisco'
+
+=back
+
+=head2 Global Methods imported from SNMP::Info::CiscoVTP
+
+See documentation in L<SNMP::Info::CiscoVTP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CDP
+
+See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoStats
+
+See documentation in L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoImage
+
+See documentation in L<SNMP::Info::CiscoImage/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoRTT
+
+See documentation in L<SNMP::Info::CiscoRTT/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoQOS
+
+See documentation in L<SNMP::Info::CiscoQOS/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoConfig
+
+See documentation in L<SNMP::Info::CiscoConfig/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::Layer2
+
+See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Table Methods imported from SNMP::Info::CiscoVTP
+
+See documentation in L<SNMP::Info::CiscoVTP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CDP
+
+See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoStats
+
+See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoImage
+
+See documentation in L<SNMP::Info::CiscoImage/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoRTT
+
+See documentation in L<SNMP::Info::CiscoRTT/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoQOS
+
+See documentation in L<SNMP::Info::CiscoQOS/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoConfig
+
+See documentation in L<SNMP::Info::CiscoConfig/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::Layer2
+
+See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=cut

Info/Layer2/Foundry.pm

@@ -0,0 +1,287 @@
+# SNMP::Info::Layer2::Foundry - SNMP Interface to Foundry Switches
+#
+# Copyright (c) 2005 Max Baker
+#
+# 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::Layer2::Foundry;
+$VERSION = '1.07';
+# $Id$
+
+use strict;
+
+use Exporter;
+use SNMP::Info::Layer2;
+use SNMP::Info::FDP;
+use SNMP::Info::EtherLike;
+use SNMP::Info::MAU;
+
+use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
+
+@SNMP::Info::Layer2::Foundry::ISA = qw/SNMP::Info::Layer2 SNMP::Info::FDP SNMP::Info::EtherLike
+                                       SNMP::Info::MAU    Exporter/;
+@SNMP::Info::Layer2::Foundry::EXPORT_OK = qw//;
+
+%MIBS =    ( %SNMP::Info::Layer2::MIBS,
+             %SNMP::Info::FDP::MIBS,
+             %SNMP::Info::EtherLike::MIBS,
+             %SNMP::Info::MAU::MIBS,
+             'FOUNDRY-SN-ROOT-MIB' => 'foundry',
+           );
+
+%GLOBALS = (
+            %SNMP::Info::Layer2::GLOBALS,
+            %SNMP::Info::FDP::GLOBALS,
+            %SNMP::Info::EtherLike::GLOBALS,
+            %SNMP::Info::MAU::GLOBALS,
+           );
+
+%FUNCS   = (
+            %SNMP::Info::Layer2::FUNCS,
+            %SNMP::Info::FDP::FUNCS,
+            %SNMP::Info::EtherLike::FUNCS,
+            %SNMP::Info::MAU::FUNCS,
+            'test'    => 'dot1dStpPortState',
+           );
+
+%MUNGE = (
+            %SNMP::Info::Layer2::MUNGE,
+            %SNMP::Info::FDP::MUNGE,
+            %SNMP::Info::EtherLike::MUNGE,
+            %SNMP::Info::MAU::MUNGE,
+         );
+
+
+# Method OverRides
+
+#sub bulkwalk_no { 1;}
+
+*SNMP::Info::Layer2::Foundry::i_duplex       = \&SNMP::Info::MAU::mau_i_duplex;
+*SNMP::Info::Layer2::Foundry::i_duplex_admin = \&SNMP::Info::MAU::mau_i_duplex_admin;
+*SNMP::Info::Layer2::Foundry::i_vlan         = \&SNMP::Info::Bridge::qb_i_vlan_t;
+
+# todo doc these
+
+sub os_ver {
+    my $foundry = shift;
+
+    my $e_name = $foundry->e_name();
+
+    # find entity table entry for "stackmanaget.1"
+    my $unit_iid = undef;
+    foreach my $e (keys %$e_name){
+        my $name = $e_name->{$e} || '';
+        $unit_iid = $e if $name eq 'stackmanaget.1';
+    }
+    
+    # Default to OID method if no dice.
+    unless (defined $unit_iid){
+        return $foundry->SUPER::model();
+    }
+
+    # Find Model Name
+    my $e_fwver = $foundry->e_fwver();
+    if (defined $e_fwver->{$unit_iid}){
+        return $e_fwver->{$unit_iid};
+    }
+
+    # Not found in ENTITY-MIB, go up a level.
+    return $foundry->SUPER::os_ver();
+}
+
+sub model {
+    my $foundry = shift;
+
+    my $e_name = $foundry->e_name();
+
+    # find entity table entry for "unit.1"
+    my $unit_iid = undef;
+    foreach my $e (keys %$e_name){
+        my $name = $e_name->{$e} || '';
+        $unit_iid = $e if $name eq 'unit.1';
+    }
+    
+    # Default to OID method if no dice.
+    unless (defined $unit_iid){
+        return $foundry->SUPER::model();
+    }
+
+    # Find Model Name
+    my $e_model = $foundry->e_model();
+    if (defined $e_model->{$unit_iid}){
+        return $e_model->{$unit_iid};
+    }
+
+    # Not found in ENTITY-MIB, go up a level.
+    return $foundry->SUPER::model();
+    
+}
+
+sub serial {
+    my $foundry = shift;
+
+    my $e_name = $foundry->e_name();
+
+    # find entity table entry for "unit.1"
+    my $unit_iid = undef;
+    foreach my $e (keys %$e_name){
+        my $name = $e_name->{$e} || '';
+        $unit_iid = $e if $name eq 'unit.1';
+    }
+    return undef unless defined $unit_iid;
+
+    # Look up serial of found entry.
+    my $e_serial = $foundry->e_serial();
+    return $e_serial->{$unit_iid} if defined $e_serial->{$unit_iid};
+
+    return $foundry->SUPER::serial();
+}
+
+sub interfaces {
+    my $foundry = shift;
+    my $i_descr = $foundry->i_description;
+    my $i_name  = $foundry->i_name;
+
+    # use ifName only if it is in portn 
+    #   format.  For EdgeIrons
+    # else use ifDescr
+    foreach my $iid (keys %$i_name){
+        my $name = $i_name->{$iid};
+        next unless defined $name;
+        $i_descr->{$iid} = $name 
+            if $name =~ /^port\d+/i;
+    }
+
+    return $i_descr;
+}
+
+sub i_ignore {
+    my $foundry = shift;
+    my $i_type = $foundry->i_type();
+
+    my %i_ignore = ();
+
+    foreach my $iid (keys %$i_type){
+        my $type = $i_type->{$iid} || '';
+        $i_ignore{$iid}++ 
+            # 33 is the console port
+            if $type =~ /(loopback|propvirtual|other|cpu|33)/i;
+    }
+    return \%i_ignore;
+}
+
+
+sub os { 
+    return 'foundry';
+}
+
+sub vendor {
+    return 'foundry';
+}
+
+# this hangs on a edgeiron24g
+# TODO: check by devicetype and deferr to SUPER if not bad device
+sub stp_p_state { undef; }
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Foundry - SNMP Interface to Foundry FastIron Network Devices
+
+=head1 AUTHOR
+
+Max Baker
+
+=head1 SYNOPSIS
+
+This module is Deprecated.  Please use Layer3::Foundry instead.
+
+=head1 DESCRIPTION
+
+This module provides support for Foundry EdgeIron Switches
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+=item SNMP::Info::FDP
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item FOUNDRY-SN-ROOT-MIB
+
+=item Inherited Classes' MIBs
+
+See classes listed above for their required MIBs.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item todo
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer2
+
+See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::FDP
+
+See documentation in L<SNMP::Info::FDP/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item todo2
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer2
+
+See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::FDP
+
+See documentation in L<SNMP::Info::FDP/"TABLE METHODS"> for details.
+
+=cut

Info/Layer2/HP.pm

@@ -1,5 +1,7 @@
 # SNMP::Info::Layer2::HP - SNMP Interface to HP ProCurve Switches
-# Max Baker <max@warped.org>
+# Max Baker
+#
+# Copyright (c) 2004,2005 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
@@ -28,7 +30,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::Layer2::HP;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 
 use strict;
@@ -36,65 +38,120 @@ use strict;
 use Exporter;
 use SNMP::Info::Layer2;
 use SNMP::Info::MAU;
-use SNMP::Info::Entity;
+use SNMP::Info::LLDP;
+use SNMP::Info::CDP;
 
 use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE $INIT/ ;
 
-@SNMP::Info::Layer2::HP::ISA = qw/SNMP::Info::Layer2 SNMP::Info::MAU SNMP::Info::Entity Exporter/;
+@SNMP::Info::Layer2::HP::ISA = qw/SNMP::Info::Layer2 SNMP::Info::MAU SNMP::Info::LLDP
+                                  SNMP::Info::CDP Exporter/;
 @SNMP::Info::Layer2::HP::EXPORT_OK = qw//;
 
-# See SNMP::Info for the details of these data structures and interworkings.
-$INIT = 0;
-
 %MIBS = ( %SNMP::Info::Layer2::MIBS,
           %SNMP::Info::MAU::MIBS,
-          %SNMP::Info::Entity::MIBS,
-          'RFC1271-MIB' => 'logDescription',
-          'HP-ICF-OID'  => 'hpSwitch4000',
+          %SNMP::Info::LLDP::MIBS,
+          %SNMP::Info::CDP::MIBS,
+          'RFC1271-MIB'    => 'logDescription',
+          'HP-ICF-OID'     => 'hpSwitch4000',
+          'HP-VLAN'        => 'hpVlanMemberIndex',
           'STATISTICS-MIB' => 'hpSwitchCpuStat',
-          'NETSWITCH-MIB'  => 'hpMsgBufFree'
+          'NETSWITCH-MIB'  => 'hpMsgBufFree',
+          'CONFIG-MIB'     => 'hpSwitchConfig',
         );
 
 %GLOBALS = (
             %SNMP::Info::Layer2::GLOBALS,
             %SNMP::Info::MAU::GLOBALS,
-            %SNMP::Info::Entity::GLOBALS,
-            'serial1'   => 'entPhysicalSerialNum.1',
-            'hp_cpu'    => 'hpSwitchCpuStat.0',
+            %SNMP::Info::LLDP::GLOBALS,
+            %SNMP::Info::CDP::GLOBALS,
+            'serial1'      => 'entPhysicalSerialNum.1',
+            'hp_cpu'       => 'hpSwitchCpuStat.0',
             'hp_mem_total' => 'hpGlobalMemTotalBytes.1',
-            'mem_free'  => 'hpGlobalMemFreeBytes.1',
-            'mem_used'  => 'hpGlobalMemAllocBytes.1',
-            'os_version' => 'hpSwitchOsVersion.0',
-            'os_bin'    => 'hpSwitchRomVersion.0',
-            'mac'       => 'hpSwitchBaseMACAddress.0'
+            'mem_free'     => 'hpGlobalMemFreeBytes.1',
+            'mem_used'     => 'hpGlobalMemAllocBytes.1',
+            'os_version'   => 'hpSwitchOsVersion.0',
+            'os_bin'       => 'hpSwitchRomVersion.0',
+            'mac'          => 'hpSwitchBaseMACAddress.0',
+            'hp_vlans'     => 'hpVlanNumber',
            );
 
 %FUNCS   = (
             %SNMP::Info::Layer2::FUNCS,
             %SNMP::Info::MAU::FUNCS,
-            %SNMP::Info::Entity::FUNCS,
+            %SNMP::Info::LLDP::FUNCS,
+            %SNMP::Info::CDP::FUNCS,
+            'bp_index2' => 'dot1dBasePortIfIndex',
             'i_type2'   => 'ifType',
             # RFC1271
-            'l_descr'   => 'logDescription'
+            'l_descr'   => 'logDescription',
+            # HP-VLAN-MIB
+            'hp_v_index'   => 'hpVlanDot1QID',
+            'hp_v_name'    => 'hpVlanIdentName',
+            'hp_v_state'   => 'hpVlanIdentState',
+            'hp_v_type'    => 'hpVlanIdentType',
+            'hp_v_status'  => 'hpVlanIdentStatus',
+            'hp_v_mac'     => 'hpVlanAddrPhysAddress',
+            'hp_v_if_index'=> 'hpVlanMemberIndex',
+            'hp_v_if_tag'  => 'hpVlanMemberTagged2',
+            # CONFIG-MIB::hpSwitchPortTable
+            'hp_duplex'       => 'hpSwitchPortEtherMode',
+            'hp_duplex_admin' => 'hpSwitchPortFastEtherMode',
            );
 
 %MUNGE = (
             # Inherit all the built in munging
             %SNMP::Info::Layer2::MUNGE,
             %SNMP::Info::MAU::MUNGE,
-            %SNMP::Info::Entity::MUNGE
+            %SNMP::Info::LLDP::MUNGE,
+            %SNMP::Info::CDP::MUNGE
          );
 
 %MODEL_MAP = ( 
-               'J4812A' => '2512',
-               'J4819A' => '5308XL',
-               'J4813A' => '2524',
-               'J4805A' => '5304XL',
-               'J4815A' => '3324XL',
-               'J4865A' => '4108GL',
-               'J4887A' => '4104GL',
-               'J4874A' => '9315',
-             );
+                'J4093A' => '2424M',
+                'J4110A' => '8000M',
+                'J4120A' => '1600M',
+                'J4121A' => '4000M',
+                'J4122A' => '2400M',
+                'J4138A' => '9308M',
+                'J4139A' => '9304M',
+                'J4812A' => '2512',
+                'J4813A' => '2524',
+                'J4815A' => '3324XL',
+                'J4819A' => '5308XL',
+                'J4840A' => '6308M-SX',
+                'J4841A' => '6208M-SX',
+                'J4850A' => '5304XL',
+                'J4851A' => '3124',
+                'J4865A' => '4108GL',
+                'J4874A' => '9315M',
+                'J4887A' => '4104GL',
+                'J4899A' => '2650',
+                'J4899B' => '2650-CR',
+                'J4900A' => '2626',
+                'J4900B' => '2626-CR',
+                'J4902A' => '6108',
+                'J4903A' => '2824',
+                'J4904A' => '2848',
+                'J4905A' => '3400cl-24G',
+                'J4906A' => '3400cl-48G',
+                'J8130A' => 'WAP-420-NA',
+                'J8131A' => 'WAP-420-WW',
+                'J8133A' => 'AP520WL',
+                'J8164A' => '2626-PWR',
+                'J8165A' => '2650-PWR',
+                'J8433A' => 'CX4-6400cl-6XG',
+                'J8474A' => 'MF-6400cl-6XG',
+                'J8697A' => '5406zl',
+                'J8698A' => '5412zl',
+                'J8718A' => '5404yl',
+                'J8719A' => '5408yl',
+                'J8770A' => '4204vl',
+                'J8773A' => '4208vl',
+                'J8680A' => '9608sl',
+                'J8762A' => '2600-8-PWR',
+                'J8692A' => '3500yl-24G-PWR',
+                'J8693A' => '3500yl-48G-PWR',
+           );
 
 # Method Overrides
 
@@ -127,7 +184,9 @@ sub os_ver {
 sub model {
     my $hp = shift;
     my $id = $hp->id();
+    return undef unless defined $id;
     my $model = &SNMP::translateObj($id);
+    return $id unless defined $model;
     
     $model =~ s/^hpswitch//i;
 
@@ -164,27 +223,6 @@ sub interfaces {
 
 }
 
-sub i_type {
-    my $hp = shift;
-    my $e_descr = $hp->e_descr();
-    my $e_port = $hp->e_port();
-
-    # Grab default values to pass through
-    my $i_type = $hp->i_type2();
-
-    # Now Stuff in the entity-table values
-    foreach my $port (keys %$e_descr){
-        my $iid = $e_port->{$port};
-        next unless defined $iid;
-        my $type = $e_descr->{$port};
-        $type =~ s/^HP ?//;
-        $i_type->{$iid} = $type;
-    }
-    
-    return $i_type;
-
-}
-
 sub i_name {
     my $hp = shift;
     my $i_alias    = $hp->i_alias();
@@ -207,6 +245,37 @@ sub i_name {
     return \%i_name;
 }
 
+sub i_duplex {
+    my $hp = shift;
+
+    return $hp->mau_i_duplex();
+}
+
+sub i_duplex_admin {
+    my $hp = shift;
+    my $partial = shift;
+
+    # Try HP MIB first
+    my $hp_duplex = $hp->hp_duplex_admin($partial);
+    if (defined $hp_duplex and scalar(keys %$hp_duplex)){
+
+        my %i_duplex;
+        foreach my $if (keys %$hp_duplex){
+            my $duplex = $hp_duplex->{$if};
+            next unless defined $duplex; 
+    
+            $duplex = 'half' if $duplex =~ /half/i;
+            $duplex = 'full' if $duplex =~ /full/i;
+            $duplex = 'auto' if $duplex =~ /auto/i;
+            $i_duplex{$if}=$duplex; 
+        }
+        return \%i_duplex;
+    }
+    else {
+        return $hp->mau_i_duplex_admin();
+    }
+}
+
 sub vendor {
     return 'hp';
 }
@@ -250,80 +319,401 @@ sub slots {
 #
 #}
 
-sub i_duplex {
+# Bridge MIB does not map Bridge Port to ifIndex correctly on all models
+sub bp_index {
     my $hp = shift;
+    my $partial = shift;
 
-    my $mau_index = $hp->mau_index();
-    my $mau_link = $hp->mau_link();
-
-    my %i_duplex;
-    foreach my $mau_port (keys %$mau_link){
-        my $iid = $mau_index->{$mau_port};
-        next unless defined $iid;
-
-        my $linkoid = $mau_link->{$mau_port};
-        my $link = &SNMP::translateObj($linkoid);
-        next unless defined $link;
-
-        my $duplex = undef;
-
-        if ($link =~ /fd$/i) {
-            $duplex = 'full';
-        } elsif ($link =~ /hd$/i){
-            $duplex = 'half';
-        }
-
-        $i_duplex{$iid} = $duplex if defined $duplex;
+    my $if_index = $hp->i_index($partial);
+    my $model = $hp->model();
+    my $bp_index = $hp->bp_index2($partial);
+    
+    unless (defined $model and $model =~ /(1600|2424|4000|8000)/) {
+        return $bp_index;
     }
-    return \%i_duplex;
+
+    my %mod_bp_index;
+    foreach my $iid (keys %$if_index){
+        $mod_bp_index{$iid} = $iid;
+    }
+    return \%mod_bp_index;
 }
 
+# VLAN methods.  Newer HPs use Q-BRIDGE, older use proprietary MIB.  Use
+# Q-BRIDGE if available.
 
-sub i_duplex_admin {
+sub v_index {
+    my $hp = shift;
+    my $partial = shift;
+
+    # Newer devices
+    my $q_index = $hp->SUPER::v_index($partial);
+    if (defined $q_index and scalar(keys %$q_index)){
+        return $q_index;
+    }
+
+    # Older devices
+    return $hp->hp_v_index($partial);
+}
+
+sub v_name {
+    my $hp = shift;
+    my $partial = shift;
+
+    # Newer devices
+    my $q_name = $hp->SUPER::v_name($partial);
+    if (defined $q_name and scalar(keys %$q_name)){
+        return $q_name;
+    }
+
+    # Older devices
+    return $hp->hp_v_name($partial);
+}
+
+sub i_vlan {
     my $hp = shift;
 
-    my $interfaces   = $hp->interfaces();
-    my $mau_index    = $hp->mau_index();
-    my $mau_auto     = $hp->mau_auto();
-    my $mau_autostat = $hp->mau_autostat();
-    my $mau_typeadmin = $hp->mau_type_admin();
-    my $mau_autosent = $hp->mau_autosent();
+    # Newer devices use Q-BRIDGE-MIB
+    my $qb_i_vlan = $hp->SUPER::i_vlan();
+    if (defined $qb_i_vlan and scalar(keys %$qb_i_vlan)){
+        return $qb_i_vlan;
+    }
 
-    my %mau_reverse = reverse %$mau_index;
+    # HP4000 ... get it from HP-VLAN
+    # the hpvlanmembertagged2 table has an entry in the form of 
+    #   vlan.interface = /untagged/no/tagged/auto
+    my $i_vlan      = {};
+    my $hp_v_index  = $hp->hp_v_index();
+    my $hp_v_if_tag = $hp->hp_v_if_tag();
+    foreach my $row (keys %$hp_v_if_tag){
+        my ($index,$if) = split(/\./,$row);
 
-    my %i_duplex_admin;
-    foreach my $iid (keys %$interfaces){
-        my $mau_index = $mau_reverse{$iid};
-        next unless defined $mau_index;
-
-        my $autostat = $mau_autostat->{$mau_index};
+        my $tag = $hp_v_if_tag->{$row};
+        my $vlan = $hp_v_index->{$index};
         
-        # HP25xx has this value
-        if (defined $autostat and $autostat =~ /enabled/i){
-            $i_duplex_admin{$iid} = 'auto';
-            next;
-        } 
-        
-        my $type = $mau_autosent->{$mau_index};
-    
-        next unless defined $type;
+        next unless (defined $tag and $tag =~ /untagged/);
 
-        if ($type == 0) {
-            $i_duplex_admin{$iid} = 'none';
-            next;
+        $i_vlan->{$if} = $vlan if defined $vlan;
+    }
+
+    return $i_vlan;
+}
+
+sub i_vlan_membership {
+    my $hp = shift;
+
+    # Newer devices use Q-BRIDGE-MIB
+    my $qb_i_vlan = $hp->SUPER::i_vlan_membership();
+    if (defined $qb_i_vlan and scalar(keys %$qb_i_vlan)){
+        return $qb_i_vlan;
+    }
+
+    # Older get it from HP-VLAN
+    my $i_vlan_membership = {};
+    my $hp_v_index  = $hp->hp_v_index();
+    my $hp_v_if_tag = $hp->hp_v_if_tag();
+    foreach my $row (keys %$hp_v_if_tag){
+        my ($index,$if) = split(/\./,$row);
+
+        my $tag = $hp_v_if_tag->{$row};
+        my $vlan = $hp_v_index->{$index};
+        
+        next unless (defined $tag);
+        next if ($tag eq 'no');
+
+        push(@{$i_vlan_membership->{$if}}, $vlan);
+    }
+
+    return $i_vlan_membership;
+}
+
+sub set_i_vlan {
+    my $hp = shift;
+    my ($vlan, $ifindex) = @_;
+
+    unless ( defined $vlan and defined $ifindex and
+            $vlan =~ /^\d+$/ and $ifindex =~ /^\d+$/ ) {
+        $hp->error_throw("Invalid parameter");
+        return undef;
+    }
+
+    # Newer devices use Q-BRIDGE-MIB
+    my $qb_i_vlan = $hp->qb_i_vlan_t();
+    if (defined $qb_i_vlan and scalar(keys %$qb_i_vlan)){
+        return $hp->SUPER::set_i_vlan($vlan, $ifindex);
+    } # We're done here if the device supports the Q-BRIDGE-MIB
+
+    # Older HP switches use the HP-VLAN MIB
+    # Thanks to Jeroen van Ingen
+    my $hp_v_index  = $hp->hp_v_index();
+    my $hp_v_if_tag = $hp->hp_v_if_tag();
+    if (defined $hp_v_index and scalar(keys %$hp_v_index)){
+        my $old_untagged;
+        # Hash to lookup VLAN index of the VID (dot1q tag)
+        my %vl_trans = reverse %$hp_v_index;
+
+        foreach my $row (keys %$hp_v_if_tag){
+            # Loop through table to determine current untagged vlan for the port we're about to change
+            my ($index,$if) = split(/\./,$row);
+            if ($if == $ifindex and $hp_v_if_tag->{$row} =~ /untagged/) {
+                # Store the row information of the current untagged VLAN and temporarily set it to tagged
+                $old_untagged = $row;
+                my $rv = $hp->set_hp_v_if_tag(1, $row);
+                warn "Unexpected error changing native/untagged VLAN into tagged.\n" unless $rv;
+                last;
+            }
         }
 
-        my $full = $hp->_isfullduplex($type);
-        my $half = $hp->_ishalfduplex($type);
+        # Translate the VLAN identifier (tag) value to the index used by the HP-VLAN MIB
+        my $vlan_index = $vl_trans{$vlan};
+        if (defined $vlan_index) {
+            # Set our port untagged in the desired VLAN
+            my $rv = $hp->set_hp_v_if_tag(2, "$vlan_index.$ifindex");
+            if ($rv) {
+                # If port change is successful, remove VLAN that used to be untagged from the port
+                $hp->set_hp_v_if_tag(3, $old_untagged) if defined $old_untagged;
+                return $rv;
+            } else {
+                # If not, try to revert to the old situation.
+                $hp->set_hp_v_if_tag(2, $old_untagged) if defined $old_untagged;
+            }
+        }
+        else {
+            warn "Requested VLAN (VLAN ID: $vlan) not found!\n";
+        }
+    }
+    print "Error: Unable to change VLAN: $vlan on IfIndex: $ifindex list\n" if $hp->debug();
+    return undef;
+}
 
-        if ($full and !$half){
-            $i_duplex_admin{$iid} = 'full';
-        } elsif ($half) {
-            $i_duplex_admin{$iid} = 'half';
-        } 
-    } 
+sub set_i_pvid {
+    my $hp = shift;
+    my ($vlan, $ifindex) = @_;
+
+    unless ( defined $vlan and defined $ifindex and
+            $vlan =~ /^\d+$/ and $ifindex =~ /^\d+$/ ) {
+        $hp->error_throw("Invalid parameter");
+        return undef;
+    }
+
+    # Newer devices use Q-BRIDGE-MIB
+    my $qb_i_vlan = $hp->qb_i_vlan_t();
+    if (defined $qb_i_vlan and scalar(keys %$qb_i_vlan)){
+        return $hp->SUPER::set_i_pvid($vlan, $ifindex);
+    }
     
-    return \%i_duplex_admin;
+    # HP method same as set_i_vlan()
+    return $hp->set_i_vlan($vlan, $ifindex);
+}
+
+sub set_add_i_vlan_tagged {
+    my $hp = shift;
+    my ($vlan, $ifindex) = @_;
+
+    unless ( defined $vlan and defined $ifindex and
+            $vlan =~ /^\d+$/ and $ifindex =~ /^\d+$/ ) {
+        $hp->error_throw("Invalid parameter");
+        return undef;
+    }
+
+    # Newer devices use Q-BRIDGE-MIB
+    my $qb_i_vlan = $hp->qb_i_vlan();
+    if (defined $qb_i_vlan and scalar(keys %$qb_i_vlan)){
+        return $hp->SUPER::set_add_i_vlan_tagged($vlan, $ifindex);
+    } # We're done here if the device supports the Q-BRIDGE-MIB
+
+    # Older HP switches use the HP-VLAN MIB
+    my $hp_v_index  = $hp->hp_v_index();
+    my $hp_v_if_tag = $hp->hp_v_if_tag();
+    if (defined $hp_v_index and scalar(keys %$hp_v_index)){
+        # Hash to lookup VLAN index of the VID (dot1q tag)
+        my %vl_trans = reverse %$hp_v_index;
+
+        # Translate the VLAN identifier (tag) value to the index used by the HP-VLAN MIB
+        my $vlan_index = $vl_trans{$vlan};
+        if (defined $vlan_index) {
+            # Add port to egress list for VLAN
+            my $rv = ($hp->set_hp_v_if_tag(1, "$vlan_index.$ifindex"));
+            if ($rv) {
+                print "Successfully added IfIndex: $ifindex to VLAN: $vlan list\n" if $hp->debug();
+                return 1;
+            }
+        }
+        else {
+            $hp->error_throw("Requested VLAN (VLAN ID: $vlan) not found!\n");
+        }
+    }
+    print "Error: Unable to add VLAN: $vlan to IfIndex: $ifindex list\n" if $hp->debug();
+    return undef;
+}
+
+sub set_remove_i_vlan_tagged {
+    my $hp = shift;
+    my ($vlan, $ifindex) = @_;
+
+    unless ( defined $vlan and defined $ifindex and
+            $vlan =~ /^\d+$/ and $ifindex =~ /^\d+$/ ) {
+        $hp->error_throw("Invalid parameter");
+        return undef;
+    }
+
+    # Newer devices use Q-BRIDGE-MIB
+    my $qb_i_vlan = $hp->qb_i_vlan();
+    if (defined $qb_i_vlan and scalar(keys %$qb_i_vlan)){
+        return $hp->SUPER::set_remove_i_vlan_tagged($vlan, $ifindex);
+    } # We're done here if the device supports the Q-BRIDGE-MIB
+
+    # Older HP switches use the HP-VLAN MIB
+    my $hp_v_index  = $hp->hp_v_index();
+    my $hp_v_if_tag = $hp->hp_v_if_tag();
+    if (defined $hp_v_index and scalar(keys %$hp_v_index)){
+        # Hash to lookup VLAN index of the VID (dot1q tag)
+        my %vl_trans = reverse %$hp_v_index;
+
+        # Translate the VLAN identifier (tag) value to the index used by the HP-VLAN MIB
+        my $vlan_index = $vl_trans{$vlan};
+        if (defined $vlan_index) {
+            # Add port to egress list for VLAN
+            my $rv = ($hp->set_hp_v_if_tag(3, "$vlan_index.$ifindex"));
+            if ($rv) {
+                print "Successfully added IfIndex: $ifindex to VLAN: $vlan list\n" if $hp->debug();
+                return 1;
+            }
+        }
+        else {
+            $hp->error_throw("Requested VLAN (VLAN ID: $vlan) not found!\n");
+        }
+    }
+    print "Error: Unable to remove VLAN: $vlan to IfIndex: $ifindex list\n" if $hp->debug();
+    return undef;
+}
+
+#  Use CDP and/or LLDP
+
+sub hasCDP {
+    my $hp = shift;
+
+    return $hp->hasLLDP() || $hp->SUPER::hasCDP();
+}
+
+sub c_ip {
+    my $hp = shift;
+    my $partial = shift;
+
+    my $cdp  = $hp->SUPER::c_ip($partial) || {};
+    my $lldp = $hp->lldp_ip($partial) || {};
+
+    my %c_ip;
+    foreach my $iid (keys %$cdp){
+        my $ip = $cdp->{$iid};
+        next unless defined $ip;
+
+        $c_ip{$iid} = $ip;
+    }
+
+    foreach my $iid (keys %$lldp){
+        my $ip = $lldp->{$iid};
+        next unless defined $ip;
+
+        $c_ip{$iid} = $ip;
+    }
+    return \%c_ip;
+}
+
+sub c_if {
+    my $hp = shift;
+    my $partial = shift;
+
+    my $lldp = $hp->lldp_if($partial) || {};;
+    my $cdp  = $hp->SUPER::c_if($partial) || {};
+    
+    my %c_if;
+    foreach my $iid (keys %$cdp){
+        my $if = $cdp->{$iid};
+        next unless defined $if;
+
+        $c_if{$iid} = $if;
+    }
+
+    foreach my $iid (keys %$lldp){
+        my $if = $lldp->{$iid};
+        next unless defined $if;
+
+        $c_if{$iid} = $if;
+    }
+    return \%c_if;
+}
+
+sub c_port {
+    my $hp = shift;
+    my $partial = shift;
+
+    my $lldp = $hp->lldp_port($partial) || {};
+    my $cdp  = $hp->SUPER::c_port($partial) || {};
+    
+    my %c_port;
+    foreach my $iid (keys %$cdp){
+        my $port = $cdp->{$iid};
+        next unless defined $port;
+
+        $c_port{$iid} = $port;
+    }
+
+    foreach my $iid (keys %$lldp){
+        my $port = $lldp->{$iid};
+        next unless defined $port;
+
+        $c_port{$iid} = $port;
+    }
+    return \%c_port;
+}
+
+sub c_id {
+    my $hp = shift;
+    my $partial = shift;
+
+    my $lldp = $hp->lldp_id($partial) || {};
+    my $cdp  = $hp->SUPER::c_id($partial) || {};
+
+    my %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;
+    }
+    return \%c_id;
+}
+
+sub c_platform {
+    my $hp = shift;
+    my $partial = shift;
+
+    my $lldp = $hp->lldp_rem_sysdesc($partial) || {};
+    my $cdp  = $hp->SUPER::c_platform($partial) || {};
+
+    my %c_platform;
+    foreach my $iid (keys %$cdp){
+        my $platform = $cdp->{$iid};
+        next unless defined $platform;
+
+        $c_platform{$iid} = $platform;
+    }
+
+    foreach my $iid (keys %$lldp){
+        my $platform = $lldp->{$iid};
+        next unless defined $platform;
+
+        $c_platform{$iid} = $platform;
+    }
+    return \%c_platform;
 }
 
 1;
@@ -335,7 +725,7 @@ SNMP::Info::Layer2::HP - SNMP Interface to HP Procurve Switches
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
@@ -373,7 +763,7 @@ a more specific class using the method above.
 
 =item SNMP::Info::Layer2
 
-=item SNMP::Info::Entity
+=item SNMP::Info::LLDP
 
 =item SNMP::Info::MAU
 
@@ -389,13 +779,20 @@ Included in V2 mibs from Cisco
 
 =item HP-ICF-OID
 
+=item HP-VLAN
+
+(this MIB new with SNMP::Info 0.8)
+
 =item STATISTICS-MIB
 
 =item NETSWITCH-MIB
 
+=item CONFIG-MIB
+
 =back
 
-The last three MIBs listed are from HP and can be found at http://www.hp.com/rnd/software
+The last five MIBs listed are from HP and can be found at L<http://www.hp.com/rnd/software>
+or L<http://www.hp.com/rnd/software/MIBs.htm>
 
 =head1 ChangeLog
 
@@ -433,15 +830,51 @@ Returns the model number of the HP Switch.  Will translate between the HP Part n
 the common model number with this map :
 
  %MODEL_MAP = ( 
-               'J4812A' => '2512',
-               'J4819A' => '5308XL',
-               'J4813A' => '2524',
-               'J4805A' => '5304XL',
-               'J4815A' => '3324XL',
-               'J4865A' => '4108GL',
-               'J4887A' => '4104GL',
-               'J4874A' => '9315',
-              );
+                'J4093A' => '2424M',
+                'J4110A' => '8000M',
+                'J4120A' => '1600M',
+                'J4121A' => '4000M',
+                'J4122A' => '2400M',
+                'J4138A' => '9308M',
+                'J4139A' => '9304M',
+                'J4812A' => '2512',
+                'J4813A' => '2524',
+                'J4815A' => '3324XL',
+                'J4819A' => '5308XL',
+                'J4840A' => '6308M-SX',
+                'J4841A' => '6208M-SX',
+                'J4850A' => '5304XL',
+                'J4851A' => '3124',
+                'J4865A' => '4108GL',
+                'J4874A' => '9315M',
+                'J4887A' => '4104GL',
+                'J4899A' => '2650',
+                'J4899B' => '2650-CR',
+                'J4900A' => '2626',
+                'J4900B' => '2626-CR',
+                'J4902A' => '6108',
+                'J4903A' => '2824',
+                'J4904A' => '2848',
+                'J4905A' => '3400cl-24G',
+                'J4906A' => '3400cl-48G',
+                'J8130A' => 'WAP-420-NA',
+                'J8131A' => 'WAP-420-WW',
+                'J8133A' => 'AP520WL',
+                'J8164A' => '2626-PWR',
+                'J8165A' => '2650-PWR',
+                'J8433A' => 'CX4-6400cl-6XG',
+                'J8474A' => 'MF-6400cl-6XG',
+                'J8697A' => '5406zl',
+                'J8698A' => '5412zl',
+                'J8718A' => '5404yl',
+                'J8719A' => '5408yl',
+                'J8770A' => '4204vl',
+                'J8773A' => '4208vl',
+                'J8680A' => '9608sl',
+                'J8762A' => '2600-8-PWR',
+                'J8692A' => '3500yl-24G-PWR',
+                'J8693A' => '3500yl-48G-PWR',
+                );
 
 =item $hp->os()
 
@@ -476,15 +909,15 @@ hp
 
 =head2 Globals imported from SNMP::Info::Layer2
 
-See documentation in SNMP::Info::Layer2 for details.
+See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
 
-=head2 Globals imported from SNMP::Info::Entity
+=head2 Globals imported from SNMP::Info::LLDP
 
-See documentation in SNMP::Info::Entity for details.
+See documentation in L<SNMP::Info::LLDP/"GLOBALS"> for details.
 
 =head2 Globals imported from SNMP::Info::MAU
 
-See documentation in SNMP::Info::MAU for details.
+See documentation in L<SNMP::Info::MAU/"GLOBALS"> for details.
 
 =head1 TABLE METHODS
 
@@ -501,35 +934,159 @@ Uses $hp->i_description()
 
 =item $hp->i_duplex()
 
-Maps $hp->mau_index() with $hp->mau_link().  Methods inherited from
-SNMP::Info::MAU.
+Returns reference to map of IIDs to current link duplex.
 
 =item $hp->i_duplex_admin()
 
-Maps $hp->mau_index() with $hp->mau_auto(), $hp->mau_autostat(),
-$hp->typeadmin(), and $mau_autosent().  Methods inherited from
-SNMP::Info::MAU.
+Returns reference to hash of IIDs to admin duplex setting.
 
 =item $hp->i_name()
 
 Crosses i_name() with $hp->e_name() using $hp->e_port() and i_alias()
 
-=item $hp->i_type()
+=item $hp->i_vlan()
 
-Crosses i_type() with $hp->e_descr() using $hp->e_port()
+Returns a mapping between ifIndex and the PVID (default VLAN) or untagged
+port when using HP-VLAN.
+
+Looks in Q-BRIDGE-MIB first (L<SNMP::Info::Bridge/"TABLE METHODS">) and for
+older devices looks in HP-VLAN.
+
+=item $hp->i_vlan_membership()
+
+Returns reference to hash of arrays: key = ifIndex, value = array of VLAN IDs.
+These are the VLANs which are members of the egress list for the port.  It
+is the union of tagged, untagged, and auto ports when using HP-VLAN.
+
+Looks in Q-BRIDGE-MIB first (L<SNMP::Info::Bridge/"TABLE METHODS">) and for
+older devices looks in HP-VLAN.
+
+  Example:
+  my $interfaces = $hp->interfaces();
+  my $vlans      = $hp->i_vlan_membership();
+  
+  foreach my $iid (sort keys %$interfaces) {
+    my $port = $interfaces->{$iid};
+    my $vlan = join(',', sort(@{$vlans->{$iid}}));
+    print "Port: $port VLAN: $vlan\n";
+  }
+
+=item $hp->bp_index()
+
+Returns reference to hash of bridge port table entries map back to interface identifier (iid)
+
+Returns (B<ifIndex>) for both key and value for 1600, 2424, 4000, and 8000 models
+since they seem to have problems with BRIDGE-MIB
+
+=back
+
+=head2 Topology information
+
+Based upon the firmware version HP devices may support Cisco Discovery
+Protocol (CDP), Link Layer Discovery Protocol (LLDP), or both.  These methods
+will query both and return the combination of all information.  As a result,
+there may be identical topology information returned from the two protocols
+causing duplicate entries.  It is the calling program's responsibility to
+identify any duplicate entries and de-duplicate if necessary.
+
+=over
+
+=item $hp->hasCDP()
+
+Returns true if the device is running either CDP or LLDP.
+
+=item $hp->c_if()
+
+Returns reference to hash.  Key: iid Value: local device port (interfaces)
+
+=item $hp->c_ip()
+
+Returns reference to hash.  Key: iid Value: remote IPv4 address
+
+If multiple entries exist with the same local port, c_if(), with the same IPv4
+address, c_ip(), it may be a duplicate entry.
+
+If multiple entries exist with the same local port, c_if(), with different IPv4
+addresses, c_ip(), there is either a non-CDP/LLDP device in between two or
+more devices or multiple devices which are not directly connected.  
+
+Use the data from the Layer2 Topology Table below to dig deeper.
+
+=item $hp->c_port()
+
+Returns reference to hash. Key: iid Value: remote port (interfaces)
+
+=item $hp->c_id()
+
+Returns reference to hash. Key: iid Value: string value used to identify the
+chassis component associated with the remote system.
+
+=item $hp->c_platform()
+
+Returns reference to hash.  Key: iid Value: Remote Device Type
 
 =back
 
 =head2 Table Methods imported from SNMP::Info::Layer2
 
-See documentation in SNMP::Info::Layer2 for details.
+See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
 
-=head2 Table Methods imported from SNMP::Info::Entity
+=head2 Table Methods imported from SNMP::Info::LLDP
 
-See documentation in SNMP::Info::Entity for details.
+See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
 
 =head2 Table Methods imported from SNMP::Info::MAU
 
-See documentation in SNMP::Info::MAU for details.
+See documentation in L<SNMP::Info::MAU/"TABLE METHODS"> for details.
+
+=head1 SET METHODS
+
+These are methods that provide SNMP set functionality for overridden methods or
+provide a simpler interface to complex set operations.  See
+L<SNMP::Info/"SETTING DATA VIA SNMP"> for general information on set operations. 
+
+=over
+
+=item $hp->set_i_vlan(vlan, ifIndex)
+
+Changes an untagged port VLAN, must be supplied with the numeric VLAN
+ID and port ifIndex.  This method will modify the port's VLAN membership.
+This method should only be used on end station (non-trunk) ports.
+
+  Example:
+  my %if_map = reverse %{$hp->interfaces()};
+  $hp->set_i_vlan('2', $if_map{'1.1'}) 
+    or die "Couldn't change port VLAN. ",$hp->error(1);
+
+=item $hp->set_i_pvid(pvid, ifIndex)
+
+Sets port PVID or default VLAN, must be supplied with the numeric VLAN ID and
+port ifIndex.  This method only changes the PVID, to modify an access (untagged)
+port use set_i_vlan() instead.
+
+  Example:
+  my %if_map = reverse %{$hp->interfaces()};
+  $hp->set_i_pvid('2', $if_map{'1.1'}) 
+    or die "Couldn't change port PVID. ",$hp->error(1);
+
+=item $hp->set_add_i_vlan_tagged(vlan, ifIndex)
+
+Adds the port to the egress list of the VLAN, must be supplied with the numeric
+VLAN ID and port ifIndex.
+
+  Example:
+  my %if_map = reverse %{$hp->interfaces()};
+  $hp->set_add_i_vlan_tagged('2', $if_map{'1.1'}) 
+    or die "Couldn't add port to egress list. ",$hp->error(1);
+
+=item $hp->set_remove_i_vlan_tagged(vlan, ifIndex)
+
+Removes the port from the egress list of the VLAN, must be supplied with the
+numeric VLAN ID and port ifIndex.
+
+  Example:
+  my %if_map = reverse %{$hp->interfaces()};
+  $hp->set_remove_i_vlan_tagged('2', $if_map{'1.1'}) 
+    or die "Couldn't add port to egress list. ",$hp->error(1);
 
 =cut

Info/Layer2/N2270.pm

@@ -0,0 +1,253 @@
+# SNMP::Info::Layer2::N2270
+# Eric Miller
+# $Id$
+#
+# Copyright (c) 2005 Eric Miller
+#
+# 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::Layer2::N2270;
+$VERSION = '1.07';
+use strict;
+
+use Exporter;
+use SNMP::Info;
+use SNMP::Info::Bridge;
+use SNMP::Info::SONMP;
+use SNMP::Info::Airespace;
+
+@SNMP::Info::Layer2::N2270::ISA = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::SONMP SNMP::Info::Airespace Exporter/;
+@SNMP::Info::Layer2::N2270::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+
+%MIBS    = (
+            %SNMP::Info::MIBS,
+            %SNMP::Info::Bridge::MIBS,
+            %SNMP::Info::SONMP::MIBS,
+            %SNMP::Info::Airespace::MIBS,
+            );
+
+%GLOBALS = (
+            %SNMP::Info::GLOBALS,
+            %SNMP::Info::Bridge::GLOBALS,
+            %SNMP::Info::SONMP::GLOBALS,
+            %SNMP::Info::Airespace::GLOBALS,
+            );
+
+%FUNCS   = (
+            %SNMP::Info::FUNCS,
+            %SNMP::Info::Bridge::FUNCS,
+            %SNMP::Info::SONMP::FUNCS,
+            %SNMP::Info::Airespace::FUNCS,
+            );
+
+%MUNGE   = (
+          %SNMP::Info::MUNGE,
+          %SNMP::Info::Bridge::MUNGE,
+          %SNMP::Info::SONMP::MUNGE,
+          %SNMP::Info::Airespace::MUNGE,
+            );
+
+sub os {
+    return 'nortel';
+}
+
+sub vendor {
+    return 'nortel';
+}
+
+sub model {
+    my $n2270 = shift;
+    my $id = $n2270->id();
+    return undef unless defined $id;
+    my $model = &SNMP::translateObj($id);
+    return $id unless defined $model;
+    $model =~ s/^sreg-WLANSecuritySwitch//i;
+
+    return $model;
+}
+
+sub index_factor {
+    return 256;
+}
+
+sub slot_offset {
+    return 0;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::N2270 - SNMP Interface to Nortel 2270 Series Wireless Switch
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+    #Let SNMP::Info determine the correct subclass for you.
+
+    my $n2270 = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+
+    or die "Can't connect to DestHost.\n";
+
+    my $class = $n2270->class();
+    print " Using device sub class : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from a 
+Nortel 2270 Series Wireless Switch through SNMP.
+
+For speed or debugging purposes you can call the subclass directly, but not after
+determining a more specific class using the method above. 
+
+my $n2270 = new SNMP::Info::Layer2::N2270(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info
+
+=item SNMP::Info::Bridge
+
+=item SNMP::Info::SONMP
+
+=item SNMP::Info::Airespace
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::Bridge/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::SONMP/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::Airespace/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $n2270->vendor()
+
+Returns 'nortel'
+
+=item $n2270->os()
+
+Returns 'nortel'
+
+=item $n2270->model()
+
+Cross references $bayhub->id() to the SYNOPTICS-ROOT-MIB and returns
+the results.
+
+Removes sreg-WLANSecuritySwitch from the model name
+
+=back
+
+=head2 Overrides
+
+=over
+
+=item  $bayhub->index_factor()
+
+Required by SNMP::Info::SONMP.  Number representing the number of ports
+reserved per slot within the device MIB.  Returns 256.
+
+=item $bayhub->slot_offset()
+
+Required by SNMP::Info::SONMP.  Offset if slot numbering does not
+start at 0.  Returns 0.
+
+=back
+
+=head2 Globals imported from SNMP::Info
+
+See documentation in L<SNMP::Info/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::Bridge
+
+See documentation in L<SNMP::Info::Bridge/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::SONMP
+
+See documentation in L<SNMP::Info::SONMP/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::Airespace
+
+See documentation in L<SNMP::Info::Airespace/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item None
+
+=back
+
+=head2 Table Methods imported from SNMP::Info
+
+See documentation in L<SNMP::Info/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::Bridge
+
+See documentation in L<SNMP::Info::Bridge/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::SONMP
+
+See documentation in L<SNMP::Info::SONMP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::Airespace
+
+See documentation in L<SNMP::Info::Airespace/"TABLE METHODS"> for details.
+
+=cut

Info/Layer2/NAP222x.pm

@@ -0,0 +1,580 @@
+# SNMP::Info::Layer2::NAP222x
+# Eric Miller
+# $Id$
+#
+# Copyright (c) 2004 Eric Miller
+#
+# 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::Layer2::NAP222x;
+$VERSION = '1.07';
+use strict;
+
+use Exporter;
+use SNMP::Info::SONMP;
+use SNMP::Info::IEEE802dot11;
+use SNMP::Info::Layer2;
+
+@SNMP::Info::Layer2::NAP222x::ISA = qw/SNMP::Info::SONMP SNMP::Info::IEEE802dot11 SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::NAP222x::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+
+%MIBS    = (
+            %SNMP::Info::Layer2::MIBS,
+            %SNMP::Info::IEEE802dot11::MIBS,
+            %SNMP::Info::SONMP::MIBS,
+            'NORTEL-WLAN-AP-MIB' => 'ntWlanSwHardwareVer',
+           );
+
+%GLOBALS = (
+            %SNMP::Info::Layer2::GLOBALS,
+            %SNMP::Info::IEEE802dot11::GLOBALS,
+            %SNMP::Info::SONMP::GLOBALS,
+            'nt_hw_ver'     => 'ntWlanSwHardwareVer',
+            'nt_fw_ver'     => 'ntWlanSwBootRomVer',
+            'nt_sw_ver'     => 'ntWlanSwOpCodeVer',
+            'nt_cc'         => 'ntWlanSwCountryCode',
+            'tftp_action'   => 'ntWlanTransferStart',
+            'tftp_host'     => 'ntWlanFileServer',
+            'tftp_file'     => 'ntWlanDestFile',
+            'tftp_type'     => 'ntWlanFileType',
+            'tftp_result'   => 'ntWlanFileTransferStatus',
+            'tftp_xtype'    => 'ntWlanTransferType',
+            'tftp_src_file' => 'ntWlanSrcFile',
+            'ftp_user'      => 'ntWlanUserName',
+            'ftp_pass'      => 'ntWlanPassword',
+           );
+
+%FUNCS   = (
+            %SNMP::Info::Layer2::FUNCS,
+            %SNMP::Info::IEEE802dot11::FUNCS,
+            %SNMP::Info::SONMP::FUNCS,
+            # From ntWlanPortTable
+            'nt_prt_name'    => 'ntWlanPortName',
+            'nt_dpx_admin'   => 'ntWlanPortCapabilities',
+            'nt_auto'        => 'ntWlanPortAutonegotiation',
+            'nt_dpx'         => 'ntWlanPortSpeedDpxStatus',
+            # From ntWlanDot11PhyOperationTable
+            'nt_i_broadcast' => 'ntWlanDot11ClosedSystem',
+            # From ntWlanApVlanTable
+            'nt_i_vlan'      => 'ntWlanApVlanDefaultVid',
+            );
+
+%MUNGE   = (
+            %SNMP::Info::Layer2::MUNGE,
+            %SNMP::Info::IEEE802dot11::MUNGE,
+            %SNMP::Info::SONMP::MUNGE,
+            );
+
+sub os {
+    return 'nortel';
+}
+
+sub os_bin {
+    my $nap222x = shift;
+    my $bin = $nap222x->nt_fw_ver();
+    return undef unless defined $bin;
+
+    if ($bin =~ m/(\d+\.\d+\.\d+)/){
+        return $1;
+        }
+    return undef;
+}
+
+sub model {
+    my $nap222x = shift;
+    my $descr = $nap222x->description();
+    return undef unless defined $descr;
+
+    return 'AP-2220' if ($descr =~ /2220/);
+    return 'AP-2221' if ($descr =~ /2221/);
+    return undef;
+}
+
+sub mac {
+    my $nap222x = shift;
+    my $i_mac = $nap222x->i_mac();
+
+# Return Interface MAC   
+    foreach my $entry (keys %$i_mac){
+        my $sn = $i_mac->{$entry};
+        next unless $sn;
+        return $sn;
+    }
+    return undef;
+}
+
+sub serial {
+    my $nap222x = shift;
+    my $i_mac = $nap222x->i_mac();
+
+# Return Interface MAC   
+    foreach my $entry (keys %$i_mac){
+        my $sn = $i_mac->{$entry};
+        next unless $sn;
+        return $sn;
+    }
+    return undef;
+}
+
+sub interfaces {
+    my $nap222x = shift;
+    my $partial = shift;
+
+    my $interfaces = $nap222x->i_index($partial) || {};
+    my $description = $nap222x->i_description($partial) || {};
+
+    my %interfaces = ();
+    foreach my $iid (keys %$interfaces){
+        my $desc = $description->{$iid};
+        next unless defined $desc;
+        next if $desc =~ /lo/i;
+
+        $interfaces{$iid} = $desc;
+    }
+    return \%interfaces;
+}
+
+sub i_duplex {
+    my $nap222x = shift;
+    my $partial = shift;
+    
+    my $mode = $nap222x->nt_dpx($partial) || {};
+    my $port_name = $nap222x->nt_prt_name($partial) || {};
+    my $interfaces = $nap222x->interfaces($partial) || {};
+    
+    my %i_duplex;
+    foreach my $if (keys %$interfaces){
+        my $port = $interfaces->{$if};
+        next unless $port =~ /dp/i;
+        foreach my $idx (keys %$mode) {
+            my $name = $port_name->{$idx}||'unknown';
+            next unless $name eq $port;
+            my $duplex = $mode->{$idx};
+            
+            $duplex = 'other' unless defined $duplex;
+            $duplex = 'half' if $duplex =~ /half/i;
+            $duplex = 'full' if $duplex =~ /full/i;
+    
+            $i_duplex{$if}=$duplex;
+        }
+    }
+    return \%i_duplex;
+}
+
+sub i_duplex_admin {
+    my $nap222x = shift;
+    my $partial = shift;
+
+    my $dpx_admin = $nap222x->nt_dpx_admin($partial) || {};
+    my $nt_auto = $nap222x->nt_auto($partial) || {};
+    my $interfaces = $nap222x->interfaces($partial) || {};
+    my $port_name = $nap222x->nt_prt_name($partial) || {};
+ 
+    my %i_duplex_admin;
+    foreach my $if (keys %$interfaces){
+        my $port = $interfaces->{$if};
+        next unless $port =~ /dp/i;
+        foreach my $idx (keys %$dpx_admin) {
+            my $name = $port_name->{$idx}||'unknown';
+            next unless $name eq $port;
+            my $duplex = $dpx_admin->{$idx};
+            my $auto = $nt_auto->{$idx};
+    
+            $duplex = 'other' unless defined $duplex;
+            $duplex = 'half' if ($duplex =~ /half/i and $auto =~ /disabled/i);
+            $duplex = 'full' if ($duplex =~ /full/i and $auto =~ /disabled/i);
+            $duplex = 'auto' if $auto =~ /enabled/i;
+    
+            $i_duplex_admin{$if}=$duplex;
+        }
+    }
+    return \%i_duplex_admin;
+}
+
+sub i_name {
+    my $nap222x = shift;
+    my $partial = shift;
+
+    my $interfaces = $nap222x->interfaces($partial) || {};
+
+    my %i_name;
+    foreach my $if (keys %$interfaces){
+        my $desc = $interfaces->{$if};
+        next unless defined $desc;
+        
+        my $name = 'unknown';
+        $name = 'Ethernet Interface' if $desc =~ /dp/i;
+        $name = 'Wireless Interface B' if $desc =~ /ndc/i;
+        $name = 'Wireless Interface A' if $desc =~ /ar/i;
+        
+        $i_name{$if} = $name;
+    }
+    return \%i_name;
+}
+
+# dot1dBasePortTable does not exist and dot1dTpFdbPort does not map to ifIndex
+sub bp_index {
+    my $nap222x = shift;
+    my $partial = shift;
+
+    my $interfaces = $nap222x->interfaces($partial) || {};
+
+    my %bp_index;
+    foreach my $iid (keys %$interfaces){
+        my $desc = $interfaces->{$iid};
+        next unless defined $desc;
+        next unless $desc =~ /(ndc|ar)/i;
+        
+        my $port = 1;
+        $port = 2 if $desc =~ /ndc/i;
+
+    $bp_index{$port} = $iid;
+    }
+    return \%bp_index;
+}
+
+# Indicies don't match anywhere in these devices! Need to override to match
+# IfIndex.
+sub i_ssidlist {
+    my $nap222x = shift;
+    my $partial = shift;
+
+    # modify partial to match index
+    if (defined $partial) {
+        $partial = $partial - 2;
+    }
+    my $ssids = $nap222x->orig_i_ssidlist($partial) || {};
+
+    my %i_ssidlist;
+    foreach my $iid (keys %$ssids){
+        my $port = $iid + 2;
+        my $ssid = $ssids->{$iid};
+        next unless defined $ssid;
+        
+        $i_ssidlist{$port} = $ssid;
+    }
+    return \%i_ssidlist;        
+}
+
+sub i_ssidbcast {
+    my $nap222x = shift;
+    my $partial = shift;
+
+    # modify partial to match index
+    if (defined $partial) {
+        $partial = $partial - 2;
+    }
+    my $bcast = $nap222x->nt_i_broadcast($partial) || {};
+
+    my %i_ssidbcast;
+    foreach my $iid (keys %$bcast){
+        my $port = $iid + 2;
+        my $bc   = $bcast->{$iid};
+        next unless defined $bc;
+        
+        $i_ssidbcast{$port} = $bc;
+    }
+    return \%i_ssidbcast;        
+}
+
+sub i_80211channel {
+    my $nap222x = shift;
+    my $partial = shift;
+
+    # modify partial to match index
+    if (defined $partial) {
+        $partial = $partial - 2;
+    }
+    my $phy_type = $nap222x->dot11_phy_type($partial) || {};
+    my $cur_freq = $nap222x->dot11_cur_freq() || {};
+    my $cur_ch   = $nap222x->dot11_cur_ch() || {};
+
+    my %i_80211channel;
+    foreach my $iid (keys %$phy_type){
+        my $port = $iid + 2;
+        my $type = $phy_type->{$iid};
+        next unless defined $type;
+        if ($type =~ /dsss/) {
+            my $ch = $cur_ch->{1};
+            next unless defined $ch;
+            $i_80211channel{$port} = $ch;
+        }
+        elsif ($type =~ /ofdm/) {
+            my $ch = $cur_freq->{0};
+            next unless defined $ch;
+            $i_80211channel{$port} = $ch;
+        }
+        else {
+            next;
+        }
+    }
+
+    return \%i_80211channel;
+}
+
+sub i_vlan {
+    my $nap222x = shift;
+    my $partial = shift;
+
+    # modify partial to match index
+    if (defined $partial) {
+        $partial = $partial - 2;
+    }
+    my $vlans = $nap222x->nt_i_vlan($partial) || {};
+
+    my %i_vlan;
+    foreach my $iid (keys %$vlans){
+        my $port = $iid + 2;
+        my $vlan = $vlans->{$iid};
+        next unless defined $vlan;
+        
+        $i_vlan{$port} = $vlan;
+    }
+    return \%i_vlan;        
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::NAP222x - SNMP Interface to Nortel 2220 Series Access Points
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $nap222x = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $nap222x->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from a Nortel
+2220 series wireless Access Points through SNMP. 
+
+For speed or debugging purposes you can call the subclass directly, but not after determining
+a more specific class using the method above. 
+
+ my $nap222x = new SNMP::Info::Layer2::NAP222x(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::SONMP
+
+=item SNMP::Info::IEEE802dot11
+
+=item SNMP::Info::Layer2
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item NORTEL-WLAN-AP-MIB
+
+=back
+
+=head2 Inherited MIBs
+
+See L<SNMP::Info::SONMP/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::IEEE802dot11/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::Layer2/"Required MIBs"> for its MIB requirements.
+
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $nap222x->model()
+
+Returns the model extracted from B<sysDescr>.
+
+=item $nap222x->os()
+
+Returns 'nortel'
+
+=item $nap222x->os_bin()
+
+Returns the firmware version extracted from B<ntWlanSwBootRomVer>.
+
+=item $nap222x->mac()
+
+Returns the MAC address of the first Ethernet Interface.
+
+=item $nap222x->serial()
+
+Returns the MAC address of the first Ethernet Interface.
+
+=item $nap222x->nt_hw_ver()
+
+Returns the hardware version.
+
+(B<ntWlanSwHardwareVer>)
+
+=item $nap222x->nt_cc()
+
+Returns the country code of the AP.
+
+(B<ntWlanSwHardwareVer>)
+
+=item $nap222x->tftp_action()
+
+(B<ntWlanTransferStart>)
+
+=item $nap222x->tftp_host()
+
+(B<ntWlanFileServer>)
+
+=item $nap222x->tftp_file()
+
+(B<ntWlanDestFile>)
+
+=item $nap222x->tftp_type()
+
+(B<ntWlanFileType>)
+
+=item $nap222x->tftp_result()
+
+(B<ntWlanFileTransferStatus>)
+
+=item $nap222x->tftp_xtype()
+
+(B<ntWlanTransferType>)
+
+=item $nap222x->tftp_src_file()
+
+(B<ntWlanSrcFile>)
+
+=item $nap222x->ftp_user()
+
+(B<ntWlanUserName>)
+
+=item $nap222x->ftp_pass()
+
+(B<ntWlanPassword>)
+
+=back
+
+=head2 Globals imported from SNMP::Info::SONMP
+
+See L<SNMP::Info::SONMP/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::IEEE802dot11
+
+See L<SNMP::Info::IEEE802dot11/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::Layer2
+
+See L<SNMP::Info::Layer2/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item $nap222x->interfaces()
+
+Returns reference to map of IIDs to physical ports. 
+
+=item $nap222x->i_duplex()
+
+Returns reference to hash.  Maps port operational duplexes to IIDs.
+
+(B<ntWlanPortSpeedDpxStatus>)
+
+=item $nap222x->i_duplex_admin()
+
+Returns reference to hash.  Maps port admin duplexes to IIDs.
+
+(B<ntWlanPortCapabilities>)
+
+=item $nap222x->i_name()
+
+Returns a human name based upon port description.
+
+=item $nap222x->bp_index()
+
+Returns a mapping between ifIndex and the Bridge Table.  This does not exist in
+the MIB and bridge port index is not the same as ifIndex so it is created. 
+
+=item $nap222x->i_ssidlist()
+
+Returns reference to hash.  SSID's recognized by the radio interface.
+
+=item $nap222x->i_ssidbcast()
+
+Returns reference to hash.  Indicates whether the SSID is broadcast.
+
+=item $nap222x->i_80211channel()
+
+Returns reference to hash.  Current operating frequency channel of the radio
+interface.
+
+=item $nap222x->i_vlan()
+
+The default VID of the radio interfaces.
+
+(B<ntWlanApVlanDefaultVid>)
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::SONMP
+
+See L<SNMP::Info::SONMP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::IEEE802dot11
+
+See L<SNMP::Info::IEEE802dot11/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::Layer2
+
+See L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=cut

Info/Layer2/Netgear.pm

@@ -0,0 +1,183 @@
+# SNMP::Info::Layer2::Netgear
+# Bill Fenner and Zoltan Erszenyi
+#
+# 
+# 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::Layer2::Netgear;
+# $Id$
+
+use strict;
+
+use Exporter;
+use SNMP::Info::Layer2;
+
+
+use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/;
+
+$VERSION = '1.07';
+@SNMP::Info::Layer2::Netgear::ISA = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Netgear::EXPORT_OK = qw//;
+
+%MIBS    = (
+            %SNMP::Info::Layer2::MIBS,
+           );
+
+%GLOBALS = (
+            %SNMP::Info::Layer2::GLOBALS,
+           );
+
+%FUNCS   = (
+	    %SNMP::Info::Layer2::FUNCS,
+           );
+
+%MUNGE   = (
+	    %SNMP::Info::Layer2::MUNGE,
+           );
+
+sub vendor {
+    return 'netgear';
+}
+
+sub os {
+    return 'netgear';
+}
+
+# Wish the OID-based method worked, but netgear scatters
+# the sysObjectID values across all the device MIBs, and
+# makes the device MIBs state secrets.
+# They seem to set sysDescr to the model number, though,
+# so we'll use that.
+sub model {
+    my $netgear = shift;
+    return $netgear->description();
+}
+
+#
+# This is model-dependent.  Some netgear brand devices don't implement
+# the bridge MIB forwarding table, so we use the Q-BRIDGE-MIB forwarding
+# table.  Fall back to the orig functions if the qb versions don't
+# return anything.
+sub fw_mac {
+    my $netgear = shift;
+    my $ret = $netgear->qb_fw_mac();
+    $ret = $netgear->orig_fw_mac() if (!defined($ret));
+    return $ret;
+}
+
+sub fw_port {
+    my $netgear = shift;
+    my $ret = $netgear->qb_fw_port();
+    $ret = $netgear->orig_fw_port() if (!defined($ret));
+    return $ret;
+}
+
+1;
+  
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Netgear - SNMP Interface to Netgear switches
+
+=head1 AUTHOR
+
+Bill Fenner and Zoltan Erszenyi
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $netgear = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $netgear->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from a 
+Netgear device through SNMP. See inherited classes' documentation for 
+inherited methods.
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item Inherited Classes' MIBs
+
+MIBs listed in L<SNMP::Info::Layer2/"Required MIBs"> and its inherited classes.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=head2 Overrides
+
+=over
+
+=item $netgear->vendor()
+
+Returns 'netgear'
+
+=item $netgear->os()
+
+Returns 'netgear' 
+
+=item $netgear->model()
+
+Returns description()
+
+=back
+
+=head2 Global Methods imported from SNMP::Info::Layer2
+
+See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of
+a reference to a hash.
+
+=head2 Table Methods imported from SNMP::Info::Layer2
+
+See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=cut

Info/Layer2/Orinoco.pm

@@ -0,0 +1,310 @@
+# SNMP::Info::Layer2::Orinoco
+# Eric Miller
+# $Id$
+#
+# Copyright (c) 2004 Eric Miller
+#
+# 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::Layer2::Orinoco;
+$VERSION = '1.07';
+use strict;
+
+use Exporter;
+use SNMP::Info::IEEE802dot11;
+use SNMP::Info::Layer2;
+
+@SNMP::Info::Layer2::Orinoco::ISA = qw/SNMP::Info::IEEE802dot11 SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Orinoco::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+
+%MIBS    = (
+            %SNMP::Info::Layer2::MIBS,
+            %SNMP::Info::IEEE802dot11::MIBS,
+            #'ORiNOCO-MIB' => 'orinoco',
+           );
+
+%GLOBALS = (
+            %SNMP::Info::Layer2::GLOBALS,
+            %SNMP::Info::IEEE802dot11::GLOBALS,
+           );
+
+%FUNCS   = (
+            %SNMP::Info::Layer2::FUNCS,
+            %SNMP::Info::IEEE802dot11::FUNCS,
+            # ORiNOCO-MIB:oriWirelessIfPropertiesTable
+            #'ori_ssid'       => 'oriWirelessIfNetworkName',
+            #'ori_channel'    => 'oriWirelessIfChannel',
+            #'ori_closed_sys' => 'oriWirelessIfClosedSystem',
+            # ORiNOCO-MIB:oriSystemInvMgmtComponentTable
+             );
+
+%MUNGE   = (
+            %SNMP::Info::Layer2::MUNGE,
+            %SNMP::Info::IEEE802dot11::MUNGE,
+            );
+
+sub os {
+    return 'orinoco';
+}
+
+sub os_ver {
+    my $orinoco = shift;
+
+    my $descr = $orinoco->description();
+    return undef unless defined $descr;
+
+    if ($descr =~ m/V(\d+\.\d+)/){
+        return $1;
+    }
+    if ($descr =~ m/v(\d+\.\d+\.\d+)/){
+        return $1;
+    }
+
+    return undef;
+}
+
+sub os_bin {
+    my $orinoco = shift;
+
+    my $descr = $orinoco->description();
+    return undef unless defined $descr;
+
+    if ($descr =~ m/V(\d+\.\d+)$/){
+        return $1;
+    }
+    if ($descr =~ m/v(\d+\.\d+\.\d+)$/){
+        return $1;
+    }
+
+    return undef;
+}
+
+sub vendor {
+    return 'proxim';
+}
+
+sub model {
+    my $orinoco = shift;
+
+    my $descr = $orinoco->description();
+    return undef unless defined $descr;
+
+    return $1 if ($descr =~ /(AP-\d+)/);
+    return 'WavePOINT-II' if ($descr =~ /WavePOINT-II/);
+    return undef;
+}
+
+sub serial {
+    my $orinoco = shift;
+
+    my $descr = $orinoco->description();
+    return undef unless defined $descr;
+
+    $descr  = $1 if $descr =~ /SN-(\S+)/;
+    return $descr;
+}
+
+sub i_ignore {
+    my $orinoco = shift;
+    my $partial = shift;
+
+    my $descr = $orinoco->i_description($partial) || {};
+
+    my %i_ignore;
+    foreach my $if (keys %$descr){
+        my $type = $descr->{$if};
+	  # Skip virtual interfaces  
+        $i_ignore{$if}++ if $type =~ /(lo|empty|PCMCIA)/i;
+    }
+    return \%i_ignore;
+}
+
+sub interfaces {
+    my $orinoco = shift;
+    my $partial = shift;
+
+    my $interfaces = $orinoco->i_index($partial) || {};
+    my $descriptions = $orinoco->i_description($partial) || {};
+
+    my %interfaces = ();
+    foreach my $iid (keys %$interfaces){
+        my $desc = $descriptions->{$iid};
+        next unless defined $desc;
+        next if $desc =~ /(lo|empty|PCMCIA)/i;
+
+	$desc  = 'AMD' if $desc =~ /AMD/;
+
+        $interfaces{$iid} = $desc;
+    }
+    return \%interfaces;
+}
+
+#sub i_ssidbcast {
+#    my $orinoco = shift;
+#    my $partial = shift;
+#
+#    my $bcast = $orinoco->ori_closed_sys($partial) || {};
+#
+#    my %i_ssidbcast;
+#    foreach my $iid (keys %$bcast){
+#        my $bc   = $bcast->{$iid};
+#        next unless defined $bc;
+#
+#        $i_ssidbcast{$iid} = $bc;
+#    }
+#    return \%i_ssidbcast;        
+#}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Orinoco - SNMP Interface to Orinoco Series Access Points
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $orinoco = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $orinoco->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from a Orinoco
+Access Point through SNMP.  Orinoco devices have been maufactured by Proxim,
+Agere, and Lucent.
+
+For speed or debugging purposes you can call the subclass directly, but not after
+determining a more specific class using the method above. 
+
+ my $orinoco = new SNMP::Info::Layer2::Orinoco(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+=item SNMP::Info::IEEE802dot11
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+None.
+
+=back
+
+=head2 Inherited MIBs
+
+See L<SNMP::Info::Layer2/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::IEEE802dot11/"Required MIBs"> for its MIB requirements.
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $orinoco->vendor()
+
+Returns 'proxim'
+
+=item $orinoco->model()
+
+Returns the model extracted from B<sysDescr>.
+
+=item $orinoco->os()
+
+Returns 'Orinoco'
+
+=item $orinoco->os_ver()
+
+Returns the software version extracted from B<sysDescr>.
+
+=item $orinoco->os_bin()
+
+Returns the firmware version extracted from B<sysDescr>.
+
+=item $orinoco->serial()
+
+Returns the serial number extracted from B<sysDescr>.
+
+=back
+
+=head2 Global Methods imported from SNMP::Info::Layer2
+
+See L<SNMP::Info::Layer2/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::IEEE802dot11
+
+See L<SNMP::Info::IEEE802dot11/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item $orinoco->interfaces()
+
+Returns reference to map of IIDs to physical ports. 
+
+=item $orinoco->i_ignore()
+
+Returns reference to hash of IIDs to ignore.
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer2
+
+See L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::IEEE802dot11
+
+See L<SNMP::Info::IEEE802dot11/"TABLE METHODS"> for details.
+
+=cut

Info/Layer2/ZyXEL_DSLAM.pm

@@ -0,0 +1,224 @@
+# SNMP::Info::Layer2::ZyXEL_DSLAM
+# Dmitry Sergienko <dmitry@trifle.net>
+#
+# Copyright (c) 2004 Max Baker
+# 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 Netdisco 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::Layer2::ZyXEL_DSLAM;
+$VERSION = '1.07';
+# $Id$
+use strict;
+
+use Exporter;
+use SNMP::Info::Layer2;
+
+@SNMP::Info::Layer2::ZyXEL_DSLAM::ISA = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::ZyXEL_DSLAM::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+
+# Set for No CDP
+%GLOBALS = (
+            %SNMP::Info::Layer2::GLOBALS
+            );
+
+%FUNCS   = (%SNMP::Info::Layer2::FUNCS,
+            'ip_adresses' => 'ipAdEntAddr',
+            'i_name'	  => 'ifDescr',
+            'i_description' => 'adslLineConfProfile',
+           );
+
+%MIBS    = (
+            %SNMP::Info::Layer2::MIBS,
+            'ADSL-LINE-MIB' => 'adslLineConfProfile'
+           );
+
+%MUNGE   = (%SNMP::Info::Layer2::MUNGE
+           );
+
+
+sub layers {
+    my $zyxel = shift;
+    my $layers = $zyxel->layers();
+    return $layers if defined $layers;
+
+    # If these don't claim to have any layers, so we'll give them 1+2
+    return '00000011';
+}
+
+sub vendor {
+    return 'zyxel';
+}
+
+sub os {
+    return 'zyxel';
+}
+
+sub os_ver {
+    my $zyxel = shift;
+    my $descr = $zyxel->description();
+    
+    if ($descr =~ m/version (\S+) /){
+        return $1;
+    }
+    return undef;
+}
+
+sub model {
+    my $zyxel = shift;
+
+    my $desc = $zyxel->description();
+
+    if ($desc =~ /8-port ADSL Module\(Annex A\)/){
+        return "AAM1008-61";
+    } elsif ($desc =~ /8-port ADSL Module\(Annex B\)/){
+        return "AAM1008-63";
+    }
+    return undef;
+}
+
+sub ip{
+    my $zyxel = shift;
+    my $ip_hash = $zyxel->ip_addresses();
+    my $ip;
+    
+    foreach $ip (keys %{$ip_hash}) {
+        my $found_ip = $ip if (defined $ip and $ip =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/);
+    }
+    return $ip;
+}
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::ZyXEL_DSLAM - SNMP Interface to ZyXEL DSLAM
+
+=head1 AUTHOR
+
+Dmitry Sergienko (C<dmitry@trifle.net>)
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $zyxel = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myhub',
+                          Community   => 'public',
+                          Version     => 1
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $l2->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from a 
+ZyXEL device through SNMP. See inherited classes' documentation for 
+inherited methods.
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item ADSL-LINE-MIB
+
+This MIB assumedly obtainable through ZyXEL or possibly included with your device.
+
+=item Inherited Classes
+
+MIBs listed in L<SNMP::Info::Layer2/"Required MIBs"> and their inherited classes.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=head2 Overrides
+
+=over
+
+=item $zyxel->vendor()
+
+Returns 'ZyXEL' :)
+
+=item $zyxel->os()
+
+Returns 'ZyXEL' 
+
+=item $zyxel->os_ver()
+
+Culls Version from description()
+
+=item $zyxel->ip()
+
+Returns IP Address of DSLAM.
+
+(B<ipAdEntAddr>)
+
+=item $zyxel->model()
+
+Trys to cull out model out of the description field.
+
+=back
+
+=head2 Global Methods imported from SNMP::Info::Layer2
+
+See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+=head2 Overrides
+
+=over
+
+=item $zyxel->i_name()
+
+Returns reference to map of IIDs to port name (B<ifDescr>).
+
+=item $zyxel->i_description()
+
+Returns reference to map of IIDs to human-set port description (profile name).
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer2
+
+See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3.pm

@@ -1,5 +1,7 @@
 # SNMP::Info::Layer3 - SNMP Interface to Layer3 devices
-# Max Baker <max@warped.org>
+# Max Baker
+#
+# Copyright (c) 2004 Max Baker -- All changes from Version 0.7 on
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
@@ -28,74 +30,99 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::Layer3;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 
 use strict;
 
 use Exporter;
 use SNMP::Info;
-use SNMP::Info::CDP;
-use SNMP::Info::CiscoStats;
 use SNMP::Info::Bridge;
 use SNMP::Info::EtherLike;
+use SNMP::Info::Entity;
+use SNMP::Info::PowerEthernet;
 
-use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
+use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-@SNMP::Info::Layer3::ISA = qw/SNMP::Info SNMP::Info::CDP SNMP::Info::Bridge 
-                              SNMP::Info::EtherLike SNMP::Info::CiscoStats Exporter/;
+@SNMP::Info::Layer3::ISA = qw/SNMP::Info::PowerEthernet
+                              SNMP::Info::Entity SNMP::Info::EtherLike 
+                              SNMP::Info::Bridge SNMP::Info Exporter/;
 @SNMP::Info::Layer3::EXPORT_OK = qw//;
 
-$DEBUG=0;
-$SNMP::debugging=$DEBUG;
-
-$INIT = 0;
-
 %MIBS = ( %SNMP::Info::MIBS,
           %SNMP::Info::Bridge::MIBS,
-          %SNMP::Info::CDP::MIBS,
-          %SNMP::Info::CiscoStats::MIBS,
           %SNMP::Info::EtherLike::MIBS,
-          'ENTITY-MIB'         => 'entPhysicalName',
-          'CISCO-PRODUCTS-MIB' => 'sysName',
-          'OSPF-MIB'           => 'ospfRouterId',
+          %SNMP::Info::Entity::MIBS,
+          %SNMP::Info::PowerEthernet::MIBS,
+          'IP-MIB'      => 'ipNetToMediaIfIndex',
+          'OSPF-MIB'    => 'ospfRouterId',
+          'BGP4-MIB'    => 'bgpIdentifier',
         );
 
 %GLOBALS = (
             # Inherit the super class ones
             %SNMP::Info::GLOBALS,
-            %SNMP::Info::CDP::GLOBALS,
-            %SNMP::Info::CiscoStats::GLOBALS,
             %SNMP::Info::Bridge::GLOBALS,
             %SNMP::Info::EtherLike::GLOBALS,
-            'mac'       => 'ifPhysAddress.1',
-            'chassis'   => 'entPhysicalDescr.1',
-            'router_ip' => 'ospfRouterId.0',
+            %SNMP::Info::Entity::GLOBALS,
+            %SNMP::Info::PowerEthernet::GLOBALS,
+            'mac'          => 'ifPhysAddress.1',
+            'serial1'      => '.1.3.6.1.4.1.9.3.6.3.0', # OLD-CISCO-CHASSIS-MIB::chassisId.0
+            'router_ip'    => 'ospfRouterId.0',
+            'bgp_id'       => 'bgpIdentifier.0',
+            'bgp_local_as' => 'bgpLocalAs.0',
            );
 
 %FUNCS   = (
             %SNMP::Info::FUNCS,
-            %SNMP::Info::CDP::FUNCS,
-            %SNMP::Info::CiscoStats::FUNCS,
             %SNMP::Info::Bridge::FUNCS,
             %SNMP::Info::EtherLike::FUNCS,
-            # IFMIB
-            'i_name2'    => 'ifName',
-            # Address Translation Table (ARP Cache)
-            'at_index'   => 'atIfIndex',
-            'at_paddr'   => 'atPhysAddress',
-            'at_netaddr' => 'atNetAddress',
-            'ospf_ip'    => 'ospfHostIpAddress'
+            %SNMP::Info::Entity::FUNCS,
+            %SNMP::Info::PowerEthernet::FUNCS,
+            # Obsolete Address Translation Table (ARP Cache)
+            'old_at_index'   => 'atIfIndex',
+            'old_at_paddr'   => 'atPhysAddress',
+            'old_at_netaddr' => 'atNetAddress',
+            # IP-MIB IP Net to Media Table (ARP Cache)
+            'at_index'    => 'ipNetToMediaIfIndex',
+            'at_paddr'    => 'ipNetToMediaPhysAddress',
+            'at_netaddr'  => 'ipNetToMediaNetAddress',
+            # OSPF-MIB::ospfIfTable
+            'ospf_if_ip'    => 'ospfIfIpAddress',
+            'ospf_if_area'  => 'ospfIfAreaId',
+            'ospf_if_type'  => 'ospfIfType',
+            'ospf_if_hello' => 'ospfIfHelloInterval',
+            'ospf_if_dead'  => 'ospfIfRtrDeadInterval',
+            'ospf_if_admin' => 'ospfIfAdminStat',
+            'ospf_if_state' => 'ospfIfState',
+            # OSPF-MIB::ospfNbrTable
+            'ospf_ip'         => 'ospfHostIpAddress',
+            'ospf_peers'      => 'ospfNbrIpAddr',
+            'ospf_peer_id'    => 'ospfNbrRtrId',
+            'ospf_peer_state' => 'ospfNbrState',
+            # BGP4-MIB::bgpPeerTable
+            'bgp_peers'               => 'bgpPeerLocalAddr',
+            'bgp_peer_id'             => 'bgpPeerIdentifier',
+            'bgp_peer_state'          => 'bgpPeerState',
+            'bgp_peer_as'             => 'bgpPeerRemoteAs',
+            'bgp_peer_addr'           => 'bgpPeerRemoteAddr',
+            'bgp_peer_fsm_est_trans'  => 'bgpPeerFsmEstablishedTransitions',
+            'bgp_peer_in_tot_msgs'    => 'bgpPeerInTotalMessages',
+            'bgp_peer_in_upd_el_time' => 'bgpPeerInUpdateElapsedTime',
+            'bgp_peer_in_upd'         => 'bgpPeerInUpdates', 
+            'bgp_peer_out_tot_msgs'   => 'bgpPeerOutTotalMessages',
+            'bgp_peer_out_upd'        => 'bgpPeerOutUpdates',
            );
 
 %MUNGE = (
             # Inherit all the built in munging
             %SNMP::Info::MUNGE,
-            %SNMP::Info::CDP::MUNGE,
-            %SNMP::Info::CiscoStats::MUNGE,
             %SNMP::Info::Bridge::MUNGE,
             %SNMP::Info::EtherLike::MUNGE,
-            'at_paddr' => \&SNMP::Info::munge_mac,
+            %SNMP::Info::Entity::MUNGE,
+            %SNMP::Info::PowerEthernet::MUNGE,
+            'old_at_paddr' => \&SNMP::Info::munge_mac,
+            'at_paddr'     => \&SNMP::Info::munge_mac,
          );
 
 
@@ -107,28 +134,31 @@ sub root_ip {
     my $router_ip  = $l3->router_ip();
     my $ospf_ip    = $l3->ospf_ip();
 
-    # return the first one found here (should be only)
+    # return the first one found here (should be only one)
     if (defined $ospf_ip and scalar(keys %$ospf_ip)){
         foreach my $key (keys %$ospf_ip){
             my $ip = $ospf_ip->{$key};
-            print " SNMP::Layer3::root_ip() using $ip\n" if $DEBUG;
+            next if $ip eq '0.0.0.0';
+            next unless $l3->snmp_connect_ip($ip);
+            print " SNMP::Layer3::root_ip() using $ip\n" if $l3->debug();
             return $ip;
         }
     }
 
-    return $router_ip if defined $router_ip;
+    return $router_ip if ( (defined $router_ip) and ($router_ip ne '0.0.0.0') and ($l3->snmp_connect_ip($router_ip)) );
     return undef;
 }
 
 sub i_ignore {
     my $l3 = shift;
+    my $partial = shift;
     
-    my $interfaces = $l3->interfaces();
+    my $interfaces = $l3->interfaces($partial) || {};
 
     my %i_ignore;
     foreach my $if (keys %$interfaces) {
         # lo -> cisco aironet 350 loopback
-        if ($interfaces->{$if} =~ /(tunnel|loopback|lo|null)/i){
+        if ($interfaces->{$if} =~ /(tunnel|loopback|\blo\b|null)/i){
             $i_ignore{$if}++;
         }
     }
@@ -138,10 +168,20 @@ sub i_ignore {
 sub serial {
     my $l3 = shift;
     
-    my $chassis = $l3->chassis();
+    my $serial1     = $l3->serial1();
+    my $e_descr     = $l3->e_descr()  || {};
+    my $e_serial    = $l3->e_serial() || {};
     
+    my $serial2     = $e_serial->{1}  || undef;
+    my $chassis     = $e_descr->{1}   || undef;
+    
+    # precedence
+    #   serial2,chassis parse,serial1
+    return $serial2 if (defined $serial2 and $serial2 !~ /^\s*$/);
     return $1 if (defined $chassis and $chassis =~ /serial#?:\s*([a-z0-9]+)/i);
+    return $serial1 if (defined $serial1 and $serial1 !~ /^\s*$/);
 
+    return undef;
 }
 
 # $l3->model() - the sysObjectID returns an IID to an entry in 
@@ -149,8 +189,16 @@ sub serial {
 sub model {
     my $l3 = shift;
     my $id = $l3->id();
+    
+    unless (defined $id){
+        print " SNMP::Info::Layer3::model() - Device does not support sysObjectID\n" if $l3->debug(); 
+        return undef;
+    }
+    
     my $model = &SNMP::translateObj($id);
 
+    return $id unless defined $model;
+
     $model =~ s/^cisco//i;
     $model =~ s/^catalyst//;
     $model =~ s/^cat//;
@@ -159,9 +207,11 @@ sub model {
 
 sub i_name {
     my $l3 = shift;
-    my $i_index = $l3->i_index();
-    my $i_alias = $l3->i_alias();
-    my $i_name2  = $l3->i_name2();
+    my $partial = shift;
+    
+    my $i_index = $l3->i_index($partial);
+    my $i_alias = $l3->i_alias($partial);
+    my $i_name2  = $l3->orig_i_name($partial);
 
     my %i_name;
     foreach my $iid (keys %$i_name2){
@@ -177,9 +227,10 @@ sub i_name {
 
 sub i_duplex {
     my $l3 = shift;
-
-    my $el_index = $l3->el_index();
-    my $el_duplex = $l3->el_duplex();
+    my $partial = shift;
+    
+    my $el_index = $l3->el_index($partial);
+    my $el_duplex = $l3->el_duplex($partial);
     
     my %i_index;
     foreach my $el_port (keys %$el_duplex){
@@ -199,8 +250,10 @@ sub i_duplex {
 # $l3->interfaces() - Map the Interfaces to their physical names
 sub interfaces {
     my $l3 = shift;
-    my $interfaces = $l3->i_index();
-    my $descriptions = $l3->i_description();
+    my $partial = shift;
+
+    my $interfaces = $l3->i_index($partial);
+    my $descriptions = $l3->i_description($partial);
 
     my %interfaces = ();
     foreach my $iid (keys %$interfaces){
@@ -218,20 +271,44 @@ sub vendor {
 
     my $descr = $l3->description();
 
-    return 'cisco' if ($descr =~ /(cisco|ios)/i);
+    return 'cisco' if ($descr =~ /(cisco|\bios\b)/i);
     return 'foundry' if ($descr =~ /foundry/i);
 
 }
+
+sub at_index {
+    my $l3 = shift;
+    my $partial = shift;
+
+    return $l3->orig_at_index($partial) || $l3->old_at_index($partial);
+}
+
+sub at_paddr {
+    my $l3 = shift;
+    my $partial = shift;
+
+    return $l3->orig_at_paddr($partial) || $l3->old_at_paddr($partial);
+}
+
+sub at_netaddr {
+    my $l3 = shift;
+    my $partial = shift;
+
+    return $l3->orig_at_netaddr($partial) || $l3->old_at_netaddr($partial);
+}
+
 1;
+
 __END__
 
 =head1 NAME
 
-SNMP::Info::Layer3 - Perl5 Interface to network devices serving Layer3 or Layers 2 & 3
+SNMP::Info::Layer3 - SNMP Interface to network devices serving Layer3 or
+Layers 2 & 3
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
@@ -246,7 +323,7 @@ Max Baker (C<max@warped.org>)
                         ) 
     or die "Can't connect to DestHost.\n";
 
- my $class      = $l3->class();
+ my $class = $l3->class();
  print "SNMP::Info determined this device to fall under subclass : $class\n";
 
  # Let's get some basic Port information
@@ -262,14 +339,15 @@ Max Baker (C<max@warped.org>)
 
 =head1 DESCRIPTION
 
-This class is usually used as a superclass for more specific device classes listed under 
-SNMP::Info::Layer3::*   Please read all docs under SNMP::Info first.
+This class is usually used as a superclass for more specific device classes
+listed under SNMP::Info::Layer3::*   Please read all docs under SNMP::Info
+first.
 
 Provides generic methods for accessing SNMP data for Layer 3 network devices. 
 Includes support for Layer2+3 devices. 
 
-For speed or debugging purposes you can call the subclass directly, but not after determining
-a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
 
  my $l3 = new SNMP::Info::Layer3(...);
 
@@ -279,33 +357,37 @@ a more specific class using the method above.
 
 =item SNMP::Info
 
-=item SNMP::Info::Bridge
-
-=item SNMP::Info::CDP
-
-=item SNMP::Info::CiscoStats
+=item SNMP::Info::Bridge (For L2/L3 devices)
 
 =item SNMP::Info::EtherLike
 
+=item SNMP::Info::Entity
+
 =back
 
 =head2 Required MIBs
 
 =over
 
-=item CISCO-PRODUCTS-MIB
-
-=item ENTITY-MIB
+=item IP-MIB
 
 =item OSPF-MIB
 
-=item Inherited Classes
-
-MIBs required by the inherited classes listed above.
+=item BGP4-MIB
 
 =back
 
-MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
+=head2 Inherited MIBs
+
+See L<SNMP::Info/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::Bridge/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::EtherLike/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::Entity/"Required MIBs"> for its MIB requirements.
+
+MIBs can be found in the netdisco-mibs package.
 
 =head1 GLOBALS
 
@@ -313,12 +395,6 @@ These are methods that return scalar value from SNMP
 
 =over
 
-=item $l3->chassis()
-
-Returns Chassis type (model).
-
-(B<entPhysicalDescr.1>)
-
 =item $l3->mac()
 
 Returns root port mac address
@@ -329,6 +405,18 @@ Returns root port mac address
 
 (B<ospfRouterId.0>)
 
+=item $l3->bgp_id()
+
+(B<bgpIdentifier.0>)
+
+Returns the BGP identifier of the local system
+
+=item $l3->bgp_local_as()
+
+Returns the local autonomous system number 
+
+(B<bgpLocalAs.0>)
+
 =back
 
 =head2 Overrides
@@ -343,35 +431,37 @@ Removes 'cisco'  from cisco devices for readability.
 
 =item $l3->serial()
 
-Trys to cull a serial number from $l3->chassis()
+Trys to cull a serial number from ENTITY-MIB, description, and OLD-CISCO-... mib
 
 =item $l3->vendor()
 
 Trys to cull a Vendor name from B<sysDescr>
 
+=item $l3->root_ip()
+
+Returns the primary IP used to communicate with the device.  Returns the first
+found:  OSPF Router ID (B<ospfRouterId>) or any OSPF Host IP Address
+(B<ospfHostIpAddress>).
+
 =back
 
 =head2 Globals imported from SNMP::Info
 
-See documentation in SNMP::Info for details.
+See L<SNMP::Info/"GLOBALS"> for details.
 
-=head2 Globals imported from SNMP::Info::Bridge
+=head2 Global Methods imported from SNMP::Info::Bridge
 
-See documentation in SNMP::Info::Bridge for details.
+See L<SNMP::Info::Bridge/"GLOBALS"> for details.
 
-=head2 Globals imported from SNMP::Info::CDP
+=head2 Global Methods imported from SNMP::Info::EtherLike
 
-See documentation in SNMP::Info::CDP for details.
+See L<SNMP::Info::EtherLike/"GLOBALS"> for details.
 
-=head2 Globals imported from SNMP::Info::CiscoStats
+=head2 Global Methods imported from SNMP::Info::Entity
 
-See documentation in SNMP::Info::CiscoStats for details.
+See L<SNMP::Info::Entity/"GLOBALS"> for details.
 
-=head2 Globals imported from SNMP::Info::EtherLike
-
-See documentation in SNMP::Info::EtherLike for details.
-
-=head1 TABLE ENTRIES
+=head1 TABLE METHODS
 
 These are methods that return tables of information in the form of a reference
 to a hash.
@@ -405,27 +495,63 @@ Returns reference to hash of iid to current link duplex setting.
 Maps $l3->el_index() to $l3->el_duplex, then culls out 
 full,half, or auto and sets the map to that value. 
 
-see SNMP::Info::Etherlike for the el_index() and el_duplex() methods.
+See L<SNMP::Info::Etherlike> for the el_index() and el_duplex() methods.
 
 =back
 
-=head2 ARP Cache Entries
+=head2 IP-MIB Arp Cache Table (B<ipNetToMediaTable>)
 
 =over
 
 =item $l3->at_index()
 
+Returns reference to hash.  Maps ARP table entries to Interface IIDs 
+
+(B<ipNetToMediaIfIndex>)
+
+If the device doesn't support B<ipNetToMediaIfIndex>, this will try
+the deprecated B<atIfIndex>.
+
+=item $l3->at_paddr()
+
+Returns reference to hash.  Maps ARP table entries to MAC addresses. 
+
+(B<ipNetToMediaPhysAddress>)
+
+If the device doesn't support B<ipNetToMediaPhysAddress>, this will try
+the deprecated B<atPhysAddress>.
+
+=item $l3->at_netaddr()
+
+Returns reference to hash.  Maps ARP table entries to IPs 
+
+(B<ipNetToMediaNetAddress>)
+
+If the device doesn't support B<ipNetToMediaNetAddress>, this will try
+the deprecated B<atNetAddress>.
+
+=back
+
+=head2 ARP Cache Entries
+
+The B<atTable> has been deprecated since 1991.  You should never need
+to use these methods.  See B<ipNetToMediaTable> above.
+
+=over
+
+=item $l3->old_at_index()
+
 Returns reference to map of IID to Arp Cache Entry
 
 (B<atIfIndex>)
 
-=item $l3->at_paddr()
+=item $l3->old_at_paddr()
 
 Returns reference to hash of Arp Cache Entries to MAC address
 
 (B<atPhysAddress>)
 
-=item $l3->at_netaddr()
+=item $l3->old_at_netaddr()
 
 Returns reference to hash of Arp Cache Entries to IP Address
 
@@ -433,24 +559,172 @@ Returns reference to hash of Arp Cache Entries to IP Address
 
 =back
 
+=head2 BGP Peer Table (B<bgpPeerTable>)
+
+=over
+
+=item $l3->bgp_peers()
+
+Returns reference to hash of BGP peer to local IP address
+
+(B<bgpPeerLocalAddr>)
+
+=item $l3->bgp_peer_id()
+
+Returns reference to hash of BGP peer to BGP peer identifier
+
+(B<bgpPeerIdentifier>)
+
+=item $l3->bgp_peer_state()
+
+Returns reference to hash of BGP peer to BGP peer state
+
+(B<bgpPeerState>)
+
+=item $l3->bgp_peer_as()
+
+Returns reference to hash of BGP peer to BGP peer autonomous system number
+
+(B<bgpPeerRemoteAs>)
+
+=item $l3->bgp_peer_addr()
+
+Returns reference to hash of BGP peer to BGP peer IP address
+
+(B<bgpPeerRemoteAddr>)
+
+=item $l3->bgp_peer_fsm_est_trans()
+
+Returns reference to hash of BGP peer to the total number of times the BGP FSM
+transitioned into the established state
+
+(B<bgpPeerFsmEstablishedTransitions>)
+
+=item $l3->bgp_peer_in_tot_msgs()
+
+Returns reference to hash of BGP peer to the total number of messages received
+from the remote peer on this connection
+
+(B<bgpPeerInTotalMessages>)
+
+=item $l3->bgp_peer_in_upd_el_time()
+
+Returns reference to hash of BGP peer to the elapsed time in seconds since
+the last BGP UPDATE message was received from the peer.
+
+(B<bgpPeerInUpdateElapsedTime>)
+
+=item $l3->bgp_peer_in_upd()
+
+Returns reference to hash of BGP peer to the number of BGP UPDATE messages
+received on this connection
+
+(B<bgpPeerInUpdates>)
+
+=item $l3->bgp_peer_out_tot_msgs()
+
+Returns reference to hash of BGP peer to the total number of messages transmitted
+to the remote peer on this connection
+
+(B<bgpPeerOutTotalMessages>)
+
+=item $l3->bgp_peer_out_upd()
+
+Returns reference to hash of BGP peer to the number of BGP UPDATE messages
+transmitted on this connection
+
+(B<bgpPeerOutUpdates>)
+
+=back
+
+=head2 OSPF Interface Table (B<ospfIfTable>)
+
+=over
+
+=item $l3->ospf_if_ip()
+
+Returns reference to hash of OSPF interface IP addresses
+
+(B<ospfIfIpAddress>)
+
+=item $l3->ospf_if_area()
+
+Returns reference to hash of the OSPF area to which the interfaces connect
+
+(B<ospfIfAreaId>)
+
+=item $l3->ospf_if_type()
+
+Returns reference to hash of the OSPF interfaces' type
+
+(B<ospfIfType>)
+
+=item $l3->ospf_if_hello()
+
+Returns reference to hash of the OSPF interfaces' hello interval
+
+(B<ospfIfHelloInterval>)
+
+=item $l3->ospf_if_dead()
+
+Returns reference to hash of the OSPF interfaces' dead interval
+
+(B<ospfIfRtrDeadInterval>)
+
+=item $l3->ospf_if_admin()
+
+Returns reference to hash of the OSPF interfaces' administrative status
+
+(B<ospfIfAdminStat>)
+
+=item $l3->ospf_if_state()
+
+Returns reference to hash of the OSPF interfaces' state
+
+(B<ospfIfState>)
+
+=back
+
+=head2 OSPF Neighbor Table (B<ospfNbrTable>)
+
+=over
+
+=item $l3->ospf_peers()
+
+Returns reference to hash of IP addresses the neighbor is using in its
+IP Source Addresses
+
+(B<ospfNbrIpAddr>)
+
+=item $l3->ospf_peer_id()
+
+Returns reference to hash of neighbor Router IDs
+
+(B<ospfNbrRtrId>)
+
+=item $l3->ospf_peer_state()
+
+Returns reference to hash of state of the relationship with the neighbor
+routers
+
+(B<ospfNbrState>)
+
+=back
+
 =head2 Table Methods imported from SNMP::Info
 
-See documentation in SNMP::Info for details.
+See L<SNMP::Info/"TABLE METHODS"> for details.
 
 =head2 Table Methods imported from SNMP::Info::Bridge
 
-See documentation in SNMP::Info::Bridge for details.
-
-=head2 Table Methods imported from SNMP::Info::CDP
-
-See documentation in SNMP::Info::CDP for details.
-
-=head2 Table Methods imported from SNMP::Info::CiscoStats
-
-See documentation in SNMP::Info::CiscoStats for details.
+See L<SNMP::Info::Bridge/"TABLE METHODS"> for details.
 
 =head2 Table Methods imported from SNMP::Info::EtherLike
 
-See documentation in SNMP::Info::EtherLike for details.
+See L<SNMP::Info::EtherLike/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::Entity
+
+See L<SNMP::Info::Entity/"TABLE METHODS"> for details.
 
 =cut

Info/Layer3/Aironet.pm

@@ -1,5 +1,7 @@
 # SNMP::Info::Layer3::Aironet
-# Max Baker <max@warped.org>
+# Max Baker
+#
+# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
@@ -28,7 +30,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::Layer3::Aironet;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 
 use strict;
@@ -40,10 +42,6 @@ use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
 @SNMP::Info::Layer3::Aironet::ISA = qw/SNMP::Info::Layer3 Exporter/;
 @SNMP::Info::Layer3::Aironet::EXPORT_OK = qw//;
 
-$DEBUG=0;
-$SNMP::debugging=$DEBUG;
-
-$INIT = 0;
 %MIBS =    (
             %SNMP::Info::Layer3::MIBS,
             'AWCVX-MIB'        => 'awcIfTable',
@@ -88,11 +86,11 @@ sub os {
 
 sub os_ver {
     my $aironet = shift;
-    my $descr = $aironet->description();
+    my $descr = $aironet->description() || '';
 
-    # CAP340 11.21
-    if ($descr =~ /AP\d{3}\s+(\d{2}\.\d{2})/){
-        return $1;
+    # CAP340 11.21, AP4800-E 11.21
+    if ($descr =~ /AP\d{3,4}(-\D+)?\s+(\d{2}\.\d{2})/){
+        return $2;
     }
     
     if ($descr =~ /Series\s*AP\s+(\d{2}\.\d{2})/){
@@ -135,7 +133,9 @@ sub fw_mac {
     }
 
     foreach my $bs (keys %$bs_mac){
-        $fw_mac->{$bs} = $bs_mac->{$bs};
+        my $entry = $bs;
+        $entry =~ s/\.0$//;
+        $fw_mac->{$entry} = $bs_mac->{$bs};
     }
 
     return $fw_mac;
@@ -149,7 +149,9 @@ sub fw_port {
 
 
     foreach my $bs (keys %$bs_port){
-        $fw_port->{$bs} = $bs_port->{$bs};
+        my $entry = $bs;
+        $entry =~ s/\.0$//;
+        $fw_port->{$entry} = $bs_port->{$bs};
     }
 
     return $fw_port;
@@ -214,7 +216,7 @@ SNMP::Info::Layer3::Aironet - Perl5 Interface to Cisco Aironet Wireless Devices
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
@@ -311,9 +313,9 @@ Returns 'cisco'.
 
 =head2 Globals imported from SNMP::Info::Layer3
 
-See documentation in SNMP::Info::Layer3 for details.
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 
-=head1 TABLE ENTRIES
+=head1 TABLE METHODS
 
 These are methods that return tables of information in the form of a reference
 to a hash.
@@ -387,6 +389,6 @@ B<awcIfMSDUMaxLength>
 
 =head2 Table Methods imported from SNMP::Info::Layer3
 
-See documentation in SNMP::Info::Layer3 for details.
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
 
 =cut

Info/Layer3/AlteonAD.pm

@@ -0,0 +1,418 @@
+# SNMP::Info::Layer3::AlteonAD
+# Eric Miller
+# $Id$
+#
+# Copyright (c) 2004 Eric Miller
+# 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::AlteonAD;
+$VERSION = '1.07';
+
+use strict;
+
+use Exporter;
+use SNMP::Info;
+use SNMP::Info::Layer3;
+use SNMP::Info::Bridge;
+
+use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE /;
+
+@SNMP::Info::Layer3::AlteonAD::ISA = qw/SNMP::Info SNMP::Info::Layer3 SNMP::Info::Bridge Exporter/;
+@SNMP::Info::Layer3::AlteonAD::EXPORT_OK = qw//;
+
+%MIBS = (
+          %SNMP::Info::MIBS,
+          %SNMP::Info::Layer3::MIBS,
+          %SNMP::Info::Bridge::MIBS,
+          'ALTEON-TIGON-SWITCH-MIB' => 'agSoftwareVersion',
+          'ALTEON-TS-PHYSICAL-MIB'  => 'agPortTableMaxEnt',
+          'ALTEON-TS-NETWORK-MIB'   => 'agPortTableMaxEnt',
+        );
+
+%GLOBALS = (
+            %SNMP::Info::GLOBALS,
+            %SNMP::Info::Layer3::GLOBALS,
+            %SNMP::Info::Bridge::GLOBALS,
+            'sw_ver'           => 'agSoftwareVersion',
+            'tftp_action'  => 'agTftpAction',
+            'tftp_host'    => 'agTftpServer',
+            'tftp_file'    => 'agTftpCfgFileName',
+            'tftp_result'  => 'agTftpLastActionStatus',
+           );
+
+%FUNCS = (
+            %SNMP::Info::FUNCS,
+            %SNMP::Info::Layer3::FUNCS,
+            %SNMP::Info::Bridge::FUNCS,
+            # From agPortCurCfgTable
+            'ag_p_cfg_idx'        => 'agPortCurCfgIndx',
+            'ag_p_cfg_pref'       => 'agPortCurCfgPrefLink',
+            'ag_p_cfg_pvid'       => 'agPortCurCfgPVID',
+            'ag_p_cfg_fe_auto'    => 'agPortCurCfgFastEthAutoNeg',
+            'ag_p_cfg_fe_mode'    => 'agPortCurCfgFastEthMode',
+            'ag_p_cfg_ge_auto'    => 'agPortCurCfgGigEthAutoNeg',
+            'ag_p_cfg_name'       => 'agPortCurCfgPortName',
+            # From portInfoTable
+            'p_info_idx'     => 'portInfoIndx',
+            'p_info_mode'    => 'portInfoMode',
+            # From portInfoTable
+            'ip_cfg_vlan'     => 'ipCurCfgIntfVlan',
+         );
+         
+%MUNGE = (
+            %SNMP::Info::MUNGE,
+            %SNMP::Info::Layer3::MUNGE,
+            %SNMP::Info::Bridge::MUNGE,
+         );
+
+sub model {
+    my $alteon = shift;
+    my $desc = $alteon->description();
+    return undef unless defined $desc;
+
+    return 'AD2' if ($desc =~ /AD2/);
+    return 'AD3' if ($desc =~ /AD3/);
+    return 'AD4' if ($desc =~ /AD4/);
+    return '180' if ($desc =~ /180/);
+    return '183' if ($desc =~ /183/);
+    return '184' if ($desc =~ /184/);
+    
+    return $desc;
+}
+
+sub vendor {
+    return 'nortel';
+}
+
+sub os {
+    return 'webos';
+}
+
+sub os_ver {
+    my $alteon = shift;
+    my $version = $alteon->sw_ver();
+    return undef unless defined $version;
+
+    return $version;
+}
+
+sub interfaces {
+    my $alteon = shift;
+    my $interfaces = $alteon->i_index();
+    my $descriptions = $alteon->i_description();
+
+    my %interfaces = ();
+    foreach my $iid (keys %$interfaces){
+        my $desc = $descriptions->{$iid};
+        next unless defined $desc;
+
+        if ($desc =~ /(^net\d+)/) {
+            $desc  = $1;
+        }
+        elsif (($iid > 256) and ($iid < 266)) {
+            $desc = ($iid % 256);
+        }
+        $interfaces{$iid} = $desc;
+    }
+    return \%interfaces;
+}
+
+sub i_duplex {
+    my $alteon = shift;
+    
+    my $p_mode = $alteon->p_info_mode();
+    
+    my %i_duplex;
+    foreach my $if (keys %$p_mode){
+        my $duplex = $p_mode->{$if};
+        next unless defined $duplex; 
+    
+        $duplex = 'half' if $duplex =~ /half/i;
+        $duplex = 'full' if $duplex =~ /full/i;
+        
+        my $idx = $if + 256;
+        
+        $i_duplex{$idx}=$duplex; 
+    }
+    return \%i_duplex;
+}
+
+sub i_duplex_admin {
+    my $alteon = shift;
+
+    my $ag_pref = $alteon->ag_p_cfg_pref();
+    my $ag_fe_auto = $alteon->ag_p_cfg_fe_auto();
+    my $ag_fe_mode = $alteon->ag_p_cfg_fe_mode();
+    my $ag_ge_auto = $alteon->ag_p_cfg_ge_auto();
+ 
+    my %i_duplex_admin;
+    foreach my $if (keys %$ag_pref){
+        my $pref = $ag_pref->{$if};
+        next unless defined $pref;
+        
+        my $string = 'other';        
+        if ($pref =~ /gigabit/i) {
+            my $ge_auto = $ag_ge_auto->{$if};
+            $string = 'full' if ($ge_auto =~ /off/i);
+            $string = 'auto' if ($ge_auto =~ /on/i);
+        }
+        elsif ($pref =~ /fast/i) {
+            my $fe_auto = $ag_fe_auto->{$if};
+            my $fe_mode = $ag_fe_mode->{$if};
+            $string = 'half' if ($fe_mode =~ /half/i and $fe_auto =~ /off/i);
+            $string = 'full' if ($fe_mode =~ /full/i and $fe_auto =~ /off/i);
+            $string = 'auto' if $fe_auto =~ /on/i;
+        }
+        my $idx = $if + 256;
+        
+        $i_duplex_admin{$idx}=$string; 
+    }
+    return \%i_duplex_admin;
+}
+
+sub i_vlan {
+    my $alteon = shift;
+
+    my $ag_vlans  = $alteon->ag_p_cfg_pvid();
+    my $ip_vlans  = $alteon->ip_cfg_vlan();
+
+
+    my %i_vlan;
+    foreach my $if (keys %$ip_vlans){
+        my $ip_vlanid = $ip_vlans->{$if};
+        next unless defined $ip_vlanid;
+        
+        $i_vlan{$if}=$ip_vlanid; 
+    }
+    foreach my $if (keys %$ag_vlans){
+        my $ag_vlanid = $ag_vlans->{$if};
+        next unless defined $ag_vlanid;
+        
+        my $idx = $if + 256;   
+        $i_vlan{$idx}=$ag_vlanid; 
+    }
+    return \%i_vlan;
+}
+
+sub i_name {
+    my $alteon = shift;
+    my $p_name = $alteon->ag_p_cfg_name();
+
+    my %i_name;
+    foreach my $iid (keys %$p_name){
+        my $name = $p_name->{$iid};
+        next unless defined $name;
+        my $idx = $iid + 256;
+        $i_name{$idx} = $name;
+    }
+    return \%i_name;
+}
+
+# Bridge MIB does not map Bridge Port to ifIndex correctly
+sub bp_index {
+    my $alteon = shift;
+    my $b_index = $alteon->orig_bp_index();
+
+    my %bp_index;
+    foreach my $iid (keys %$b_index){
+        my $port = $b_index->{$iid};
+        next unless defined $port;
+        $port = $port + 256;
+
+        $bp_index{$iid} = $port;
+    }
+    return \%bp_index;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::AlteonAD - Perl5 Interface to Nortel Networks' Alteon Ace
+Director Series Layer 2-7 Switches.
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $alteon = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $alteon->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Abstraction subclass for Layer 2-7 load balancing switches running Nortel Networks'
+Alteon Web OS Traffic Control Software.
+
+For speed or debugging purposes you can call the subclass directly, but not after
+determining a more specific class using the method above. 
+
+ my $alteon = new SNMP::Info::Layer3::AlteonAD(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info
+
+=item SNMP::Info::Bridge
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item ALTEON-TIGON-SWITCH-MIB
+
+=item ALTEON-TS-PHYSICAL-MIB
+
+=item ALTEON-TS-NETWORK-MIB
+
+MIBs can be found on the CD that came with your product.
+
+Or, they can be downloaded directly from Nortel Networks regardless of support
+contract status.  Go to http://www.nortelnetworks.com Techninal Support,
+Browse Technical Support, Select by Product Families, Alteon,
+Alteon Web OS Traffic Control Software, Software.  Filter on mibs and download
+the latest version's archive.
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::Bridge/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $alteon->model()
+
+Returns the model extracted from B<sysDescr>
+
+=item $alteon->vendor()
+
+Returns 'nortel'
+
+=item $alteon->os()
+
+Returns 'webos'
+
+=item $alteon->os_ver()
+
+Returns the software version reported by B<agSoftwareVersion>
+
+=item $alteon->tftp_action()
+
+(B<agTftpAction>)
+
+=item $alteon->tftp_host()
+
+(B<agTftpServer>)
+
+=item $alteon->tftp_file()
+
+(B<agTftpCfgFileName>)
+
+=item $alteon->tftp_result()
+
+(B<agTftpLastActionStatus>)
+
+=back
+
+=head2 Globals imported from SNMP::Info
+
+See documentation in L<SNMP::Info/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::Bridge
+
+See documentation in L<SNMP::Info::Bridge/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item $alteon->interfaces()
+
+Returns reference to the map between IID and physical port.
+
+Utilizes description for network interfaces.  Ports are determined by
+formula (ifIndex mod 256).
+
+=item $alteon->i_duplex()
+
+Returns reference to hash.  Maps port operational duplexes to IIDs.
+
+=item $alteon->i_duplex_admin()
+
+Returns reference to hash.  Maps port admin duplexes to IIDs.
+
+=item $alteon->i_vlan()
+
+Returns reference to hash.  Maps port VLAN ID to IIDs.
+
+=item $alteon->i_name()
+
+Maps (B<agPortCurCfgPortName>) to port and returns the human set port name if exists.
+
+=item $alteon->bp_index()
+
+Returns a mapping between ifIndex and the Bridge Table.
+
+=back
+
+=head2 Table Methods imported from SNMP::Info
+
+See documentation in L<SNMP::Info/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::Bridge
+
+See documentation in L<SNMP::Info::Bridge/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3/C3550.pm

@@ -1,6 +1,7 @@
 # SNMP::Info::Layer3::C3550
-# Max Baker <max@warped.org>
+# Max Baker
 #
+# Copyright (c) 2004 Max Baker changes from version 0.8 and beyond.
 # Copyright (c) 2003, Regents of the University of California
 # All rights reserved.
 # 
@@ -28,144 +29,76 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::Layer3::C3550;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 
 use strict;
 
 use Exporter;
+use SNMP::Info::CiscoVTP;
+use SNMP::Info::CiscoStack;
+use SNMP::Info::CDP;
+use SNMP::Info::CiscoStats;
+use SNMP::Info::CiscoImage;
+use SNMP::Info::CiscoPortSecurity;
+use SNMP::Info::CiscoPower;
 use SNMP::Info::Layer3;
 
-use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE $INIT/ ;
-@SNMP::Info::Layer3::C3550::ISA = qw/SNMP::Info::Layer3 Exporter/;
+use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
+@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//;
 
-$DEBUG=0;
-
-# See SNMP::Info for the details of these data structures and 
-#       the interworkings.
-$INIT = 0;
-
-%MIBS = (
-         %SNMP::Info::Layer3::MIBS,  
-         'CISCO-STACK-MIB' => 'moduleType',
-         'CISCO-VTP-MIB'   => 'vtpVlanIndex'
-        );
+%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,
+           );
 
 %GLOBALS = (
             %SNMP::Info::Layer3::GLOBALS,
+            %SNMP::Info::CiscoPower::GLOBALS,
+            %SNMP::Info::CiscoPortSecurity::GLOBALS,
+            %SNMP::Info::CiscoImage::GLOBALS,
+            %SNMP::Info::CiscoStats::GLOBALS,
+            %SNMP::Info::CDP::GLOBALS,
+            %SNMP::Info::CiscoStack::GLOBALS,
+            %SNMP::Info::CiscoVTP::GLOBALS,
             'ports2'      => 'ifNumber',
-            # these are in CISCO-STACK-MIB
-            'serial'      => 'chassisSerialNumberString',    
-            'ps1_type'    => 'chassisPs1Type',    
-            'ps1_status'  => 'chassisPs1Status',    
-            'ps2_type'    => 'chassisPs2Type',    
-            'ps2_status'  => 'chassisPs2Status',    
-            'fan'         => 'chassisFanStatus'
-             );
+           );
 
 %FUNCS = (
             %SNMP::Info::Layer3::FUNCS,
-            'i_type2'        => 'ifType',
-            # CISCO-STACK-MIB::portEntry 
-            'p_name'    => 'portName',
-            'p_type'    => 'portType',
-            'p_status'  => 'portOperStatus',
-            'p_status2' => 'portAdditionalStatus',
-            'p_speed'   => 'portAdminSpeed',
-            'p_duplex'  => 'portDuplex',
-            'p_port'    => 'portIfIndex',
-            # CISCO-STACK-MIB::PortCpbEntry
-            'p_speed_admin'  => 'portCpbSpeed',
-            'p_duplex_admin' => 'portCpbDuplex',
-            # CISCO-VTP-MIB::VtpVlanEntry 
-            'v_state'   => 'vtpVlanState',
-            'v_type'    => 'vtpVlanType',
-            'v_name'    => 'vtpVlanName',
-            'v_mtu'     => 'vtpVlanMtu',
-        );
+            %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,
+         );
 
 %MUNGE = (
             # Inherit all the built in munging
             %SNMP::Info::Layer3::MUNGE,
-            'm_ports_status' => \&munge_port_status,
-            'p_duplex_admin' => \&SNMP::Info::munge_bits,
+            %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,
          );
 
-%PORTSTAT = (1 => 'other',
-             2 => 'ok',
-             3 => 'minorFault',
-             4 => 'majorFault');
-
-# Changes binary byte describing each port into ascii, and returns
-# an ascii list separated by spaces.
-sub munge_port_status {
-    my $status = shift;
-    my @vals = map($PORTSTAT{$_},unpack('C*',$status));
-    return join(' ',@vals);
-}
-
-# Overidden Methods
-
-sub i_type {
-    my $c3550 = shift;
-
-    my $p_port = $c3550->p_port();
-    my $p_type  = $c3550->p_type();
-
-    # Get more generic port types from IF-MIB
-    my $i_type  = $c3550->i_type2();
-
-    # Now Override w/ port entries
-    foreach my $port (keys %$p_type) {
-        my $iid = $p_port->{$port};
-        $i_type->{$iid} = $p_type->{$port};  
-    }
-
-    return $i_type;
-}
-
-sub i_duplex {
-    my $c3550 = shift;
-
-    my $p_port = $c3550->p_port();
-    my $p_duplex  = $c3550->p_duplex();
-
-    my %i_duplex;
-    foreach my $port (keys %$p_duplex) {
-        my $iid = $p_port->{$port};
-        $i_duplex{$iid} = $p_duplex->{$port};
-    }
-    return \%i_duplex; 
-}
-
-sub i_duplex_admin {
-    my $c3550 = shift;
-
-    my $p_port          = $c3550->p_port();
-    my $p_duplex_admin  = $c3550->p_duplex_admin();
-
-    my %i_duplex_admin;
-    foreach my $port (keys %$p_duplex_admin) {
-        my $iid = $p_port->{$port};
-        next unless defined $iid;
-        my $duplex = $p_duplex_admin->{$port};
-        next unless defined $duplex;
-
-        my $string = 'other';
-        # see CISCO-STACK-MIB for a description of the bits
-        $string = 'half' if ($duplex =~ /001$/ or $duplex =~ /0100.$/);
-        $string = 'full' if ($duplex =~ /010$/ or $duplex =~ /100.0$/);
-        # we'll call it auto if both full and half are turned on, or if the
-        #   specifically 'auto' flag bit is set.
-        $string = 'auto' 
-            if ($duplex =~ /1..$/ or $duplex =~ /110..$/ or $duplex =~ /..011$/);
-       
-        $i_duplex_admin{$iid} = $string;
-    }
-    return \%i_duplex_admin; 
-}
-
 sub vendor {
     return 'cisco';
 }
@@ -173,10 +106,13 @@ sub vendor {
 sub model {
     my $c3550 = shift;
     my $id = $c3550->id();
-    my $model = &SNMP::translateObj($id);
+    my $model = &SNMP::translateObj($id) || $id;
     $model =~ s/^catalyst//;
-    $model =~ s/(24|48)$//;
 
+    # turn 355048 into 3550-48
+    if ($model =~ /^(35\d\d)(\d\d(T|G)?)$/) {
+        $model = "$1-$2";
+    }
     return $model;
 }
 
@@ -188,33 +124,122 @@ sub ports {
 
     my $id = $c3550->id();
     my $model = &SNMP::translateObj($id);
-    if ($model =~ /(24|48)$/) {
+    if ($model =~ /(12|24|48)(C|T|TS|G|TS-E|TS-S|T-E)?$/) {
         return $1;
     }
     return $ports2;
 }
 
+#  Verions prior to 12.1(22)EA1a use the older CiscoStack method
+#  Newer versions use the ETHERLIKE-MIB to report operational duplex.
+#  See http://www.ciscosystems.com/en/US/products/hw/switches/ps646/prod_release_note09186a00802a08ee.html
+
+sub i_duplex {
+    my $c3550 = shift;
+    my $partial = shift;
+
+    my $el_duplex = $c3550->el_duplex($partial);
+
+    # Newer software     
+    if (defined $el_duplex and scalar(keys %$el_duplex)){
+        my %i_duplex;
+        foreach my $el_port (keys %$el_duplex){
+            my $duplex = $el_duplex->{$el_port};
+            next unless defined $duplex;
+
+            $i_duplex{$el_port} = 'half' if $duplex =~ /half/i;
+            $i_duplex{$el_port} = 'full' if $duplex =~ /full/i;
+        }
+        return \%i_duplex;
+    }
+    # Fall back to CiscoStack method
+    else {
+        return $c3550->SUPER::i_duplex($partial);
+    }
+}
+
+# Software >= 12.1(22)EA1a uses portDuplex as admin setting
+
+sub i_duplex_admin {
+    my $c3550 = shift;
+    my $partial = shift;
+
+    my $el_duplex = $c3550->el_duplex($partial);
+
+    # Newer software     
+    if (defined $el_duplex and scalar(keys %$el_duplex)){
+        my $p_port   = $c3550->p_port()   || {};
+        my $p_duplex = $c3550->p_duplex() || {};
+        
+        my $i_duplex_admin = {};
+        foreach my $port (keys %$p_duplex) {
+            my $iid = $p_port->{$port};
+            next unless defined $iid;
+            next if (defined $partial and $iid !~ /^$partial$/);
+            
+            $i_duplex_admin->{$iid} = $p_duplex->{$port};
+        }
+        return $i_duplex_admin;
+    }
+    # Fall back to CiscoStack method
+    else {
+        return $c3550->SUPER::i_duplex_admin($partial);
+    }    
+}
+
+sub set_i_duplex_admin {
+    # map a textual duplex to an integer one the switch understands
+    my %duplexes = qw/half 1 full 2 auto 4/;
+
+    my $c3550 = shift;
+    my ($duplex, $iid) = @_;
+
+    my $el_duplex = $c3550->el_duplex($iid);
+
+    # Auto duplex only supported on newer software
+    if (defined $el_duplex and scalar(keys %$el_duplex)){
+        my $p_port  = $c3550->p_port() || {};
+        my %reverse_p_port = reverse %$p_port;
+
+       $duplex = lc($duplex);
+
+       return 0 unless defined $duplexes{$duplex};
+
+       $iid = $reverse_p_port{$iid};
+
+       return $c3550->set_p_duplex($duplexes{$duplex}, $iid);
+    }
+    else {
+        $c3550->SUPER::set_i_duplex_admin;
+    }
+}
+
+sub cisco_comm_indexing {
+    1;
+}
+
 1;
 __END__
 
 =head1 NAME
 
-SNMP::Info::Layer3::C3550 - Perl5 Interface to Cisco Catalyst 3550 Layer 2/3 Switches running IOS
+SNMP::Info::Layer3::C3550 - SNMP Interface to Cisco Catalyst 3550 Layer 2/3
+Switches running IOS
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
  # Let SNMP::Info determine the correct subclass for you. 
  my $c3550 = new SNMP::Info(
-                          AutoSpecify => 1,
-                          Debug       => 1,
-                          # These arguments are passed directly on to SNMP::Session
-                          DestHost    => 'myswitch',
-                          Community   => 'public',
-                          Version     => 2
+                        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";
 
@@ -225,12 +250,12 @@ Max Baker (C<max@warped.org>)
 
 Abstraction subclass for Cisco Catalyst 3550 Layer 2/3 Switches.  
 
-These devices run IOS but have some of the same charactersitics as the Catalyst WS-C family (5xxx,6xxx). 
-For example, forwarding tables are held in VLANs, and extened interface information
-is gleened from CISCO-SWITCH-MIB.
+These devices run IOS but have some of the same charactersitics as the
+Catalyst WS-C family (5xxx,6xxx).  For example, forwarding tables are held in
+VLANs, and extened interface information is gleened from CISCO-SWITCH-MIB.
 
-For speed or debugging purposes you can call the subclass directly, but not after determining
-a more specific class using the method above. 
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
 
  my $c3550 = new SNMP::Info::Layer3::C3550(...);
 
@@ -240,15 +265,43 @@ a more specific class using the method above.
 
 =item SNMP::Info::Layer3
 
+=item SNMP::Info::CiscoPower
+
+=item SNMP::Info::CiscoPortSecurity
+
+=item SNMP::Info::CiscoVTP
+
+=item SNMP::Info::CiscoStack
+
+=item SNMP::Info::CDP
+
+=item SNMP::Info::CiscoStats
+
+=item SNMP::Info::CiscoImage
+
 =back
 
 =head2 Required MIBs
 
 =over
 
-=item CISCO-STACK-MIB
+=item Inherited Classes' MIBs
 
-=item CISCO-VTP-MIB
+See L<SNMP::Info::Layer3/"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 requirements.
+
+See L<SNMP::Info::CiscoVTP/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoStack/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoStats/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoImage/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CDP/"Required MIBs"> for its own MIB requirements.
 
 =back
 
@@ -258,41 +311,56 @@ These are methods that return scalar value from SNMP
 
 =over
 
-=item $c3550->serial()
-(B<chassisSerialNumberString>)
-
-=item $c3550->model()
-(B<chassisModel>)
-
-=item $c3550->ps1_type()
-(B<chassisPs1Type>)
-
-=item $c3550->ps2_type()
-(B<chassisPs2Type>)
-
-=item $c3550->ps1_status()
-(B<chassisPs1Status>)
-
-=item $c3550->ps2_status()
-(B<chassisPs2Status>)
-
-=item $c3550->slots()
-(B<chassisNumSlots>)
-
-=item $c3550->fan()
-(B<chassisFanStatus>)
-
 =item $c3550->vendor()
 
     Returns 'cisco'
 
+=item $c3550->model()
+
+Will take the translated model number and try to format it better.
+
+ 355048 -> 3550-48
+ 355012G -> 3550-12G
+
+=item $c3550->ports()
+
+Trys to cull the number of ports from the model number.
+
 =back
 
 =head2 Globals imported from SNMP::Info::Layer3
 
-See documentation in SNMP::Info::Layer3 for details.
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 
-=head1 TABLE ENTRIES
+=head2 Globals imported from SNMP::Info::CiscoPower
+
+See documentation in L<SNMP::Info::CiscoPower/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoPortSecurity
+
+See documentation in L<SNMP::Info::CiscoPortSecurity/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::CiscoVTP
+
+See documentation in L<SNMP::Info::CiscoVTP/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::CiscoStack
+
+See documentation in L<SNMP::Info::CiscoStack/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CDP
+
+See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoStats
+
+See documentation in L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoImage
+
+See documentation in L<SNMP::Info::CiscoImage/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
 
 These are methods that return tables of information in the form of a reference
 to a hash.
@@ -301,103 +369,72 @@ to a hash.
 
 =over
 
-=item $c3550->i_type()
-
-Crosses p_port() with p_type() and returns the results. 
-
-Overrides with ifType if p_type() isn't available.
-
-=item $c3550->i_name()
-
-Crosses p_name with p_port and returns results.
-
 =item $c3550->i_duplex()
 
-Crosses p_duplex with p_port and returns results.
+Returns reference to hash of iid to current link duplex setting.
+
+Software version 12.1(22)EA1a or greater returns duplex based upon the
+result of $c3550->el_duplex().  Otherwise it uses the result of
+the call to CiscoStack i_duplex().
+
+See L<SNMP::Info::Etherlike> for el_duplex() method and
+L<SNMP::Info::CiscoStack> for its i_duplex() method.
 
 =item $c3550->i_duplex_admin()
 
-Crosses p_duplex_admin with p_port.
+Returns reference to hash of iid to administrative duplex setting.
 
-Munges bit_string returned from p_duplex_admin to get duplex settings.
+Software version 12.1(22)EA1a or greater returns duplex based upon the
+result of $c3550->p_duplex().  Otherwise it uses the result of
+the call to CiscoStack i_duplex().
 
-=back
+See L<SNMP::Info::CiscoStack> for its i_duplex() and p_duplex() methods.
 
-=head2 Port Entry Table (CISCO-STACK-MIB::portTable)
+=item $c3550->set_i_duplex_admin(duplex, ifIndex)
 
-=over
+Sets port duplex, must be supplied with duplex and port ifIndex.
 
-=item $c3550->p_name()
+Speed choices are 'auto', 'half', 'full'.
 
-(B<portName>)
+Crosses $c3550->p_port() with $c3550->p_duplex() to utilize port ifIndex.
 
-=item $c3550->p_type()
-
-(B<portType>)
-
-=item $c3550->p_status()
-
-(B<portOperStatus>)
-
-=item $c3550->p_status2()
-
-(B<portAdditionalStatus>)
-
-=item $c3550->p_speed()
-
-(B<portAdminSpeed>)
-
-=item $c3550->p_duplex()
-
-(B<portDuplex>)
-
-=item $c3550->p_port()
-
-(B<portIfIndex>)
-
-=back
-
-=head2 Port Capability Table (CISCO-STACK-MIB::portCpbTable)
-
-=over
-
-=item $c3550->p_speed_admin()
-
-(B<portCpbSpeed>)
-
-=item $c3550->p_duplex_admin()
-
-(B<portCpbDuplex>)
-
-=back
-
-=head2 VLAN Entry Table
-
-See ftp://ftp.cisco.com/pub/mibs/supportlists/wsc5000/wsc5000-communityIndexing.html
-for a good treaty of how to connect to the VLANs
-
-=over
-
-=item $c3550->v_state()
-
-(B<vtpVlanState>)
-
-=item $c3550->v_type()
-
-(B<vtpVlanType>)
-
-=item $c3550->v_name()
-
-(B<vtpVlanName>)
-
-=item $c3550->v_mtu()
-
-(B<vtpVlanMtu>)
+    Example:
+    my %if_map = reverse %{$c3550->interfaces()};
+    $c3550->set_i_duplex_admin('auto', $if_map{'FastEthernet0/1'}) 
+        or die "Couldn't change port duplex. ",$c3550->error(1);
 
 =back
 
 =head2 Table Methods imported from SNMP::Info::Layer3
 
-See documentation in SNMP::Info::Layer3 for details.
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoPower
+
+See documentation in L<SNMP::Info::CiscoPower/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoPortSecurity
+
+See documentation in L<SNMP::Info::CiscoPortSecurity/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoVTP
+
+See documentation in L<SNMP::Info::CiscoVTP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoStack
+
+See documentation in L<SNMP::Info::CiscoStack/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CDP
+
+See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoStats
+
+See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoImage
+
+See documentation in L<SNMP::Info::CiscoImage/"TABLE METHODS"> for details.
 
 =cut

Info/Layer3/C4000.pm

@@ -0,0 +1,283 @@
+# SNMP::Info::Layer3::C4000
+# Bill Fenner
+#
+# Copyright (c) 2006 Bill Fenner
+# 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 
+#       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::C4000;
+# $Id$
+
+use strict;
+
+use Exporter;
+
+use SNMP::Info::CiscoVTP;
+use SNMP::Info::CDP;
+use SNMP::Info::CiscoStats;
+use SNMP::Info::CiscoImage;
+use SNMP::Info::CiscoPortSecurity;
+use SNMP::Info::CiscoConfig;
+use SNMP::Info::MAU;
+use SNMP::Info::Layer3;
+
+use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
+$VERSION = '1.07';
+@SNMP::Info::Layer3::C4000::ISA = qw/SNMP::Info::CiscoVTP SNMP::Info::CDP
+                                    SNMP::Info::CiscoStats SNMP::Info::CiscoImage
+                                    SNMP::Info::CiscoPortSecurity
+                                    SNMP::Info::CiscoConfig SNMP::Info::MAU 
+                                    SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::C4000::EXPORT_OK = qw//;
+
+%MIBS =    ( 
+            %SNMP::Info::Layer3::MIBS,
+            %SNMP::Info::MAU::MIBS,
+            %SNMP::Info::CiscoConfig::MIBS,
+            %SNMP::Info::CiscoPortSecurity::MIBS,
+            %SNMP::Info::CiscoImage::MIBS,
+            %SNMP::Info::CiscoStats::MIBS,
+            %SNMP::Info::CDP::MIBS,
+            %SNMP::Info::CiscoVTP::MIBS,
+            'CISCO-ENVMON-MIB' => 'ciscoEnvMonMIB',
+           );
+
+%GLOBALS = (
+            %SNMP::Info::Layer3::GLOBALS,
+            %SNMP::Info::MAU::GLOBALS,
+            %SNMP::Info::CiscoConfig::GLOBALS,
+            %SNMP::Info::CiscoPortSecurity::GLOBALS,
+            %SNMP::Info::CiscoImage::GLOBALS,
+            %SNMP::Info::CiscoStats::GLOBALS,
+            %SNMP::Info::CDP::GLOBALS,
+            %SNMP::Info::CiscoVTP::GLOBALS,
+	    'ps1_type' => 'ciscoEnvMonSupplyStatusDescr.1',
+	    'ps1_status' => 'ciscoEnvMonSupplyState.1',
+	    'ps2_type' => 'ciscoEnvMonSupplyStatusDescr.2',
+	    'ps2_status' => 'ciscoEnvMonSupplyState.2',
+           );
+
+%FUNCS = (
+            %SNMP::Info::Layer3::FUNCS,
+            %SNMP::Info::MAU::FUNCS,
+            %SNMP::Info::CiscoConfig::FUNCS,
+            %SNMP::Info::CiscoPortSecurity::FUNCS,
+            %SNMP::Info::CiscoImage::FUNCS,
+            %SNMP::Info::CiscoStats::FUNCS,
+            %SNMP::Info::CDP::FUNCS,
+            %SNMP::Info::CiscoVTP::FUNCS,
+            'fan_state' => 'ciscoEnvMonFanState',
+            'fan_descr' => 'ciscoEnvMonFanStatusDescr',
+         );
+
+%MUNGE = (
+            %SNMP::Info::Layer3::MUNGE,
+            %SNMP::Info::MAU::MUNGE,
+            %SNMP::Info::CiscoConfig::MUNGE,
+            %SNMP::Info::CiscoPortSecurity::MUNGE,
+            %SNMP::Info::CiscoImage::MUNGE,
+            %SNMP::Info::CiscoStats::MUNGE,
+            %SNMP::Info::CDP::MUNGE,
+            %SNMP::Info::CiscoVTP::MUNGE,
+         );
+
+# Override Inheritance for these specific methods
+# use MAU-MIB for admin. duplex and admin. speed
+*SNMP::Info::Layer3::C4000::i_duplex_admin = \&SNMP::Info::MAU::mau_i_duplex_admin;
+*SNMP::Info::Layer3::C4000::i_speed_admin = \&SNMP::Info::MAU::mau_i_speed_admin;
+
+sub fan {
+    my $c4000 = shift;
+    my $fan_state = $c4000->fan_state();
+    my $fan_descr = $c4000->fan_descr();
+    my $ret = "";
+    my $s = "";
+    foreach my $i (sort {$a <=> $b} keys %$fan_state) {
+	$ret .= $s . $fan_descr->{$i} . ": " . $fan_state->{$i};
+	$s = ", ";
+    }
+    return undef if ($s eq "");
+    $ret;
+}
+
+sub cisco_comm_indexing { 1; }
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::C4000 - SNMP Interface to Cisco Catalyst 4000 Layer 2/3
+Switches running IOS
+
+=head1 AUTHOR
+
+Bill Fenner
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $c4000 = 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      = $c4000->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Abstraction subclass for Cisco Catalyst 4000 Layer 2/3 Switches.  
+
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
+
+ my $c4000 = new SNMP::Info::Layer3::C4000(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::CiscoVTP
+
+=item SNMP::Info::CDP
+
+=item SNMP::Info::CiscoStats
+
+=item SNMP::Info::CiscoImage
+
+=item SNMP::Info::CiscoPortSecurity
+
+=item SNMP::Info::CiscoConfig
+
+=item SNMP::Info::MAU
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::CiscoVTP/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CDP/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoStats/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoImage/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoPortSecurity/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoConfig/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::MAU/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=head2 Global Methods imported from SNMP::Info::CiscoVTP
+
+See documentation in L<SNMP::Info::CiscoVTP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CDP
+
+See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoStats
+
+See documentation in L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoImage
+
+See documentation in L<SNMP::Info::CiscoImage/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoPortSecurity
+
+See documentation in L<SNMP::Info::CiscoPortSecurity/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoConfig
+
+See documentation in L<SNMP::Info::CiscoConfig/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::MAU
+
+See documentation in L<SNMP::Info::MAU/"GLOBALS"> for details.
+
+=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.
+
+=head2 Table Methods imported from SNMP::Info::CiscoVTP
+
+See documentation in L<SNMP::Info::CiscoVTP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CDP
+
+See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoStats
+
+See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoImage
+
+See documentation in L<SNMP::Info::CiscoImage/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoPortSecurity
+
+See documentation in L<SNMP::Info::CiscoPortSecurity/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoConfig
+
+See documentation in L<SNMP::Info::CiscoConfig/"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::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3/C6500.pm

@@ -0,0 +1,415 @@
+# SNMP::Info::Layer3::C6500
+# Max Baker
+#
+# Copyright (c) 2003,2004,2005 Max Baker
+# 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 
+#       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::C6500;
+# $Id$
+
+use strict;
+
+use Exporter;
+use SNMP::Info::CiscoVTP;
+use SNMP::Info::CiscoStack;
+use SNMP::Info::CDP;
+use SNMP::Info::CiscoStats;
+use SNMP::Info::CiscoImage;
+use SNMP::Info::CiscoPortSecurity;
+use SNMP::Info::CiscoConfig;
+use SNMP::Info::CiscoPower;
+use SNMP::Info::Layer3;
+
+use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
+$VERSION = '1.07';
+@SNMP::Info::Layer3::C6500::ISA = qw/SNMP::Info::CiscoVTP 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::C6500::EXPORT_OK = qw//;
+
+%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,
+           );
+
+%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::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,
+         );
+
+%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,
+         );
+
+sub vendor {
+    return 'cisco';
+}
+
+sub cisco_comm_indexing { 1; }
+
+#  Newer versions use the ETHERLIKE-MIB to report operational duplex.
+
+sub i_duplex {
+    my $c6500 = shift;
+    my $partial = shift;
+
+    my $el_duplex = $c6500->el_duplex($partial);
+
+    # Newer software     
+    if (defined $el_duplex and scalar(keys %$el_duplex)){
+        my %i_duplex;
+        foreach my $el_port (keys %$el_duplex){
+            my $duplex = $el_duplex->{$el_port};
+            next unless defined $duplex;
+
+            $i_duplex{$el_port} = 'half' if $duplex =~ /half/i;
+            $i_duplex{$el_port} = 'full' if $duplex =~ /full/i;
+        }
+        return \%i_duplex;
+    }
+    # Fall back to CiscoStack method
+    else {
+        return $c6500->SUPER::i_duplex($partial);
+    }
+}
+
+# Newer software uses portDuplex as admin setting
+
+sub i_duplex_admin {
+    my $c6500 = shift;
+    my $partial = shift;
+
+    my $el_duplex = $c6500->el_duplex($partial);
+
+    # Newer software     
+    if (defined $el_duplex and scalar(keys %$el_duplex)){
+        my $p_port   = $c6500->p_port()   || {};
+        my $p_duplex = $c6500->p_duplex() || {};
+        
+        my $i_duplex_admin = {};
+        foreach my $port (keys %$p_duplex) {
+            my $iid = $p_port->{$port};
+            next unless defined $iid;
+            next if (defined $partial and $iid !~ /^$partial$/);
+            
+            $i_duplex_admin->{$iid} = $p_duplex->{$port};
+        }
+        return $i_duplex_admin;
+    }
+    # Fall back to CiscoStack method
+    else {
+        return $c6500->SUPER::i_duplex_admin($partial);
+    }    
+}
+
+sub set_i_duplex_admin {
+    # map a textual duplex to an integer one the switch understands
+    my %duplexes = qw/half 1 full 2 auto 4/;
+
+    my $c6500 = shift;
+    my ($duplex, $iid) = @_;
+
+    my $el_duplex = $c6500->el_duplex($iid);
+
+    # Auto duplex only supported on newer software
+    if (defined $el_duplex and scalar(keys %$el_duplex)){
+        my $p_port  = $c6500->p_port() || {};
+        my %reverse_p_port = reverse %$p_port;
+
+       $duplex = lc($duplex);
+
+       return 0 unless defined $duplexes{$duplex};
+
+       $iid = $reverse_p_port{$iid};
+
+       return $c6500->set_p_duplex($duplexes{$duplex}, $iid);
+    }
+    else {
+        $c6500->SUPER::set_i_duplex_admin;
+    }
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::C6500 - SNMP Interface to Cisco Catalyst 6500 Layer 2/3
+Switches running IOS and/or CatOS
+
+=head1 AUTHOR
+
+Max Baker
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $c6500 = 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      = $c6500->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Abstraction subclass for Cisco Catalyst 6500 Layer 2/3 Switches.  
+
+These devices run IOS but have some of the same charactersitics as the Catalyst
+WS-C family (5xxx). For example, forwarding tables are held in VLANs, and
+extended interface information is gleened from CISCO-SWITCH-MIB.
+
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
+
+ my $c6500 = new SNMP::Info::Layer3::C6500(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::CiscoVTP
+
+=item SNMP::Info::CiscoStack
+
+=item SNMP::Info::CDP
+
+=item SNMP::Info::CiscoStats
+
+=item SNMP::Info::CiscoImage
+
+=item SNMP::Info::CiscoPortSecurity
+
+=item SNMP::Info::CiscoConfig
+
+=item SNMP::Info::CiscoPower
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::CiscoVTP/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoStack/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CDP/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoStats/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoImage/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoPortSecurity/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoConfig/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoPower/"Required MIBs"> for its own MIB requirements.
+
+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 $c6500->vendor()
+
+    Returns 'cisco'
+
+=back
+
+=head2 Global Methods imported from SNMP::Info::CiscoVTP
+
+See documentation in L<SNMP::Info::CiscoVTP/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::CiscoStack
+
+See documentation in L<SNMP::Info::CiscoStack/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CDP
+
+See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoStats
+
+See documentation in L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoImage
+
+See documentation in L<SNMP::Info::CiscoImage/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoPortSecurity
+
+See documentation in L<SNMP::Info::CiscoPortSecurity/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoConfig
+
+See documentation in L<SNMP::Info::CiscoConfig/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoPower
+
+See documentation in L<SNMP::Info::CiscoPower/"GLOBALS"> for details.
+
+=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.
+
+=head2 Overrides
+
+=over
+
+=item $c6500->i_duplex()
+
+Returns reference to hash of iid to current link duplex setting.
+
+Newer software versions return duplex based upon the result of
+$c6500->el_duplex().  Otherwise it uses the result of the call to
+CiscoStack i_duplex().
+
+See L<SNMP::Info::Etherlike> for el_duplex() method and
+L<SNMP::Info::CiscoStack> for its i_duplex() method.
+
+=item $c6500->i_duplex_admin()
+
+Returns reference to hash of iid to administrative duplex setting.
+
+Newer software versions return duplex based upon the result of
+$c6500->p_duplex().  Otherwise it uses the result of the call to
+CiscoStack i_duplex().
+
+See L<SNMP::Info::CiscoStack> for its i_duplex() and p_duplex() methods.
+
+=item $c6500->set_i_duplex_admin(duplex, ifIndex)
+
+Sets port duplex, must be supplied with duplex and port ifIndex.
+
+Speed choices are 'auto', 'half', 'full'.
+
+Crosses $c6500->p_port() with $c6500->p_duplex() to utilize port ifIndex.
+
+    Example:
+    my %if_map = reverse %{$c6500->interfaces()};
+    $c6500->set_i_duplex_admin('auto', $if_map{'FastEthernet0/1'}) 
+        or die "Couldn't change port duplex. ",$c6500->error(1);
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::CiscoVTP
+
+See documentation in L<SNMP::Info::CiscoVTP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoStack
+
+See documentation in L<SNMP::Info::CiscoStack/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CDP
+
+See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoStats
+
+See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoImage
+
+See documentation in L<SNMP::Info::CiscoImage/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoPortSecurity
+
+See documentation in L<SNMP::Info::CiscoPortSecurity/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoConfig
+
+See documentation in L<SNMP::Info::CiscoConfig/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoPower
+
+See documentation in L<SNMP::Info::CiscoPower/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=cut
+

Info/Layer3/Cisco.pm

@@ -0,0 +1,313 @@
+# SNMP::Info::Layer3::Cisco
+# Max Baker
+#
+# Copyright (c) 2004 Max Baker
+# 
+# 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::Cisco;
+# $Id$
+
+use strict;
+
+use Exporter;
+use SNMP::Info::CiscoVTP;
+use SNMP::Info::CDP;
+use SNMP::Info::CiscoStats;
+use SNMP::Info::CiscoImage;
+use SNMP::Info::CiscoRTT;
+use SNMP::Info::CiscoQOS;
+use SNMP::Info::CiscoConfig;
+use SNMP::Info::CiscoPower;
+use SNMP::Info::Layer3;
+
+use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
+$VERSION = '1.07';
+@SNMP::Info::Layer3::Cisco::ISA = qw/SNMP::Info::CiscoVTP SNMP::Info::CDP
+                                    SNMP::Info::CiscoStats SNMP::Info::CiscoImage 
+                                    SNMP::Info::CiscoRTT  SNMP::Info::CiscoQOS
+                                    SNMP::Info::CiscoConfig SNMP::Info::CiscoPower
+                                    SNMP::Info::Layer3
+                                    Exporter/;
+@SNMP::Info::Layer3::Cisco::EXPORT_OK = qw//;
+
+%MIBS = (
+            %SNMP::Info::Layer3::MIBS,
+            %SNMP::Info::CiscoPower::MIBS,
+            %SNMP::Info::CiscoConfig::MIBS,
+            %SNMP::Info::CiscoQOS::MIBS,
+            %SNMP::Info::CiscoRTT::MIBS,
+            %SNMP::Info::CiscoImage::MIBS,
+            %SNMP::Info::CiscoStats::MIBS,
+            %SNMP::Info::CDP::MIBS,
+            %SNMP::Info::CiscoVTP::MIBS,
+            'CISCO-EIGRP-MIB' => 'cEigrpAsRouterId',
+        );
+
+%GLOBALS = (
+            %SNMP::Info::Layer3::GLOBALS,
+            %SNMP::Info::CiscoPower::GLOBALS,
+            %SNMP::Info::CiscoConfig::GLOBALS,
+            %SNMP::Info::CiscoQOS::GLOBALS,
+            %SNMP::Info::CiscoRTT::GLOBALS,
+            %SNMP::Info::CiscoImage::GLOBALS,
+            %SNMP::Info::CiscoStats::GLOBALS,
+            %SNMP::Info::CDP::GLOBALS,
+            %SNMP::Info::CiscoVTP::GLOBALS,
+            'eigrp_id'     => 'cEigrpAsRouterId',
+           );
+
+%FUNCS = (
+            %SNMP::Info::Layer3::FUNCS,
+            %SNMP::Info::CiscoPower::FUNCS,
+            %SNMP::Info::CiscoConfig::FUNCS,
+            %SNMP::Info::CiscoQOS::FUNCS,
+            %SNMP::Info::CiscoRTT::FUNCS,
+            %SNMP::Info::CiscoImage::FUNCS,
+            %SNMP::Info::CiscoStats::FUNCS,
+            %SNMP::Info::CDP::FUNCS,
+            %SNMP::Info::CiscoVTP::FUNCS,
+            # EIGRP
+            'eigrp_peers' => 'cEigrpPeerAddr',
+         );
+
+%MUNGE = (
+            %SNMP::Info::Layer3::MUNGE,
+            %SNMP::Info::CiscoPower::MUNGE,
+            %SNMP::Info::CiscoConfig::MUNGE,
+            %SNMP::Info::CiscoQOS::MUNGE,
+            %SNMP::Info::CiscoRTT::MUNGE,
+            %SNMP::Info::CiscoImage::MUNGE,
+            %SNMP::Info::CiscoStats::MUNGE,
+            %SNMP::Info::CDP::MUNGE,
+            %SNMP::Info::CiscoVTP::MUNGE,
+            'eigrp_peers' => \&SNMP::Info::munge_ip,
+         );
+
+sub i_vlan {
+	my ($cisco) = shift;
+	my ($partial) = shift;
+
+	my ($i_type) = $cisco->i_type($partial);
+	my ($i_descr) = $cisco->i_description($partial);
+	my %i_vlan;
+
+	foreach my $idx (keys %$i_descr) {
+		if ($i_type->{$idx} eq 'l2vlan' || $i_type->{$idx} eq 135) {
+			if ($i_descr->{$idx} =~ /\.(\d+)$/) {
+				$i_vlan{$idx} = $1;
+			}
+		}
+	}
+	\%i_vlan;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Cisco - SNMP Interface to L3 and L2+L3 IOS Cisco Device
+that are not covered in other classes.
+
+=head1 AUTHOR
+
+Max Baker
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $cisco = 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      = $cisco->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Generic Cisco Routers running IOS
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::CiscoVTP
+
+=item SNMP::Info::CDP
+
+=item SNMP::Info::CiscoStats
+
+=item SNMP::Info::CiscoImage
+
+=item SNMP::Info::CiscoRTT
+
+=item SNMP::Info::CiscoQOS
+
+=item SNMP::Info::CiscoConfig
+
+=item SNMP::Info::Power
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item CISCO-EIGRP-MIB
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::CiscoVTP/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CDP/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoStats/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoImage/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoRTT/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoQOS/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoConfig/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoPower/"Required MIBs"> for its own MIB requirements.
+
+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 $cisco->vendor()
+
+    Returns 'cisco'
+
+=item $cisco->eigrp_id()
+
+(B<cEigrpAsRouterId>)
+
+=back
+
+=head2 Global Methods imported from SNMP::Info::CiscoVTP
+
+See documentation in L<SNMP::Info::CiscoVTP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CDP
+
+See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoStats
+
+See documentation in L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoImage
+
+See documentation in L<SNMP::Info::CiscoImage/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoRTT
+
+See documentation in L<SNMP::Info::CiscoRTT/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoQOS
+
+See documentation in L<SNMP::Info::CiscoQOS/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoConfig
+
+See documentation in L<SNMP::Info::CiscoConfig/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoPower
+
+See documentation in L<SNMP::Info::CiscoPower/"GLOBALS"> for details.
+
+=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 $cisco->eigrp_peers()
+
+Returns EIGRP peer IP addresses
+
+(B<cEigrpPeerAddr>)
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::CiscoVTP
+
+See documentation in L<SNMP::Info::CiscoVTP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CDP
+
+See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoStats
+
+See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoImage
+
+See documentation in L<SNMP::Info::CiscoImage/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoRTT
+
+See documentation in L<SNMP::Info::CiscoRTT/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoQOS
+
+See documentation in L<SNMP::Info::CiscoQOS/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoConfig
+
+See documentation in L<SNMP::Info::CiscoConfig/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoPower
+
+See documentation in L<SNMP::Info::CiscoPower/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3/Contivity.pm

@@ -0,0 +1,313 @@
+# SNMP::Info::Layer3::Contivity
+# Eric Miller
+# $Id$
+#
+# Copyright (c) 2004 Eric Miller, Max Baker
+# 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::Contivity;
+$VERSION = '1.07';
+
+use strict;
+
+use Exporter;
+use SNMP::Info;
+use SNMP::Info::Layer3;
+use SNMP::Info::Entity;
+
+use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
+
+@SNMP::Info::Layer3::Contivity::ISA = qw/SNMP::Info SNMP::Info::Layer3 SNMP::Info::Entity Exporter/;
+@SNMP::Info::Layer3::Contivity::EXPORT_OK = qw//;
+
+%MIBS = (
+         %SNMP::Info::MIBS,
+         %SNMP::Info::Layer3::MIBS,
+         %SNMP::Info::Entity::MIBS,
+        );
+
+%GLOBALS = (
+           %SNMP::Info::GLOBALS,
+           %SNMP::Info::Layer3::GLOBALS,
+           %SNMP::Info::Entity::GLOBALS,
+           );
+
+%FUNCS = (
+          %SNMP::Info::FUNCS,
+          %SNMP::Info::Layer3::FUNCS,
+          %SNMP::Info::Entity::FUNCS,
+         );
+         
+%MUNGE = (
+          %SNMP::Info::MUNGE,
+          %SNMP::Info::Layer3::MUNGE,
+          %SNMP::Info::Entity::MUNGE,
+         );
+
+sub layers {
+    return '00000100';
+}
+
+sub vendor {
+    return 'nortel';
+}
+
+sub model {
+    my $contivity = shift;
+    my $e_model = $contivity->e_model() || {};
+
+    my $model = $e_model->{1} || undef;
+    
+    return $1 if (defined $model and $model =~ /(CES\d+)/i);
+    return undef;
+}
+
+sub os {
+    return 'contivity';
+}
+
+sub os_ver {
+    my $contivity = shift;
+    my $descr = $contivity->description();
+    return undef unless defined $descr;
+
+    if ($descr =~ m/V(\d+_\d+\.\d+)/i){
+        return $1;
+    }
+    return undef;
+}
+
+sub mac {
+    my $contivity = shift;
+    my $i_mac = $contivity->i_mac();
+
+# Return Interface MAC   
+    foreach my $entry (keys %$i_mac){
+        my $sn = $i_mac->{$entry};
+        next unless $sn;
+        return $sn;
+    }
+    return undef;
+}
+
+sub serial {
+    my $contivity = shift;
+    my $e_serial = $contivity->e_serial() || {};
+
+    my $serial = $e_serial->{1} || undef;
+    
+    return $1 if (defined $serial and $serial =~ /(\d+)/);
+    return undef;
+}
+
+
+sub interfaces {
+    my $contivity = shift;
+    my $partial = shift;
+
+    my $description = $contivity->i_description($partial) || {};
+    
+    my %interfaces = ();
+    foreach my $iid (keys %$description){
+        my $desc = $description->{$iid};
+        # Skip everything except Ethernet interfaces
+        next unless (defined $desc and $desc =~ /fe/i);
+
+        $interfaces{$iid} = $desc;
+    }
+    return \%interfaces;
+}
+
+sub i_name {
+    my $contivity = shift;
+    my $partial = shift;
+
+    my $i_name2 = $contivity->orig_i_name($partial) || {};
+    
+    my %i_name;
+    foreach my $iid (keys %$i_name2){
+        my $name = $i_name2->{$iid};
+        #Skip everything except Ethernet interfaces
+        next unless (defined $name and $name =~ /fe/i);
+
+        $name = $1 if $name =~ /(fei\.\d+\.\d+)/;
+
+        $i_name{$iid} = $name;
+     }
+     return \%i_name;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Contivity - SNMP Interface to Nortel VPN Routers (Contivity
+Extranet Switches).
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $contivity = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $contivity->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Abstraction subclass for Nortel VPN Routers (Contivity Extranet Switch).  
+
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
+
+ my $contivity = new SNMP::Info::Layer3::Contivity(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info
+
+=item SNMP::Info::Layer3
+
+=item SNMP::Info::Entity
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::Entity/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $contivity->vendor()
+
+Returns 'Nortel'
+
+=item $contivity->model()
+
+Returns the chassis name.
+
+(B<entPhysicalModelName.1>)
+
+=item $contivity->os()
+
+Returns 'CES'
+
+=item $contivity->os_ver()
+
+Returns the software version extracted from (B<sysDescr>).
+
+=item $contivity->serial()
+
+Returns the chassis serial number.
+
+(B<entPhysicalSerialNum.1>)
+
+=item $contivity->mac()
+
+Returns the MAC address of the first Ethernet Interface.
+
+=back
+
+=head2 Overrides
+
+=over
+
+=item $contivity->layers()
+
+Returns 00000100.  Contivity does not support bridge MIB, so override reported
+layers.
+
+=back
+
+=head2 Globals imported from SNMP::Info
+
+See documentation in L<SNMP::Info/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::Entity
+
+See documentation in L<SNMP::Info::Entity/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item $contivity->interfaces()
+
+Returns reference to the map between IID and physical Port.  Skips loopback and
+tunnel interfaces.
+
+=back
+
+=head2 Table Methods imported from SNMP::Info
+
+See documentation in L<SNMP::Info/"TABLE METHODS"> for details.
+
+=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::Entity
+
+See documentation in L<SNMP::Info::Entity/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3/Dell.pm

@@ -0,0 +1,374 @@
+# SNMP::Info::Layer3::Dell - SNMP Interface to Dell devices
+# Eric Miller
+#
+# Copyright (c) 2006 Eric Miller
+# 
+# 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::Dell;
+# $Id$
+
+use strict;
+
+use Exporter;
+use SNMP::Info::Layer3;
+
+use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
+
+$VERSION = '1.07';
+
+@SNMP::Info::Layer3::Dell::ISA = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Dell::EXPORT_OK = qw//;
+
+%MIBS = ( %SNMP::Info::Layer3::MIBS,
+          'RADLAN-Physicaldescription-MIB'   => 'rlPhdStackReorder',
+          'RADLAN-rlInterfaces'              => 'rlIfNumOfLoopbackPorts',
+          'RADLAN-HWENVIROMENT'              => 'rlEnvPhysicalDescription',
+          'Dell-Vendor-MIB'                  => 'productIdentificationVersion',
+        );
+
+%GLOBALS = (
+            %SNMP::Info::Layer3::GLOBALS,
+            'os_ver'        => 'productIdentificationVersion',
+            'dell_id_name'  => 'productIdentificationDisplayName',
+           );
+
+%FUNCS   = (
+            %SNMP::Info::Layer3::FUNCS,
+            # RADLAN-rlInterfaces:swIfTable
+            'dell_duplex_admin' => 'swIfDuplexAdminMode',
+            'dell_duplex'       => 'swIfDuplexOperMode',
+            'dell_tag_mode'     => 'swIfTaggedMode',
+            'dell_i_type'            => 'swIfType',
+            'dell_fc_admin'     => 'swIfFlowControlMode',
+            'dell_speed_admin'  => 'swIfSpeedAdminMode',
+            'dell_auto'         => 'swIfSpeedDuplexAutoNegotiation',
+            'dell_fc'           => 'swIfOperFlowControlMode',
+            # RADLAN-Physicaldescription-MIB:rlPhdUnitGenParamTable
+            'dell_unit'      => 'rlPhdUnitGenParamStackUnit',
+            'dell_sw_ver'    => 'rlPhdUnitGenParamSoftwareVersion',           
+            'dell_fw_ver'    => 'rlPhdUnitGenParamFirmwareVersion',
+            'dell_hw_ver'    => 'rlPhdUnitGenParamHardwareVersion',
+            'dell_serial_no' => 'rlPhdUnitGenParamSerialNum',
+            'dell_asset_no'  => 'rlPhdUnitGenParamAssetTag',
+            # RADLAN-COPY-MIB:rlCopyTable
+            'dell_cp_idx'     => 'rlCopyIndex',
+            'dell_cp_sloc'    => 'rlCopySourceLocation',           
+            'dell_cp_sip'     => 'rlCopySourceIpAddress',
+            'dell_cp_sunit'   => 'rlCopySourceUnitNumber',
+            'dell_cp_sfile'   => 'rlCopySourceFileName',
+            'dell_cp_stype'   => 'rlCopySourceFileType',
+            'dell_cp_dloc'    => 'rlCopyDestinationLocation',
+            'dell_cp_dip'     => 'rlCopyDestinationIpAddress',           
+            'dell_cp_dunit'   => 'rlCopyDestinationUnitNumber',
+            'dell_cp_dfile'   => 'rlCopyDestinationFileName',
+            'dell_cp_dtype'   => 'rlCopyDestinationFileType',
+            'dell_cp_state'   => 'rlCopyOperationState',
+            'dell_cp_bkgnd'   => 'rlCopyInBackground',
+            'dell_cp_rstatus' => 'rlCopyRowStatus',
+            # RADLAN-HWENVIROMENT:rlEnvMonSupplyStatusTable
+            'dell_pwr_src'    => 'rlEnvMonSupplySource',
+            'dell_pwr_state'  => 'rlEnvMonSupplyState',           
+            'dell_pwr_desc'   => 'rlEnvMonSupplyStatusDescr',
+            # RADLAN-HWENVIROMENT:rlEnvMonFanStatusTable
+            'dell_fan_state' => 'rlEnvMonFanState',
+            'dell_fan_desc'  => 'rlEnvMonFanStatusDescr',
+           );
+
+
+%MUNGE = (
+            %SNMP::Info::Layer3::MUNGE,
+         );
+
+# Method OverRides
+
+sub bulkwalk_no { 1; }
+
+sub model {
+    my $dell = shift;
+
+    my $name = $dell->dell_id_name();
+    
+    if ($name =~ m/(\d+)/){
+        return $1;
+    }
+
+    return undef;
+}
+
+sub vendor {
+
+    return 'dell';
+}
+
+sub os {
+
+    return 'dell';
+}
+
+sub serial {
+    my $dell    = shift;
+
+    my $numbers = $dell->dell_serial_no();
+    
+    foreach my $key (keys %$numbers){
+        my $serial = $numbers->{$key};  
+        return $serial if (defined $serial and $serial !~ /^\s*$/);
+        next;
+    }
+
+    return undef;
+}
+
+# Descriptions are all the same, so use name instead
+sub interfaces {
+    my $dell = shift;
+    my $partial = shift;
+
+    my $interfaces = $dell->i_index($partial) || {};
+    my $names = $dell->orig_i_name($partial) || {};
+
+    my %interfaces = ();
+    foreach my $iid (keys %$interfaces){
+        my $name = $names->{$iid};
+        next unless defined $name;
+
+        $interfaces{$iid} = $name;
+    }
+    
+    return \%interfaces;
+}
+
+sub i_duplex_admin {
+    my $dell = shift;
+    my $partial = shift;
+    
+    my $interfaces  = $dell->interfaces($partial) || {};
+    my $dell_duplex = $dell->dell_duplex_admin($partial) || {};
+    my $dell_auto   = $dell->dell_auto($partial) || {};
+ 
+    my %i_duplex_admin;
+    foreach my $if (keys %$interfaces){
+        my $duplex = $dell_duplex->{$if};
+        next unless defined $duplex;
+        my $auto = $dell_auto->{$if}||'false';
+    
+        $duplex = 'half' if ($duplex =~ /half/i and $auto =~ /false/i);
+        $duplex = 'full' if ($duplex =~ /half/i and $auto =~ /false/i);
+        $duplex = 'auto' if $auto =~ /true/i;
+        $i_duplex_admin{$if}=$duplex; 
+    }
+    return \%i_duplex_admin;
+}
+
+# Normal BRIDGE-MIB not working?  Use Q-BRIDGE-MIB for macsuck
+sub fw_mac {
+    my $dell = shift;
+    my $partial = shift;
+
+    return $dell->qb_fw_mac($partial);
+}
+
+sub fw_port {
+    my $dell = shift;
+    my $partial = shift;
+
+    return $dell->qb_fw_port($partial);
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Dell - SNMP Interface to Dell Power Connect Network Devices
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $dell = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 1
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $dell->class();
+
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from an 
+Dell Power Connect device through SNMP. 
+
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
+
+my $dell = new SNMP::Info::Layer3::Dell(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item Dell-Vendor-MIB
+
+=item RADLAN-Physicaldescription-MIB
+
+=item RADLAN-rlInterfaces
+
+=item RADLAN-HWENVIROMENT
+
+=item Inherited Classes' MIBs
+
+See classes listed above for their required MIBs.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $dell->os_ver()
+
+(B<productIdentificationVersion>)
+
+=item $dell->dell_id_name()
+
+(B<productIdentificationDisplayName>)
+
+=item $dell->model()
+
+Returns model type.  Returns numeric from (B<productIdentificationDisplayName>).
+
+=item $dell->vendor()
+
+Returns dell
+
+=item $dell->os()
+
+Returns dell
+
+=back
+
+=head2 Overrides
+
+=over
+
+=item $dell->bulkwalk_no
+
+Return C<1>.  Bulkwalk is currently turned off for this class.
+
+=item $dell->serial()
+
+Returns serial number. (B<rlPhdUnitGenParamSerialNum>)
+
+=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.
+
+=head2 RADLAN Interface Table (B<swIfTable>)
+
+=over
+
+=item $dell->dell_duplex_admin()
+
+(B<swIfDuplexAdminMode>)
+
+=item $dell->dell_duplex()
+
+(B<swIfDuplexOperMode>)
+
+=item $dell->dell_tag_mode()
+
+(B<swIfTaggedMode>)
+
+=item $dell->dell_i_type()
+
+(B<swIfType>)
+
+=item $dell->dell_fc_admin()
+
+(B<swIfFlowControlMode>)
+
+=item $dell->dell_speed_admin()
+
+(B<swIfSpeedAdminMode>)
+
+=item $dell->dell_auto()
+
+(B<swIfSpeedDuplexAutoNegotiation>)
+
+=item $dell->dell_fc()
+
+(B<swIfOperFlowControlMode>)
+
+=back
+
+=head2 Overrides
+
+=over
+
+=item $dell->interfaces()
+
+Returns the map between SNMP Interface Identifier (iid) and physical port name.
+Uses name instead of description since descriptions are not unique.
+
+Only returns those iids that have a name listed in $l3->i_name()
+
+=item $dell->i_duplex_admin()
+
+Returns reference to hash of iid to current link administrative duplex setting.
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3/Enterasys.pm

@@ -0,0 +1,506 @@
+# SNMP::Info::Layer3::Enterasys - SNMP Interface to Enterasys devices
+# Eric Miller
+#
+# Copyright (c) 2007 Eric Miller
+#
+# 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.
+# 
+# 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::Enterasys;
+# $Id$
+
+use strict;
+
+use Exporter;
+use SNMP::Info::MAU;
+use SNMP::Info::LLDP;
+use SNMP::Info::CDP;
+use SNMP::Info::Layer3;
+
+use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
+
+$VERSION = '1.07';
+
+@SNMP::Info::Layer3::Enterasys::ISA = qw/SNMP::Info::MAU SNMP::Info::LLDP
+                                        SNMP::Info::CDP SNMP::Info::Layer3
+                                        Exporter/;
+@SNMP::Info::Layer3::Enterasys::EXPORT_OK = qw//;
+
+%MIBS = (
+         %SNMP::Info::Layer3::MIBS,
+         %SNMP::Info::CDP::MIBS,
+         %SNMP::Info::LLDP::MIBS,
+         %SNMP::Info::MAU::MIBS,
+         'ENTERASYS-OIDS-MIB' => 'etsysOidDevice',
+        );
+
+%GLOBALS = (
+            %SNMP::Info::Layer3::GLOBALS,
+            %SNMP::Info::CDP::GLOBALS,
+            %SNMP::Info::LLDP::GLOBALS,
+            %SNMP::Info::MAU::GLOBALS,
+            'mac'            => 'dot1dBaseBridgeAddress',
+           );
+
+%FUNCS   = (
+            %SNMP::Info::Layer3::FUNCS,
+            %SNMP::Info::CDP::FUNCS,
+            %SNMP::Info::LLDP::FUNCS,
+            %SNMP::Info::MAU::FUNCS,
+           );
+
+%MUNGE = (
+          %SNMP::Info::Layer3::MUNGE,
+          %SNMP::Info::CDP::MUNGE,
+          %SNMP::Info::LLDP::MUNGE,
+          %SNMP::Info::MAU::MUNGE,
+         );
+
+sub model {
+    my $enterasys = shift;
+    my $id = $enterasys->id();
+    
+    unless (defined $id){
+        print " SNMP::Info::Layer3::Enterasys::model() - Device does not support sysObjectID\n" if $enterasys->debug(); 
+        return undef;
+    }
+    
+    my $model = &SNMP::translateObj($id);
+
+    $model =~ s/^etsysOidDev//i;
+    $model =~ s/^etsysOidPhy//i;
+    return $id unless defined $model;
+
+    return $model;
+}
+
+sub vendor {
+    return 'enterasys';
+}
+
+sub os {
+    return 'enterasys';
+}
+
+sub os_ver {
+    my $enterasys = shift;
+    my $descr = $enterasys->description();
+    return undef unless defined $descr;
+
+    if ($descr =~ m/\bRev ([\d.]*)/){
+        return $1;
+    }
+
+    return undef;
+}
+
+# Use ifName as it is used for CDP and LLDP.
+sub interfaces {
+    my $enterasys = shift;
+    my $partial = shift;
+
+    #  We need the original ifName, SUPER:: would give us a method definition
+    #  in a higher class, we could use orig_ but just call the MIB leaf since
+    #  that's what we really want anyway.
+    return $enterasys->ifName($partial) || $enterasys->i_description($partial);
+}
+
+sub i_ignore {
+    my $enterasys = shift;
+    my $partial = shift;
+    
+    my $interfaces = $enterasys->i_type($partial) || {};
+
+    my %i_ignore;
+    foreach my $if (keys %$interfaces) {
+        if ($interfaces->{$if} =~ /(rs232|tunnel|loopback|\blo\b|null)/i){
+            $i_ignore{$if}++;
+        }
+    }
+    return \%i_ignore;
+}
+
+sub i_duplex {
+    my $enterasys = shift;
+    my $partial = shift;
+    
+    return $enterasys->mau_i_duplex($partial);
+}
+
+sub i_duplex_admin {
+    my $enterasys = shift;
+    my $partial = shift;
+    
+    return $enterasys->mau_i_duplex_admin($partial);
+}
+
+# Normal BRIDGE-MIB has issues on some devices, duplicates and
+# non-increasing oids, Use Q-BRIDGE-MIB for macsuck
+sub fw_mac {
+    my $enterasys = shift;
+    my $partial = shift;
+
+    return $enterasys->qb_fw_mac($partial);
+}
+
+sub fw_port {
+    my $enterasys = shift;
+    my $partial = shift;
+
+    return $enterasys->qb_fw_port($partial);
+}
+
+#  Use CDP and/or LLDP
+
+sub hasCDP {
+    my $enterasys = shift;
+
+    return $enterasys->hasLLDP() || $enterasys->SUPER::hasCDP();
+}
+
+sub c_ip {
+    my $enterasys = shift;
+    my $partial = shift;
+
+    my $cdp  = $enterasys->SUPER::c_ip($partial) || {};
+    my $lldp = $enterasys->lldp_ip($partial) || {};
+
+    my %c_ip;
+    foreach my $iid (keys %$cdp){
+        my $ip = $cdp->{$iid};
+        next unless defined $ip;
+
+        $c_ip{$iid} = $ip;
+    }
+
+    foreach my $iid (keys %$lldp){
+        my $ip = $lldp->{$iid};
+        next unless defined $ip;
+
+        $c_ip{$iid} = $ip;
+    }
+    return \%c_ip;
+}
+
+sub c_if {
+    my $enterasys = shift;
+    my $partial = shift;
+
+    my $lldp = $enterasys->lldp_if($partial) || {};;
+    my $cdp  = $enterasys->SUPER::c_if($partial) || {};
+    
+    my %c_if;
+    foreach my $iid (keys %$cdp){
+        my $if = $cdp->{$iid};
+        next unless defined $if;
+
+        $c_if{$iid} = $if;
+    }
+
+    foreach my $iid (keys %$lldp){
+        my $if = $lldp->{$iid};
+        next unless defined $if;
+
+        $c_if{$iid} = $if;
+    }
+    return \%c_if;
+}
+
+sub c_port {
+    my $enterasys = shift;
+    my $partial = shift;
+
+    my $lldp = $enterasys->lldp_port($partial) || {};
+    my $cdp  = $enterasys->SUPER::c_port($partial) || {};
+    
+    my %c_port;
+    foreach my $iid (keys %$cdp){
+        my $port = $cdp->{$iid};
+        next unless defined $port;
+
+        $c_port{$iid} = $port;
+    }
+
+    foreach my $iid (keys %$lldp){
+        my $port = $lldp->{$iid};
+        next unless defined $port;
+
+        $c_port{$iid} = $port;
+    }
+    return \%c_port;
+}
+
+sub c_id {
+    my $enterasys = shift;
+    my $partial = shift;
+
+    my $lldp = $enterasys->lldp_id($partial) || {};
+    my $cdp  = $enterasys->SUPER::c_id($partial) || {};
+
+    my %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;
+    }
+    return \%c_id;
+}
+
+sub c_platform {
+    my $enterasys = shift;
+    my $partial = shift;
+
+    my $lldp = $enterasys->lldp_rem_sysdesc($partial) || {};
+    my $cdp  = $enterasys->SUPER::c_platform($partial) || {};
+
+    my %c_platform;
+    foreach my $iid (keys %$cdp){
+        my $platform = $cdp->{$iid};
+        next unless defined $platform;
+
+        $c_platform{$iid} = $platform;
+    }
+
+    foreach my $iid (keys %$lldp){
+        my $platform = $lldp->{$iid};
+        next unless defined $platform;
+
+        $c_platform{$iid} = $platform;
+    }
+    return \%c_platform;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Enterasys - SNMP Interface to Enterasys Network Devices
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $enterasys = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 1
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $enterasys->class();
+
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from an 
+Enterasys device through SNMP. 
+
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
+
+my $enterasys = new SNMP::Info::Layer3::Enterasys(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::MAU
+
+=item SNMP::Info::LLDP
+
+=item SNMP::Info::CDP
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item ENTERASYS-OIDS-MIB
+
+=back
+
+=head2 Inherited MIBs
+
+See L<SNMP::Info::MAU/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::LLDP/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::CDP/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its MIB requirements.
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $enterasys->model()
+
+Returns model type.  Checks $enterasys->id() against the ENTERASYS-OIDS-MIB.
+
+=item $enterasys->vendor()
+
+Returns enterasys
+
+=item $enterasys->os()
+
+Returns enterasys
+
+=item $enterasys->mac()
+
+Returns base mac
+
+(B<dot1dBaseBridgeAddress>)
+
+=back
+
+=head2 Overrides
+
+=over
+
+=back
+
+=head2 Globals imported from SNMP::Info::MAU
+
+See documentation in L<SNMP::Info::MAU/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CDP
+
+See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.
+
+=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.
+
+=head2 Overrides
+
+=over
+
+=item $enterasys->i_ignore()
+
+Returns reference to hash.  Creates a key for each IID that should be ignored.
+
+Currently looks for rs232, tunnel,loopback,lo,null from $enterasys->interfaces()
+
+=item $enterasys->i_duplex()
+
+See documentation for mau_i_duplex() in L<SNMP::Info::MAU/"TABLE METHODS">.
+
+=item $enterasys->i_duplex_admin()
+
+See documentation for mau_i_duplex_admin() in L<SNMP::Info::MAU/"TABLE METHODS">.
+
+=back
+
+=head2 Topology information
+
+Based upon the firmware version Enterasys devices may support Cabletron
+Discovery Protocol (CTRON-CDP), Cisco Discovery Protocol (CDP), Link Layer
+Discovery Protocol (LLDP), or all.  This module currently supports CDP and
+LLDP, but not CTRON-CDP.  These methods will query both CDP and LLDP and
+return the combination of all information.  As a result, there may be
+identical topology information returned from the two protocols
+causing duplicate entries.  It is the calling program's responsibility to
+identify any duplicate entries and de-duplicate if necessary.
+
+=over
+
+=item $enterasys->hasCDP()
+
+Returns true if the device is running either CDP or LLDP.
+
+=item $enterasys->c_if()
+
+Returns reference to hash.  Key: iid Value: local device port (interfaces)
+
+=item $enterasys->c_ip()
+
+Returns reference to hash.  Key: iid Value: remote IPv4 address
+
+If multiple entries exist with the same local port, c_if(), with the same IPv4
+address, c_ip(), it may be a duplicate entry.
+
+If multiple entries exist with the same local port, c_if(), with different IPv4
+addresses, c_ip(), there is either a non-CDP/LLDP device in between two or
+more devices or multiple devices which are not directly connected.  
+
+Use the data from the Layer2 Topology Table below to dig deeper.
+
+=item $enterasys->c_port()
+
+Returns reference to hash. Key: iid Value: remote port (interfaces)
+
+=item $enterasys->c_id()
+
+Returns reference to hash. Key: iid Value: string value used to identify the
+chassis component associated with the remote system.
+
+=item $enterasys->c_platform()
+
+Returns reference to hash.  Key: iid Value: Remote Device Type
+
+=back
+
+=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.
+
+=head2 Table Methods imported from SNMP::Info::CDP
+
+See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3/Extreme.pm

@@ -0,0 +1,702 @@
+# SNMP::Info::Layer3::Extreme - SNMP Interface to Extreme devices
+# Eric Miller
+# Bill Fenner
+#
+# Copyright (c) 2005 Eric Miller
+#
+# Copyright (c) 2002,2003 Regents of the University of California
+# 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::Extreme;
+# $Id$
+
+use strict;
+
+use Exporter;
+use SNMP::Info::Layer3;
+use SNMP::Info::MAU;
+
+use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
+
+$VERSION = '1.07';
+
+@SNMP::Info::Layer3::Extreme::ISA = qw/SNMP::Info::Layer3 SNMP::Info::MAU Exporter/;
+@SNMP::Info::Layer3::Extreme::EXPORT_OK = qw//;
+
+%MIBS = ( %SNMP::Info::Layer3::MIBS,
+          %SNMP::Info::MAU::MIBS,
+          'EXTREME-BASE-MIB'   => 'extremeAgent',
+          'EXTREME-SYSTEM-MIB' => 'extremeSystem',
+          'EXTREME-FDB-MIB'    => 'extremeSystem',
+          'EXTREME-VLAN-MIB'   => 'extremeVlan',
+        );
+
+%GLOBALS = (
+            %SNMP::Info::Layer3::GLOBALS,
+            %SNMP::Info::MAU::GLOBALS,
+            'serial1'        => 'extremeSystemID.0',
+            'temp'           => 'extremeCurrentTemperature',
+            'ps1_status_old' => 'extremePrimaryPowerOperational.0',
+            'ps1_status_new' => 'extremePowerSupplyStatus.1',
+            'ps2_status_old' => 'extremeRedundantPowerStatus.0',
+            'ps2_status_new' => 'extremePowerSupplyStatus.2',
+            'mac'            => 'dot1dBaseBridgeAddress',
+           );
+
+%FUNCS   = (
+            %SNMP::Info::Layer3::FUNCS,
+            %SNMP::Info::MAU::FUNCS,
+            'fan_state'         => 'extremeFanOperational',
+            # EXTREME-FDB-MIB:extremeFdbMacFdbTable
+            'ex_fw_mac'         => 'extremeFdbMacFdbMacAddress',
+            'ex_fw_port'        => 'extremeFdbMacFdbPortIfIndex',
+            'ex_fw_status'      => 'extremeFdbMacFdbStatus',
+            # EXTREME-VLAN-MIB:extremeVlanIfTable
+            'ex_vlan_descr'     => 'extremeVlanIfDescr',
+            'ex_vlan_global_id' => 'extremeVlanIfGlobalIdentifier',
+            # EXTREME-VLAN-MIB:extremeVlanEncapsIfTable
+            'ex_vlan_encap_tag' => 'extremeVlanEncapsIfTag',
+           );
+
+%MUNGE = (
+            # Inherit all the built in munging
+            %SNMP::Info::Layer3::MUNGE,
+            %SNMP::Info::MAU::MUNGE,
+            'ex_fw_mac' => \&SNMP::Info::munge_mac,
+            'ps1_status_old' => \&munge_true_ok,
+            'ps1_status_new' => \&munge_power_stat,
+            'ps2_status_old' => \&munge_power_stat,
+            'ps2_status_new' => \&munge_power_stat,
+            'fan_state' => \&munge_true_ok,
+         );
+
+# Method OverRides
+
+*SNMP::Info::Layer3::Extreme::i_duplex       = \&SNMP::Info::MAU::mau_i_duplex;
+*SNMP::Info::Layer3::Extreme::i_duplex_admin = \&SNMP::Info::MAU::mau_i_duplex_admin;
+
+sub model {
+    my $extreme = shift;
+    my $id = $extreme->id();
+    
+    unless (defined $id){
+        print " SNMP::Info::Layer3::Extreme::model() - Device does not support sysObjectID\n" if $extreme->debug(); 
+        return undef;
+    }
+    
+    my $model = &SNMP::translateObj($id);
+
+    return $id unless defined $model;
+
+    return $model;
+}
+
+sub vendor {
+    return 'extreme';
+}
+
+sub os {
+    return 'extreme';
+}
+
+sub os_ver {
+    my $extreme = shift;
+    my $descr = $extreme->description();
+    return undef unless defined $descr;
+
+    if ($descr =~ m/Version ([\d.]*)/){
+        return $1;
+    }
+
+    return undef;
+}
+
+#
+# ifName is a nice concise port name on Extreme devices.
+# Layer3.pm defaults to i_description, which is verbose
+# and has spaces.  However, ifName has the IP address
+# assigned for router interfaces, so we use ifDescr
+# for those.
+sub interfaces {
+    my $extreme = shift;
+    my $partial = shift;
+    my $i_name = $extreme->orig_i_name($partial);
+    my $i_description = $extreme->orig_i_description($partial);
+    my $interfaces = {};
+    foreach my $idx (keys %$i_name) {
+        if ($i_name->{$idx} =~ /\([0-9.]+\)/) {
+            $interfaces->{$idx} = $i_description->{$idx};
+        } else {
+            $interfaces->{$idx} = $i_name->{$idx};
+        }
+    }
+    return $interfaces;
+}
+
+#
+# Ignore VLAN meta-interfaces and loopback
+sub i_ignore {
+    my $extreme = shift;
+    my $partial = shift;
+    
+    my $i_description = $extreme->i_description($partial) || {};
+
+    my %i_ignore;
+    foreach my $if (keys %$i_description) {
+        if ($i_description->{$if} =~ /^(802.1Q Encapsulation Tag \d+|VLAN \d+|lo\d+)/i){
+            $i_ignore{$if}++;
+        }
+    }
+    return \%i_ignore;
+}
+
+# When we use the extreme_fw_* objects, we're not using BRIDGE-MIB.
+# Either way, Extreme uses a 1:1 mapping of bridge interface ID to
+# ifIndex.
+sub bp_index {
+    my $extreme = shift;
+    my $if_index = $extreme->i_index();
+
+    my %bp_index;
+    foreach my $iid (keys %$if_index){
+        $bp_index{$iid} = $iid;
+    }
+    return \%bp_index;
+}
+
+sub munge_true_ok {
+    my $val = shift;
+    return undef unless defined($val);
+    return "OK" if ($val eq 'true');
+    return "Not OK" if ($val eq 'false');
+    return $val;
+}
+
+sub munge_power_stat {
+    my $val = shift;
+    return undef unless defined($val);
+    $val =~ s/^present//;
+    $val =~ s/^not/Not /i;
+    return $val;
+}
+
+sub ps1_status {
+    my $extreme = shift;
+    my $ps1_status = $extreme->ps1_status_new();
+    return $ps1_status || $extreme->ps1_status_old();
+}
+
+sub ps2_status {
+    my $extreme = shift;
+    my $ps2_status = $extreme->ps2_status_new();
+    return $ps2_status || $extreme->ps2_status_old();
+}
+
+sub fan {
+    my $extreme = shift;
+    my $fan_state = $extreme->fan_state();
+    my $ret = "";
+    my $s = "";
+    foreach my $i (sort {$a <=> $b} keys %$fan_state) {
+        $ret .= $s . $i . ": " . $fan_state->{$i};
+        $s = ", ";
+    }
+    return undef if ($s eq "");
+    $ret;
+}
+
+# Newer versions of the Extreme firmware have vendor-specific tables
+# for this; those are ex_fw_*().  Older firmware versions don't have
+# these tables, so we use the BRIDGE-MIB tables.
+sub fw_mac {
+    my $extreme = shift;
+    my $fw_mac = $extreme->ex_fw_mac;
+    return $fw_mac if defined($fw_mac);
+    return $extreme->orig_fw_mac();
+}
+
+sub fw_port {
+    my $extreme = shift;
+    my $fw_port = $extreme->ex_fw_port;
+    return $fw_port if defined($fw_port);
+    return $extreme->orig_fw_port();
+}
+
+sub fw_status {
+    my $extreme = shift;
+    my $fw_status = $extreme->ex_fw_status;
+    return $fw_status if defined($fw_status);
+    return $extreme->orig_fw_status();
+}
+
+# Mapping the virtual VLAN interfaces:
+# The virtual VLAN interfaces in extremeVlanIfTable
+#  are the higher layer above the interfaces that are
+#  untagged, and also above an interface in
+#  extremeVlanEncapsIfTable that does the encapsulation.
+# Note that it's possible to have a VLAN defined that
+#  does not have a tag, if it has all native interfaces.
+#  To represent this, we use a negative version of the
+#  internal VLAN ID (the deprecated extremeVlanIfGlobalIdentifier)
+sub _if2tag {
+    my $extreme = shift;
+    my $partial = shift;
+    my $stack = shift || $extreme->ifStackStatus($partial);
+    my $encap_tag = $extreme->ex_vlan_encap_tag();
+    my $vlan_descr = $extreme->ex_vlan_descr();
+
+    my $stackmap = {};
+    foreach my $idx (keys %$stack) {
+        my ($higher, $lower) = split(/\./, $idx);
+        $stackmap->{$higher}->{$lower} = $stack->{$idx};
+    }
+
+    my %if2tag = ();
+    my $missed = 0;
+    foreach my $if (keys %$vlan_descr) {
+        $if2tag{$if} = -1;
+        foreach my $tagif (keys %$encap_tag) {
+            if (defined($stackmap->{$if}->{$tagif}) && $stackmap->{$if}->{$tagif} eq 'active') {
+                $if2tag{$if} = $encap_tag->{$tagif};
+            }
+        }
+        if ($if2tag{$if} == -1) {
+            $missed++;
+        }
+    }
+    if ($missed) {
+        my $global_id = $extreme->ex_vlan_global_id();
+        foreach my $if (keys %if2tag) {
+            $if2tag{$if} = -$global_id->{$if} if ($if2tag{$if} == -1 && defined($global_id->{$if}));
+        }
+    }
+    \%if2tag;
+}
+
+# No partial support in v_name or v_index, because the obivous partial
+# is the VLAN ID and the index here is the ifIndex of
+# the VLAN interface.
+sub v_name {
+    my $extreme = shift;
+    return $extreme->ex_vlan_descr();
+}
+
+sub v_index {
+    my $extreme = shift;
+    return $extreme->_if2tag();
+}
+
+sub i_vlan {
+    my $extreme = shift;
+    my $partial = shift;
+    my $stack = $extreme->ifStackStatus($partial);
+    my $encap_tag = $extreme->ex_vlan_encap_tag();
+    my $vlan_descr = $extreme->ex_vlan_descr();
+    my $stackmap = {};
+    foreach my $idx (keys %$stack) {
+        my ($higher, $lower) = split(/\./, $idx);
+        $stackmap->{$higher}->{$lower} = $stack->{$idx};
+    }
+    my $if2tag = $extreme->_if2tag($partial, $stack);
+    #
+    # Now that we've done all that mapping work, we can map the
+    #   ifStack indexes.
+    my %i_vlan = ();
+    foreach my $if (keys %$if2tag) {
+        foreach my $lowif (keys %{$stackmap->{$if}}) {
+            $i_vlan{$lowif} = $if2tag->{$if};
+        }
+    }
+    return \%i_vlan;
+}
+
+sub i_vlan_membership {
+    my $extreme = shift;
+    my $partial = shift;
+    my $stack = $extreme->ifStackStatus($partial);
+    my $encap_tag = $extreme->ex_vlan_encap_tag();
+    my $vlan_descr = $extreme->ex_vlan_descr();
+    my $stackmap = {};
+    foreach my $idx (keys %$stack) {
+        my ($higher, $lower) = split(/\./, $idx);
+        $stackmap->{$higher}->{$lower} = $stack->{$idx};
+    }
+    my $if2tag = $extreme->_if2tag($partial, $stack);
+    #
+    # Now that we've done all that mapping work, we can map the
+    #   ifStack indexes.
+    my %i_vlan_membership = ();
+    foreach my $if (keys %$if2tag) {
+        foreach my $lowif (keys %{$stackmap->{$if}}) {
+	    push(@{$i_vlan_membership{$lowif}}, $if2tag->{$if});
+        }
+    }
+    #
+    # Now add all the tagged ports.
+    foreach my $if (keys %$encap_tag) {
+        foreach my $lowif (keys %{$stackmap->{$if}}) {
+	    push(@{$i_vlan_membership{$lowif}}, $encap_tag->{$if});
+        }
+    }
+    return \%i_vlan_membership;
+}
+
+# VLAN management.
+# See extreme-vlan.mib for a detailed description of
+# Extreme's use of ifStackTable and EXTREME-VLAN-MIB.
+
+sub set_i_vlan {
+    my $extreme = shift;
+    return $extreme->_extreme_set_i_vlan(0, @_);
+}
+
+sub set_i_pvid {
+    my $extreme = shift;
+    return $extreme->_extreme_set_i_vlan(1, @_);
+}
+
+# set_i_vlan implicitly turns off any encapsulation
+# set_i_pvid retains any encapsulation
+# otherwise they do the same: set the unencapsulated
+# vlan ID.
+# First arg to _set_i_vlan is whether or not to turn
+# off any encapsulation.
+sub _extreme_set_i_vlan {
+    my $extreme = shift;
+    my ($is_pvid, $vlan_id, $ifindex) = @_;
+    my $encap_tag = $extreme->ex_vlan_encap_tag();
+    # The inverted stack MIB would make this easier, since
+    # we need to find the vlan interface
+    # that's stacked above $ifindex.
+    my $cur_stack = $extreme->ifStackStatus();
+    #
+    # create inverted stack
+    my $invstack;
+    foreach my $idx (keys %$cur_stack) {
+        my ($higher, $lower) = split(/\./, $idx);
+        $invstack->{$lower}->{$higher} = $cur_stack->{$idx};
+    }
+    # create vlan tag -> encap interface map
+    my %encapif = reverse %$encap_tag;
+    # now find encap interface from tag
+    my $encapidx = $encapif{$vlan_id};
+    if (!defined($encapidx)) {
+        $extreme->error_throw("can't map $vlan_id to encapsulation interface");
+        return undef;
+    }
+    # now find vlan interface stacked above encap
+    my @abovevlan =  keys %{$invstack->{$encapidx}};
+    if (@abovevlan != 1) {
+        $extreme->error_throw("can't map encap interface $encapidx for $vlan_id to encapsulation interface");
+        return undef;
+    }
+    my $vlanidx = $abovevlan[0];
+    my $rv;
+    # Delete old VLAN mapping
+    foreach my $oldidx (keys %{$invstack->{$ifindex}}) {
+        if ($is_pvid && defined($encap_tag->{$oldidx})) {
+            next;       # Don't delete tagged mappings
+        }
+        $rv = $extreme->set_ifStackStatus("destroy", $oldidx . "." . $ifindex);
+        unless ($rv) {
+            $extreme->error_throw("Unable to remove $ifindex from old VLAN index $oldidx");
+            return undef;
+        }
+    }
+    # Add new VLAN mapping
+    $rv = $extreme->set_ifStackStatus("createAndGo", $vlanidx . "." . $ifindex);
+    unless ($rv) {
+        $extreme->error_throw("Unable to add new VLAN index $vlanidx to ifIndex $ifindex");
+        return undef;
+    }
+    # XXX invalidate cache of ifstack?
+    # XXX Info.pm library function for this?
+    # XXX set_ should do invalidation?
+    # $store = $extreme->store(); delete $store->{ifStackStatus}; $extreme->store($store);
+    # $extreme->{_ifStackStatus} = 0;
+    return $rv;
+}
+
+sub set_remove_i_vlan_tagged {
+    my $extreme = shift;
+    my ($vlan_id, $ifindex) = @_;
+    my $encap_tag = $extreme->ex_vlan_encap_tag();
+    # create vlan tag -> encap interface map
+    my %encapif = reverse %$encap_tag;
+    # now find encap interface from tag
+    my $encapidx = $encapif{$vlan_id};
+    if (!defined($encapidx)) {
+        $extreme->error_throw("can't map $vlan_id to encapsulation interface");
+        return undef;
+    }
+    my $rv = $extreme->set_ifStackStatus("destroy", $encapidx . "." . $ifindex);
+    unless ($rv) {
+        $extreme->error_throw("Unable to delete VLAN encap ifIndex $encapidx for VLAN $vlan_id from ifIndex $ifindex");
+        return undef;
+    }
+    # invalidate cache of ifstack?
+    return $rv;
+}
+
+sub set_add_i_vlan_tagged {
+    my $extreme = shift;
+    my ($vlan_id, $ifindex) = @_;
+    my $encap_tag = $extreme->ex_vlan_encap_tag();
+    # create vlan tag -> encap interface map
+    my %encapif = reverse %$encap_tag;
+    # now find encap interface from tag
+    my $encapidx = $encapif{$vlan_id};
+    if (!defined($encapidx)) {
+        $extreme->error_throw("can't map $vlan_id to encapsulation interface");
+        return undef;
+    }
+    my $rv = $extreme->set_ifStackStatus("createAndGo", $encapidx . "." . $ifindex);
+    unless ($rv) {
+        $extreme->error_throw("Unable to add VLAN encap ifIndex $encapidx for VLAN $vlan_id to ifIndex $ifindex");
+        return undef;
+    }
+    # invalidate cache of ifstack?
+    return $rv;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Extreme - Perl5 Interface to Extreme Network Devices
+
+=head1 AUTHOR
+
+Eric Miller, Bill Fenner
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $extreme = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 1
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $extreme->class();
+
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from an 
+Extreme device through SNMP. 
+
+For speed or debugging purposes you can call the subclass directly, but not after determining
+a more specific class using the method above. 
+
+my $extreme = new SNMP::Info::Layer3::Extreme(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=item SNMP::Info::MAU
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item EXTREME-BASE-MIB
+
+=item EXTREME-SYSTEM-MIB
+
+=item EXTREME-FDB-MIB
+
+=item EXTREME-VLAN-MIB
+
+=item Inherited Classes' MIBs
+
+See classes listed above for their required MIBs.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+#=item $extreme->bulkwalk_no
+#
+#Return C<1>.  Bulkwalk is currently turned off for this class.
+
+=item $extreme->model()
+
+Returns model type.  Checks $extreme->id() against the EXTREME-BASE-MIB.
+
+=item $extreme->vendor()
+
+Returns extreme
+
+=item $extreme->os()
+
+Returns extreme
+
+=item $extreme->serial()
+
+Returns serial number
+
+(B<extremeSystemID>)
+
+=item $extreme->temp()
+
+Returns system temperature
+
+(B<extremeCurrentTemperature>)
+
+=item $extreme->ps1_status()
+
+Returns status of power supply 1
+
+(B<extremePowerSupplyStatus.1>)
+
+=item $extreme->fan()
+
+Returns fan status
+
+(B<extremeFanOperational.1>)
+
+=item $extreme->mac()
+
+Returns base mac
+
+(B<dot1dBaseBridgeAddress>)
+
+=back
+
+=head2 Overrides
+
+=over
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::MAU
+
+See documentation in L<SNMP::Info::MAU/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item $extreme->fw_mac()
+
+(B<extremeFdbMacFdbMacAddress>)
+
+=item $extreme->fw_port()
+
+(B<extremeFdbMacFdbPortIfIndex>)
+
+=item $extreme->fw_status()
+
+(B<extremeFdbMacFdbStatus>)
+
+=item $extreme->i_vlan()
+
+Returns a mapping between ifIndex and the VLAN.
+
+=item $stack->bp_index()
+
+Returns reference to hash of bridge port table entries map back to interface identifier (iid)
+
+Returns (B<ifIndex>) for both key and value since we're using EXTREME-FDB-MIB
+rather than BRIDGE-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.
+
+=item $extreme->set_i_vlan ( vlan, ifIndex )
+
+Changes an access (untagged) port VLAN, must be supplied with the numeric
+VLAN ID and port ifIndex.  This method should only be used on end station
+(non-trunk) ports.
+
+  Example:
+  my %if_map = reverse %{$extreme->interfaces()};
+  $extreme->set_i_vlan('2', $if_map{'FastEthernet0/1'}) 
+    or die "Couldn't change port VLAN. ",$extreme->error(1);
+
+=item $extreme->set_i_pvid ( pvid, ifIndex )
+
+Sets port default VLAN, must be supplied with the numeric VLAN ID and
+port ifIndex.  This method should only be used on trunk ports.
+
+  Example:
+  my %if_map = reverse %{$extreme->interfaces()};
+  $extreme->set_i_pvid('2', $if_map{'FastEthernet0/1'}) 
+    or die "Couldn't change port default VLAN. ",$extreme->error(1);
+
+=item $extreme->set_add_i_vlan_tagged ( vlan, ifIndex )
+
+Adds the VLAN to the enabled VLANs list of the port, must be supplied with the
+numeric VLAN ID and port ifIndex.
+
+  Example:
+  my %if_map = reverse %{$extreme->interfaces()};
+  $extreme->set_add_i_vlan_tagged('2', $if_map{'FastEthernet0/1'}) 
+    or die "Couldn't add port to egress list. ",$extreme->error(1);
+
+=item $extreme->set_remove_i_vlan_tagged ( vlan, ifIndex )
+
+Removes the VLAN from the enabled VLANs list of the port, must be supplied
+with the numeric VLAN ID and port ifIndex.
+
+  Example:
+  my %if_map = reverse %{$extreme->interfaces()};
+  $extreme->set_remove_i_vlan_tagged('2', $if_map{'FastEthernet0/1'}) 
+    or die "Couldn't add port to egress list. ",$extreme->error(1);
+
+=cut

Info/Layer3/Foundry.pm

@@ -1,5 +1,7 @@
 # SNMP::Info::Layer3::Foundry - SNMP Interface to Foundry devices
-# Max Baker <max@warped.org>
+# Max Baker
+#
+# Copyright (c) 2004,2005 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
@@ -28,63 +30,50 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::Layer3::Foundry;
-$VERSION = 0.4;
 # $Id$
 
 use strict;
 
 use Exporter;
-use SNMP::Info;
-use SNMP::Info::Bridge;
+use SNMP::Info::Layer3;
+use SNMP::Info::FDP;
+use SNMP::Info::LLDP;
 
 use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
 
-@SNMP::Info::Layer3::Foundry::ISA = qw/SNMP::Info SNMP::Info::Bridge Exporter/;
+$VERSION = '1.07';
+
+@SNMP::Info::Layer3::Foundry::ISA = qw/SNMP::Info::FDP SNMP::Info::LLDP
+                                       SNMP::Info::Layer3 Exporter/;
 @SNMP::Info::Layer3::Foundry::EXPORT_OK = qw//;
 
-$DEBUG=0;
-$SNMP::debugging=$DEBUG;
-
-$INIT = 0;
-
-%MIBS = ( %SNMP::Info::MIBS,
-          %SNMP::Info::Bridge::MIBS,
-          'FOUNDRY-SN-ROOT-MIB' => 'foundry',
-          # IP-FORWARD-MIB
-          # ETHERLIKE-MIB
-          # RFC1398-MIB
-          # RMON-MIB
-          # IF-MIB
+%MIBS = ( %SNMP::Info::Layer3::MIBS,
+          %SNMP::Info::LLDP::MIBS,
+          %SNMP::Info::FDP::MIBS,
+          'FOUNDRY-SN-ROOT-MIB'         => 'foundry',
+          'FOUNDRY-SN-AGENT-MIB'        => 'snChasPwrSupplyDescription',
+          'FOUNDRY-SN-SWITCH-GROUP-MIB' => 'snSwGroupOperMode',
         );
 
 %GLOBALS = (
-            # Inherit the super class ones
-            %SNMP::Info::GLOBALS,
-            %SNMP::Info::Bridge::GLOBALS,
+            %SNMP::Info::Layer3::GLOBALS,
+            %SNMP::Info::LLDP::GLOBALS,
+            %SNMP::Info::FDP::GLOBALS,
             'mac'        => 'ifPhysAddress.1',
             'chassis'    => 'entPhysicalDescr.1',
-            'serial'     => 'snChasSerNum',
             'temp'       => 'snChasActualTemperature',
             'ps1_type'   => 'snChasPwrSupplyDescription.1',
             'ps1_status' => 'snChasPwrSupplyOperStatus.1',
             'fan'        => 'snChasFanOperStatus.1',
-            #'serial'   => 'enterprises.1991.1.1.1.1.2.0',
-            #'temp'     => 'enterprises.1991.1.1.1.1.18.0',
-            #'ps1_type' => 'enterprises.1991.1.1.1.2.1.1.2.1',
-            #'ps1_status' => 'enterprises.1991.1.1.1.2.1.1.3.1',
-            #'fan'   => 'enterprises.1991.1.1.1.3.1.1.3.1'
+
            );
 
 %FUNCS   = (
-            %SNMP::Info::FUNCS,
-            %SNMP::Info::Bridge::FUNCS,
-            'i_name2'    => 'ifName',
-            # From RFC1213-MIB
-            'at_index'    => 'ipNetToMediaIfIndex',
-            'at_paddr'    => 'ipNetToMediaPhysAddress',
-            'at_netaddr'  => 'ipNetToMediaNetAddress',
-            # FOUNDRY-MIB
-            #   snSwPortInfoTable - Switch Port Information Group
+            %SNMP::Info::Layer3::FUNCS,
+            %SNMP::Info::LLDP::FUNCS,
+            %SNMP::Info::FDP::FUNCS,
+            # FOUNDRY-SN-SWITCH-GROUP-MIB
+            # snSwPortInfoTable - Switch Port Information Group
             'sw_index'    => 'snSwPortIfIndex',
             'sw_duplex'   => 'snSwPortInfoChnMode',
             'sw_type'     => 'snSwPortInfoMediaType',
@@ -92,42 +81,20 @@ $INIT = 0;
            );
 
 %MUNGE = (
-            # Inherit all the built in munging
-            %SNMP::Info::MUNGE,
-            %SNMP::Info::Bridge::MUNGE,
-            'at_paddr' => \&SNMP::Info::munge_mac,
+            %SNMP::Info::Layer3::MUNGE,
+            %SNMP::Info::LLDP::MUNGE,
+            %SNMP::Info::FDP::MUNGE,
          );
 
-
-# Method OverRides
-
-# Add our i_aliases if they are set (manually)
-sub i_name {
-    my $foundry = shift;
-    my $i_name = $foundry->i_name2();
-
-    my $i_alias = $foundry->i_alias();
-
-    foreach my $iid (keys %$i_name){
-        my $alias = $i_alias->{$iid};
-        next unless defined $alias;
-        next unless length($alias);
-        $i_name->{$iid} = $i_alias->{$iid};
-    }
-
-    return $i_name;
-}
-
 sub i_ignore {
     my $foundry = shift;
-    
-    my $interfaces = $foundry->interfaces();
-    my $i_descr    = $foundry->i_descr();
+    my $partial = shift;
+
+    my $interfaces = $foundry->interfaces($partial) || {};
 
     my %i_ignore;
     foreach my $if (keys %$interfaces) {
-        # lo -> cisco aironet 350 loopback
-        if ($interfaces->{$if} =~ /(tunnel|loopback|lo|lb|null)/i){
+        if ($interfaces->{$if} =~ /(tunnel|loopback|\blo\b|lb|null)/i){
             $i_ignore{$if}++;
         }
     }
@@ -136,8 +103,14 @@ sub i_ignore {
 
 sub i_duplex {
     my $foundry = shift;
-    my $sw_index = $foundry->sw_index();
-    my $sw_duplex= $foundry->sw_duplex();
+    my $partial = shift;
+
+    my $sw_index = $foundry->sw_index($partial);
+    my $sw_duplex= $foundry->sw_duplex($partial);
+
+    unless (defined $sw_index and defined $sw_duplex){
+       return $foundry->SUPER::i_duplex(); 
+    }
     
     my %i_duplex;
     foreach my $sw_port (keys %$sw_duplex){
@@ -150,83 +123,285 @@ sub i_duplex {
     return \%i_duplex;
 }
 
-sub i_type {
-    my $foundry = shift;
-    my $sw_index = $foundry->sw_index();
-    my $sw_type= $foundry->sw_type();
-    
-    my %i_type;
-    foreach my $sw_port (keys %$sw_type){
-        my $iid = $sw_index->{$sw_port};
-        my $type = $sw_type->{$sw_port};
-        next unless defined $type;
-        $i_type{$iid} = $type;
-    }
-    return \%i_type;
-}
-
-sub i_speed {
-    my $foundry = shift;
-    my $sw_index = $foundry->sw_index();
-    my $sw_speed= $foundry->sw_speed();
-    
-    my %i_speed;
-    foreach my $sw_port (keys %$sw_speed){
-        my $iid = $sw_index->{$sw_port};
-        my $speed = $sw_speed->{$sw_port};
-        next unless defined $speed;
-        $speed = 'auto'     if $speed =~ /auto/i;
-        $speed = '10 Mbps'  if $speed =~ /s10m/i;
-        $speed = '100 Mbps' if $speed =~ /s100m/i;
-        $speed = '1.0 Gbps' if $speed =~ /s1g/i;
-        $speed = '45 Mbps' if $speed =~ /s45M/i;
-        $speed = '155 Mbps' if $speed =~ /s155M/i;
-        $i_speed{$iid} = $speed;
-    }
-    return \%i_speed;
-}
-
-# $foundry->model() - looks for xxnnnn in the description
 sub model {
     my $foundry = shift;
     my $id = $foundry->id();
-    my $desc = $foundry->description();
     my $model = &SNMP::translateObj($id);
 
-    $model = $1 if $desc =~ /\s+([a-z]{2}\d{4})\D/i;
+    # EdgeIron
+    if ($id =~ /\.1991\.1\.[45]\./) {
+
+        my $e_name = $foundry->e_name();
+
+        # Find entity table entry for "unit.1"
+        my $unit_iid = undef;
+        foreach my $e (keys %$e_name){
+            my $name = $e_name->{$e} || '';
+            $unit_iid = $e if $name eq 'unit.1';
+        }
+
+        # Find Model Name
+        my $e_model = $foundry->e_model();
+        if (defined $e_model->{$unit_iid}){
+            return $e_model->{$unit_iid};
+        }
+    }
     
+    return $id unless defined $model;
+    
+    $model =~ s/^sn//;
 
     return $model;
 }
 
-# $foundry->interfaces() - Map the Interfaces to their physical names
-sub interfaces {
-    my $foundry = shift;
-    my $interfaces = $foundry->i_index();
-    
-    my $descriptions = $foundry->i_description();
-
-    my %ifs = ();
-    foreach my $iid (keys %$interfaces){
-        $ifs{$iid} = $descriptions->{$iid}; 
-    }
-    
-    return \%ifs;
+sub os { 
+    return 'foundry';
 }
 
 sub vendor {
     return 'foundry';
 }
+
+sub os_ver {
+    my $foundry = shift;
+
+    return $foundry->snAgImgVer() if ( defined $foundry->snAgImgVer() );
+
+    # Some older ones don't have this value,so we cull it from the description
+    my $descr = $foundry->description();
+    if ($descr =~ m/Version (\d\S*)/) {
+        return $1;
+    }
+
+    # EdgeIron
+    my $e_name = $foundry->e_name();
+
+    # find entity table entry for "stackmanaget.1"
+    my $unit_iid = undef;
+    foreach my $e (keys %$e_name){
+        my $name = $e_name->{$e} || '';
+        $unit_iid = $e if $name eq 'stackmanaget.1';
+    }
+
+    if (defined $unit_iid){
+
+        # Find Model Name
+        my $e_fwver = $foundry->e_fwver();
+        if (defined $e_fwver->{$unit_iid}){
+            return $e_fwver->{$unit_iid};
+        }
+    }
+
+    # Last resort
+    return $foundry->SUPER::os_ver();
+
+}
+
+sub serial {
+    my $foundry = shift;
+
+    # Return chassis serial number if available
+    return $foundry->snChasSerNum() if ( $foundry->snChasSerNum() );
+
+    # If no chassis serial use first module serial
+    my $mod_serials = $foundry->snAgentConfigModuleSerialNumber();
+
+    foreach my $mod (sort keys %$mod_serials){
+        my $serial = $mod_serials->{$mod} || '';
+        next unless defined $serial;
+        return $serial;
+    }
+
+    # EdgeIron
+    my $e_name = $foundry->e_name();
+
+    # find entity table entry for "unit.1"
+    my $unit_iid = undef;
+    foreach my $e (keys %$e_name){
+        my $name = $e_name->{$e} || '';
+        $unit_iid = $e if $name eq 'unit.1';
+    }
+
+    if (defined $unit_iid) {
+        # Look up serial of found entry.
+        my $e_serial = $foundry->e_serial();
+        return $e_serial->{$unit_iid} if defined $e_serial->{$unit_iid};
+    }
+
+    # Last resort
+    return $foundry->SUPER::serial();
+}
+
+sub interfaces {
+    my $foundry = shift;
+    my $partial = shift;
+
+    my $i_descr = $foundry->i_description($partial) || {};
+    my $i_name  = $foundry->i_name($partial) || {};
+
+    # Use ifName for EdgeIrons else use ifDescr
+    foreach my $iid (keys %$i_name){
+        my $name = $i_name->{$iid};
+        next unless defined $name;
+        $i_descr->{$iid} = $name 
+            if $name =~ /^port\d+/i;
+    }
+    
+    return $i_descr;
+}
+
+# Reported hangs on a EdgeIron 24G
+sub stp_p_state {
+    my $foundry = shift;  
+    my $partial = shift;
+
+    my $descr = $foundry->description();
+    if ($descr =~ m/\bEdgeIron 24G\b/) {
+        return undef;
+    }
+
+    return $foundry->SUPER::stp_p_state($partial) || {};
+
+}
+
+#  Use FDP and/or LLDP
+
+sub hasCDP {
+    my $foundry = shift;
+
+    return $foundry->hasLLDP() || $foundry->SUPER::hasCDP();
+}
+
+sub c_ip {
+    my $foundry = shift;
+    my $partial = shift;
+
+    my $cdp  = $foundry->SUPER::c_ip($partial) || {};
+    my $lldp = $foundry->lldp_ip($partial) || {};
+
+    my %c_ip;
+    foreach my $iid (keys %$cdp){
+        my $ip = $cdp->{$iid};
+        next unless defined $ip;
+
+        $c_ip{$iid} = $ip;
+    }
+
+    foreach my $iid (keys %$lldp){
+        my $ip = $lldp->{$iid};
+        next unless defined $ip;
+
+        $c_ip{$iid} = $ip;
+    }
+    return \%c_ip;
+}
+
+sub c_if {
+    my $foundry = shift;
+    my $partial = shift;
+
+    my $lldp = $foundry->lldp_if($partial) || {};;
+    my $cdp  = $foundry->SUPER::c_if($partial) || {};
+    
+    my %c_if;
+    foreach my $iid (keys %$cdp){
+        my $if = $cdp->{$iid};
+        next unless defined $if;
+
+        $c_if{$iid} = $if;
+    }
+
+    foreach my $iid (keys %$lldp){
+        my $if = $lldp->{$iid};
+        next unless defined $if;
+
+        $c_if{$iid} = $if;
+    }
+    return \%c_if;
+}
+
+sub c_port {
+    my $foundry = shift;
+    my $partial = shift;
+
+    my $lldp = $foundry->lldp_port($partial) || {};
+    my $cdp  = $foundry->SUPER::c_port($partial) || {};
+    
+    my %c_port;
+    foreach my $iid (keys %$cdp){
+        my $port = $cdp->{$iid};
+        next unless defined $port;
+
+        $c_port{$iid} = $port;
+    }
+
+    foreach my $iid (keys %$lldp){
+        my $port = $lldp->{$iid};
+        next unless defined $port;
+
+        $c_port{$iid} = $port;
+    }
+    return \%c_port;
+}
+
+sub c_id {
+    my $foundry = shift;
+    my $partial = shift;
+
+    my $lldp = $foundry->lldp_id($partial) || {};
+    my $cdp  = $foundry->SUPER::c_id($partial) || {};
+
+    my %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;
+    }
+    return \%c_id;
+}
+
+sub c_platform {
+    my $foundry = shift;
+    my $partial = shift;
+
+    my $lldp = $foundry->lldp_rem_sysdesc($partial) || {};
+    my $cdp  = $foundry->SUPER::c_platform($partial) || {};
+
+    my %c_platform;
+    foreach my $iid (keys %$cdp){
+        my $platform = $cdp->{$iid};
+        next unless defined $platform;
+
+        $c_platform{$iid} = $platform;
+    }
+
+    foreach my $iid (keys %$lldp){
+        my $platform = $lldp->{$iid};
+        next unless defined $platform;
+
+        $c_platform{$iid} = $platform;
+    }
+    return \%c_platform;
+}
+
 1;
 __END__
 
 =head1 NAME
 
-SNMP::Info::Layer3::Foundry - Perl5 Interface to Foundry FastIron Network Devices
+SNMP::Info::Layer3::Foundry - SNMP Interface to Foundry Network Devices
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
@@ -241,19 +416,16 @@ Max Baker (C<max@warped.org>)
                         ) 
     or die "Can't connect to DestHost.\n";
 
- my $class      = $foundry->class();
+ my $class = $foundry->class();
+
  print "SNMP::Info determined this device to fall under subclass : $class\n";
 
 =head1 DESCRIPTION
 
-This subclass no longer supported.
+Abstraction subclass for Foundry Networks devices.
 
-This module provides limited functionality from older Foundry devices.
-
-Specifically designed for a FI4802.
-
-For speed or debugging purposes you can call the subclass directly, but not after determining
-a more specific class using the method above.  Turn off the AutoSpecify flag.
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above.
 
  my $foundry = new SNMP::Info::Layer3::Foundry(...);
 
@@ -261,9 +433,11 @@ a more specific class using the method above.  Turn off the AutoSpecify flag.
 
 =over
 
-=item SNMP::Info
+=item SNMP::Info::Layer3;
 
-=item SNMP::Info::Bridge
+=item SNMP::Info::FDP;
+
+=item SNMP::Info::LLDP;
 
 =back
 
@@ -273,14 +447,20 @@ a more specific class using the method above.  Turn off the AutoSpecify flag.
 
 =item FOUNDRY-SN-ROOT-MIB
 
+=item FOUNDRY-SN-AGENT-MIB
+
+=item FOUNDRY-SN-SWITCH-GROUP-MIB
+
 =item Inherited Classes' MIBs
 
-See classes listed above for their required MIBs.
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::FDP/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::LLDP/"Required MIBs"> for its own MIB requirements.
 
 =back
 
-The Foundry MIBS can be downloaded from www.mibdepot.com and ??
-
 =head1 GLOBALS
 
 These are methods that return scalar value from SNMP
@@ -289,12 +469,20 @@ These are methods that return scalar value from SNMP
 
 =item $foundry->model()
 
-Returns model type.  Checks $foundry->id() against the 
-FOUNDRY-SN-ROOT-MIB and then parses out xxNNNN
+Returns model type.  Checks $foundry->id() against the FOUNDRY-SN-ROOT-MIB
+and removes 'sn'.  EdgeIron models determined through ENTITY-MIB.  
 
 =item $foundry->vendor()
 
-Returns 'foundry' :)
+Returns 'foundry'
+
+=item $foundry->os()
+
+Returns 'foundry'
+
+=item $foundry->os_ver()
+
+Returns the software version
 
 =item $foundry->mac()
 
@@ -312,8 +500,6 @@ Returns Chassis type.
 
 Returns serial number of device.
 
-(B<snChasSerNum>)
-
 =item $foundry->temp()
 
 Returns the chassis temperature
@@ -340,15 +526,19 @@ Returns the status of the chassis fan.
 
 =back
 
-=head2 Globals imported from SNMP::Info
+=head2 Global Methods imported from SNMP::Info::Layer3
 
-See documentation in SNMP::Info for details.
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 
-=head2 Globals imported from SNMP::Info::Bridge
+=head2 Global Methods imported from SNMP::Info::FDP
 
-See documentation in SNMP::Info::Bridge for details.
+See documentation in L<SNMP::Info::FDP/"GLOBALS"> for details.
 
-=head1 TABLE ENTRIES
+=head2 Global Methods imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
 
 These are methods that return tables of information in the form of a reference
 to a hash.
@@ -361,13 +551,6 @@ to a hash.
 
 Returns reference to hash of interface names to iids.
 
-Uses B<ifDescr>.
-
-=item $foundry->i_name()
-
-Returns reference to hash of interface names.  
-Trys for B<ifAlias> and Defaults to B<ifName>
-
 =item $foundry->i_ignore()
 
 Returns reference to hash of interfaces to be ignored.
@@ -380,43 +563,6 @@ Returns reference to hash of interface link duplex status.
 
 Crosses $foundry->sw_duplex() with $foundry->sw_index()
 
-=item $foundry->i_type()
-
-Returns reference to hash of interface types.
-
-Crosses $foundry->sw_type() with $foundry->sw_index()
-
-=item $foundry->i_speed()
-
-Returns reference to hash of interface speeds .
-
-Crosses $foundry->sw_speeD() with $foundry->sw_index() and 
-does a little munging.
-
-=back
-
-=head2 RFC1213 Arp Cache Table (B<ipNetToMediaTable>)
-
-=over
-
-=item $foundry->at_index()
-
-Returns reference to hash.  Maps ARP table entries to Interface IIDs 
-
-(B<ipNetToMediaIfIndex>)
-
-=item $foundry->at_paddr()
-
-Returns reference to hash.  Maps ARP table entries to MAC addresses. 
-
-(B<ipNetToMediaPhysAddress>)
-
-=item $foundry->at_netaddr()
-
-Returns reference to hash.  Maps ARP table entries to IPs 
-
-(B<ipNetToMediaNetAddress>)
-
 =back
 
 =head2 Foundry Switch Port Information Table (B<snSwPortIfTable>)
@@ -449,12 +595,63 @@ Returns reference to hash.  Current Port Speed.
 
 =back
 
-=head2 Table Methods imported from SNMP::Info
+=head2 Topology information
 
-See documentation in SNMP::Info for details.
+Based upon the software version devices may support Foundry Discovery
+Protocol (FDP) and Link Layer Discovery Protocol (LLDP). These
+methods will query both and return the combination of all information. As a
+result, there may be identical topology information returned from the two
+protocols causing duplicate entries.  It is the calling program's
+responsibility to identify any duplicate entries and de-duplicate if necessary.
 
-=head2 Table Methods imported from SNMP::Info::Bridge
+=over
 
-See documentation in SNMP::Info::Bridge for details.
+=item $foundry->hasCDP()
+
+Returns true if the device is running either FDP or LLDP.
+
+=item $foundry->c_if()
+
+Returns reference to hash.  Key: iid Value: local device port (interfaces)
+
+=item $foundry->c_ip()
+
+Returns reference to hash.  Key: iid Value: remote IPv4 address
+
+If multiple entries exist with the same local port, c_if(), with the same IPv4
+address, c_ip(), it may be a duplicate entry.
+
+If multiple entries exist with the same local port, c_if(), with different IPv4
+addresses, c_ip(), there is either a non-FDP/LLDP device in between two or
+more devices or multiple devices which are not directly connected.  
+
+Use the data from the Layer2 Topology Table below to dig deeper.
+
+=item $foundry->c_port()
+
+Returns reference to hash. Key: iid Value: remote port (interfaces)
+
+=item $foundry->c_id()
+
+Returns reference to hash. Key: iid Value: string value used to identify the
+chassis component associated with the remote system.
+
+=item $foundry->c_platform()
+
+Returns reference to hash.  Key: iid Value: Remote Device Type
+
+=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::FDP
+
+See documentation in L<SNMP::Info::FDP/"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/Juniper.pm

@@ -0,0 +1,214 @@
+# SNMP::Info::Layer3::Juniper
+# 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::Juniper;
+# $Id$
+
+use Exporter;
+use SNMP::Info::Layer3;
+
+use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
+$VERSION = '1.07';
+@SNMP::Info::Layer3::Juniper::ISA = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Juniper::EXPORT_OK = qw//;
+
+%MIBS = (
+            %SNMP::Info::Layer3::MIBS,  
+	    'JUNIPER-CHASSIS-DEFINES-MIB' => 'jnxChassisDefines',
+	    'JUNIPER-MIB' => 'jnxBoxAnatomy',
+	);
+
+%GLOBALS = (
+            %SNMP::Info::Layer3::GLOBALS,
+	    'serial' => 'jnxBoxSerialNo.0',
+	   );
+
+%FUNCS = (
+            %SNMP::Info::Layer3::FUNCS,
+	 );
+
+%MUNGE = (
+            %SNMP::Info::Layer3::MUNGE,
+	 );
+
+sub vendor {
+	return 'juniper';
+}
+
+sub os {
+	return 'junos';
+}
+
+sub os_ver {
+    my $juniper = shift;
+    my $descr = $juniper->description();
+    return undef unless defined $descr;
+
+    if ($descr =~ m/kernel JUNOS (\S+)/) {
+	return $1;
+    }
+    return undef;
+}
+
+sub model {
+    my $l3 = shift;
+    my $id = $l3->id();
+    
+    unless (defined $id){
+        print " SNMP::Info::Layer3::Juniper::model() - Device does not support sysObjectID\n" if $l3->debug(); 
+        return undef;
+    }
+    
+    my $model = &SNMP::translateObj($id);
+
+    return $id unless defined $model;
+
+    $model =~ s/^jnxProductName//i;
+    return $model;
+}
+
+# Override the fancy Layer3.pm serial function
+sub serial {
+    my $juniper = shift;
+    return $juniper->orig_serial();
+}
+
+sub i_vlan {
+	my ($juniper) = shift;
+	my ($partial) = shift;
+
+	my ($i_type) = $juniper->i_type($partial);
+	my ($i_descr) = $juniper->i_description($partial);
+	my %i_vlan;
+
+	foreach my $idx (keys %$i_descr) {
+		if ($i_type->{$idx} eq 'l2vlan' || $i_type->{$idx} eq 135) {
+			if ($i_descr->{$idx} =~ /\.(\d+)$/) {
+				$i_vlan{$idx} = $1;
+			}
+		}
+	}
+	\%i_vlan;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Juniper - SNMP Interface to L3 Juniper Devices
+
+=head1 AUTHOR
+
+Bill Fenner
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $juniper = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myrouter',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $juniper->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Generic Juniper Routers running JUNOS
+
+=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 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $juniper->vendor()
+
+    Returns 'juniper'
+
+=item $juniper->os()
+
+    Returns 'junos'
+
+=item $juniper->os_ver()
+
+    Returns the software version extracted from sysDescr.
+
+=item $juniper->model()
+
+    Returns the model from sysObjectID, with jnxProductName
+    removed from the beginning.
+
+=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 $juniper->i_vlan()
+
+Returns the list of interfaces whose ifType is l2vlan(135), and
+the VLAN ID extracted from the interface description.
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3/Microsoft.pm

@@ -0,0 +1,179 @@
+# SNMP::Info::Layer3::Microsoft
+# 
+# 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::Microsoft;
+$VERSION = '1.07';
+# $Id$
+
+use Exporter;
+use SNMP::Info::Layer3;
+
+use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
+@SNMP::Info::Layer3::Microsoft::ISA = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Microsoft::EXPORT_OK = qw//;
+
+%MIBS = (
+            %SNMP::Info::Layer3::MIBS,  
+	);
+
+%GLOBALS = (
+            %SNMP::Info::Layer3::GLOBALS,
+	   );
+
+%FUNCS = (
+            %SNMP::Info::Layer3::FUNCS,
+	 );
+
+%MUNGE = (
+            %SNMP::Info::Layer3::MUNGE,
+	 );
+
+sub vendor {
+	return 'microsoft';
+}
+
+sub os {
+	return 'windows';
+}
+
+sub os_ver {
+    return '';
+}
+
+sub model {
+     return 'Windows Router'
+}
+sub serial {
+     return '';
+}
+# $l3->interfaces() - Map the Interfaces to their physical names
+# Add interface number to interface name because if MS Win
+# have identical interface cards ("HP NC7782 Gigabit Server Adapter"
+# for example), than MS Win return identical ifDescr
+sub interfaces {
+    my $l3 = shift;
+    my $partial = shift;
+
+    my $interfaces = $l3->i_index($partial);
+    my $descriptions = $l3->i_description($partial);
+
+    my %interfaces = ();
+    foreach my $iid (keys %$interfaces){
+        my $desc = $descriptions->{$iid};
+        next unless defined $desc;
+
+        $interfaces{$iid} = sprintf("(%U) %s", $iid, $desc);
+    }
+
+    return \%interfaces;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Microsoft - SNMP Interface to L3 Microsoft Windows router
+
+=head1 AUTHOR
+
+begemot
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $router = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myrouter',
+                          Community   => 'public',
+                          Version     => 1
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $router->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Generic Microsoft Routers running Microsoft Windows OS
+
+=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 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $router->vendor()
+
+    Returns 'microsoft'
+
+=item $router->os()
+
+    Returns 'windows'
+
+=item $router->os_ver()
+
+    Returns nothing.
+
+=item $router->model()
+
+    Returns 'Windows Router'
+
+=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.
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3/N1600.pm

@@ -0,0 +1,320 @@
+# SNMP::Info::Layer3::N1600 - SNMP Interface to Nortel N16XX devices
+# Eric Miller
+#
+# Copyright (c) 2005 Eric Miller
+# 
+# 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.
+# 
+# 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::N1600;
+# $Id$
+
+use strict;
+
+use Exporter;
+use SNMP::Info::Layer3;
+use SNMP::Info::SONMP;
+
+use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
+
+$VERSION = '1.07';
+
+@SNMP::Info::Layer3::N1600::ISA = qw/SNMP::Info::Layer3 SNMP::Info::SONMP Exporter/;
+@SNMP::Info::Layer3::N1600::EXPORT_OK = qw//;
+
+%MIBS = ( %SNMP::Info::Layer3::MIBS,
+          %SNMP::Info::SONMP::MIBS,
+          'SWL2MGMT-MIB' => 'swL2MgmtMIB',
+          'RAPID-CITY' => 'rapidCity',
+        );
+
+%GLOBALS = (
+            %SNMP::Info::Layer3::GLOBALS,
+            %SNMP::Info::SONMP::GLOBALS,
+           );
+
+%FUNCS   = (
+            %SNMP::Info::Layer3::FUNCS,
+            %SNMP::Info::SONMP::FUNCS,
+            # SWL2MGMT-MIB
+            # swL2PortInfoTable
+            'n1600_nway_status'  => 'swL2PortInfoNwayStatus',
+            # swL2PortCtrlTable
+            'n1600_nway_state'   => 'swL2PortCtrlNwayState',
+           );
+
+%MUNGE = (
+            # Inherit all the built in munging
+            %SNMP::Info::Layer3::MUNGE,
+            %SNMP::Info::SONMP::MUNGE,
+         );
+
+# Method OverRides
+
+sub bulkwalk_no { 1; }
+
+sub model {
+    my $n1600 = shift;
+    my $id = $n1600->id();
+    
+    unless (defined $id){
+        print " SNMP::Info::Layer3::N1600::model() - Device does not support sysObjectID\n" if $n1600->debug(); 
+        return undef;
+    }
+    
+    my $model = &SNMP::translateObj($id);
+
+    return $id unless defined $model;
+
+    $model =~ s/^rcA//i;
+    return $model;
+}
+
+sub vendor {
+    return 'nortel';
+}
+
+sub os {
+    return 'passport';
+}
+
+sub os_ver {
+    my $n1600 = shift;
+    my $descr = $n1600->description();
+    return undef unless defined $descr;
+
+    if ($descr =~ m/(\d+\.\d+\.\d+\.\d+)/){
+        return $1;
+    }
+
+    return undef;
+}
+
+sub interfaces {
+    my $n1600 = shift;
+    my $partial = shift;
+
+    my $i_index = $n1600->i_index($partial) || {};
+    
+    my %if;
+    foreach my $iid (keys %$i_index){
+        my $index = $i_index->{$iid};
+        next unless defined $index;
+
+        my $slotport = "1.$index";
+        $if{$iid} = $slotport;
+    }
+    return \%if;
+}
+
+sub i_duplex {
+    my $n1600 = shift;
+    my $partial = shift;
+
+    my $nway_status = $n1600->n1600_nway_status($partial) || {};
+    
+    my %i_duplex;
+    foreach my $iid (keys %$nway_status){
+        my $duplex = $nway_status->{$iid};
+        next unless defined $duplex;
+        next if $duplex =~ /other/i;
+        $i_duplex{$iid} = 'half' if $duplex =~ /half/i;
+        $i_duplex{$iid} = 'full' if $duplex =~ /full/i;
+    }
+    return \%i_duplex;
+}
+
+sub i_duplex_admin {
+    my $n1600 = shift;
+    my $partial = shift;
+
+    my $nway_state = $n1600->n1600_nway_state($partial) || {};
+    
+    my %i_duplex;
+    foreach my $iid (keys %$nway_state){
+        my $duplex = $nway_state->{$iid};
+        next unless defined $duplex;
+        next if $duplex =~ /other/i;
+        $i_duplex{$iid} = 'half' if $duplex =~ /half/i;
+        $i_duplex{$iid} = 'full' if $duplex =~ /full/i;
+        $i_duplex{$iid} = 'auto' if $duplex =~ /nway-enabled/i;
+    }
+    return \%i_duplex;
+}
+
+# Required for SNMP::Info::SONMP
+sub index_factor {
+    return 64;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::N1600 - SNMP Interface to Nortel 16XX Network Devices
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $n1600 = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 1
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $n1600->class();
+
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from a Nortel 
+N16XX device through SNMP. 
+
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above. 
+
+my $n1600 = new SNMP::Info::Layer3::N1600(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=item SNMP::Info::SONMP
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item SWL2MGMT-MIB
+
+=item RAPID-CITY
+
+=item Inherited Classes' MIBs
+
+See classes listed above for their required MIBs.
+
+=back
+
+MIBs can be found on the CD that came with your product.
+
+Or, they can be downloaded directly from Nortel regardless of support
+contract status.
+
+Go to http://www.nortel.com Techninal Support, Browse Technical Support,
+Select by product, Java Device Manager, Software.  Download the latest version.
+After installation, all mibs are located under the install directory under mibs
+and the repspective product line.
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $n1600->bulkwalk_no
+
+Return C<1>.  Bulkwalk is currently turned off for this class.
+
+=item $n1600->model()
+
+Returns model type.  Checks $n1600->id() against the 
+RAPID-CITY-MIB and then parses out rcA.
+
+=item $n1600->vendor()
+
+Returns 'nortel'
+
+=item $n1600->os()
+
+Returns 'passport'
+
+=back
+
+=head2 Overrides
+
+=over
+
+=item  $n1600->index_factor()
+
+Required by SNMP::Info::SONMP.  Number representing the number of ports
+reserved per slot within the device MIB.
+
+Returns 64 since largest switch has 48 ports.  Since these switches can
+not stack, the only requirment to reserve more than the max number of ports.
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::SONMP
+
+See documentation in SNMP::SONMP::Layer3 for details.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item $n1600->interfaces()
+
+Returns reference to hash of interface names to iids.
+
+Places a 1 in front of index number.  This is required for compatibilty with
+SNMP::Info::SONMP.
+
+=item $n1600->i_duplex()
+
+Returns reference to hash of interface operational link duplex status. 
+
+=item $n1600->i_duplex_admin()
+
+Returns reference to hash of interface administrative link duplex status. 
+
+=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::SONMP
+
+See documentation in L<SNMP::Info::SONMP/"TABLE METHODS"> for details.
+
+=cut

Info/Layer3/NetSNMP.pm

@@ -0,0 +1,236 @@
+# SNMP::Info::Layer3::NetSNMP
+# Bradley Baetz and 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::NetSNMP;
+# $Id$
+
+use Exporter;
+use SNMP::Info::Layer3;
+
+use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
+$VERSION = '1.07';
+@SNMP::Info::Layer3::NetSNMP::ISA = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::NetSNMP::EXPORT_OK = qw//;
+
+%MIBS = (
+            %SNMP::Info::Layer3::MIBS,  
+            'UCD-SNMP-MIB' => 'versionTag',
+            'NET-SNMP-TC' => 'netSnmpAgentOIDs',
+            'HOST-RESOURCES-MIB' => 'hrSystem',
+        );
+
+%GLOBALS = (
+            %SNMP::Info::Layer3::GLOBALS,
+            'netsnmp_vers' => 'versionTag',
+            'hrSystemUptime' => 'hrSystemUptime',
+           );
+
+%FUNCS = (
+            %SNMP::Info::Layer3::FUNCS,
+         );
+
+%MUNGE = (
+            %SNMP::Info::Layer3::MUNGE,
+         );
+
+sub vendor {
+    return 'Net-SNMP';
+}
+
+sub os {
+    my $netsnmp = shift;
+    my $descr = $netsnmp->description();
+
+    return $1 if ($descr =~ /^(\S+)\s+/);
+    return undef;
+}
+
+sub os_ver {
+    my $netsnmp = shift;
+    my $descr = $netsnmp->description();
+    my $vers = $netsnmp->netsnmp_vers();
+    my $os_ver = undef;
+
+    $os_ver = $1 if ($descr =~ /^\S+\s+\S+\s+(\S+)\s+/);
+    if ($vers) {
+        $os_ver = "???" unless defined($os_ver);
+        $os_ver .= " / Net-SNMP " . $vers;
+    }
+
+    return $os_ver;
+}
+
+sub serial {
+    return '';
+}
+
+# sysUptime gives us the time since the SNMP daemon has restarted,
+# so return the system uptime since that's probably what the user
+# wants.  (Caution: this could cause trouble if using
+# sysUptime-based discontinuity timers or other TimeStamp
+# objects.
+sub uptime {
+    my $netsnmp = shift;
+    my $uptime;
+
+    $uptime = $netsnmp->hrSystemUptime();
+    return $uptime if defined $uptime;
+
+    return $netsnmp->SUPER::uptime();
+}
+
+sub i_ignore {
+    my $l3 = shift;
+    my $partial = shift;
+    
+    my $interfaces = $l3->interfaces($partial) || {};
+
+    my %i_ignore;
+    foreach my $if (keys %$interfaces) {
+        # lo0 etc
+        if ($interfaces->{$if} =~ /\blo\d*\b/i){
+            $i_ignore{$if}++;
+        }
+    }
+    return \%i_ignore;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::NetSNMP - SNMP Interface to L3 Net-SNMP Devices
+
+=head1 AUTHORS
+
+Bradley Baetz and Bill Fenner
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $netsnmp = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myrouter',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $netsnmp->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Generic Net-SNMP devices
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item UCD-SNMP-MIB
+
+=item NET-SNMP-TC
+
+=item HOST-RESOURCES-MIB
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $netsnmp->vendor()
+
+Returns 'Net-SNMP'.
+
+=item $netsnmp->os()
+
+Returns the OS extracted from sysDescr.
+
+=item $netsnmp->os_ver()
+
+Returns the software version extracted from sysDescr, along
+with the Net-SNMP version.
+
+=item $netsnmp->uptime()
+
+Returns the system uptime instead of the agent uptime.
+NOTE: discontinuity timers and other TimeStamp-based objects
+are based on agent uptime, so use orig_uptime().
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3> for details.
+
+=head1 TABLE ENTRIES
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3> for details.
+
+=head1 NOTES
+
+In order to cause SNMP::Info to classify your device into this class, it
+may be necessary to put a configuration line into your F<snmpd.conf>
+similar to
+
+  sysobjectid .1.3.6.1.4.1.8072.3.2.N
+
+where N is the object ID for your OS from the C<NET-SNMP-TC> MIB (or
+255 if not listed).  Some Net-SNMP installations default to an
+incorrect return value for system.sysObjectId.
+
+In order to recognize a Net-SNMP device as Layer3, it may be necessary
+to put a configuration line similar to
+
+  sysservices 76
+
+in your F<snmpd.conf>.
+
+=cut

Info/Layer3/Netscreen.pm

@@ -0,0 +1,211 @@
+# SNMP::Info::Layer3::Netscreen
+# Kent Hamilton
+# $Id$
+#
+# 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::Netscreen;
+$VERSION = '1.07';
+use strict;
+
+use Exporter;
+use SNMP::Info::Layer3;
+
+@SNMP::Info::Layer3::Netscreen::ISA = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Netscreen::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+ 
+%MIBS    = ( 
+	     %SNMP::Info::Layer3::MIBS,
+	     'NETSCREEN-SMI'             => 'netscreenSetting',
+             'NETSCREEN-PRODUCTS-MIB'    => 'netscreenGeneric',
+	     'NETSCREEN-INTERFACE-MIB'   => 'nsIfIndex',
+             'NETSCREEN-SET-GEN-MIB'     => 'nsSetGenSwVer',
+           );
+
+%GLOBALS = (
+             %SNMP::Info::Layer3::GLOBALS,
+	     'os_version'   =>  'nsSetGenSwVer',
+           );
+
+%FUNCS   = (
+             %SNMP::Info::Layer3::FUNCS,
+           );
+
+%MUNGE   = (
+             %SNMP::Info::Layer3::MUNGE,
+           );
+
+sub layers {
+	return '01001100';
+}
+
+sub vendor {
+    return 'netscreen';
+}
+
+sub os {
+    return 'screenos';
+}
+
+sub os_ver {
+    my $netscreen = shift;
+
+    my $descr = $netscreen->description();
+    if ( $descr =~ m/version (\d\S*) \(SN: /) {
+      return $1;
+    }
+    return undef;
+}
+
+sub serial {
+    my $netscreen = shift;
+
+    my $e_serial = $netscreen->e_serial() || {};
+
+    my $serial = $e_serial->{1} || undef;
+
+    return $1 if (defined $serial and $serial =~ /(\d+)/);
+    my $descr = $netscreen->description();
+    if ( $descr =~ m/version .*\(SN: (\d\S*),/) {
+        return $1;
+    }
+    return undef;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Netscreen - SNMP Interface to Juniper Netscreen Devices
+
+=head1 AUTHOR
+
+Kent Hamilton
+
+=head1 SYNOPSIS
+
+    #Let SNMP::Info determine the correct subclass for you.
+
+    my $netscreen = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+
+    or die "Can't connect to DestHost.\n";
+
+    my $class = $netscreen->class();
+    print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from a 
+Netscreen device through SNMP. See inherited classes' documentation for 
+inherited methods.
+
+my $netscreen = new SNMP::Info::Layer3::Netscreen(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item NETSCREEN-SMI
+
+=item NETSCREEN-PRODUCTS-MIB
+
+=item NETSCREEN-INTERFACE-MIB
+
+=item NETSCREEN-SET-GEN-MIB
+
+=item Inherited Classes
+
+See L<SNMP::Info::Layer3/"Required MIBs"> and its inherited classes.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $netscreen->vendor()
+
+Returns 'netscreen'
+
+=item $netscreen->os()
+
+Returns 'screenos'
+
+=item $netscreen->os_ver()
+
+Extracts the OS version from the description string.
+
+=item $netscreen->serial()
+
+Returns serial number..
+
+=back
+
+=head2 Overrides
+
+=over
+
+=item $netscreen->layers()
+
+Returns 01001100.  Device doesn't report layers properly, modified to reflect 
+Layer3 functionality.
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer3
+
+See 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.
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=cut
+

Info/Layer3/Sun.pm

@@ -0,0 +1,187 @@
+# SNMP::Info::Layer3::Sun
+# 
+# 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::Sun;
+$VERSION = '1.07';
+
+# $Id$
+use strict;
+
+use Exporter;
+use SNMP::Info::Layer3;
+
+use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE $INIT/ ;
+@SNMP::Info::Layer3::Sun::ISA = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Sun::EXPORT_OK = qw//;
+
+%MIBS = (
+            %SNMP::Info::Layer3::MIBS,  
+	);
+
+%GLOBALS = (
+            %SNMP::Info::Layer3::GLOBALS,
+	    'sun_hostid' => '.1.3.6.1.4.1.42.3.1.2.0',
+	    'motd' => '.1.3.6.1.4.1.42.3.1.3.0',
+	   );
+
+%FUNCS = (
+            %SNMP::Info::Layer3::FUNCS,
+	 );
+
+%MUNGE = (
+            %SNMP::Info::Layer3::MUNGE,
+	 );
+
+sub vendor {
+	return 'sun';
+}
+
+sub os {
+	return 'sun';
+}
+
+sub os_ver {
+    my $sun = shift;
+    my $descr = $sun->motd();
+    return undef unless defined $descr;
+
+    if ($descr =~ m/SunOS (\S+)/) {
+	return $1;
+    }
+    return undef;
+}
+
+sub model {
+     return 'Solaris Router'
+}
+sub serial {
+     my $sun = shift;
+     my $serial = unpack("H*", $sun->sun_hostid());
+     return $serial; 
+}
+
+sub i_ignore {
+    my $l3 = shift;
+    my $partial = shift;
+
+    my $interfaces = $l3->interfaces($partial) || {};
+
+    my %i_ignore;
+    foreach my $if (keys %$interfaces) {
+        # lo0 
+        if ($interfaces->{$if} =~ /\blo0\b/i){
+            $i_ignore{$if}++;
+        }
+    }
+    return \%i_ignore;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Sun - SNMP Interface to L3 Sun Solaris
+
+=head1 AUTHOR
+
+begemot
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $sun = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'mysunrouter',
+                          Community   => 'public',
+                          Version     => 1
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $sun->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Generic Sun Routers running SunOS
+
+=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 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $sun->vendor()
+
+    Returns 'sun'
+
+=item $sun->os()
+
+    Returns 'sun'
+
+=item $sun->os_ver()
+
+    Returns the software version extracted from motd.
+
+=item $sun->model()
+
+    Returns 'Solaris Router'
+
+=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.
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+
+=cut

Info/MAU.pm

@@ -1,5 +1,7 @@
-# SNMP::Info::MAU - Media Access Unit - RFC2668
-# Max Baker <max@warped.org>
+# SNMP::Info::MAU - Media Access Unit - RFC 2668
+# Max Baker
+#
+# Copyright (c) 2004,2005 Max Baker changes from version 0.8 and beyond.
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # All rights reserved.
@@ -28,7 +30,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package SNMP::Info::MAU;
-$VERSION = 0.4;
+$VERSION = '1.07';
 # $Id$
 
 use strict;
@@ -40,11 +42,6 @@ use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
 @SNMP::Info::MAU::ISA = qw/SNMP::Info Exporter/;
 @SNMP::Info::MAU::EXPORT_OK = qw//;
 
-$DEBUG=0;
-$SNMP::debugging=$DEBUG;
-
-$INIT = 0;
-
 %MIBS = ('MAU-MIB' => 'mauMod');
 
 %GLOBALS = (
@@ -103,17 +100,171 @@ sub _ishalfduplex{
     return 0;
 }
 
+my %_mau_i_speed_map = (
+ '10' => '10 Mbps',
+ '100' => '100 Mbps',
+ '1000' => '1.0 Gbps',
+ '10Gig' => '10 Gbps',
+);
+
+sub mau_i_speed_admin {
+    my $mau = shift;
+
+    my $mau_index = $mau->mau_index();
+    my $mau_type_admin = $mau->mau_type_admin();
+
+    my %i_speed_admin;
+    foreach my $mau_port (keys %$mau_type_admin){
+        my $iid = $mau_index->{$mau_port};
+        next unless defined $iid;
+
+        my $type_adminoid = $mau_type_admin->{$mau_port};
+        my $type_admin = &SNMP::translateObj($type_adminoid);
+        next unless defined $type_admin;
+
+	if ($type_adminoid eq '.0.0') {
+		$i_speed_admin{$iid} = 'auto';
+	} elsif ($type_admin =~ /^dot3MauType(.*)Base/ && $_mau_i_speed_map{$1}) {
+		$i_speed_admin{$iid} = $_mau_i_speed_map{$1};
+	}
+    }
+    return \%i_speed_admin;
+}
+
+sub mau_i_duplex {
+    my $mau = shift;
+
+    my $mau_index = $mau->mau_index();
+    my $mau_link = $mau->mau_link();
+
+    my %i_duplex;
+    foreach my $mau_port (keys %$mau_link){
+        my $iid = $mau_index->{$mau_port};
+        next unless defined $iid;
+
+        my $linkoid = $mau_link->{$mau_port};
+        my $link = &SNMP::translateObj($linkoid);
+        next unless defined $link;
+
+        my $duplex = undef;
+
+        if ($link =~ /fd$/i) {
+            $duplex = 'full';
+        } elsif ($link =~ /hd$/i){
+            $duplex = 'half';
+        }
+
+        $i_duplex{$iid} = $duplex if defined $duplex;
+    }
+    return \%i_duplex;
+}
+
+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();
+
+    # Older HP4000's don't implement ifMauDefaultType, but we can
+    # figure out from ifMauAutoNegCapAdvertised what we'd like.
+    if (!defined($mau_type_admin)) {
+        if (defined($mau_index)) {
+            return mau_i_duplex_admin_old($mau,$mau_index,$mau_autostat);
+        } else {
+            return undef;
+        }
+    }
+
+    my %i_duplex_admin;
+    foreach my $mau_port (keys %$mau_type_admin){
+        my $iid = $mau_index->{$mau_port};
+        next unless defined $iid;
+
+        my $autostat = $mau_autostat->{$mau_port};
+        if (defined $autostat and $autostat =~ /enabled/i){
+            $i_duplex_admin{$iid} = 'auto';
+            next;
+        } 
+
+        my $type_adminoid = $mau_type_admin->{$mau_port};
+        my $type_admin = &SNMP::translateObj($type_adminoid);
+        next unless defined $type_admin;
+
+        my $duplex = undef;
+
+        if ($type_admin =~ /fd$/i) {
+            $duplex = 'full';
+        } elsif ($type_admin =~ /hd$/i){
+            $duplex = 'half';
+        } elsif ($type_admin eq 'zeroDotZero') {
+            $duplex = 'auto';
+        }
+
+        $i_duplex_admin{$iid} = $duplex if defined $duplex;
+    }
+    return \%i_duplex_admin;
+}
+
+sub mau_i_duplex_admin_old {
+    my $mau = shift;
+    my $mau_index = shift;
+    my $mau_autostat = shift;
+
+    my $interfaces   = $mau->interfaces();
+    my $mau_autosent = $mau->mau_autosent();
+
+    my %mau_reverse = reverse %$mau_index;
+
+    my %i_duplex_admin;
+    foreach my $iid (keys %$interfaces){
+        my $mau_index = $mau_reverse{$iid};
+        next unless defined $mau_index;
+
+        my $autostat = $mau_autostat->{$mau_index};
+        
+        # HP25xx has this value
+        if (defined $autostat and $autostat =~ /enabled/i){
+            $i_duplex_admin{$iid} = 'auto';
+            next;
+        } 
+        
+        my $type = $mau_autosent->{$mau_index};
+    
+        next unless defined $type;
+
+        if ($type == 0) {
+            $i_duplex_admin{$iid} = 'none';
+            next;
+        }
+
+        my $full = $mau->_isfullduplex($type);
+        my $half = $mau->_ishalfduplex($type);
+
+        if ($full and !$half){
+            $i_duplex_admin{$iid} = 'full';
+        } elsif ($half) {
+            $i_duplex_admin{$iid} = 'half';
+        } 
+    } 
+    
+    return \%i_duplex_admin;
+}
+
 1;
 __END__
 
 
 =head1 NAME
 
-SNMP::Info::MAU - Perl5 Interface to Medium Access Unit (MAU) MIB (RFC2668) via SNMP
+SNMP::Info::MAU - SNMP Interface to Medium Access Unit (MAU) MIB (RFC 2668)
+via SNMP
 
 =head1 AUTHOR
 
-Max Baker (C<max@warped.org>)
+Max Baker
 
 =head1 SYNOPSIS
 
@@ -131,13 +282,14 @@ Max Baker (C<max@warped.org>)
 =head1 DESCRIPTION
 
 SNMP::Info::MAU is a sublcass of SNMP::Info that supplies access to the
-MAU-MIB (RFC2668). This MIB is sometimes implemented on Layer 2 network devices like HP Switches.
-MAU = Media Access Unit.
+MAU-MIB (RFC 2668). This MIB is sometimes implemented on Layer 2 network
+devices like HP Switches.  MAU = Media Access Unit.
 
 The MAU table contains link and duplex info for the port itself and the device
 connected to that port.
 
-Normally you use or create a subclass of SNMP::Info that inherits this one.  Do not use directly.
+Normally you use or create a subclass of SNMP::Info that inherits this one.  Do
+not use directly.
 
 For debugging purposes call the class directly as you would SNMP::Info
 
@@ -170,7 +322,32 @@ These are methods that return scalar value from SNMP
 These are methods that return tables of information in the form of a reference
 to a hash.
 
-=head2 MAU INTERFACE TABLE ENTRIES
+
+=over
+
+=item $mau->mau_i_duplex()
+
+Parses mau_index and mau_link to return the duplex information for
+interfaces.
+
+=item $mau->mau_i_duplex_admin()
+
+Parses C<mac_index>,C<mau_autostat>,C<mau_type_admin> in
+order to find the admin duplex setting for all the interfaces.
+
+Returns either (auto,full,half).
+
+=item $mau->mau_i_duplex_admin_old()
+
+Called by mau_i_duplex_admin() if C<mau_type_admin> is empty.
+Parses C<mau_index>,C<mau_autostat>,C<mau_autosent> in
+order to find the admin duplex setting for all the interfaces.
+
+Returns either (auto,none,full,half).
+
+=back
+
+=head2 MAU INTERFACE TABLE METHODS
 
 =over
 
@@ -232,10 +409,18 @@ of the port from a MAU POV.
 
 (B<ifMauTypeList>)
 
+=item $mau->mau_type_admin()
+
+(C<ifMauDefaultType>)
+
 =item $mau->mau_auto() - Returns status of auto-negotiation mode for ports.
 
 (B<ifMauAutoNegAdminStatus>)
 
+=item $mau->mau_autostat()
+
+(C<ifMauAutoNegAdminStatus>)
+
 =item $mau->mau_autosent() - Returns a 32 bit bit-string representing the
 capabilities we are broadcasting on that port 
 

Info/NortelStack.pm

@@ -0,0 +1,894 @@
+# SNMP::Info::NortelStack
+# Eric Miller
+# $Id$
+#
+# Copyright (c) 2004 Eric Miller, Max Baker
+# 
+# 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::NortelStack;
+$VERSION = '1.07'; 
+
+use strict;
+
+use Exporter;
+use SNMP::Info;
+
+@SNMP::Info::NortelStack::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::NortelStack::EXPORT_OK = qw//;
+
+use vars qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT/;
+
+%MIBS    = (
+            # S5-ROOT-MIB and S5-TCS-MIB required by the MIBs below
+            'S5-AGENT-MIB'   => 's5AgMyGrpIndx',
+            'S5-CHASSIS-MIB' => 's5ChasType',
+            'S5-REG-MIB'     => 's5ChasTypeVal',
+            );
+
+%GLOBALS = (
+            # From S5-AGENT-MIB
+            'ns_ag_ver'    => 's5AgInfoVer',
+            'ns_op_mode'   => 's5AgSysCurrentOperationalMode',
+            'ns_auto_pvid' => 's5AgSysAutoPvid',
+            'tftp_host'    => 's5AgSysTftpServerAddress',
+            'tftp_file'    => 's5AgSysBinaryConfigFilename',
+            'tftp_action'  => 's5AgInfoFileAction',
+            'tftp_result'  => 's5AgInfoFileStatus',
+            'vlan'         => 's5AgSysManagementVlanId',
+            # From S5-CHASSIS-MIB
+            'ns_serial'    => 's5ChasSerNum',
+            'ns_ch_type'   => 's5ChasType',
+            'ns_cfg_chg'   => 's5ChasGblConfChngs',
+            'ns_cfg_time'  => 's5ChasGblConfLstChng',
+            );
+
+%FUNCS  = (
+            # From S5-AGENT-MIB::s5AgMyIfTable
+            'i_cfg_file'       => 's5AgMyIfCfgFname',
+            'i_cfg_host'       => 's5AgMyIfLdSvrAddr',
+            # From S5-CHASSIS-MIB::s5ChasGrpTable
+            'ns_grp_type'      => 's5ChasGrpType',
+            # From S5-CHASSIS-MIB::s5ChasComTable
+            'ns_com_grp_idx'   => 's5ChasComGrpIndx',
+            'ns_com_idx'       => 's5ChasComIndx',
+            'ns_com_sub_idx'   => 's5ChasComSubIndx',
+            'ns_com_type'      => 's5ChasComType',
+            'ns_com_descr'     => 's5ChasComDescr',
+            'ns_com_ver'       => 's5ChasComVer',
+            'ns_com_serial'    => 's5ChasComSerNum',
+            # From S5-CHASSIS-MIB::s5ChasStoreTable
+            'ns_store_grp_idx' => 's5ChasStoreGrpIndx',
+            'ns_store_com_idx' => 's5ChasStoreComIndx',
+            'ns_store_sub_idx' => 's5ChasStoreSubIndx',
+            'ns_store_idx'     => 's5ChasStoreIndx',
+            'ns_store_type'    => 's5ChasStoreType',
+            'ns_store_size'    => 's5ChasStoreCurSize',
+            'ns_store_ver'     => 's5ChasStoreCntntVer',
+          );
+
+%MUNGE = (
+            'ns_ch_type'       => \&munge_ns_com_type,
+            'ns_grp_type'      => \&munge_ns_grp_type,
+            'ns_com_type'      => \&munge_ns_com_type,
+            'ns_store_type'    => \&munge_ns_store_type,
+         );
+
+sub os_ver {
+    my $stack = shift;
+
+    my $ver = $stack->ns_ag_ver();
+    return undef unless defined $ver;
+
+    if ($ver =~ m/(\d+\.\d+\.\d+\.\d+)/){
+        return $1;
+    }      
+    if ($ver =~ m/V(\d+\.\d+\.\d+)/i){
+        return $1;
+    }  
+   return undef;
+}
+
+sub os_bin {
+    my $stack = shift;
+
+    my $ver = $stack->ns_ag_ver();
+    return undef unless defined $ver;
+
+    if ($ver =~ m/(\d+\.\d+\.\d+\.\d+)/i){
+        return $1;
+    }     
+    if ($ver =~ m/V(\d+\.\d+.\d+)/i){
+        return $1;
+    }
+   return undef;
+}
+
+# Need to override here since overridden in Layer2 and Layer3 classes
+sub serial {
+    my $stack = shift;
+
+    my $ver = $stack->ns_serial();
+    return $ver unless !defined $ver;
+    
+    return undef;
+}
+
+# Psuedo ENTITY-MIB methods for older switches with don't support ENTITY-MIB
+
+# This class supports both stackable and chassis based switches, identify if
+# we have a stackable so that we return appropriate entPhysicalClass 
+sub ns_e_is_virtual {
+    my $stack   = shift;
+
+    # We really only need one value, but we want this cached since most methods
+    # call it at least via ns_e_index() 
+    my $v_test = $stack->s5ChasComRelPos() || {};
+    return $v_test->{'8.1.0'};
+}
+
+# Identify is the stackable is actually a stack vs. single switch
+sub ns_e_is_stack {
+    my $stack   = shift;
+
+    my $s_test = $stack->ns_e_class() || {};
+    
+    foreach my $iid (keys %$s_test){
+        my $class = $s_test->{$iid};
+        next unless defined $class;
+        return 1 if ($class eq 'stack');
+    }
+    return 0;
+}
+
+sub ns_e_index {
+    my $stack   = shift;
+    my $partial = shift;
+
+    my $ns_e_idx = $stack->ns_com_grp_idx($partial) || {};
+    my $is_virtual = $stack->ns_e_is_virtual();
+
+    my %ns_e_index;
+    foreach my $iid (keys %$ns_e_idx){
+        # Skip backplane, power, sensor, fan, clock - these aren't in the
+        # newer devices ENTITY-MIB we're emulating
+        next if ($iid =~ /^[24567]/);
+        next if (($is_virtual) and ($iid =~ /^8/ or $iid eq '1.0.0'));
+        # Format into consistent integer format so that numeric sorting works
+        my $index = join('',map { sprintf "%02d",$_ } split /\./, $iid);
+        $ns_e_index{$iid} = $index;
+    }
+    return \%ns_e_index;
+}
+
+sub ns_e_class {
+    my $stack = shift;
+    my $partial = shift;
+
+    my $ns_e_idx   = $stack->ns_e_index($partial) || {};
+    my $classes    = $stack->ns_grp_type();
+    my $ns_grp_enc = $stack->s5ChasGrpEncodeFactor($partial) || {};
+    my $is_virtual = $stack->ns_e_is_virtual();
+
+    my %ns_e_class;
+    foreach my $iid (keys %$ns_e_idx){
+        my ($grp, $idx, $sub) = split (/\./,$iid);
+        next unless defined $grp;
+        my $class = $classes->{$grp};
+        next unless defined $class;
+        my $enc = $ns_grp_enc->{$grp};
+
+        # Handle quirks of dealing with both stacks and chassis
+        if ((!$is_virtual) and ($grp == 1)) {
+            $class = 'module';
+        }
+        if (($is_virtual) and ($grp == 3) and !($idx % $enc)) {
+            $class = 'chassis';
+        }
+
+        $ns_e_class{$iid} = $class;
+    }
+    return \%ns_e_class;
+}
+
+sub ns_e_descr {
+    my $stack   = shift;
+    my $partial = shift;
+
+    my $ns_e_idx   = $stack->ns_e_index($partial) || {};
+    my $ns_e_descr = $stack->ns_com_descr($partial) || {};
+
+    my %ns_e_descr;
+    foreach my $iid (keys %$ns_e_idx){
+        my $descr = $ns_e_descr->{$iid};
+        next unless defined $descr;
+
+        $ns_e_descr{$iid} = $descr;
+    }
+    return \%ns_e_descr;
+}
+
+sub ns_e_name {
+    my $stack = shift;
+    my $partial = shift;
+
+    my $ns_class  = $stack->ns_e_class() || {};
+    my $ns_e_idx  = $stack->ns_e_index() || {};
+    my $ns_grp_enc = $stack->s5ChasGrpEncodeFactor($partial) || {};
+    my $is_virtual = $stack->ns_e_is_virtual();
+
+    my %ns_e_name;
+    foreach my $iid (keys %$ns_e_idx){
+
+        my ($grp, $idx, $sub) = split (/\./,$iid);
+        my $class = $ns_class->{$iid};
+        next unless defined $class;
+        my $enc = $ns_grp_enc->{$grp};
+
+        if ((!$is_virtual) and ($grp == 1)) {
+            $ns_e_name{$iid} = 'Supervisory Module';
+        }
+        elsif ($class eq 'stack') {
+            $ns_e_name{$iid} = 'Stack Master Unit';
+        }
+        elsif ($class eq 'chassis') {
+            if ($is_virtual) {
+                my $unit = $idx / $enc;
+                $ns_e_name{$iid} = "Switch Unit $unit";
+            }
+            else {
+                $ns_e_name{$iid} = "Chassis";
+            }
+        }
+        elsif ($class eq 'module') {
+            if ($is_virtual) {
+                my $unit = int ($idx / $enc);
+                my $mda  = $idx % $enc;
+                $ns_e_name{$iid} = "Switch Unit $unit, MDA $mda";
+            }
+            elsif ($sub != 0) {
+                $ns_e_name{$iid} = "Module Slot $idx, Subcomponent $sub";
+            }
+            else {
+                $ns_e_name{$iid} = "Module Slot $idx";
+            }
+        }
+    }
+    return \%ns_e_name;
+}
+
+sub ns_e_hwver {
+    my $stack   = shift;
+    my $partial = shift;
+
+    my $ns_e_idx = $stack->ns_e_index($partial) || {};
+    my $ns_e_ver = $stack->ns_com_ver($partial) || {};
+
+    my %ns_e_hwver;
+    foreach my $iid (keys %$ns_e_idx){
+        my $ver = $ns_e_ver->{$iid};
+        next unless defined $ver;
+
+        $ns_e_hwver{$iid} = $ver;
+    }
+    return \%ns_e_hwver;
+}
+
+sub ns_e_vendor {
+    my $stack   = shift;
+    my $partial = shift;
+
+    my $ns_e_idx = $stack->ns_e_index($partial) || {};
+
+    my %ns_e_vendor;
+    foreach my $iid (keys %$ns_e_idx){
+        my $vendor = 'nortel';
+
+        $ns_e_vendor{$iid} = $vendor;
+    }
+    return \%ns_e_vendor;
+}
+
+sub ns_e_serial {
+    my $stack   = shift;
+    my $partial = shift;
+
+    my $ns_e_idx    = $stack->ns_e_index($partial) || {};
+    my $ns_e_serial = $stack->ns_com_serial($partial) || {};
+
+    my %ns_e_serial;
+    foreach my $iid (keys %$ns_e_idx){
+        my $serial = $ns_e_serial->{$iid};
+        next unless defined $serial;
+
+        $ns_e_serial{$iid} = $serial;
+    }
+    return \%ns_e_serial;
+}
+
+sub ns_e_type {
+    my $stack   = shift;
+    my $partial = shift;
+
+    my $ns_e_idx  = $stack->ns_e_index($partial) || {};
+    my $ns_e_type = $stack->ns_com_type($partial) || {};
+    my $is_stack  = $stack->ns_e_is_stack();
+    my $ch_type   = $stack->ns_ch_type();
+
+    my %ns_e_type;
+    foreach my $iid (keys %$ns_e_idx){
+        my $type = $ns_e_type->{$iid};
+        next unless defined $type;
+        
+        if ($is_stack and $iid =~ /^1/) {
+            $type = $ch_type;
+        }
+        $ns_e_type{$iid} = $type;
+    }
+    return \%ns_e_type;
+}
+
+sub ns_e_pos {
+    my $stack   = shift;
+    my $partial = shift;
+
+    my $ns_e_idx   = $stack->ns_e_index($partial) || {};
+    my $ns_grp_enc = $stack->s5ChasGrpEncodeFactor($partial) || {};
+    my $is_stack   = $stack->ns_e_is_stack();
+    my $is_virtual = $stack->ns_e_is_virtual();
+
+    my %ns_e_pos;
+    foreach my $iid (keys %$ns_e_idx){
+        my ($grp, $pos, $idx) = split (/\./,$iid);
+        next unless defined $grp;
+        next unless defined $pos;
+
+        if ($grp == 1) {
+            if ($is_stack) {
+                $pos = -1;
+            }
+            else {
+                $pos = 99;
+            }
+        }
+        elsif ($grp == 3 and $idx == 0 ) {
+            my $enc = $ns_grp_enc->{$grp};
+            if ($is_virtual and ($pos % $enc)) {
+                $pos = int ($pos % $enc);
+            }
+            elsif ($is_virtual and !$is_stack and !($pos % $enc)) {
+                $pos = -1;
+            }
+            elsif ($is_virtual and !($pos % $enc)) {
+                $pos = ($pos / $enc);
+            }
+        }
+        elsif (!$is_stack and $grp == 3) {
+            $pos = $idx;
+        }
+        elsif ($grp == 8) {
+            $pos = -1;
+        }
+        $ns_e_pos{$iid} = $pos;
+    }
+    return \%ns_e_pos;
+}
+
+sub ns_e_fwver {
+    my $stack   = shift;
+    my $partial = shift;
+
+    my $ns_e_idx   = $stack->ns_e_index($partial) || {};
+    my $ns_e_ver   = $stack->ns_store_ver($partial)  || {};
+    my $ns_e_type  = $stack->ns_store_type($partial) || {};
+    my $ns_grp_enc = $stack->s5ChasGrpEncodeFactor($partial) || {};
+    my $is_virt   = $stack->ns_e_is_virtual();
+
+    my %ns_e_fwver;
+    foreach my $iid (keys %$ns_e_type){
+        my $type = $ns_e_type->{$iid};
+        next unless defined $type;
+        next unless $type =~ /(rom|boot|fw)/i;
+        my $ver  = $ns_e_ver->{$iid};
+        next unless defined $ver;
+        $iid =~ s/\.\d+$//;
+        
+        if ($is_virt) {
+            my ($grp, $idx, $pos) = split (/\./,$iid);
+            my $enc = $ns_grp_enc->{$grp};
+            $idx = $idx * $enc;
+            $iid = "3.$idx.$pos";
+        }
+        $ns_e_fwver{$iid} = $ver;
+    }
+    return \%ns_e_fwver;
+}
+
+sub ns_e_swver {
+    my $stack   = shift;
+    my $partial = shift;
+
+    my $ns_e_idx   = $stack->ns_e_index($partial) || {};
+    my $ns_e_ver  = $stack->ns_store_ver($partial)  || {};
+    my $ns_e_type = $stack->ns_store_type($partial) || {};
+    my $ns_grp_enc = $stack->s5ChasGrpEncodeFactor($partial) || {};
+    my $is_virt   = $stack->ns_e_is_virtual();
+
+    my %ns_e_swver;
+    foreach my $iid (keys %$ns_e_type){
+        my $type = $ns_e_type->{$iid};
+        next unless defined $type;
+        next unless $type =~ /(flash)/i;
+        my $ver  = $ns_e_ver->{$iid};
+        next unless defined $ver;
+        $iid =~ s/\.\d+$//;
+
+        if ($is_virt) {
+            my ($grp, $idx, $pos) = split (/\./,$iid);
+            my $enc = $ns_grp_enc->{$grp};
+            $idx = $idx * $enc;
+            $iid = "3.$idx.$pos";
+        }
+        $ns_e_swver{$iid} = $ver;
+    }
+    return \%ns_e_swver;
+}
+
+sub ns_e_parent {
+    my $stack   = shift;
+    my $partial = shift;
+
+    my $ns_e_idx   = $stack->ns_e_index($partial) || {};
+    my $ns_grp_enc = $stack->s5ChasGrpEncodeFactor($partial) || {};
+    my $is_stack   = $stack->ns_e_is_stack();
+    my $is_virtual = $stack->ns_e_is_virtual();
+
+    my %ns_e_parent;
+    foreach my $iid (keys %$ns_e_idx){
+        my $index = $ns_e_idx->{$iid};
+        my ($grp, $idx, $pos) = split (/\./,$iid);
+        next unless defined $grp;
+        if ($grp == 8) {
+                $ns_e_parent{$iid} = '0';
+        }
+        if ($grp == 1) {
+            if ($is_stack) {
+                $ns_e_parent{$iid} = '0';
+            }
+            else {
+                $ns_e_parent{$iid} = '080100';
+            }
+        }
+        if ($grp == 3) {
+            my $enc = $ns_grp_enc->{$grp};
+            if ($idx % $enc) {
+                my $npos = ($idx % $enc) * $enc;
+                my @parent = ($grp, $npos, $pos);
+                my $parent = join('',map { sprintf "%02d",$_ } @parent);
+                $ns_e_parent{$iid} = $parent;
+            }
+            elsif ($is_stack) {
+                $ns_e_parent{$iid} = '010100';
+            }
+            elsif ($is_virtual and !$is_stack) {
+                $ns_e_parent{$iid} = 0;
+            }
+            elsif ($pos == 0) {
+                $ns_e_parent{$iid} = '080100';
+            }
+            else {
+                my $parent = $iid;
+                $parent =~ s/\.\d+$/\.00/;
+                $parent = join('',map { sprintf "%02d",$_ } split /\./, $parent);
+                $ns_e_parent{$iid} = $parent;
+            }
+        }
+        next;
+    }
+    return \%ns_e_parent;
+}
+
+sub munge_ns_com_type {
+    my $oid = shift;
+
+    my $name = &SNMP::translateObj($oid);
+    return $name if defined($name);
+    return $oid;
+}
+
+sub munge_ns_store_type {
+    my $oid = shift;
+
+    my $name = &SNMP::translateObj($oid);
+    return $name if defined($name);
+    return $oid;
+}
+
+sub munge_ns_grp_type {
+    my $oid = shift;
+    
+    my %e_class = (
+                    Sup     => 'stack',
+                    Bkpl    => 'backplane',
+                    Brd     => 'module',
+                    Pwr     => 'powerSupply',
+                    TmpSnr  => 'sensor',
+                    Fan     => 'fan',
+                    Clk     => 'other',
+                    Unit    => 'chassis',
+                  );
+
+    my $name = &SNMP::translateObj($oid);
+    $name =~ s/s5ChasGrp//;
+    if ((defined($name)) and (exists($e_class{$name}))) {
+        $name = $e_class{$name};
+    }
+    return $name if defined($name);
+    return $oid;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SNMP::Info::NortelStack - SNMP Interface to the Nortel S5-AGENT-MIB and S5-CHASSIS-MIB
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $stack = new SNMP::Info(
+                    AutoSpecify => 1,
+                    Debug       => 1,
+                    # These arguments are passed directly on to SNMP::Session
+                    DestHost    => 'myswitch',
+                    Community   => 'public',
+                    Version     => 2
+                    ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $stack->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+SNMP::Info::NortelStack is a subclass of SNMP::Info that provides an interface
+to C<S5-AGENT-MIB> and C<S5-CHASSIS-MIB>.  These MIBs are used across the
+Nortel Stackable Ethernet Switches (BayStack), as well as, older Nortel devices
+such as the Centillion family of ATM switches.
+
+Use or create in a subclass of SNMP::Info.  Do not use directly.
+
+=head2 Inherited Classes
+
+None.
+
+=head2 Required MIBs
+
+=over
+
+=item S5-AGENT-MIB
+
+=item S5-CHASSIS-MIB
+
+=item S5-ROOT-MIB and S5-TCS-MIB are required by the other MIBs.
+
+=back
+
+=head1 GLOBAL METHODS
+
+These are methods that return scalar values from SNMP
+
+=over
+
+=item $stack->os_ver()
+
+Returns the software version extracted from (B<s5AgInfoVer>)
+
+=item $stack->os_bin()
+
+Returns the firmware version extracted from (B<s5AgInfoVer>)
+
+=item  $stack->serial()
+
+Returns serial number of the chassis
+
+(B<s5ChasSerNum>)
+
+=item $stack->ns_ag_ver()
+
+Returns the version of the agent in the form 'major.minor.maintenance[letters]'. 
+
+(B<s5AgInfoVer>)
+
+=item $stack->ns_op_mode()
+
+Returns the stacking mode. 
+
+(B<s5AgSysCurrentOperationalMode>)
+
+=item $stack->tftp_action()
+
+This object is used to download or upload a config file or an image file.
+
+(B<s5AgInfoFileAction>)
+
+=item $stack->tftp_result()
+
+Returns the status of the latest action as shown by $stack->tftp_action().
+
+(B<s5AgInfoFileStatus>)
+
+=item $stack->ns_auto_pvid()
+
+Returns the value indicating whether adding a port as a member of a VLAN
+automatically results in its PVID being set to be the same as that VLAN ID.
+
+(B<s5AgSysAutoPvid>)
+
+=item $stack->tftp_file()
+
+Name of the binary configuration file that will be downloaded/uploaded when
+the $stack->tftp_action() object is set.
+
+(B<s5AgSysBinaryConfigFilename>)
+
+=item $stack->tftp_host()
+
+The IP address of the TFTP server for all TFTP operations.
+
+(B<s5AgSysTftpServerAddress>)
+
+=item $stack->vlan()
+
+Returns the VLAN ID of the system's management VLAN.
+
+(B<s5AgSysManagementVlanId>)
+
+=item $stack->ch_ser()
+
+Returns the serial number of the chassis.
+
+(B<s5ChasSerNum>)
+
+=item $stack->ns_cfg_chg()
+
+Returns the total number of configuration changes (other than attachment changes,
+or physical additions or removals) in the chassis that have been detected since
+cold/warm start.
+
+(B<s5ChasGblConfChngs>)
+
+=item $stack->ns_cfg_time()
+
+Returns the value of sysUpTime when the last configuration change (other than
+attachment changes, or physical additions or removals) in the chassis was
+detected.
+
+(B<s5ChasGblConfLstChng>)
+
+=back
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Agent Interface Table (s5AgMyIfTable)
+
+=over
+
+=item $stack->i_cfg_file()
+
+Returns reference to hash.  Key: Table entry, Value: Name of the file
+
+(B<s5AgMyIfCfgFname>)
+
+=item $stack->i_cfg_host()
+
+Returns reference to hash.  Key: Table entry, Value: IP address of the load server
+
+(B<s5AgMyIfLdSvrAddr>)
+
+=back
+
+=head2 Chassis Components Table (s5ChasComTable)
+
+=over
+
+=item $stack->ns_com_grp_idx()
+
+Returns reference to hash.  Key: Table entry, Value: Index of the chassis level
+group which contains this component.
+
+(B<s5ChasComGrpIndx>)
+
+=item $stack->ns_com_idx()
+
+Returns reference to hash.  Key: Table entry, Value: Index of the component in
+the group.  For modules in the 'board' group, this is the slot number.
+
+(B<s5ChasComIndx>)
+
+=item $stack->ns_com_sub_idx()
+
+Returns reference to hash.  Key: Table entry, Value: Index of the sub-component
+in the component.
+
+(B<s5ChasComSubIndx>)
+
+=item $stack->ns_com_type()
+
+Returns reference to hash.  Key: Table entry, Value: Type
+
+(B<s5ChasComType>)
+
+=item $stack->ns_com_descr()
+
+Returns reference to hash.  Key: Table entry, Value: Description
+
+(B<s5ChasComDescr>)
+
+=item $stack->ns_com_ver()
+
+Returns reference to hash.  Key: Table entry, Value: Version
+
+(B<s5ChasComVer>)
+
+=item $stack->ns_com_serial()
+
+Returns reference to hash.  Key: Table entry, Value: Serial Number
+
+(B<s5ChasComSerNum>)
+
+=back
+
+=head2 Storage Area Table (s5ChasStoreTable)
+
+=over
+
+=item $stack->ns_store_grp_idx()
+
+Returns reference to hash.  Key: Table entry, Value: Index of the chassis level
+group.
+
+(B<s5ChasStoreGrpIndx>)
+
+=item $stack->ns_store_idx()
+
+Returns reference to hash.  Key: Table entry, Value: Index of the group.
+
+(B<s5ChasStoreComIndx>)
+
+=item $stack->ns_store_sub_idx()
+
+Returns reference to hash.  Key: Table entry, Value: Index of the sub-component.
+
+(B<s5ChasStoreSubIndx>)
+
+=item $stack->ns_store_idx()
+
+Returns reference to hash.  Key: Table entry, Value: Index of the storage area.
+
+(B<s5ChasStoreIndx>)
+
+=item $stack->ns_store_type()
+
+Returns reference to hash.  Key: Table entry, Value: Type
+
+(B<s5ChasStoreType>)
+
+=item $stack->ns_store_size()
+
+Returns reference to hash.  Key: Table entry, Value: Size
+
+(B<s5ChasStoreCurSize>)
+
+=item $stack->ns_store_ver()
+
+Returns reference to hash.  Key: Table entry, Value: Version
+
+(B<s5ChasStoreCntntVer>)
+
+=back
+
+=head2 Psuedo ENTITY-MIB information
+
+These methods emulate ENTITY-MIB Physical Table methods using S5-CHASSIS-MIB. 
+
+=over
+
+=item $stack->ns_e_index()
+
+Returns reference to hash.  Key: IID, Value: Integer, Indicies are combined
+into a six digit integer, each index is two digits padded with leading zero if
+required.
+
+=item $stack->ns_e_class()
+
+Returns reference to hash.  Key: IID, Value: General hardware type
+(B<s5ChasGrpDescr>).
+
+Group is stripped from the string.  Values may be Supervisory Module,
+Backplane, Board, Power Supply, Sensor, Fan, Clock, Unit.
+
+=item $stack->ns_e_descr()
+
+Returns reference to hash.  Key: IID, Value: Human friendly name
+
+(B<s5ChasComDescr>)
+
+=item $stack->ns_e_hwver()
+
+Returns reference to hash.  Key: IID, Value: Hardware version
+
+(B<s5ChasComVer>)
+
+=item $stack->ns_e_vendor()
+
+Returns reference to hash.  Key: IID, Value: nortel
+
+=item $stack->ns_e_serial()
+
+Returns reference to hash.  Key: IID, Value: Serial number
+
+(B<s5ChasComSerNum>)
+
+=item $stack->ns_e_pos()
+
+Returns reference to hash.  Key: IID, Value: The relative position among all
+entities sharing the same parent.
+
+(B<s5ChasComSubIndx>)
+
+=item $stack->ns_e_type()
+
+Returns reference to hash.  Key: IID, Value: Type of component/sub-component
+as defined under B<s5ChasComTypeVal> in S5-REG-MIB.
+
+=item $stack->ns_e_fwver()
+
+Returns reference to hash.  Key: IID, Value: Firmware revision.
+
+Value of B<s5ChasStoreCntntVer> for entries with rom, boot, or fw in
+B<s5ChasStoreType>.
+
+=item $stack->ns_e_fwver()
+
+Returns reference to hash.  Key: IID, Value: Software revision.
+
+Value of B<s5ChasStoreCntntVer> for entries with "flash" in B<s5ChasStoreType>.
+
+=item $stack->ns_e_parent()
+
+Returns reference to hash.  Key: IID, Value: The value of ns_e_index() for the
+entity which 'contains' this entity.  A value of zero indicates	this entity
+is not contained in any other entity.
+
+=cut

Info/PowerEthernet.pm

@@ -0,0 +1,219 @@
+# SNMP::Info::PowerEthernet
+# Bill Fenner
+#
+# Copyright (c) 2007 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::PowerEthernet;
+$VERSION = '1.07';
+# $Id$
+
+use strict;
+
+use Exporter;
+use SNMP::Info;
+
+use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
+@SNMP::Info::PowerEthernet::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::PowerEthernet::EXPORT_OK = qw//;
+
+%MIBS    = ('POWER-ETHERNET-MIB' => 'pethPsePortDetectionStatus');
+
+%GLOBALS = (
+           );
+
+%FUNCS   = (
+	    # parts of pethPsePortTable
+	    'peth_port_admin'    => 'pethPsePortAdminEnable',
+	    'peth_port_status'   => 'pethPsePortDetectionStatus',
+	    'peth_port_class'    => 'pethPsePortPowerClassifications',
+	    # pethMainPseTable
+	    'peth_power_watts'       => 'pethMainPsePower',
+	    'peth_power_status'      => 'pethMainPseOperStatus',
+	    'peth_power_consumption' => 'pethMainPseConsumptionPower',
+	    'peth_power_threshold'   => 'pethMainPseUsageThreshold',
+           );
+
+%MUNGE   = (
+           );
+
+# POWER-ETHERNET-MIB doesn't define a mapping of its
+# "module"/"port" index to ifIndex.  Different vendors
+# do this in different ways.  This is a poor fallback:
+# if all of the module values = 1, return the port number
+# on the assumption that port number = ifindex.
+# If there is a module != 1, this heuristic doesn't work
+# so returns undef.
+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);
+	if ($module != 1) {
+	    # This heuristic won't work, so say that we got nothing.
+	    # If you have this case, you have to write a device-specific
+	    # version of this function.
+	    return undef;
+	}
+	$peth_port_ifindex->{$i} = $port;
+    }
+    return $peth_port_ifindex;
+}
+
+1;
+
+=head1 NAME
+
+SNMP::Info::PowerEthernet - SNMP Interface to data stored in POWER-ETHERNET-MIB.
+
+=head1 AUTHOR
+
+Bill Fenner
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you. 
+ my $poe = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          # These arguments are passed directly on to SNMP::Session
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        ) 
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $poe->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+POWER-ETHERNET-MIB is used to describe PoE (IEEE 802.3af)
+
+Create or use a device subclass that inherit this class.  Do not use directly.
+
+For debugging purposes you can call this class directly as you would SNMP::Info
+
+ my $poe = new SNMP::Info::PowerEthernet (...);
+
+=head2 Inherited Classes
+
+none.
+
+=head2 Required MIBs
+
+=over
+
+=item POWER-ETHERNET-MIB
+
+=back
+
+=head1 GLOBALS
+
+none.
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Power Port Table
+
+Selected values from the C<pethPsePortTable>
+
+=over
+
+=item $poe->peth_port_admin()
+
+Administrative status: is this port permitted to deliver power?
+
+C<pethPsePortAdminEnable>
+
+=item $poe->peth_port_status()
+
+Current status: is this port delivering power, searching, disabled, etc?
+
+C<pethPsePortDetectionStatus>
+
+=item $poe->peth_port_class()
+
+Device class: if status is deliveringPower, this represents the 802.3af
+class of the device being powered.
+
+C<pethPsePortPowerClassifications>
+
+=item $poe->peth_port_ifindex()
+
+A mapping function from the pethPsePortTable INDEX of
+module.port to an ifIndex.  The default mapping ignores the
+module (returning undef if there are any module values greater
+than 1) and returns the port number, assuming that there is a
+1:1 mapping.
+
+This mapping is more or less left up to the device vendor to
+implement; the MIB gives only very weak guidance.
+A given device class may implement its own version
+of this function (e.g., see Info::CiscoPower).
+
+=back
+
+=head2 Power Supply Table
+
+=over
+
+=item $poe->peth_power_watts()
+
+The power supply's capacity, in watts.
+
+C<pethMainPsePower>
+
+=item $poe->peth_power_status()
+
+The power supply's operational status.
+
+C<pethMainPseOperStatus>
+
+=item $poe->peth_power_consumption()
+
+How much power, in watts, this power supply has been committed to
+deliver.  (Note: certain devices seem to supply this value in milliwats,
+so be cautious interpreting it.)
+
+C<pethMainPseConsumptionPower>
+
+=item $poe->peth_power_threshold()
+
+The threshold (in percent) of consumption required to raise an
+alarm.
+
+C<pethMainPseUsageThreshold>
+
+=back
+
+=cut

Info/SONMP.pm

@@ -0,0 +1,408 @@
+# SNMP::Info::SONMP
+# Eric Miller
+# $Id$
+#
+# Copyright (c) 2004 Eric Miller, Max Baker
+#
+# 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::SONMP;
+$VERSION = '1.07';
+
+use strict;
+
+use Exporter;
+use SNMP::Info;
+
+@SNMP::Info::SONMP::ISA = qw/SNMP::Info Exporter/;
+@SNMP::Info::SONMP::EXPORT_OK = qw//;
+
+use vars qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT/;
+
+%MIBS    = (
+            'SYNOPTICS-ROOT-MIB' => 'synoptics',
+            'S5-ETH-MULTISEG-TOPOLOGY-MIB' => 's5EnMsTop',
+            );
+
+%GLOBALS = (
+            'cdp_id'  => 's5EnMsTopIpAddr',
+            'cdp_run' => 's5EnMsTopStatus',
+            );
+
+%FUNCS  = (
+            # From S5-ETH-MULTISEG-TOPOLOGY-MIB::TopNmmTable
+            'sonmp_topo_slot'     => 's5EnMsTopNmmSlot',
+            'sonmp_topo_port'     => 's5EnMsTopNmmPort',
+            'sonmp_topo_ip'       => 's5EnMsTopNmmIpAddr',
+            'sonmp_topo_seg'      => 's5EnMsTopNmmSegId',
+            'sonmp_topo_mac'      => 's5EnMsTopNmmMacAddr',
+            'sonmp_topo_platform' => 's5EnMsTopNmmChassisType',
+            'sonmp_topo_localseg' => 's5EnMsTopNmmLocalSeg',
+          );
+
+%MUNGE = (
+         'sonmp_topo_mac'           => \&SNMP::Info::munge_mac
+         );
+
+sub index_factor {
+    return 32;
+}
+
+sub slot_offset {
+    return 1;
+}
+
+sub port_offset {
+    return 0;
+}
+
+sub hasCDP {
+    my $sonmp = shift;
+    return $sonmp->cdp_run();
+}
+
+sub c_if {
+    my $sonmp = shift;
+    my $partial = shift;
+
+    my $sonmp_topo_port = $sonmp->sonmp_topo_port($partial) || {};
+    my $sonmp_topo_slot = $sonmp->sonmp_topo_slot($partial) || {};
+    my $index_factor = $sonmp->index_factor();
+    my $slot_offset = $sonmp->slot_offset();
+    my $port_offset = $sonmp->port_offset();
+    my $model = $sonmp->model();
+
+    my %c_if;
+    foreach my $entry (keys %$sonmp_topo_port){
+        my $port = $sonmp_topo_port->{$entry};
+        next unless defined $port;
+        next if $port == 0;
+        my $slot = $sonmp_topo_slot->{$entry} || 0;
+
+        if ($model eq 'Baystack Hub') {
+        my $comidx = $slot;
+            if (! ($comidx % 5)) {
+               $slot = ($slot / 5);
+            } elsif ($comidx =~ /[16]$/) {
+               $slot = int($slot/5);
+               $port = 25;          
+            } elsif ($comidx =~ /[27]$/) {
+               $slot = int($slot/5);
+               $port = 26;          
+            }
+        }
+
+        my $index = (($slot-$slot_offset)*$index_factor) + ($port-$port_offset);
+        
+        $c_if{$entry} = $index;
+    }
+    return \%c_if;
+}
+
+sub c_ip {
+    my $sonmp = shift;
+    my $partial = shift;
+
+    my $sonmp_topo_port = $sonmp->sonmp_topo_port($partial) || {};
+    my $sonmp_topo_ip   = $sonmp->sonmp_topo_ip($partial) || {};
+
+    my %c_ip;
+    foreach my $entry (keys %$sonmp_topo_ip){
+        my $port = $sonmp_topo_port->{$entry};
+        next unless defined $port;
+        next if $port == 0;
+        
+        my $ip = $sonmp_topo_ip->{$entry};
+        $c_ip{$entry} = $ip;
+    }
+    return \%c_ip;
+}
+
+sub c_port {
+    my $sonmp = shift;
+    my $partial = shift;
+
+    my $sonmp_topo_port = $sonmp->sonmp_topo_port($partial) || {};
+    my $sonmp_topo_seg = $sonmp->sonmp_topo_seg($partial) || {};
+    my $sonmp_topo_platform = $sonmp->sonmp_topo_platform($partial) || {};
+
+    my %c_port;
+    foreach my $entry (keys %$sonmp_topo_seg){
+        my $port = $sonmp_topo_port->{$entry};
+        next unless defined $port;
+        next if $port == 0;
+
+        my $seg  = $sonmp_topo_seg->{$entry};
+        my $platform = $sonmp_topo_platform->{$entry};
+        # AP-222x Series does not adhere to port numbering
+        if ($platform =~ /AccessPoint/i) {
+            $c_port{$entry} = 'dp0';
+        }
+        # BayHubs send the lower three bytes of the MAC not the slot/port        
+        elsif ($seg > 4000) {
+            $c_port{$entry} = 'unknown';
+        }
+        else {
+            # Segment id is (256 * remote slot_num) + (remote_port)
+            my $remote_port = $seg % 256;
+            my $remote_slot = int($seg / 256);
+    
+           $c_port{$entry} = "$remote_slot.$remote_port";
+        }
+    }
+    return \%c_port;
+}
+
+sub c_platform {
+    my $sonmp = shift;
+    my $partial = shift;
+
+    my $sonmp_topo_port = $sonmp->sonmp_topo_port($partial) || {};
+    my $sonmp_topo_platform = $sonmp->sonmp_topo_platform($partial) || {};
+
+    my %c_platform;
+    foreach my $entry (keys %$sonmp_topo_platform){
+        my $port = $sonmp_topo_port->{$entry};
+        next unless defined $port;
+        next if $port == 0;
+
+        my $platform  = $sonmp_topo_platform->{$entry};
+
+        $c_platform{$entry} = $platform;
+    }
+    return \%c_platform;
+}
+
+sub mac {
+    my $sonmp = shift;
+
+    my $sonmp_topo_port = $sonmp->sonmp_topo_port();
+    my $sonmp_topo_mac = $sonmp->sonmp_topo_mac();
+    
+    foreach my $entry (keys %$sonmp_topo_port){
+        my $port = $sonmp_topo_port->{$entry};
+        next unless $port == 0;
+        my $mac = $sonmp_topo_mac->{$entry};
+        return $mac;
+    }
+    # Topology turned off, not supported.
+    return undef;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::SONMP - SNMP Interface to SynOptics Network Management Protocol (SONMP)
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ my $sonmp = new SNMP::Info ( 
+                             AutoSpecify => 1,
+                             Debug       => 1,
+                             DestHost    => 'router', 
+                             Community   => 'public',
+                             Version     => 2
+                           );
+
+ my $class = $sonmp->class();
+ print " Using device sub class : $class\n";
+
+ $hascdp   = $sonmp->hasCDP() ? 'yes' : 'no';
+
+ # Print out a map of device ports with CDP neighbors:
+ my $interfaces = $sonmp->interfaces();
+ my $c_if       = $sonmp->c_if();
+ my $c_ip       = $sonmp->c_ip();
+ my $c_port     = $sonmp->c_port();
+
+ foreach my $cdp_key (keys %$c_ip){
+    my $iid           = $c_if->{$cdp_key};
+    my $port          = $interfaces->{$iid};
+    my $neighbor      = $c_ip->{$cdp_key};
+    my $neighbor_port = $c_port->{$cdp_key};
+    print "Port : $port connected to $neighbor / $neighbor_port\n";
+ }
+
+=head1 DESCRIPTION
+
+SNMP::Info::SONMP is a subclass of SNMP::Info that provides an object oriented 
+interface to the SynOptics Network Management Protocol (SONMP) information
+through SNMP.
+
+SONMP is a Layer 2 protocol that supplies topology information of devices that
+also speak SONMP, mostly switches and hubs.  SONMP is implemented in SynOptics,
+Bay, and Nortel devices.  SONMP has been rebranded by Bay then Nortel and is
+know by several different names, most recently Nortel Discovery Protocol (NDP).
+
+Create or use a device subclass that inherits this class.  Do not use directly.
+
+Each device implements a subset of the global and cache entries. 
+Check the return value to see if that data is held by the device.
+
+=head2 Inherited Classes
+
+None.
+
+=head2 Required MIBs
+
+=over
+
+=item SYNOPTICS-ROOT-MIB
+
+=item S5-ETH-MULTISEG-TOPOLOGY-MIB
+
+=back
+
+=head1 GLOBAL METHODS
+
+These are methods that return scalar values from SNMP
+
+=over
+
+=item  $sonmp->index_factor()
+
+Returns a number representing the number of ports reserved per slot or switch
+within the device MIB.  Defaults to 32.
+
+=item $sonmp->slot_offset()
+
+Returns the offset if slot numbering does not start at 0.  Defaults to 1.
+
+=item $sonmp->port_offset()
+
+Returns the offset if port numbering does not start at 0.  Defaults to 0. 
+
+=item  $cdp->hasCDP()
+
+Is SONMP is active in this device?
+
+=item $sonmp->cdp_id()
+
+Returns the IP that the device is sending out for its Nmm topology info.
+
+(B<s5EnMsTopIpAddr>)
+
+=item $sonmp->cdp_run()
+
+Returns true if SONMP is on for this device. 
+
+(B<s5EnMsTopStatus>)
+
+=item $sonmp->mac()
+
+Returns MAC of the advertised IP address of the device. 
+
+=back
+
+=head1 TABLE METHODS
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Layer2 Topology info (B<s5EnMsTopNmmTable>)
+
+=over
+
+=item $sonmp->sonmp_topo_slot()
+
+Returns reference to hash.  Key: Table entry, Value:slot number
+
+(B<s5EnMsTopNmmSlot>)
+
+=item $sonmp->sonmp_topo_port()
+
+Returns reference to hash.  Key: Table entry, Value:Port Number (interface iid)
+
+(B<s5EnMsTopNmmPort>)
+
+=item $sonmp->sonmp_topo_ip()
+
+Returns reference to hash.  Key: Table entry, Value:Remote IP address of entry
+
+(B<s5EnMsTopNmmIpAddr>)
+
+=item $sonmp->sonmp_topo_seg()
+
+Returns reference to hash.  Key: Table entry, Value:Remote Segment ID
+
+(B<s5EnMsTopNmmSegId>)
+
+=item $sonmp->sonmp_topo_mac()
+
+(B<s5EnMsTopNmmMacAddr>)
+
+Returns reference to hash.  Key: Table entry, Value:Remote MAC address
+
+=item $sonmp->sonmp_topo_platform
+
+Returns reference to hash.  Key: Table entry, Value:Remote Device Type
+
+(B<s5EnMsTopNmmChassisType>)
+
+=item $sonmp->sonmp_topo_localseg
+
+Returns reference to hash.  Key: Table entry, Value: Boolean, if bay_topo_seg()
+is local.
+
+(B<s5EnMsTopNmmLocalSeg>)
+
+=back
+
+=head2 Psuedo CDP information
+
+All entries with port=0 are local and ignored.
+
+=over
+
+=item $sonmp->c_if()
+
+Returns reference to hash.  Key: IID, Value: Local port (interfaces)
+
+=item $sonmp->c_ip()
+
+Returns reference to hash.  Key: IID, Value: Remote IP address
+
+If multiple entries exist with the same local port, c_if(), with different IPv4
+addresses, c_ip(), there is either a non-SONMP device in between two or
+more devices or multiple devices which are not directly connected.  
+
+Use the data from the Layer2 Topology Table below to dig deeper.
+
+=item $sonmp->c_port()
+
+Returns reference to hash. Key: IID, Value: Remote port (interfaces)
+
+=item $sonmp->c_platform()
+
+Returns reference to hash. Key: IID, Value: Remote device type
+
+=back
+
+=cut

MANIFEST

@@ -1,26 +1,78 @@
-COPYRIGHT
 ChangeLog
+COPYRIGHT
+DeviceMatrix.txt
 Info.pm
+Info/Airespace.pm
 Info/Bridge.pm
 Info/CDP.pm
+Info/CiscoConfig.pm
+Info/CiscoImage.pm
+Info/CiscoPortSecurity.pm
+Info/CiscoPower.pm
+Info/CiscoQOS.pm
+Info/CiscoRTT.pm
+Info/CiscoStack.pm
 Info/CiscoStats.pm
+Info/CiscoVTP.pm
 Info/Entity.pm
 Info/EtherLike.pm
+Info/FDP.pm
+Info/IEEE802dot11.pm
 Info/Layer1.pm
 Info/Layer1/Allied.pm
 Info/Layer1/Asante.pm
+Info/Layer1/Bayhub.pm
+Info/Layer1/Cyclades.pm
+Info/Layer1/S3000.pm
 Info/Layer2.pm
+Info/Layer2/Airespace.pm
+Info/Layer2/Aironet.pm
+Info/Layer2/Allied.pm
+Info/Layer2/Aruba.pm
 Info/Layer2/Bay.pm
+Info/Layer2/Baystack.pm
 Info/Layer2/C1900.pm
 Info/Layer2/C2900.pm
 Info/Layer2/Catalyst.pm
+Info/Layer2/Centillion.pm
+Info/Layer2/Cisco.pm
+Info/Layer2/Foundry.pm
 Info/Layer2/HP.pm
+Info/Layer2/N2270.pm
+Info/Layer2/NAP222x.pm
+Info/Layer2/Netgear.pm
+Info/Layer2/Orinoco.pm
+Info/Layer2/ZyXEL_DSLAM.pm
 Info/Layer3.pm
 Info/Layer3/Aironet.pm
+Info/Layer3/AlteonAD.pm
+Info/Layer3/BayRS.pm
 Info/Layer3/C3550.pm
+Info/Layer3/C4000.pm
+Info/Layer3/C6500.pm
+Info/Layer3/Cisco.pm
+Info/Layer3/Contivity.pm
+Info/Layer3/Dell.pm
+Info/Layer3/Enterasys.pm
+Info/Layer3/Extreme.pm
 Info/Layer3/Foundry.pm
+Info/Layer3/Juniper.pm
+Info/Layer3/Microsoft.pm
+Info/Layer3/N1600.pm
+Info/Layer3/Netscreen.pm
+Info/Layer3/NetSNMP.pm
+Info/Layer3/Passport.pm
+Info/Layer3/Sun.pm
+Info/LLDP.pm
 Info/MAU.pm
-MANIFEST
+Info/NortelStack.pm
+Info/PowerEthernet.pm
+Info/RapidCity.pm
+Info/SONMP.pm
 Makefile.PL
+MANIFEST			This list of files
 README
+t/docmunge
+t/make_dev_matrix.pl
 t/prereq.t
+t/test_class.pl

Makefile.PL

@@ -21,5 +21,6 @@ WriteMakefile(
 
 sub MY::postamble { "
 .PHONY: readme
-readme:
+readme: README
+README: Info.pm
 	pod2text -l Info.pm > README" }

t/docmunge

@@ -0,0 +1,35 @@
+#!/usr/bin/perl -i.bak
+#
+# [Re-]write POD to create cross-links between Required MIBs, GLOBALS
+#     and TABLE METHODS sections.
+# This is a horrible jumble of heuristics, but works with
+# all of the existing files. It has only one false positive: HP.pm's
+# mention of an SNMP::Info version number.
+#
+$section = undef;
+$waiting = 0;
+while (<>) {
+	if (eof) {
+		$section = undef;
+		$waiting = 0;
+	}
+	if (/^=head(\d)/) {
+		$sl = $1;
+		if ($sl <= $level) {
+			$section = undef;
+		}
+		if (/(TABLE METHODS|GLOBALS|Required MIBs)/) {
+			$section = $1;
+			$level = $sl;
+			if ($section eq 'TABLE METHODS' || $section eq 'GLOBALS') {
+				$waiting = 1;
+			}
+		}
+		if ($waiting && /imported/i) {
+			$waiting = 0;
+		}
+	} elsif (defined($section) && !$waiting && /^[^=]/ && /SNMP::Info/) {
+		s,(?:L<)?(SNMP::Info[a-zA-Z0-9:]*)(?:/[^>]+)?(?:>)?,L<$1/"$section">,g;
+	}
+	print;
+}

t/make_dev_matrix.pl

@@ -0,0 +1,336 @@
+#!/usr/bin/perl -w
+
+# $Id$
+
+$DevMatrix = '../DeviceMatrix.txt';
+$DevHTML   = 'DeviceMatrix.html';
+$DevPNG    = 'DeviceMatrix.png';
+$Attributes= {};
+
+# Parse Data File
+$matrix = parse_data($DevMatrix);
+
+# Graph it for fun
+eval "use GraphViz::Data::Structure;";
+if ($@) {
+    print "GraphViz::Data::Structure not installed. $@\n";
+} else {
+    my %graph = ();
+    foreach my $vendor (sort sort_nocase keys %$matrix){
+        $graph{$vendor} = {};
+        foreach my $family  (sort sort_nocase keys %{$matrix->{$vendor}->{families}} ){
+            my @models;
+            foreach my $mod (keys %{$matrix->{$vendor}->{families}->{$family}->{models}}){
+                push(@models,split(/\s*,\s*/,$mod));
+            }
+            if (scalar @models){
+                $graph{$vendor}->{$family}=\@models;
+            } else {
+                $graph{$vendor}->{$family}=[];
+            }
+            
+        }
+    }
+    my $now = scalar localtime;
+    my $gvds = GraphViz::Data::Structure->new(\%graph,Orientation=>'vertical',
+        Colors=> 'Deep',
+        graph => {label=>"SNMP::Info and Netdisco Supported Devices \n $now",'fontpath'=>'/usr/local/netdisco','fontname'=>'lucon',concentrate=>'true','overlap'=>'false',spline=>'true',bgcolor=>'wheat'},
+        node  => {fontname=>'lucon'},
+        );
+    $gvds->graph()->as_png($DevPNG);
+}
+
+open (HTML, "> $DevHTML") or die "Can't open $DevHTML. $!\n";
+$old_fh = select(HTML);
+&html_head;
+print_vendors($matrix);
+foreach my $vendor (sort sort_nocase keys %$matrix){
+    print "<A NAME=\"$vendor\"><SPAN CLASS=\"vendor\"><B>$vendor</B></SPAN></A>\n";
+    print "<DL>\n";
+
+    my $vendor_defaults = $matrix->{$vendor}->{defaults};
+    print_notes($vendor_defaults,1);
+
+    my $families = $matrix->{$vendor}->{families};
+    foreach my $family (sort sort_nocase keys %$families ) {
+        print "<DT>$family Family\n";
+
+        my $family_defaults = $families->{$family}->{defaults};
+        print_notes($family_defaults,2);
+
+        my $models = $families->{$family}->{models};
+        foreach my $model (sort sort_nocase keys %$models ){
+            my $model_defaults = $models->{$model}->{defaults};
+            print "<DD>$model\n";
+            print "<DL>\n";
+            print_notes($model_defaults,3);
+
+            print "<DT><DD><TABLE BORDER=1>\n";
+            print_headers();
+            print "<TR>\n";
+            foreach my $a (sort sort_nocase keys %$Attributes) {
+                my $val;
+                next if $a eq 'note';
+                $val = ['-'];
+                $class = 'none';
+                if (defined $model_defaults->{$a}) {
+                    $val = $model_defaults->{$a};
+                    $class = 'model';
+                } elsif (defined $family_defaults->{$a}){
+                    $val = $family_defaults->{$a};
+                    $class = 'family';
+                } elsif (defined $vendor_defaults->{$a}){
+                    $val = $vendor_defaults->{$a};
+                    $class = 'vendor';
+                } 
+                print "  <TD CLASS='$class'>",join("<BR>\n",@$val),"</TD>\n";
+            }
+            print "</TR></TABLE>\n";
+            print "</DL>\n";
+        }
+    }
+    print "</DL>\n";
+}
+
+
+&html_tail;
+
+select ($old_fh);
+close (HTML) or die "Can't write $DevHTML. $!\n";
+
+# Data Structures
+
+# Matrix =
+#   ( vendor => { families  => { family => family_hash },
+#                  defaults => { cmd    => [values]    },
+#               }
+#   )
+
+# Family Hash
+#   ( models   => { model => model_hash },
+#     defaults => { cmd   => [values]   }
+#   )
+
+# Model Hash
+#   ( defaults => { cmd => [values] } )
+sub parse_data {
+    my $file = shift;
+    my %ignore = map { $_ => 1  }  @_;
+    my $Matrix;
+
+    my @Lines;
+    open (DM, "< $file") or die "Can't open $file. $!\n";
+    {
+        @Lines = <DM>;
+    }
+    close (DM);
+
+    my ($device,$family,$vendor,$class);
+    foreach my $line (@Lines){
+        chomp($line);
+        # Comments
+        $line =~ s/#.*//;
+
+        # Blank Lines
+        next if $line =~ /^\s*$/;
+
+        # Trim whitespace
+        $line =~ s/^\s+//;
+        $line =~ s/\s+$//;
+
+        my ($cmd,$value);
+        if ($line =~ /^([a-z-_]+)\s*:\s*(.*)$/) {
+            $cmd = $1;  $value = $2; 
+        } else {
+            print "What do i do with this line : $line \n";
+            next;
+        }
+
+        if (exists $ignore{$cmd}){
+            print "Ignoring $cmd\n";
+        }
+        # Set Class {vendor,family,device}
+        if ($cmd eq 'device-vendor'){
+            $vendor = $value;
+            $family = $model = undef;
+            $Matrix->{$vendor} = {} unless defined $Matrix->{$vendor};
+            $class = $Matrix->{$vendor};
+            $class->{defaults}->{type}='vendor';
+            next;
+        }
+
+        if ($cmd eq 'device-family'){
+            $family = $value;
+            $model = undef;
+            print "$family has no vendor.\n" unless defined $vendor;
+            $Matrix->{$vendor}->{families}->{$family} = {} 
+                unless defined $Matrix->{$vendor}->{families}->{$family};
+            $class = $Matrix->{$vendor}->{families}->{$family};
+            $class->{defaults}->{type}='family';
+            next;
+        }   
+
+        if ($cmd eq 'device') {
+            $model = $value;
+            print "$model has no family.\n" unless defined $family;
+            print "$model has no vendor.\n" unless defined $vendor;
+            $Matrix->{$vendor}->{families}->{$family}->{models}->{$model} = {} 
+                unless defined $Matrix->{$vendor}->{families}->{$family}->{models}->{$model};
+            $class = $Matrix->{$vendor}->{families}->{$family}->{models}->{$model};
+            $class->{defaults}->{type}='device';
+            next;
+        }
+
+        # Store attribute
+        push (@{$class->{defaults}->{$cmd}} , $value);
+        $Attributes->{$cmd}++;
+    }
+
+    return $Matrix;
+}
+
+sub sort_nocase {
+    return lc($a) cmp lc($b);
+}
+
+sub print_notes {
+    my $defaults = shift;
+    my $level    = shift;
+    my $notes    = $defaults->{note} || [];
+    foreach my $note (@$notes){
+        if ($note =~ s/^!//){
+            $note = '<SPAN CLASS="note">' . $note . '</SPAN>';
+        }
+    }
+    if (scalar @$notes){
+        print "<DT>\n";
+        my $print_note = join("\n<LI>",@$notes);
+        print "<UL TYPE='square'><LI>$print_note</UL>\n";
+    }
+}
+
+sub print_vendors {
+    my $matrix=shift;
+    print "<h1>Device Vendors</h1>\n";
+    foreach my $vendor (sort sort_nocase keys %$matrix){
+        print "[<A HREF=\"#$vendor\">$vendor</A>]\n";
+    }
+    print "<HR>\n";
+}
+
+sub html_head {
+    print <<"end_head";
+<HTML>
+<HEAD>
+<TITLE>SNMP::Info - Device Compatibility Matrix</TITLE>
+<STYLE TYPE="text/css" MEDIA="screen">
+<!--
+    BODY    { font-family:arial,helvetica,sans-serif; font-size:12pt; }
+    TD      { font-family:arial,helvetica,sans-serif; font-size:10pt; }
+    TH      { font-family:arial,helvetica,sans-serif; font-size:10pt; background:#F0F0F0; }
+    H1      { font-family:arial,helvetica,sans-serif; font-size:14pt; }
+    .vendor { font-size:12pt; color:#777777; }
+    .family { font-size:12pt; color:blue; }
+    .model  { font-size:12pt; color:red; }
+    .note   { color:red; } 
+//-->
+</STYLE>
+</HEAD>
+<BODY>
+<h1>SNMP::Info - Device Compatibility Matrix</h1>
+<P>
+end_head
+}
+
+sub html_tail {
+    print <<'end_tail';
+<HR>
+<h1>Color Key</h1>
+[<SPAN CLASS="model">Model Attribute</SPAN>]
+[<SPAN CLASS="family">Family Attribute</SPAN>]
+[<SPAN CLASS="vendor">Vendor Attribute</SPAN>]
+<h1>Attribute Key</h1>
+A value of <B>-</B> signifies the information is not specified and can
+be assumed working.
+<TABLE BORDER=1>
+<TR>
+    <TD>Arpnip</TD>
+    <TD>Ability to collect ARP tables for MAC to IP translation.</TD>
+</TR>
+<TR>
+    <TD>CDP</TD>
+    <TD>Cisco Discovery Protocol usable.
+        <UL>
+            <LI><tt>Yes</tt> - Has CDP information through CISCO-CDP-MIB
+            <LI><tt>Proprietary</tt> means the device has its own L2 Discovery Protocol.
+        </UL>
+    </TD>
+</TR>
+<TR>
+    <TD>Class</TD>
+    <TD>SNMP::Info Class the the device currently uses.  Devices using more generic
+        interfaces like <tt>Layer2</tt> or <tt>Layer3</tt> may eventually get their
+        own subclass.
+    </TD>
+</TR>
+<TR>
+    <TD>Duplex</TD>
+    <TD>Ability to cull duplex settings from device.<BR>
+        <UL>
+            <LI><tt>no</tt> - Can't recover current or admin setting.
+            <LI><tt>link</tt> - Can get current setting only.
+            <LI><tt>both</tt> - Can get admin and link setting.
+            <LI><tt>write</tt> - Can get admin and link setting and perform sets.
+        </UL>
+    </TD>
+</TR>
+<TR>
+    <TD>Macsuck</TD>
+    <TD>Ability to get CAM tables for MAC to switch port mapping.<BR>
+        <UL>
+            <LI><TT>no</TT> - Have not found an SNMP method to get data yet.
+            <LI><TT>yes</TT> - Can get through normal SWITCH-MIB method.
+            <LI><TT>vlan</TT> - Have to re-connect to each VLAN and then fetch with normal
+        method.
+        </UL>
+    </TD>
+</TR>
+<TR>
+    <TD>Modules</TD>
+    <TD>Ability to gather hardware module information.</TD>
+</TR>
+<TR>
+    <TD>Portmac</TD>
+    <TD>Whether the device will list the MAC address of the switch port on each
+        switch port when doing a Macsuck.
+    </TD>
+</TR>
+<TR>
+    <TD>Ver</TD>
+    <TD>SNMP Protocol Version the device has to use.</TD>
+</TR>
+<TR>
+    <TD>Vlan</TD>
+    <TD>Ability to get VLAN port assignments.<BR>
+        <UL>
+            <LI><TT>no</TT> - Have not found an SNMP method to get data yet.
+            <LI><TT>yes</TT> - Can read information.
+            <LI><TT>write</TT> - Can read and write (set).
+        </UL>
+    </TD>
+</TR>
+</TABLE>
+</BODY>
+</HTML>
+end_tail
+    
+}
+
+sub print_headers {
+    print "<TR>\n";
+    foreach my $a (sort sort_nocase keys %$Attributes) {
+        next if $a eq 'note';
+        print "  <TH>$a</TH>\n";
+    }
+    print "</TR>\n";
+}

t/test_class.pl

@@ -0,0 +1,188 @@
+#!/usr/bin/perl -w
+#
+# test_class.pl
+#
+#   Test a device class in SNMP::Info against a device.
+#
+# Max Baker
+#
+# $Id$
+#
+
+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/;
+
+# Default Values
+$Class = '';
+$Dev   = '';
+$Comm  = '';
+$Ver   = 2;
+@Dump  = ();
+$Debug = 0;
+$NoBulk = 0;
+
+GetOptions ('c|class=s'  => \$Class,
+            'd|dev=s'    => \$Dev,
+            's|comm=s'   => \$Comm,
+            'v|ver=i'    => \$Ver,
+            'h|help'     => \&usage,
+            'p|print=s'  => \@Dump,
+            'x|debug+'   => \$Debug,
+            'n|nobulk'   => \$NoBulk,
+           );
+
+&usage unless ($Dev and $Comm);
+
+$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";
+
+print "Dumping : ",join(',',@Dump),"\n"  if scalar @Dump;
+
+%args = ();
+if ($NoBulk) {
+	$args{BulkWalk} = 0;
+}
+
+my $dev = new $Class( 'AutoSpecify' => 0,
+                      'AutoVerBack' => 0,
+                      'Version'     => $Ver,
+                      'Debug'       => $Debug,
+                      'DestHost'    => $Dev,
+                      'Community'   => $Comm,
+			%args
+                    ) or die "\n"; 
+
+print "Connected to $Dev.\n";
+print "It's a ", $dev->device_type(), ".\n";
+    
+my $layers = $dev->layers();
+
+unless (defined $layers){
+    die "Are you sure you got the right community string and version?\nCan't fetch layers.\n";
+}
+
+print "Fetching global info...\n\n";
+
+my @globals = qw/description uptime contact name location layers ports mac serial
+                ps1_type ps2_type ps1_status ps2_status fan slots vendor os os_ver/;
+
+foreach my $global (@globals){
+    test_global($dev,$global);
+}
+
+print "\nFetching interface info...\n\n";
+
+my @fns = qw/interfaces i_type i_ignore i_description i_mtu i_speed i_mac i_up
+             i_up_admin i_name i_duplex i_duplex_admin i_stp_state
+             i_lastchange/;
+
+foreach my $fn (@fns){
+    test_fn($dev,$fn);
+}
+
+print "\nTesting Misc...\n\n";
+my @misc = qw/v_name v_port/;
+foreach my $fn (@misc){
+    test_fn($dev,$fn);
+}
+
+foreach my $fn (@Dump) {
+    test_fn($dev,$fn) unless $Dumped{$fn};
+}
+
+#--------------------------------
+sub test_global {
+    my $dev    = shift;
+    my $method = shift;
+
+    my $value;
+    eval {
+        $value = $dev->$method();
+    };
+    
+    if ($@){
+        my $err = $@;
+        $err =~ s/[[:cntrl:]]+/ /g;
+        printf "%-20s Blew up. $err\n",$method;
+        return 0;
+    }
+    
+    unless (defined $value){
+        printf "%-20s Does not exist.\n",$method;
+        return 0;
+    }
+    $value =~ s/[[:cntrl:]]+/ /g;
+    if (length $value > 60) {
+        $value = substr($value,0,60);
+        $value .= '...';
+    }
+    printf "%-20s %s \n",$method,$value;
+    return 1;
+}
+
+sub test_fn {
+    my $dev = shift;    
+    my $method = shift;
+
+    my $results;
+
+    eval {
+        $results = $dev->$method();
+    };
+
+    if ($@){
+        my $err = $@;
+        $err =~ s/\n/ /g;
+        printf "%-20s Blew up. $err\n",$method;
+        return 0;
+    }
+
+    # If accidentally called on a global, pass it along nicely.
+    if (defined($results) and !ref($results)) {
+	return test_global($dev, $method);
+    }
+    unless (defined $results and scalar keys %$results) {
+        printf "%-20s Empty Results.\n",$method;
+        return 0;
+    }
+
+    printf "%-20s %d rows.\n",$method, scalar(keys %$results);
+    if (grep(/^$method$/,@Dump)) {
+        $Dumped{$method} = 1;
+        foreach my $iid (keys %$results){
+            print "  $iid : ";
+	    if (ref($results->{$iid}) eq 'ARRAY') {
+		print "[ ", join(", ", @{$results->{$iid}}), " ]";
+	    } else {
+		print $results->{$iid};
+	    }
+	    print "\n";
+        }
+    }
+    return 1;
+}
+
+sub usage {
+    print << "end_usage";
+
+test_class - Test a device against an SNMP::Info class
+    -c  --class  Layer2::Catalyst
+    -d  --dev    myswitch
+    -s  --comm   public
+    -v  --ver    2
+    -p  --print  i_blah
+    -p  --print  i_blah2
+    -x  --debug  debugging flag
+    -n  --nobulk disable bulkwalk
+
+end_usage
+    exit;
+}