release 3.66

some files were missing eol at the end
whitespace
2019-03-24 09:43:31 +00:00 · 2019-03-24 04:16:24 +01:00 · 2019-03-24 03:07:36 +01:00 · 2019-03-24 01:59:25 +01:00 · 2019-03-19 06:55:38 +01:00 · 2019-03-12 12:24:39 +00:00
292 changed files with 33267 additions and 5856 deletions
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -0,0 +1,41 @@
+<!--- Provide a general summary of the issue in the Title above -->
+<!--- https://guides.github.com/features/mastering-markdown/#examples -->
+
+## Expected Behavior
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->
+
+## Current Behavior
+<!--- If describing a bug, tell us what happens instead of the expected behavior -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for bugs)
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant, or attach screenshots -->
+1. 
+2. 
+3. 
+4. 
+
+## Context
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Your Device
+<!--- Some basic info about your device will help out pinpointing the issue more easily -->
+<!--- also, snmpwalk output of the following oid helps out a lot: .1.3.6.1.2.1.1 -->
+<!--- this is the system leaf of the snmp mib-2 -->
+* Vendor:
+* Device Model:
+* Operating System Version:
+* Snmpwalk output of .1.3.6.1.2.1.1:
+
+
+## Your Environment
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+* SNMP::Info version used: 
+* Netdisco version (if used): 
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,12 @@
-*.db
+*.swp
+*.pid
+test.pl
+MYMETA.*
+*.tar.gz
+MANIFEST.*
+*.komodo*
+Makefile*
+Build
+_build
+blib
+cover_db
--- a/t/.perltidyrc
+++ b/t/.perltidyrc
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,34 @@
+language: perl
+addons:
+  apt:
+    packages:
+      - jq
+      - libsnmp-dev
+branches:
+  only:
+    - /^3\.\d{2}$/
+    - 'master'
+before_install:
+  - mkdir ~/netdisco-mibs
+  - cd ~/netdisco-mibs
+install:
+  - curl -sL https://github.com/netdisco/netdisco-mibs/releases/download/4.014/netdisco-mibs.tar.gz | tar --strip-components=1 -zxf -
+  - cpanm --quiet --notest PkgConfig Test::CChecker Alien::zlib::Static Alien::OpenSSL::Static Alien::SNMP
+before_script:
+  - 'cd ${TRAVIS_BUILD_DIR}'
+script:
+  - >
+    perl Build.PL &&
+    PERL_MM_USE_DEFAULT=1 ./Build installdeps --cpan_client 'cpanm --quiet --notest' &&
+    ./Build test --test_files t/ --test_files xt/
+notifications:
+  irc:
+    on_success: always
+    on_failure: always
+    channels:
+      - 'chat.freenode.net#netdisco'
+  email:
+    on_success: always
+    on_failure: always
+    recipients:
+      - 'snmp-info-cvs@lists.sourceforge.net'
--- a/Build.PL
+++ b/Build.PL
@@ -0,0 +1,53 @@
+use strict;
+use warnings;
+use Module::Build;
+
+Module::Build->new(
+  module_name => 'SNMP::Info',
+  license     => 'bsd',
+  dist_author => 'Eric A. Miller <emiller@cpan.org>',
+  # dynamic_config => 1,
+  create_readme => 1,
+  configure_requires => {
+    'Module::Build' => '0.42',
+  },
+  # build_requires => {
+  # },
+  requires => {
+    'SNMP' => '0',
+    'Math::BigInt' => '0',
+    'NetAddr::IP' => '4.068',
+  },
+  recommends => {
+    'PPI' => '0',
+    'Class::ISA' => '0',
+    'Module::Info' => '0',
+    'Module::Load' => '0',
+    'File::Slurp' => '0',
+  },
+  test_requires => {
+    'Test::More' => '0.88',
+    'Test::Distribution' => '0',
+    'Test::Class::Most'  => '0',
+    'Test::MockObject::Extends' => '0',
+    'File::Find' => '0',
+    'Path::Class' => '0',
+    'File::Slurper' => '0',
+    'Test::Exception' => '0.43',
+    'Class::Inspector' => '0',
+    'NetSNMP::default_store' => '0',
+    'Module::Find' => '0',
+  },
+  # script_files => [
+  # ],
+  # share_dir => 'share',
+  meta_merge => {
+    resources => {
+      homepage => 'http://netdisco.org/',
+      bugtracker => 'https://github.com/netdisco/snmp-info/issues',
+      repository => 'https://github.com/netdisco/snmp-info',
+      MailingList => 'https://lists.sourceforge.net/lists/listinfo/snmp-info-users',
+      IRC => 'irc://irc.freenode.org/#netdisco',
+    },
+  },
+)->create_build_script;
--- a/764
+++ b/764
@@ -1,4 +1,697 @@
-SNMP::Info - Friendly OO-style interface to Network devices using SNMP.
+Version 3.66 (2019-03-24)
+
+  [NEW FEATURES]
+
+  * #316 add support for IS-IS routing protocol (pyro3d)
+
+  [ENHANCEMENTS]
+
+  * switch to Alien::SNMP for travis builds (ollyg)
+
+  [BUG FIXES]
+
+  * clarify MRO usage
+
+Version 3.65 (2019-02-24)
+
+  [ENHANCEMENTS]
+
+  * #296 expand CiscoAgg to also include LACP (inphobia)
+  * #308 update VyOS enterprise OID
+  * #310 bring layer3::oneaccess up to date for oneos6. (inphobia)
+  * Add two more HP 2930F models (JeroenvIS)
+
+  [BUG FIXES]
+
+  * #295 make CiscoAgg return ifindex instead of bp_index (inphobia)
+  * more documentation fixes + whitespace cleanup in all files
+
+Version 3.64 (2018-12-30)
+
+  [NEW FEATURES]
+
+  * #283 support for Exinda/GFI traffic shapers (inphobia)
+
+  [ENHANCEMENTS]
+
+  * #282 Aerohive base MAC lookup (inphobia)
+
+  [BUG FIXES]
+
+  * many documentation fixes (inphobia)
+
+Version 3.63 (2018-11-25)
+
+  [ENHANCEMENTS]
+
+  * #280 update to retrieve Aerohive serial (inphobia / nick n.)
+  * #271 update os_ver for Alcatel-Lucent (stromsoe)
+
+  [BUG FIXES]
+
+  * #273 remove old ADTRAN modules not in netdisco-mibs
+
+Version 3.62 (2018-10-29)
+
+  [ENHANCEMENTS]
+
+  * #278 Support for Cisco Firepower Threat Defense
+  * #275 Document peth_port_ifindex for Junipers
+  * #274 Add peth_port_ifindex override for Junipers
+  * #270 Add support for additional Mikrotik models
+  * Add HP 3810M, 2930M, 2930F and 2540 series switches
+
+  [BUG FIXES]
+
+  * #265 Fix typos in L3::Huawei
+
+Version 3.61 (2018-05-09)
+
+  [ENHANCEMENTS]
+
+  * #255 IPv6 support - Set the transport-specifier if given an IPv6 address
+  * #195 IP address table - IPv4 Address Table will use the
+     IP-MIB::ipAddressTable if the deprecated IP-MIB::ipAddrTable doesn't
+     return results
+
+  [BUG FIXES]
+
+  * #261 EIGRP Peer Neighbor Formatting / Munge
+  * #252 Unpack binary MAC if present in cdp_port
+  * Fix SNMPv1 cdp_run check
+
+Version 3.60 (2018-05-06)
+
+  [ENHANCEMENTS]
+
+  * #263 detect Aerohive ap250 & ap230 models (inphobia)
+
+  [BUG FIXES]
+
+  * #140 LLDP fixes - treat remote port type of 'local' as an interface name if
+    the remote port id doesn't look like an index
+  * Fix potential issue in enumeration of LLDP reported system capabilities
+    supported by the remote system due to the 'lldpRemSysCapSupported' leaf
+    name being defined in multiple MIBs
+
+Version 3.59 (2018-05-01)
+
+  [NEW FEATURES]
+
+  * #214 SNMP::Info Device models Genua, ATMedia, Liebert
+
+  [ENHANCEMENTS]
+
+  * Capture base MAC in L3::Huawei
+  * Change _lldp_addr_index to a method so it can be properly overridden in
+    subclasses
+
+  [BUG FIXES]
+
+  * Capture fan ans power supply status in L3::Huawei when description is
+    not available
+
+Version 3.58 (2018-04-29)
+
+  [NEW FEATURES]
+
+  * #202 Support for Aerohive access points
+
+  [ENHANCEMENTS]
+
+  * #220 Alcatel-Lucent / Nokia SR 7750 missing port information. Add duplex,
+    fan, and power supply status, as well as, module inventory to L3::Timetra
+  * Add fan and power supply status to L3::Huawei
+  * Override ifMTU with max frame size when applicable in L3::Huawei
+
+  [BUG FIXES]
+
+  * Correct POE power module to port mapping in L3::Huawei
+
+Version 3.57 (2018-04-26)
+
+  [ENHANCEMENTS]
+
+  * #145 Patch for Huawei (robwwd)
+  * #228 Huawei aggregate link support
+  * POE and duplex admin support added to L3::Huawei
+  * Significant performance improvement validating AUTOLOAD methods
+
+  [BUG FIXES]
+
+  * IEEE802dot3ad portlist is indexed with a dot1dBasePort, cross reference
+    with dot1dBasePortIfIndex
+  * Fix for macsuck in Cisco classes introduced in 3.55 caused by inheritance
+    issue in CiscoStack
+
+Version 3.56 (2018-04-22)
+
+  [BUG FIXES]
+
+  * Fix table methods when defined as an OID which will not completely
+    translate to a fully qualified textual leaf
+
+Version 3.55 (2018-04-19)
+
+  [NEW FEATURES]
+  * #260 Oneaccess (robwwd)
+  * #259 Add ERX (Old Juniper E-Series JunOSe) Support (robwwd)
+  * #258 Add support for Arbor devices (robwwd)
+  * #253 Nexans switch support (paecker)
+  * #142 Sixnet Switch Support
+
+  [ENHANCEMENTS]
+
+  * #117 Recognition for HP Blade switches (J R Binks)
+  * #196 Support for powerconnect 8164F
+  * Refactor Layer3::Dell for better support of newer models
+  * Increase capture of i_vlan on router interfaces in L3::Cisco
+  * Factor out logic to determine serial number from ENTITY-MIB in Layer2 and
+    Layer3 to new method entity_derived_serial in Entity class and added new
+    method entity_derived_os_ver in Entity class to determine OS version
+    in a similar manner
+
+  [BUG FIXES]
+
+  * #67 Juniper EX4300 Missing/Wrong information
+  * #61 ZyXEL (X)GS1900 family MIB - Fix loop in layers method
+  * Fix ISA in AMAP and EDP classes
+  * Add missing MIB in L2::Trapeze, L2::NWSS2300, and L3::Dell
+  * Fix gigabit logic in i_duplex_admin() of CiscoStack
+  * Prevent potential undefined warnings in i_speed_admin() of L2::C2900 and
+    ports() of L3::C3550
+  * Correct validation and IID/key used in mau_set_i_speed_admin() and
+    mau_set_i_duplex_admin() of MAU
+  * Correct typo in MIB leaf names in L3::Aironet
+  * Don't use MIB leafs that are not-accessible according to MIB
+    NOTE: Fixing this logic now results in methods on MIB leafs specified as
+    not-accessible failing validation in _validate_autoload_method()
+
+Version 3.54 (2018-04-01)
+
+  [NEW FEATURES]
+
+  * #141 Avocent ACS files for correct discovery in Netdisco
+  * Add support for Avocent ACS 5K/6K/8K terminal servers in Layer1::Cyclades
+
+  [ENHANCEMENTS]
+
+  * #215 Nokia/Alcatel-Lucent 7705 LLDP
+  * #220 Alcatel-Lucent / Nokia SR 7750 missing neighbors
+  * Improve Layer3::Timetra model detection
+
+  [BUG FIXES]
+
+  * Fix logic in Layer1::Asante i_up() method
+  * Fix MIB leaf typo in IPv6
+  * Don't use MIB leafs that are not-accessible according to MIB
+  * Fix logic for determining if MIB leaf supports set operations
+    NOTE: Fixing this logic now results in methods starting with set_ on MIB
+    leafs without Write or Create access failing validation in
+    _validate_autoload_method()
+
+Version 3.53 (2018-03-22)
+
+  [NEW FEATURES]
+
+  * #12 add Cisco PortFast support via CiscoStpExtensions::i_faststart_enabled
+
+  [ENHANCEMENTS]
+
+  * Report serial/version on Netgear FSM (paecker)
+  * Add test harness and expand developer test coverage
+  * Add back the base (RFC) MIBs for when net-snmp does not have them builtin
+
+  [BUG FIXES]
+
+  *  Fix AUTOLOAD / can() bug that could result in DESTROY being redefined and
+     dynamic methods not being added to the symbol table.
+
+version 3.52 (2018-03-19)
+
+  [ENHANCEMENTS]
+
+  * set fallback for nonmatching interfaces in Cumulus class
+  * better interface naming for Ubiquiti
+  * modify mock utility to work under a perlbrew environment
+
+version 3.50 (2018-03-14)
+
+  [ENHANCEMENTS]
+
+  * #198 Add Support for Gigamon devices
+
+  [BUG FIXES]
+
+  * #226 Avaya VSP devices - no ifAlias
+  * #227 Remove bogus can() check in _set()
+  * Fix SNMP::Info::IEEE802dot3ad when more than 1 LAG
+
+version 3.49 (2018-03-03)
+
+  [ENHANCEMENTS]
+
+  * Better Layer3::Cumulus interface naming
+
+  [BUG FIXES]
+
+  * Use GitHub for MIBs download for testing, instead of sf.net
+
+version 3.48 (2018-03-03)
+
+  [ENHANCEMENTS]
+
+  * Add Layer3::Cumulus for Cumulus Networks devices
+
+version 3.47 (2018-02-27)
+
+  [ENHANCEMENTS]
+
+  * Add LLDP-MIB::lldpXMedRemInventoryTable methods
+
+version 3.46 (2018-02-17)
+
+  [ENHANCEMENTS]
+
+  * Add method to get err-disable cause for interfaces on Cisco
+
+version 3.45 (2018-02-14)
+
+  [ENHANCEMENTS]
+
+  * Enable Layer3::Foundry for Brocade VDX platform
+
+  [BUG FIXES]
+
+  * #222 #238 #239 handle BayStack switches with port index 128 (zoeloe)
+
+version 3.44 (2018-02-12)
+
+  [ENHANCEMENTS]
+
+  * Improve F10 OS version detection (laelly)
+  * Better IPv6 prefix derivation
+
+version 3.43 (2018-02-02)
+
+  [BUG FIXES]
+
+  * Fix identification of Brocade CES
+
+version 3.42 (2018-02-02)
+
+  [ENHANCEMENTS]
+
+  * IPv6 Prefix Length support via IPv6::ipv6_addr_prefixlength
+
+  [BUG FIXES]
+
+  * Fix test for updated snmplabs.com data
+
+version 3.41 (2018-02-01)
+
+  [BUG FIXES]
+
+  * Fixes to distriution metadata
+
+version 3.40 (2018-01-28)
+
+  [ENHANCEMENTS]
+
+  * #240 Support for CheckPoint devies through SNMP
+  * #240 Cisco SB switches fixup
+  * #244 Add Adtran support
+  * #241 Vyatta/VyOS support
+  * #246 Nexus VRF support (works with Netdisco)
+  * #244 Improve Juniper model reporting
+  * #240 Improve H3C reporting
+
+  [BUG FIXES]
+
+  * #243 Nexus additional debug lines should be hidden
+
+version 3.39 (2017-12-17)
+
+  [ENHANCEMENTS]
+
+  * #236 Enhanced Ubiquiti device support (L. Begnaud)
+  * add HP J9774A model (H. Teulahti)
+
+  [BUG FIXES]
+
+  * fix scripts (F. Mass)
+  * fix CiscoASA typos (laelly)
+
+version 3.38 (2017-10-23)
+
+  [ENHANCEMENTS]
+
+  * Layer2::Airespace several newer 802.11 data rates added
+
+  [BUG FIXES]
+
+  * #232 Improve generic Info::Layer3 serial number detection
+
+version 3.37 (2017-07-11)
+
+  [ENHANCEMENTS]
+
+  * Layer3::Juniper fixed to return os_ver for JUNOS 14.x and higher
+
+version 3.36 (2017-06-28)
+
+  [ENHANCEMENTS]
+
+  * Migrate to Module::Build for distribution maintenance
+
+version 3.35 (2017-06-28)
+
+  [ENHANCEMENTS]
+
+  * Include loading of LLDP-EXT-MED-MIB in LLDP.pm
+
+  [BUG FIXES]
+
+  * #180 support CiscoConfig on Nexus (sf.net:scratchfury)
+  * #50 remove interface specific part from vrf interfaces on IOS (W. Vandersmissen)
+  * #211 f5 class should respect UseEnums when faking i_type
+
+version 3.34 (2016-11-20)
+
+  [ENHANCEMENTS]
+
+  * Support Cisco IPS Modules homed on the Cisco ASA (M. Kraus)
+
+  [BUG FIXES]
+
+  * Serial number on Nexus 9372 (genereic check for ID before using) (M. Caines)
+
+version 3.33 (2016-04-27)
+
+  [ENHANCEMENTS]
+
+  * Move author-only tests to xt directory so they aren't run on installation
+    by users
+
+  [BUG FIXES]
+
+  * Correct device serial number reporting for Cisco Nexus 5k switches with
+    software version >= 7
+
+version 3.32 (2016-04-26)
+
+  [ENHANCEMENTS]
+
+  * Add 200 Mbps and 2.0 Gbps aliases to SPEED_MAP
+  * Add Palo Alto support
+  * Add VMware support
+  * Support for propMultiplexor as ifType
+  * Add device MAC to APC UPS
+  * [#61] Report APC model for PDU products
+  * Removed DeviceMatrix from the distribution
+
+  [BUG FIXES]
+
+  * Support undefined (noSuchInstance) values in Offline mode
+  * Do not init table cache if Cache provided by user
+  * Avoid deep recusion when AUTOLOAD and carp collide
+  * Detect Cisco VG350s as L3 devices instead of APs
+  * fix for 'Use of inherited AUTOLOAD for non-method SNMP::Info::Layer2::HP::agg_ports_ifstack() is deprecated'
+  * Workaround in IPv6.pm to deal with possibly incorrect IPV6-MIB implementations
+  * [#71] AUTOLOAD typo-catcher search for SNMP::Info no longer anchored
+  * [#70] Respect version/comm/secname on passed Session obj
+
+version 3.31 (2016-01-22)
+
+  [ENHANCEMENTS]
+
+  * Support for CiscoSB OS and Version (D. Tuecks)
+  * SONMP support for Enhanced Topology Table
+  * Add support for channelized interfaces in L3::Passport
+
+  [BUG FIXES]
+
+  * Correct link to MIB tarball
+
+version 3.30 (2015-11-16)
+
+  [ENHANCEMENTS]
+
+  * RT #106254: Add new sysObjectID mapping for Ubiquiti
+
+  [BUG FIXES]
+
+  * Correct link to MIB tarball
+  * Correct port indexing of newer VSP 4K and 8K in L3::Passport
+  * Statistics in the sysIfxStatTable are 64-bit counters, so they should
+    override the 64-bit methods.
+
+version 3.29 (2015-10-13)
+
+  [ENHANCEMENTS]
+
+  * Add IPv6::ipv6_addr() method to map IPv6 interface address indexes to actual addresses
+  * Add support for (remote) IPv6 addresses to LLDP::lldp_addr()
+  * Add LLDP::lldp_ipv6() and LLDP::lldp_mac() so that remote management
+    addresses of specific types can be requested
+
+version 3.28 (2015-06-18)
+
+  [ENHANCEMENTS]
+
+  * Add Layer3::Huawei class for Huawei Quidway switches
+  * Modified generic Layer3::Cisco class: use community based indexing if
+    the device returns a value for vtpVersion
+
+  [BUG FIXES]
+
+  * Correct port indexing of VSP 4K in L3::Passport
+
+version 3.27 (2015-05-05)
+
+  [ENHANCEMENTS]
+
+  * Cisco Aironet PSU information
+  * Only log adding mibdirs at debug level 2
+
+  [BUG FIXES]
+
+  * [#221] Drop Cisco Voice VLAN 4096
+
+version 3.26 (2015-03-07)
+
+  [ENHANCEMENTS]
+
+  * Add fan and psu reporting to Layer3::Dell
+  * Include Voice VLANs in (tagged) VLAN Membership on Cisco devices
+
+  [BUG FIXES]
+
+  * Fix typo in MRO::print_superclasses
+
+version 3.25 (2015-02-25)
+
+  [ENHANCEMENTS]
+
+    * Add new model name mappings for to Layer2::HP
+
+version 3.24 (2015-02-04)
+
+   [ENHANCEMENTS]
+
+    * Support RSTP and ieee8021d STP operating modes in RapidCity
+
+   [BUG FIXES]
+
+    * Fix single instance leafs defined in %FUNCS to behave like table leafs
+    * Fix incorrect FDB ID to VLAN ID mapping in Bridge and L3:Enterasys
+
+version 3.23 (2014-12-09)
+
+   [ENHANCEMENTS]
+
+    * Update MIB used in L1::Asante
+    * Enhanced STP support for L3::Extreme
+
+   [BUG FIXES]
+
+    * Fix Cisco VLAN membership issue introduced in 3.22 related to capturing
+      port VLANs on Cisco interfaces which are configured for trunking but
+      are not in operational trunking mode
+
+version 3.22 (2014-12-02)
+
+   [NEW FEATURES]
+
+    * Support obtaining FDB in Avaya SPBM edge deployments in L2::Baystack
+      NOTE: This requires a RAPID-CITY MIB with the rcBridgeSpbmMacTable
+    * Support for Fortinet devices in new class L3::Fortinet
+
+   [ENHANCEMENTS]
+
+    * Include LLDP support in base Layer2 and Layer3 classes. Due to the
+      widespread adoption of LLDP, this should improve mapping networks
+      when devices aren't supported in a more specific class.
+    * No longer ignore interfaces based on name, in base L2/L3/L7 device
+      classes. For several device classes SNMP::Info will now return tunnel
+      interfaces and/or loopbacks, if present.
+    * Use dot1qVlanCurrentTable if available to capture dynamic and static
+      VLANs, fall back to dot1qVlanStaticTable if not available.
+    * New method i_vlan_membership_untagged() for VLANs transmitted as
+      untagged frames.
+    * Capture Aruba AP hardware and software version when available
+    * New STP methods to support gathering information from devices running
+      mutiple STP instances such as PVST and MST
+    * Enhanced STP support for Avaya and Foundry classes
+
+   [BUG FIXES]
+
+    * [#64] Misdetection: Wireless APs, add products MIB to L2::3Com
+    * Use FDB ID to VID mapping if available to determine end station VLAN
+      rather than assuming they are the same.
+    * Capture port VLANs on Cisco interfaces which are configured for
+      trunking but are not in operational trunking mode
+    * Correct munging of stp_p_port(), i_stp_port(), and stp_root() methods
+      in Bridge
+    * In LLDP.pm don't create a variable in a conditional
+
+version 3.20 (2014-09-08)
+
+   [NEW FEATURES]
+
+    * Override layers in Juniper for routers with switch modules
+
+   [BUG FIXES]
+
+    * Update MANIFEST to include Ubiquiti files
+
+version 3.19 (2014-08-01)
+
+   [NEW FEATURES]
+
+    * Support for Ubiquiti Access Points in new class L2::Ubiquiti (begemot)
+    * Preliminary support for 3Com switches in new class L2::3Com (begemot)
+
+   [BUG FIXES]
+
+    * Fix Avaya detection lldp_port()
+    * Silence uninitialized value warning in L3::Cisco
+    * H3C fixes (begemot)
+    * Only use L2::ZyXEL_DSLAM for ZyXEL DSL modules
+
+version 3.18 (2014-07-02)
+
+   [ENHANCEMENTS]
+
+    * Pseudo ENTITY-MIB methods added to L3::Tasman for hardware information
+    * Capture VPC Keepalive IP addresses in L3::Nexus (jeroenvi)
+    * L2::Netgear inheritance clean up and removal of unnecessary c_* methods
+      defined in Info base class
+
+   [BUG FIXES]
+
+    * Correctly identify device type (class) for instantiated objects which
+      have overridden layers.
+    * [#58] Fix inheritance in L3::FWSM and L3::CiscoASA
+    * [#71] Don't try to match on a false port description in lldp_if
+    * [#54] Possible bad values returned for cdp_id and lldp_port with some HP
+      gear (Joel Leonhardt)
+
+version 3.17 (2014-06-23)
+
+   [ENHANCEMENTS]
+
+    * POD tests are not required for distribution.
+
+version 3.16 (2014-06-23)
+
+   [ENHANCEMENTS]
+
+    * Add method resolution discovery in SNMP::Info::MRO helper module
+    * Consolidate CiscoImage class into CiscoStats class
+    * Clean up inheritance for Cisco classes.  With this change
+      all applicable classes now inherit CiscoAgg, CiscoStpExtensions,
+      CiscoPortSecurity, CiscoPower, and LLDP classes.
+    * Remove inheritance of classes the devices do not support in L3::FWSM
+      and L3::CiscoASA
+
+   [BUG FIXES]
+
+    * Use CiscoVTP methods to get interface VLAN in L3::Cisco rather than
+      solely relying on the interface description.
+
+version 3.15 (2014-07-10)
+
+   [NEW FEATURES]
+
+    * Offline mode and Cache export/priming.
+
+   [ENHANCEMENTS]
+
+    * Return serial number for Cisco 3850 from entPhysicalSerialNum
+
+   [BUG FIXES]
+
+    * Cisco SB serial number probably did not work
+
+version 3.14 (2014-06-07)
+
+   [ENHANCEMENTS]
+
+    * Improvements to Mikrotik module (Alex Z)
+    * Don't unshift length from broken lldpRemManAddrTable implementations (G. Shtern)
+    * 802.3ad LAG support in Layer3::H3C
+    * Add LLDP capabilities to Layer2::HPVC class
+
+   [BUG FIXES]
+
+    * Return correct VLAN info with qb_fw_table() on Layer2::HP
+
+version 3.13 (2014-03-27)
+
+   [ENHANCEMENTS]
+
+    * Cisco PAgP support added to LAG method
+    * HP ProCurve LAG support by inheriting Info::Aggregate class
+
+version 3.12 (2014-02-10)
+
+   [ENHANCEMENTS]
+
+    * Modify L3::Passport to obtain forwarding table information from
+      RAPID-CITY if information is not available in either Q-BRIDGE-MIB or
+      BRIDGE-MIB.  Needed for VSP 9000 prior to version 4.x (Tobias Gerlach)
+
+   [BUG FIXES]
+
+    * [#52] NETSCREEN-IP-ARP-MIB considered harmful
+    * Foundry/Brocade aggreate port master ifIndex resolved properly
+
+version 3.11 (2014-01-26)
+
+   [NEW FEATURES]
+
+    * [#31] port-channel (aggregate) support.  Aggregate support added in new
+      agg_ports() method.  Inital support added for Arista (ifStack),
+      Avaya (MLT), Brocade (MST), and Cisco (802.3ad).
+
+   [ENHANCEMENTS]
+
+    * Use Q-BRIDGE-MIB as default with fallback to BRIDGE-MIB across all
+      classes for the fw_mac, fw_port, and fw_status methods
+    * Additional support for Avaya 8800 series in L3::Passport
+
+   [BUG FIXES]
+
+    * Modify cdp_cap() to handle devices which return space delimited strings
+      for cdpCacheCapabilities rather than hex strings
+    * [#51] Netdisco shows broken topology for devices with no alias entry
+      for primary IP - Collect nsIfMngIp when getting IP interfaces in
+      L3::Netscreen
+    * Fix Extreme XOS i_vlan_membership - Revert [28bbe0], fix bug with
+      untagged being added to @ret twice (Robert Kerr)
+    * Skip default CPU management addresses on VSP and 8800/8600 series in
+      L3::Passport to prevent erroneous duplicate addresses

 version 3.10 (2013-12-16)

@@ -77,7 +770,7 @@ version 3.08 (2013-10-22)
    * [#68] Fix device_port entries for switches with non-unique
      ifDesc (Nic Bernstein)
    * Don't try to munge undef values
-    * [#49] Perl 5.18 UNIVERSAL::can change could cause infinite loop 
+    * [#49] Perl 5.18 UNIVERSAL::can change could cause infinite loop
    * Silence warning from uninitialized variable in L3::Passport e_descr()

 version 3.07 (2013-10-01)
@@ -104,12 +797,11 @@ version 3.05 (2013-08-16)
      Layer2/CiscoSB class
    * Add proper LLDP support to Netgear.pm
    * Change $netgear->interfaces() to use ifName rather than ifDescr
-      as the former is unique per interface while the latter is not.  
+      as the former is unique per interface while the latter is not.
      If ifName is not present, concatenate ifDescr and ifIndex
      to achieve a unique value.
    * Properly report hardware version, Serial No. and OS Version for
      Netgear.
-    

 version 3.03 (2013-07-11)

@@ -139,7 +831,7 @@ version 3.01 (2013-04-13)
      they can be called directly, sonmp_ip(), cdp_ip(), etc.
    * L2::Bay and L2::Foundry have been removed from the distribution.  Both
      classes were depreciated and all functionality is available through
-      L2::Baystack and L3::Foundry. 
+      L2::Baystack and L3::Foundry.

    [NEW FEATURES]

@@ -169,7 +861,7 @@ version 3.01 (2013-04-13)

    [ENHANCEMENTS]

-    * UNIVERSAL::can() now works with dynamic methods 
+    * UNIVERSAL::can() now works with dynamic methods
    * Dynamically generated methods are added to symbol table to avoid
      AUTOLOAD on subsequent calls
    * L2::Airespace now supports 802.11n client tx rates
@@ -201,20 +893,20 @@ version 2.09 (2012-11-28)
    * New method i_ssidmac() to get BSSID's from AP's with initial support
      in L2::Aironet and Airespace classes
    * Support for Avaya Secure Routers in new class L3::Tasman
-    * Add EDP and LLDP L2 Topology to L3::Extreme 
+    * Add EDP and LLDP L2 Topology to L3::Extreme
    * [3185393] Support for Juniper SSL VPN in new class L7::Neoteris
-    * [3381027] Support for Cisco Nexus in new class L3::Nexus   
+    * [3381027] Support for Cisco Nexus in new class L3::Nexus
    * [1424336] Support for Extreme Discovery Protocol (EDP)
-    
+
    [ENHANCEMENTS]

-    * [3017571] Add LLDP support for NetSNMP device class (begemot) 
+    * [3017571] Add LLDP support for NetSNMP device class (begemot)
    * [3418918] Extreme devices now report OS as either extremeware or xos
    * [2809045] Strip preceding netscreen from model name in L3::Netscreen
    * [] Classify Linksys 2024 as L3::Dell (Rogier Krieger)
-    
+
    [BUG FIXES]
-    
+
    * Fixed logic to return cached data for table methods when available and
      not a partial fetch
    * Fix typo in PoD for Bridge.pm and CiscoConfig.pm (William Bulley)
@@ -234,7 +926,7 @@ version 2.08 (2012-07-15)

    * Pseudo ENTITY-MIB methods added to L3::Juniper for hardware information
    * Add method to report current transmit power of the radio interface,
-      dot11_cur_tx_pwr_mw(), in Airespace class 
+      dot11_cur_tx_pwr_mw(), in Airespace class
    * [3085411] Activate L3 properties for Netgear GSM7224v2 (phishphreek)
    * [3085413] SNMP OIDs for Netgear Serial and OS Ver (phishphreek)
    * [3286549] Dell LLDP Support (Nico Giefing)
@@ -283,7 +975,7 @@ version 2.06 (2011-09-28)
    * [3344843] Fix returning serial() and os_ver() for web-managable HP
      switches, introduced by HP/HP4000 class split, reported by J R Binks
    * [2809033] Put L2-only Cisco blade switches in L3::C6500
-    * [3408506] Fix uninitialized value in IPv6 when neighbor state is 
+    * [3408506] Fix uninitialized value in IPv6 when neighbor state is
      incomplete (Michael Borgelt)

 version 2.05 (2011-06-23)
@@ -299,13 +991,13 @@ version 2.04 (2011-03-31)
      (Brian De Wolf)
    + Added L3::Pf for FreeBSD PFSense Firewalls (max)
    * Added specific functions for neighbor mgmt addresses to CDP class
-    * Implemented os_bin() method in CiscoStats 
+    * Implemented os_bin() method in CiscoStats
    + [2980787] Fix for C1900 bp_index not containing interfaces.
      (Brian De Wolf)
    + [2599795] Added vendor_i_type() method to HP and HP4000 clases
    + [2688801] Minor modification for obscure Proxim/Orinoco device
      (jrbinks)
-    + [3051443] Add PoE measured power per port to Cisco, Extrme and HP 
+    + [3051443] Add PoE measured power per port to Cisco, Extrme and HP
      classes (jeroenvi)
    * Minor tweaks to support devices without sysServices
    * Added Cisco CBS3xxx blade switches to L3::C6500
@@ -343,7 +1035,7 @@ version 2.00 (08/01/08)
    + Support for Alcatel-Lucent Service Router via L3::Timetra
    + Support for Alcatel-Lucent OmniAccess via L2::Aruba

-    * Silence warnings in MAU due to uninitialized variables 
+    * Silence warnings in MAU due to uninitialized variables

 version 1.09 (07/22/08) - Beta/developer release
    + Added support for HP ProCurve Foundry OEM switches, such as the 9300
@@ -367,7 +1059,7 @@ version 1.09 (07/22/08) - Beta/developer release
    + Add support to specify MIB to resolve leaf names conflicts in
      %GLOBALS and %FUNCS.
    + Added munge_port_list() and modify_port_list() methods to assist in
-      working with PortList objects. 
+      working with PortList objects.
    + Added set_multi() method to enable a SNMP set command on several new
      values in one request.  Required for complex set operations
      on some agents.
@@ -394,7 +1086,7 @@ version 1.05 (11/25/07) - CVS only. No official release
      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 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)
@@ -405,7 +1097,7 @@ version 1.05 (11/25/07) - CVS only. No official release
    + 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örger)
+      Business Ethernet Switches (David Siebö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
@@ -418,7 +1110,7 @@ version 1.05 (11/25/07) - CVS only. No official release
    + 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. 
+      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.
@@ -480,14 +1172,14 @@ 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).  
+    *  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 
+    * 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
@@ -553,15 +1245,15 @@ version 1.0 (04/07/06) - CVS only. No official release
      translated properly

 verison 0.9 (11/15/04)
-    + ** Added full Nortel/Bay/BayStack support 
-        by new developer Eric Miller.  
+    + ** 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 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.
@@ -611,27 +1303,27 @@ version 0.6 (06/18/03)

 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 
+      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.  
+    * 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 
+    * 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.
    * Globals are now cached
-    * Added new argument 'AutoSpecify' to new() to auto-connect with subclass 
+    * Added new argument 'AutoSpecify' to new() to auto-connect with subclass
      detected in device_type()
    * New method specify() returns a new subclass object
    * Subclasses are automatically loaded when specify or autospecify is used!
    * Added methods for Interface statistics (ifInOctets ...)
-    * Added methods for Memory and CPU statistics 
+    * Added methods for Memory and CPU statistics
    * Added SNMP::Info::Entity, moved out of L2-HP
    * Added SNMP::Info::Layer2::Aironet

@@ -644,7 +1336,7 @@ version 0.3 (03/06/03)
      Thanks to Martin Lorensen <martin /at- lorensen.dk>
    * Removed requirement for SNMP in the Makefile.PL and moved it to t/prereq.t
      so that the Module will install via CPAN without trying to install the old
-      4.2.0 version of SNMP on CPAN.  Will now fail in the test phase. 
+      4.2.0 version of SNMP on CPAN.  Will now fail in the test phase.
      Thanks again to Martin Lorensen <martin /at- lorensen.dk>
    * Moved tests from test.pl to t/*

@@ -654,10 +1346,10 @@ version 0.2 (02/19/03)
    * Fixed HP Detection in device_type()
    * 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 
+    * Added poke for Bay 450 Switches
    * Mapped HP Part Numbers to model numbers J4812A => 2512 in
      SNMP::Info::Layer2::HP
-     
+
 version 0.1 (12/30/02)
    * Initial Release
    * SubClasses Included:
@@ -667,13 +1359,13 @@ version 0.1 (12/30/02)
        * SNMP::Info::MAU
        * SNMP::Info::Layer1
              o SNMP::Info::Layer1::Allied
-              o SNMP::Info::Layer1::Asante 
+              o SNMP::Info::Layer1::Asante
        * SNMP::Info::Layer2
              o SNMP::Info::Layer2::Bay
              o SNMP::Info::Layer2::C1900
              o SNMP::Info::Layer2::C2900
              o SNMP::Info::Layer2::Catalyst
-              o SNMP::Info::Layer2::HP 
+              o SNMP::Info::Layer2::HP
        * SNMP::Info::Layer3
              o SNMP::Info::Layer3::Aironet
              o SNMP::Info::Layer3::Foundry
--- a/DeviceMatrix.txt
+++ b/DeviceMatrix.txt
--- a/Info/Layer1/Cyclades.pm
+++ b/Info/Layer1/Cyclades.pm
@@ -1,444 +0,0 @@
-# SNMP::Info::Layer1::Cyclades
-# $Id$
-#
-# Copyright (c) 2008 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::Layer1::Cyclades;
-
-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/;
-
-$VERSION = '3.10';
-
-%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 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 F<CYCLADES-ACS-SYS-MIB>
-
-=item F<CYCLADES-ACS-CONF-MIB>
-
-=item F<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()
-
-(C<cyACSversion>)
-
-=item $cyclades->serial()
-
-(C<cyACSDevId>)
-
-=item $cyclades->root_ip()
-
-(C<cyEthIPaddr>)
-
-=item $cyclades->ps1_status()
-
-(C<cyACSPw1>)
-
-=item $cyclades->ps2_status()
-
-(C<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 (C<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
-C<cySPortSocketPort> to avoid conflicts with C<ifIndex>.  
-
-=item $cyclades->interfaces()
-
-Returns reference to map of IIDs to physical ports.  Extended to include
-serial ports, C<cyISPortTty>.
-
-=item $cyclades->i_speed()
-
-Returns interface speed.  Extended to include serial ports, C<cyISPortSpeed>. 
-
-=item $cyclades->i_up()
-
-Returns link status for each port.  Extended to include serial ports,
-C<cyISPortSigCD>.
-
-=item $cyclades->i_description()
-
-Returns description of each port.  Extended to include serial ports,
-C<cyISPortName>.
-
-=item $cyclades->i_name()
-
-Returns name of each port.  Extended to include serial ports, C<cyISPortName>.
-
-=back
-
-=head2 Table Methods imported from SNMP::Info::Layer1
-
-See L<SNMP::Info::Layer1/"TABLE METHODS"> for details.
-
-=cut
--- a/Info/Layer3/Nexus.pm
+++ b/Info/Layer3/Nexus.pm
@@ -1,494 +0,0 @@
-# SNMP::Info::Layer3::Nexus
-#
-# Copyright (c) 2012 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::Nexus;
-
-use strict;
-use Exporter;
-use SNMP::Info::LLDP;
-use SNMP::Info::CDP;
-use SNMP::Info::CiscoImage;
-use SNMP::Info::CiscoPortSecurity;
-use SNMP::Info::CiscoConfig;
-use SNMP::Info::CiscoPower;
-use SNMP::Info::Layer3;
-use SNMP::Info::CiscoStpExtensions;
-use SNMP::Info::CiscoVTP;
-
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
-
-# NOTE : Top-most items gets precedence for @ISA
-@SNMP::Info::Layer3::Nexus::ISA = qw/
-    SNMP::Info::CiscoVTP 
-    SNMP::Info::CiscoStpExtensions
-    SNMP::Info::LLDP
-    SNMP::Info::CDP 
-    SNMP::Info::CiscoImage
-    SNMP::Info::CiscoPortSecurity
-    SNMP::Info::CiscoConfig
-    SNMP::Info::CiscoPower
-    SNMP::Info::Layer3
-    Exporter
-/;
-
-@SNMP::Info::Layer3::Nexus::EXPORT_OK = qw//;
-
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
-
-$VERSION = '3.10';
-
-# NOTE: Order creates precedence
-#       Example: v_name exists in Bridge.pm and CiscoVTP.pm
-#       Bridge is called from Layer3 and CiscoStpExtensions
-#       So we want CiscoVTP to come last to get the right one.
-# The @ISA order should be reverse of these orders.
-
-%MIBS = (
-    %SNMP::Info::Layer3::MIBS,
-    %SNMP::Info::CiscoPower::MIBS,
-    %SNMP::Info::CiscoConfig::MIBS,
-    %SNMP::Info::CiscoPortSecurity::MIBS,
-    %SNMP::Info::CiscoImage::MIBS,
-    %SNMP::Info::CDP::MIBS,
-    %SNMP::Info::LLDP::MIBS,
-    %SNMP::Info::CiscoStpExtensions::MIBS, 
-    %SNMP::Info::CiscoVTP::MIBS,
-    'CISCO-ENTITY-VENDORTYPE-OID-MIB' => 'cevMIBObjects',
-);
-
-%GLOBALS = (
-    %SNMP::Info::Layer3::GLOBALS,
-    %SNMP::Info::CiscoPower::GLOBALS,
-    %SNMP::Info::CiscoConfig::GLOBALS,
-    %SNMP::Info::CiscoPortSecurity::GLOBALS,
-    %SNMP::Info::CiscoImage::GLOBALS,
-    %SNMP::Info::CDP::GLOBALS,
-    %SNMP::Info::LLDP::GLOBALS,
-    %SNMP::Info::CiscoStpExtensions::GLOBALS,
-    %SNMP::Info::CiscoVTP::GLOBALS,
-    'mac' => 'dot1dBaseBridgeAddress',
-);
-
-%FUNCS = (
-    %SNMP::Info::Layer3::FUNCS,
-    %SNMP::Info::CiscoPower::FUNCS,
-    %SNMP::Info::CiscoConfig::FUNCS,
-    %SNMP::Info::CiscoPortSecurity::FUNCS,
-    %SNMP::Info::CiscoImage::FUNCS,
-    %SNMP::Info::CDP::FUNCS,
-    %SNMP::Info::LLDP::FUNCS,
-    %SNMP::Info::CiscoStpExtensions::FUNCS, 
-    %SNMP::Info::CiscoVTP::FUNCS,    
-);
-
-
-%MUNGE = (
-    %SNMP::Info::Layer3::MUNGE,
-    %SNMP::Info::CiscoPower::MUNGE,
-    %SNMP::Info::CiscoConfig::MUNGE,
-    %SNMP::Info::CiscoPortSecurity::MUNGE,
-    %SNMP::Info::CiscoImage::MUNGE,         
-    %SNMP::Info::CDP::MUNGE,
-    %SNMP::Info::LLDP::MUNGE,
-    %SNMP::Info::CiscoStpExtensions::MUNGE, 
-    %SNMP::Info::CiscoVTP::MUNGE,    
-);
-
-sub cisco_comm_indexing { return 1; }
-
-sub vendor {
-    return 'cisco';
-}
-
-sub os {
-    return 'nx-os';
-}
-
-sub os_ver {
-    my $nexus = shift; 
-    my $descr = $nexus->description();
-    
-    return $1 if ( $descr =~ /\),\s+Version\s+(.+?),/ );
-    return $descr;
-}
-
-sub serial {
-    my $nexus = shift;
-
-    my $e_parent = $nexus->e_parent();
-
-    foreach my $iid ( keys %$e_parent ) {
-	my $parent = $e_parent->{$iid};
-        if ($parent eq '0') {
-	    my $serial = $nexus->e_serial($iid);
-	    return $serial->{$iid};
-	}
-    }    
-    return;
-}
-
-# sysObjectID returns an IID to an entry in the CISCO-ENTITY-VENDORTYPE-OID-MIB.
-# Look it up and return it.
-sub model {
-    my $nexus = shift;
-    my $id    = $nexus->id();
-
-    unless ( defined $id ) {
-        print
-            " SNMP::Info::Layer3::Nexus::model() - Device does not support sysObjectID\n"
-            if $nexus->debug();
-        return;
-    }
-
-    my $model = &SNMP::translateObj($id);
-
-    return $id unless defined $model;
-
-    $model =~ s/^cevChassis//i;
-    return $model;
-}
-
-# Reported version 6.x of NX-OS doesn't use the IPv4 address as index
-# override methods in ipAddrTable
-sub ip_table {
-    my $nexus         = shift;
-    my $orig_ip_table = $nexus->orig_ip_table();
-
-    my %ip_table;
-    foreach my $iid ( keys %$orig_ip_table ) {
-	my $ip = $orig_ip_table->{$iid};
-	next unless defined $ip;
-
-	$ip_table{$ip} = $ip;
-    }
-    return \%ip_table;
-}
-
-sub ip_index {
-    my $nexus         = shift;
-    my $orig_ip_table = $nexus->orig_ip_table();
-    my $orig_ip_index = $nexus->orig_ip_index();
-
-    my %ip_index;
-    foreach my $iid ( keys %$orig_ip_table ) {
-	my $ip    = $orig_ip_table->{$iid};
-	my $index = $orig_ip_index->{$iid};
-
-	next unless ( defined $ip && defined $index );
-
-	$ip_index{$ip} = $index;
-    }
-    return \%ip_index;
-}
-
-sub ip_netmask {
-    my $nexus           = shift;
-    my $orig_ip_table   = $nexus->orig_ip_table();
-    my $orig_ip_netmask = $nexus->orig_ip_netmask();
-
-    my %ip_netmask;
-    foreach my $iid ( keys %$orig_ip_table ) {
-	my $ip      = $orig_ip_table->{$iid};
-	my $netmask = $orig_ip_netmask->{$iid};
-
-	next unless ( defined $ip && defined $netmask );
-
-	$ip_netmask{$ip} = $netmask;
-    }
-    return \%ip_netmask;
-}
-
-sub ip_broadcast {
-    my $nexus             = shift;
-    my $orig_ip_table     = $nexus->orig_ip_table();
-    my $orig_ip_broadcast = $nexus->orig_ip_broadcast();
-
-    my %ip_broadcast;
-    foreach my $iid ( keys %$orig_ip_table ) {
-	my $ip        = $orig_ip_table->{$iid};
-	my $broadcast = $orig_ip_broadcast->{$iid};
-
-	next unless ( defined $ip && defined $broadcast );
-
-	$ip_broadcast{$ip} = $broadcast;
-    }
-    return \%ip_broadcast;
-}
-
-1;
-__END__
-
-=head1 NAME
-
-SNMP::Info::Layer3::Nexus - SNMP Interface to Cisco Nexus Switches running
-NX-OS
-
-=head1 AUTHOR
-
-Eric Miller
-
-=head1 SYNOPSIS
-
- # Let SNMP::Info determine the correct subclass for you. 
- my $nexus = 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      = $nexus->class();
- print "SNMP::Info determined this device to fall under subclass : $class\n";
-
-=head1 DESCRIPTION
-
-Abstraction subclass for Cisco Nexus Switches running NX-OS.  
-
-For speed or debugging purposes you can call the subclass directly, but not
-after determining a more specific class using the method above. 
-
- my $nexus = new SNMP::Info::Layer3::Nexus(...);
-
-=head2 Inherited Classes
-
-=over
-
-=item SNMP::Info::Layer3
-
-=item SNMP::Info::CiscoVTP
-
-=item SNMP::Info::CDP
-
-=item SNMP::Info::CiscoImage
-
-=item SNMP::Info::CiscoPortSecurity
-
-=item SNMP::Info::CiscoConfig
-
-=item SNMP::Info::CiscoPower
-
-=item SNMP::Info::CiscoStpExtensions
-
-=item SNMP::Info::LLDP
-
-=back
-
-=head2 Required MIBs
-
-=over
-
-=item F<CISCO-ENTITY-VENDORTYPE-OID-MIB>
-
-=back
-
-=over
-
-=item Inherited Classes' MIBs
-
-See L<SNMP::Info::Layer3/"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::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::CiscoStpExtensions/"Required MIBs"> for its own MIB requirements.
-
-See L<SNMP::Info::LLDP/"Required MIBs"> for its own MIB requirements.
-
-=back
-
-=head1 GLOBALS
-
-These are methods that return a scalar value from SNMP
-
-=over
-
-=item $nexus->vendor()
-
-Returns 'cisco'
-
-=item $nexus->os()
-
-Returns C<'nx-os'>
-
-=item $nexus->os_ver()
-
-Returns operating system version extracted from C<sysDescr>.
-
-=item $nexus->serial()
-
-Returns the serial number of the chassis from F<ENTITY-MIB>.
-
-=item $nexus->model()
-
-Tries to reference $nexus->id() to F<CISCO-ENTITY-VENDORTYPE-OID-MIB>
-
-Removes C<'cevChassis'> for readability.
-
-=item $nexus->mac()
-
-C<dot1dBaseBridgeAddress>
-
-=item $nexus->cisco_comm_indexing()
-
-Returns 1.  Use vlan indexing.
-
-=back
-
-=head2 Overrides
-
-=head3 IP Address Table
-
-Each entry in this table is an IP address in use on this device.  Some 
-versions do not index the table with the IPv4 address in accordance with
-the MIB definition, these overrides correct that behavior.
-
-=over
-
-=item $nexus->ip_index()
-
-Maps the IP Table to the IID
-
-(C<ipAdEntIfIndex>)
-
-=item $nexus->ip_table()
-
-Maps the Table to the IP address
-
-(C<ipAdEntAddr>)
-
-=item $nexus->ip_netmask()
-
-Gives netmask setting for IP table entry.
-
-(C<ipAdEntNetMask>)
-
-=item $nexus->ip_broadcast()
-
-Gives broadcast address for IP table entry.
-
-(C<ipAdEntBcastAddr>)
-
-=back
-
-=head2 Globals imported from SNMP::Info::Layer3
-
-See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
-
-=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::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::CiscoStpExtensions
-
-See documentation in L<SNMP::Info::CiscoStpExtensions/"GLOBALS"> for details.
-
-=head2 Globals 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.
-
-=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::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::CiscoPower
-
-See documentation in L<SNMP::Info::CiscoPower/"TABLE METHODS"> for details.
-
-=head2 Table Methods imported from SNMP::Info::CiscoStpExtensions
-
-See documentation in L<SNMP::Info::CiscoStpExtensions/"TABLE METHODS"> for details.
-
-=head2 Table Methods imported from SNMP::Info::LLDP
-
-See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
-
-=cut
--- a/Info/Layer3/Timetra.pm
+++ b/Info/Layer3/Timetra.pm
@@ -1,194 +0,0 @@
-# SNMP::Info::Layer3::Timetra
-# $Id$
-#
-# Copyright (c) 2008 Bill Fenner
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-#     * Redistributions of source code must retain the above copyright notice,
-#       this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the University of California, Santa Cruz nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-package SNMP::Info::Layer3::Timetra;
-
-use strict;
-
-use Exporter;
-use SNMP::Info::Layer3;
-
-@SNMP::Info::Layer3::Timetra::ISA = qw/SNMP::Info::Layer3
-    Exporter/;
-@SNMP::Info::Layer3::Timetra::EXPORT_OK = qw//;
-
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
-
-$VERSION = '3.10';
-
-%MIBS = ( %SNMP::Info::Layer3::MIBS, 'TIMETRA-GLOBAL-MIB' => 'timetraReg', );
-
-%GLOBALS = ( %SNMP::Info::Layer3::GLOBALS, );
-
-%FUNCS = ( %SNMP::Info::Layer3::FUNCS, );
-
-%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );
-
-sub model {
-    my $timetra = shift;
-    my $id      = $timetra->id();
-    my $model   = &SNMP::translateObj($id);
-
-    return $id unless defined $model;
-
-    $model =~ s/^tmnxModel//;
-
-    return $model;
-}
-
-sub os {
-    return 'TiMOS';
-}
-
-sub vendor {
-    return 'alcatel-lucent';
-}
-
-sub os_ver {
-    my $timetra = shift;
-
-    my $descr = $timetra->description();
-    if ( $descr =~ m/^TiMOS-(\S+)/ ) {
-        return $1;
-    }
-
-    # No clue what this will try but hey
-    return $timetra->SUPER::os_ver();
-}
-
-# The interface description contains the SFP type, so
-# to avoid losing historical information through a configuration change
-# we use interface name instead.
-sub interfaces {
-    my $alu     = shift;
-    my $partial = shift;
-
-    return $alu->orig_i_name($partial);
-}
-
-1;
-__END__
-
-=head1 NAME
-
-SNMP::Info::Layer3::Timetra - SNMP Interface to Alcatel-Lucent SR
-
-=head1 AUTHOR
-
-Bill Fenner
-
-=head1 SYNOPSIS
-
- # Let SNMP::Info determine the correct subclass for you. 
- my $alu = new SNMP::Info(
-                        AutoSpecify => 1,
-                        Debug       => 1,
-                        # These arguments are passed directly to SNMP::Session
-                        DestHost    => 'myswitch',
-                        Community   => 'public',
-                        Version     => 2
-                        ) 
-    or die "Can't connect to DestHost.\n";
-
- my $class      = $alu->class();
- print "SNMP::Info determined this device to fall under subclass : $class\n";
-
-=head1 DESCRIPTION
-
-Subclass for Alcatel-Lucent Service Routers
-
-=head2 Inherited Classes
-
-=over
-
-=item SNMP::Info::Layer3
-
-=back
-
-=head2 Required MIBs
-
-=over
-
-=item F<TIMETRA-GLOBAL-MIB>
-
-=item Inherited Classes' MIBs
-
-See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
-
-=back
-
-=head1 GLOBALS
-
-These are methods that return scalar value from SNMP
-
-=over
-
-=item $alu->vendor()
-
-Returns 'alcatel-lucent'
-
-=item $alu->os()
-
-Returns 'TiMOS'
-
-=item $alu->os_ver()
-
-Grabs the version string from C<sysDescr>.
-
-=item $alu->model()
-
-Tries to reference $alu->id() to one of the product MIBs listed above
-
-Removes 'tmnxModel' from the name for readability.
-
-=back
-
-=head2 Globals imported from SNMP::Info::Layer3
-
-See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
-
-=head1 TABLE METHODS
-
-These are methods that return tables of information in the form of a reference
-to a hash.
-
-=over
-
-=item $alu->interfaces()
-
-Returns C<ifName>, since the default Layer3 C<ifDescr> varies based
-upon the transceiver inserted.
-
-=back
-
-=head2 Table Methods imported from SNMP::Info::Layer3
-
-See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
-
-=cut
--- a/18
+++ b/18
@@ -1,12 +1,12 @@
 All code from version 0.7 on
-Copyright (c) 2003-2009 Max Baker and SNMP::Info Developers
+Copyright (c) 2003-2016 Max Baker and SNMP::Info Developers
 All rights reserved.

 Original Code
 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,
@@ -14,17 +14,17 @@ modification, are permitted provided that the following conditions are met:
    * 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.
--- a/399
+++ b/399
@@ -1,120 +1,283 @@
-ChangeLog
-COPYRIGHT
-DEVELOP
-DeviceMatrix.txt
-Info.pm
-Info/AdslLine.pm
-Info/Airespace.pm
-Info/AMAP.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/CiscoStpExtensions.pm
-Info/CiscoVTP.pm
-Info/EDP.pm
-Info/Entity.pm
-Info/EtherLike.pm
-Info/FDP.pm
-Info/IEEE802dot11.pm
-Info/IPv6.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/Baystack.pm
-Info/Layer2/C1900.pm
-Info/Layer2/C2900.pm
-Info/Layer2/Catalyst.pm
-Info/Layer2/Centillion.pm
-Info/Layer2/Cisco.pm
-Info/Layer2/CiscoSB.pm
-Info/Layer2/HP.pm
-Info/Layer2/HP4000.pm
-Info/Layer2/HPVC.pm
-Info/Layer2/Kentrox.pm
-Info/Layer2/N2270.pm
-Info/Layer2/NAP222x.pm
-Info/Layer2/Netgear.pm
-Info/Layer2/NWSS2300.pm
-Info/Layer2/Orinoco.pm
-Info/Layer2/Trapeze.pm
-Info/Layer2/ZyXEL_DSLAM.pm
-Info/Layer3.pm
-Info/Layer3/Aironet.pm
-Info/Layer3/AlcatelLucent.pm
-Info/Layer3/AlteonAD.pm
-Info/Layer3/Altiga.pm
-Info/Layer3/Arista.pm
-Info/Layer3/Aruba.pm
-Info/Layer3/BayRS.pm
-Info/Layer3/BlueCoatSG.pm
-Info/Layer3/C3550.pm
-Info/Layer3/C4000.pm
-Info/Layer3/C6500.pm
-Info/Layer3/Cisco.pm
-Info/Layer3/CiscoASA.pm
-Info/Layer3/CiscoFWSM.pm
-Info/Layer3/Contivity.pm
-Info/Layer3/Dell.pm
-Info/Layer3/Enterasys.pm
-Info/Layer3/Extreme.pm
-Info/Layer3/F5.pm
-Info/Layer3/Force10.pm
-Info/Layer3/Foundry.pm
-Info/Layer3/H3C.pm
-Info/Layer3/HP9300.pm
-Info/Layer3/IBMGbTor.pm
-Info/Layer3/Juniper.pm
-Info/Layer3/Lantronix.pm
-Info/Layer3/Microsoft.pm
-Info/Layer3/Mikrotik.pm
-Info/Layer3/N1600.pm
-Info/Layer3/Netscreen.pm
-Info/Layer3/NetSNMP.pm
-Info/Layer3/Nexus.pm
-Info/Layer3/PacketFront.pm
-Info/Layer3/Passport.pm
-Info/Layer3/Pf.pm
-Info/Layer3/Pica8.pm
-Info/Layer3/SonicWALL.pm
-Info/Layer3/Steelhead.pm
-Info/Layer3/Sun.pm
-Info/Layer3/Tasman.pm
-Info/Layer3/Timetra.pm
-Info/Layer7.pm
-Info/Layer7/APC.pm
-Info/Layer7/Neoteris.pm
-Info/Layer7/Netscaler.pm
-Info/LLDP.pm
-Info/MAU.pm
-Info/NortelStack.pm
-Info/PowerEthernet.pm
-Info/RapidCity.pm
-Info/SONMP.pm
-Makefile.PL
+.perltidyrc
+Build.PL
+Changes
+contrib/DEVELOP
+contrib/util/docmunge
+contrib/util/make_dev_matrix.pl
+contrib/util/make_snmpdata.pl
+contrib/util/push_ver
+contrib/util/run_test
+contrib/util/test_class.pl
+contrib/util/test_class_mocked.pl
+lib/SNMP/Info.pm
+lib/SNMP/Info/AdslLine.pm
+lib/SNMP/Info/Aggregate.pm
+lib/SNMP/Info/Airespace.pm
+lib/SNMP/Info/AMAP.pm
+lib/SNMP/Info/Bridge.pm
+lib/SNMP/Info/CDP.pm
+lib/SNMP/Info/CiscoAgg.pm
+lib/SNMP/Info/CiscoConfig.pm
+lib/SNMP/Info/CiscoPortSecurity.pm
+lib/SNMP/Info/CiscoPower.pm
+lib/SNMP/Info/CiscoQOS.pm
+lib/SNMP/Info/CiscoRTT.pm
+lib/SNMP/Info/CiscoStack.pm
+lib/SNMP/Info/CiscoStats.pm
+lib/SNMP/Info/CiscoStpExtensions.pm
+lib/SNMP/Info/CiscoVTP.pm
+lib/SNMP/Info/EDP.pm
+lib/SNMP/Info/Entity.pm
+lib/SNMP/Info/EtherLike.pm
+lib/SNMP/Info/FDP.pm
+lib/SNMP/Info/IEEE802dot11.pm
+lib/SNMP/Info/IEEE802dot3ad.pm
+lib/SNMP/Info/IPv6.pm
+lib/SNMP/Info/Layer1.pm
+lib/SNMP/Info/Layer1/Allied.pm
+lib/SNMP/Info/Layer1/Asante.pm
+lib/SNMP/Info/Layer1/Bayhub.pm
+lib/SNMP/Info/Layer1/Cyclades.pm
+lib/SNMP/Info/Layer1/S3000.pm
+lib/SNMP/Info/Layer2.pm
+lib/SNMP/Info/Layer2/3Com.pm
+lib/SNMP/Info/Layer2/Adtran.pm
+lib/SNMP/Info/Layer2/Aerohive.pm
+lib/SNMP/Info/Layer2/Airespace.pm
+lib/SNMP/Info/Layer2/Aironet.pm
+lib/SNMP/Info/Layer2/Allied.pm
+lib/SNMP/Info/Layer2/Atmedia.pm
+lib/SNMP/Info/Layer2/Baystack.pm
+lib/SNMP/Info/Layer2/C1900.pm
+lib/SNMP/Info/Layer2/C2900.pm
+lib/SNMP/Info/Layer2/Catalyst.pm
+lib/SNMP/Info/Layer2/Centillion.pm
+lib/SNMP/Info/Layer2/Cisco.pm
+lib/SNMP/Info/Layer2/CiscoSB.pm
+lib/SNMP/Info/Layer2/Exinda.pm
+lib/SNMP/Info/Layer2/HP.pm
+lib/SNMP/Info/Layer2/HP4000.pm
+lib/SNMP/Info/Layer2/HPVC.pm
+lib/SNMP/Info/Layer2/Kentrox.pm
+lib/SNMP/Info/Layer2/N2270.pm
+lib/SNMP/Info/Layer2/NAP222x.pm
+lib/SNMP/Info/Layer2/Netgear.pm
+lib/SNMP/Info/Layer2/Nexans.pm
+lib/SNMP/Info/Layer2/NWSS2300.pm
+lib/SNMP/Info/Layer2/Orinoco.pm
+lib/SNMP/Info/Layer2/Sixnet.pm
+lib/SNMP/Info/Layer2/Trapeze.pm
+lib/SNMP/Info/Layer2/Ubiquiti.pm
+lib/SNMP/Info/Layer2/ZyXEL_DSLAM.pm
+lib/SNMP/Info/Layer3.pm
+lib/SNMP/Info/Layer3/Aironet.pm
+lib/SNMP/Info/Layer3/AlcatelLucent.pm
+lib/SNMP/Info/Layer3/AlteonAD.pm
+lib/SNMP/Info/Layer3/Altiga.pm
+lib/SNMP/Info/Layer3/Arista.pm
+lib/SNMP/Info/Layer3/Aruba.pm
+lib/SNMP/Info/Layer3/BayRS.pm
+lib/SNMP/Info/Layer3/BlueCoatSG.pm
+lib/SNMP/Info/Layer3/C3550.pm
+lib/SNMP/Info/Layer3/C4000.pm
+lib/SNMP/Info/Layer3/C6500.pm
+lib/SNMP/Info/Layer3/CheckPoint.pm
+lib/SNMP/Info/Layer3/Cisco.pm
+lib/SNMP/Info/Layer3/CiscoASA.pm
+lib/SNMP/Info/Layer3/CiscoFWSM.pm
+lib/SNMP/Info/Layer3/CiscoSwitch.pm
+lib/SNMP/Info/Layer3/Contivity.pm
+lib/SNMP/Info/Layer3/Cumulus.pm
+lib/SNMP/Info/Layer3/Dell.pm
+lib/SNMP/Info/Layer3/DLink.pm
+lib/SNMP/Info/Layer3/Enterasys.pm
+lib/SNMP/Info/Layer3/ERX.pm
+lib/SNMP/Info/Layer3/Extreme.pm
+lib/SNMP/Info/Layer3/F5.pm
+lib/SNMP/Info/Layer3/Force10.pm
+lib/SNMP/Info/Layer3/Fortinet.pm
+lib/SNMP/Info/Layer3/Foundry.pm
+lib/SNMP/Info/Layer3/Genua.pm
+lib/SNMP/Info/Layer3/H3C.pm
+lib/SNMP/Info/Layer3/HP9300.pm
+lib/SNMP/Info/Layer3/Huawei.pm
+lib/SNMP/Info/Layer3/IBMGbTor.pm
+lib/SNMP/Info/Layer3/Juniper.pm
+lib/SNMP/Info/Layer3/Lantronix.pm
+lib/SNMP/Info/Layer3/Microsoft.pm
+lib/SNMP/Info/Layer3/Mikrotik.pm
+lib/SNMP/Info/Layer3/N1600.pm
+lib/SNMP/Info/Layer3/Netscreen.pm
+lib/SNMP/Info/Layer3/NetSNMP.pm
+lib/SNMP/Info/Layer3/Nexus.pm
+lib/SNMP/Info/Layer3/OneAccess.pm
+lib/SNMP/Info/Layer3/PacketFront.pm
+lib/SNMP/Info/Layer3/PaloAlto.pm
+lib/SNMP/Info/Layer3/Passport.pm
+lib/SNMP/Info/Layer3/Pf.pm
+lib/SNMP/Info/Layer3/Pica8.pm
+lib/SNMP/Info/Layer3/SonicWALL.pm
+lib/SNMP/Info/Layer3/Steelhead.pm
+lib/SNMP/Info/Layer3/Sun.pm
+lib/SNMP/Info/Layer3/Tasman.pm
+lib/SNMP/Info/Layer3/Timetra.pm
+lib/SNMP/Info/Layer3/VMware.pm
+lib/SNMP/Info/Layer3/VyOS.pm
+lib/SNMP/Info/Layer7.pm
+lib/SNMP/Info/Layer7/APC.pm
+lib/SNMP/Info/Layer7/Arbor.pm
+lib/SNMP/Info/Layer7/CiscoIPS.pm
+lib/SNMP/Info/Layer7/Gigamon.pm
+lib/SNMP/Info/Layer7/Liebert.pm
+lib/SNMP/Info/Layer7/Neoteris.pm
+lib/SNMP/Info/Layer7/Netscaler.pm
+lib/SNMP/Info/LLDP.pm
+lib/SNMP/Info/MAU.pm
+lib/SNMP/Info/MRO.pm
+lib/SNMP/Info/NortelStack.pm
+lib/SNMP/Info/PowerEthernet.pm
+lib/SNMP/Info/RapidCity.pm
+lib/SNMP/Info/SONMP.pm
+LICENSE
 MANIFEST			This list of files
+META.json
+META.yml
 README
-t/00-load.t
-t/docmunge
-t/make_dev_matrix.pl
-t/pod-coverage.t
-t/pod.t
-t/prereq.t
-t/push_ver
-t/run_test
-t/test_class.pl
-t/util/make_snmpdata.pl
-t/util/test_class_mocked.pl
+t/00_load.t
+xt/.perltidyrc
+xt/00_local_distribution.t
+xt/00_local_docininfo.t
+xt/00_local_perlcritic.t
+xt/00_local_pod-coverage.t
+xt/00_local_pod.t
+xt/00_local_prereq.t
+xt/00_local_spelling.t
+xt/00_local_versionsync.t
+xt/10_remote_snmplabs.t
+xt/21_run.t
+xt/lib/My/Test/Class.pm
+xt/lib/Test/SNMP/Info.pm
+xt/lib/Test/SNMP/Info/AdslLine.pm
+xt/lib/Test/SNMP/Info/Aggregate.pm
+xt/lib/Test/SNMP/Info/Airespace.pm
+xt/lib/Test/SNMP/Info/AMAP.pm
+xt/lib/Test/SNMP/Info/Bridge.pm
+xt/lib/Test/SNMP/Info/CDP.pm
+xt/lib/Test/SNMP/Info/CiscoAgg.pm
+xt/lib/Test/SNMP/Info/CiscoConfig.pm
+xt/lib/Test/SNMP/Info/CiscoPortSecurity.pm
+xt/lib/Test/SNMP/Info/CiscoPower.pm
+xt/lib/Test/SNMP/Info/CiscoQOS.pm
+xt/lib/Test/SNMP/Info/CiscoRTT.pm
+xt/lib/Test/SNMP/Info/CiscoStats.pm
+xt/lib/Test/SNMP/Info/CiscoStpExtensions.pm
+xt/lib/Test/SNMP/Info/CiscoVTP.pm
+xt/lib/Test/SNMP/Info/EDP.pm
+xt/lib/Test/SNMP/Info/Entity.pm
+xt/lib/Test/SNMP/Info/EtherLike.pm
+xt/lib/Test/SNMP/Info/FDP.pm
+xt/lib/Test/SNMP/Info/IEEE802dot11.pm
+xt/lib/Test/SNMP/Info/IEEE802dot3ad.pm
+xt/lib/Test/SNMP/Info/IPv6.pm
+xt/lib/Test/SNMP/Info/Layer1.pm
+xt/lib/Test/SNMP/Info/Layer1/Allied.pm
+xt/lib/Test/SNMP/Info/Layer1/Asante.pm
+xt/lib/Test/SNMP/Info/Layer1/Bayhub.pm
+xt/lib/Test/SNMP/Info/Layer1/Cyclades.pm
+xt/lib/Test/SNMP/Info/Layer1/S3000.pm
+xt/lib/Test/SNMP/Info/Layer2.pm
+xt/lib/Test/SNMP/Info/Layer2/3Com.pm
+xt/lib/Test/SNMP/Info/Layer2/Aerohive.pm
+xt/lib/Test/SNMP/Info/Layer2/Airespace.pm
+xt/lib/Test/SNMP/Info/Layer2/Aironet.pm
+xt/lib/Test/SNMP/Info/Layer2/Allied.pm
+xt/lib/Test/SNMP/Info/Layer2/Atmedia.pm
+xt/lib/Test/SNMP/Info/Layer2/Baystack.pm
+xt/lib/Test/SNMP/Info/Layer2/C1900.pm
+xt/lib/Test/SNMP/Info/Layer2/C2900.pm
+xt/lib/Test/SNMP/Info/Layer2/Catalyst.pm
+xt/lib/Test/SNMP/Info/Layer2/Centillion.pm
+xt/lib/Test/SNMP/Info/Layer2/Cisco.pm
+xt/lib/Test/SNMP/Info/Layer2/CiscoSB.pm
+xt/lib/Test/SNMP/Info/Layer2/HP.pm
+xt/lib/Test/SNMP/Info/Layer2/HP4000.pm
+xt/lib/Test/SNMP/Info/Layer2/HPVC.pm
+xt/lib/Test/SNMP/Info/Layer2/Kentrox.pm
+xt/lib/Test/SNMP/Info/Layer2/N2270.pm
+xt/lib/Test/SNMP/Info/Layer2/NAP222x.pm
+xt/lib/Test/SNMP/Info/Layer2/Netgear.pm
+xt/lib/Test/SNMP/Info/Layer2/Nexans.pm
+xt/lib/Test/SNMP/Info/Layer2/NWSS2300.pm
+xt/lib/Test/SNMP/Info/Layer2/Orinoco.pm
+xt/lib/Test/SNMP/Info/Layer2/Sixnet.pm
+xt/lib/Test/SNMP/Info/Layer2/Trapeze.pm
+xt/lib/Test/SNMP/Info/Layer2/Ubiquiti.pm
+xt/lib/Test/SNMP/Info/Layer2/ZyXEL_DSLAM.pm
+xt/lib/Test/SNMP/Info/Layer3.pm
+xt/lib/Test/SNMP/Info/Layer3/Aironet.pm
+xt/lib/Test/SNMP/Info/Layer3/AlcatelLucent.pm
+xt/lib/Test/SNMP/Info/Layer3/AlteonAD.pm
+xt/lib/Test/SNMP/Info/Layer3/Altiga.pm
+xt/lib/Test/SNMP/Info/Layer3/Arista.pm
+xt/lib/Test/SNMP/Info/Layer3/Aruba.pm
+xt/lib/Test/SNMP/Info/Layer3/BayRS.pm
+xt/lib/Test/SNMP/Info/Layer3/BlueCoatSG.pm
+xt/lib/Test/SNMP/Info/Layer3/C3550.pm
+xt/lib/Test/SNMP/Info/Layer3/C4000.pm
+xt/lib/Test/SNMP/Info/Layer3/C6500.pm
+xt/lib/Test/SNMP/Info/Layer3/CheckPoint.pm
+xt/lib/Test/SNMP/Info/Layer3/Cisco.pm
+xt/lib/Test/SNMP/Info/Layer3/CiscoASA.pm
+xt/lib/Test/SNMP/Info/Layer3/CiscoFWSM.pm
+xt/lib/Test/SNMP/Info/Layer3/CiscoSwitch.pm
+xt/lib/Test/SNMP/Info/Layer3/Contivity.pm
+xt/lib/Test/SNMP/Info/Layer3/Cumulus.pm
+xt/lib/Test/SNMP/Info/Layer3/Dell.pm
+xt/lib/Test/SNMP/Info/Layer3/DLink.pm
+xt/lib/Test/SNMP/Info/Layer3/Enterasys.pm
+xt/lib/Test/SNMP/Info/Layer3/ERX.pm
+xt/lib/Test/SNMP/Info/Layer3/Extreme.pm
+xt/lib/Test/SNMP/Info/Layer3/F5.pm
+xt/lib/Test/SNMP/Info/Layer3/Force10.pm
+xt/lib/Test/SNMP/Info/Layer3/Fortinet.pm
+xt/lib/Test/SNMP/Info/Layer3/Foundry.pm
+xt/lib/Test/SNMP/Info/Layer3/Genua.pm
+xt/lib/Test/SNMP/Info/Layer3/H3C.pm
+xt/lib/Test/SNMP/Info/Layer3/HP9300.pm
+xt/lib/Test/SNMP/Info/Layer3/Huawei.pm
+xt/lib/Test/SNMP/Info/Layer3/IBMGbTor.pm
+xt/lib/Test/SNMP/Info/Layer3/Juniper.pm
+xt/lib/Test/SNMP/Info/Layer3/Lantronix.pm
+xt/lib/Test/SNMP/Info/Layer3/Microsoft.pm
+xt/lib/Test/SNMP/Info/Layer3/Mikrotik.pm
+xt/lib/Test/SNMP/Info/Layer3/N1600.pm
+xt/lib/Test/SNMP/Info/Layer3/Netscreen.pm
+xt/lib/Test/SNMP/Info/Layer3/NetSNMP.pm
+xt/lib/Test/SNMP/Info/Layer3/Nexus.pm
+xt/lib/Test/SNMP/Info/Layer3/OneAccess.pm
+xt/lib/Test/SNMP/Info/Layer3/PacketFront.pm
+xt/lib/Test/SNMP/Info/Layer3/PaloAlto.pm
+xt/lib/Test/SNMP/Info/Layer3/Passport.pm
+xt/lib/Test/SNMP/Info/Layer3/Pf.pm
+xt/lib/Test/SNMP/Info/Layer3/Pica8.pm
+xt/lib/Test/SNMP/Info/Layer3/SonicWALL.pm
+xt/lib/Test/SNMP/Info/Layer3/Steelhead.pm
+xt/lib/Test/SNMP/Info/Layer3/Sun.pm
+xt/lib/Test/SNMP/Info/Layer3/Tasman.pm
+xt/lib/Test/SNMP/Info/Layer3/Timetra.pm
+xt/lib/Test/SNMP/Info/Layer3/VMware.pm
+xt/lib/Test/SNMP/Info/Layer3/VyOS.pm
+xt/lib/Test/SNMP/Info/Layer7.pm
+xt/lib/Test/SNMP/Info/Layer7/APC.pm
+xt/lib/Test/SNMP/Info/Layer7/Arbor.pm
+xt/lib/Test/SNMP/Info/Layer7/CiscoIPS.pm
+xt/lib/Test/SNMP/Info/Layer7/Gigamon.pm
+xt/lib/Test/SNMP/Info/Layer7/Liebert.pm
+xt/lib/Test/SNMP/Info/Layer7/Neoteris.pm
+xt/lib/Test/SNMP/Info/Layer7/Netscaler.pm
+xt/lib/Test/SNMP/Info/LLDP.pm
+xt/lib/Test/SNMP/Info/MAU.pm
+xt/lib/Test/SNMP/Info/NortelStack.pm
+xt/lib/Test/SNMP/Info/PowerEthernet.pm
+xt/lib/Test/SNMP/Info/RapidCity.pm
+xt/lib/Test/SNMP/Info/SONMP.pm
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -1,28 +1,70 @@
-# Version control files and dirs.
+\.bak$
+\.pid$
+\.swp$
+
+^SNMP-Info-
+
+^MANIFEST\.
+
+# Avoid version control files.
 \bRCS\b
 \bCVS\b
+\bSCCS\b
 ,v$
 \B\.svn\b
 \B\.git\b
-.gitignore
+\B\.gitignore\b
+\b_darcs\b
+\B\.cvsignore$

-# Makemaker generated files and dirs.
-^MANIFEST\.
-^Makefile$
-^blib/
-^MakeMaker-\d
-pm_to_blib
-MYMETA.*
+# Avoid VMS specific MakeMaker generated files
+\bDescrip.MMS$
+\bDESCRIP.MMS$
+\bdescrip.mms$

-# Temp, old and emacs backup files.
+# Avoid Makemaker generated and utility files.
+\bMANIFEST\.bak
+\bMakefile$
+\bblib/
+\bMakeMaker-\d
+\bpm_to_blib\.ts$
+\bpm_to_blib$
+\bblibdirs\.ts$         # 6.18 through 6.25 generated this
+
+# Avoid Module::Build generated and utility files.
+\bBuild$
+\b_build/
+\bBuild.bat$
+\bBuild.COM$
+\bBUILD.COM$
+\bbuild.com$
+
+# Avoid temp and backup files.
 ~$
 \.old$
-^#.*#$
-^\.#
+\#$
+\b\.#
+\.bak$
+\.tmp$
+\.#
+\.rej$

-# Private Regression Tests
-\d+_local_
-\.?perl\w+\.?rc$
+# Avoid OS-specific files/dirs
+# Mac OSX metadata
+\B\.DS_Store
+# Mac OSX SMB mount metadata files
+\B\._

-# Komodo project file
-\.kpf$
+# Avoid Devel::Cover and Devel::CoverX::Covered files.
+\bcover_db\b
+\bcovered\b
+
+# Avoid MYMETA files
+^MYMETA\.
+
+.github
+.travis
+README.md
+
+# Avoid Komodo project file
+\.komodoproject$
--- a/META.json
+++ b/META.json
@@ -0,0 +1,587 @@
+{
+   "abstract" : "OO Interface to Network devices and MIBs through SNMP",
+   "author" : [
+      "Eric A. Miller <emiller@cpan.org>"
+   ],
+   "dynamic_config" : 1,
+   "generated_by" : "Module::Build version 0.4224",
+   "license" : [
+      "bsd"
+   ],
+   "meta-spec" : {
+      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+      "version" : 2
+   },
+   "name" : "SNMP-Info",
+   "prereqs" : {
+      "configure" : {
+         "requires" : {
+            "Module::Build" : "0.42"
+         }
+      },
+      "runtime" : {
+         "recommends" : {
+            "Class::ISA" : "0",
+            "File::Slurp" : "0",
+            "Module::Info" : "0",
+            "Module::Load" : "0",
+            "PPI" : "0"
+         },
+         "requires" : {
+            "Math::BigInt" : "0",
+            "NetAddr::IP" : "4.068",
+            "SNMP" : "0"
+         }
+      },
+      "test" : {
+         "requires" : {
+            "Class::Inspector" : "0",
+            "File::Find" : "0",
+            "File::Slurper" : "0",
+            "Module::Find" : "0",
+            "NetSNMP::default_store" : "0",
+            "Path::Class" : "0",
+            "Test::Class::Most" : "0",
+            "Test::Distribution" : "0",
+            "Test::Exception" : "0.43",
+            "Test::MockObject::Extends" : "0",
+            "Test::More" : "0.88"
+         }
+      }
+   },
+   "provides" : {
+      "SNMP::Info" : {
+         "file" : "lib/SNMP/Info.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::AMAP" : {
+         "file" : "lib/SNMP/Info/AMAP.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::AdslLine" : {
+         "file" : "lib/SNMP/Info/AdslLine.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Aggregate" : {
+         "file" : "lib/SNMP/Info/Aggregate.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Airespace" : {
+         "file" : "lib/SNMP/Info/Airespace.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Bridge" : {
+         "file" : "lib/SNMP/Info/Bridge.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::CDP" : {
+         "file" : "lib/SNMP/Info/CDP.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::CiscoAgg" : {
+         "file" : "lib/SNMP/Info/CiscoAgg.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::CiscoConfig" : {
+         "file" : "lib/SNMP/Info/CiscoConfig.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::CiscoPortSecurity" : {
+         "file" : "lib/SNMP/Info/CiscoPortSecurity.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::CiscoPower" : {
+         "file" : "lib/SNMP/Info/CiscoPower.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::CiscoQOS" : {
+         "file" : "lib/SNMP/Info/CiscoQOS.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::CiscoRTT" : {
+         "file" : "lib/SNMP/Info/CiscoRTT.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::CiscoStack" : {
+         "file" : "lib/SNMP/Info/CiscoStack.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::CiscoStats" : {
+         "file" : "lib/SNMP/Info/CiscoStats.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::CiscoStpExtensions" : {
+         "file" : "lib/SNMP/Info/CiscoStpExtensions.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::CiscoVTP" : {
+         "file" : "lib/SNMP/Info/CiscoVTP.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::EDP" : {
+         "file" : "lib/SNMP/Info/EDP.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Entity" : {
+         "file" : "lib/SNMP/Info/Entity.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::EtherLike" : {
+         "file" : "lib/SNMP/Info/EtherLike.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::FDP" : {
+         "file" : "lib/SNMP/Info/FDP.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::IEEE802dot11" : {
+         "file" : "lib/SNMP/Info/IEEE802dot11.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::IEEE802dot3ad" : {
+         "file" : "lib/SNMP/Info/IEEE802dot3ad.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::IPv6" : {
+         "file" : "lib/SNMP/Info/IPv6.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::LLDP" : {
+         "file" : "lib/SNMP/Info/LLDP.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer1" : {
+         "file" : "lib/SNMP/Info/Layer1.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer1::Allied" : {
+         "file" : "lib/SNMP/Info/Layer1/Allied.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer1::Asante" : {
+         "file" : "lib/SNMP/Info/Layer1/Asante.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer1::Bayhub" : {
+         "file" : "lib/SNMP/Info/Layer1/Bayhub.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer1::Cyclades" : {
+         "file" : "lib/SNMP/Info/Layer1/Cyclades.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer1::S3000" : {
+         "file" : "lib/SNMP/Info/Layer1/S3000.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2" : {
+         "file" : "lib/SNMP/Info/Layer2.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::3Com" : {
+         "file" : "lib/SNMP/Info/Layer2/3Com.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Adtran" : {
+         "file" : "lib/SNMP/Info/Layer2/Adtran.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Aerohive" : {
+         "file" : "lib/SNMP/Info/Layer2/Aerohive.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Airespace" : {
+         "file" : "lib/SNMP/Info/Layer2/Airespace.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Aironet" : {
+         "file" : "lib/SNMP/Info/Layer2/Aironet.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Allied" : {
+         "file" : "lib/SNMP/Info/Layer2/Allied.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Atmedia" : {
+         "file" : "lib/SNMP/Info/Layer2/Atmedia.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Baystack" : {
+         "file" : "lib/SNMP/Info/Layer2/Baystack.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::C1900" : {
+         "file" : "lib/SNMP/Info/Layer2/C1900.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::C2900" : {
+         "file" : "lib/SNMP/Info/Layer2/C2900.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Catalyst" : {
+         "file" : "lib/SNMP/Info/Layer2/Catalyst.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Centillion" : {
+         "file" : "lib/SNMP/Info/Layer2/Centillion.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Cisco" : {
+         "file" : "lib/SNMP/Info/Layer2/Cisco.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::CiscoSB" : {
+         "file" : "lib/SNMP/Info/Layer2/CiscoSB.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Exinda" : {
+         "file" : "lib/SNMP/Info/Layer2/Exinda.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::HP" : {
+         "file" : "lib/SNMP/Info/Layer2/HP.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::HP4000" : {
+         "file" : "lib/SNMP/Info/Layer2/HP4000.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::HPVC" : {
+         "file" : "lib/SNMP/Info/Layer2/HPVC.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Kentrox" : {
+         "file" : "lib/SNMP/Info/Layer2/Kentrox.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::N2270" : {
+         "file" : "lib/SNMP/Info/Layer2/N2270.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::NAP222x" : {
+         "file" : "lib/SNMP/Info/Layer2/NAP222x.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::NWSS2300" : {
+         "file" : "lib/SNMP/Info/Layer2/NWSS2300.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Netgear" : {
+         "file" : "lib/SNMP/Info/Layer2/Netgear.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Nexans" : {
+         "file" : "lib/SNMP/Info/Layer2/Nexans.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Orinoco" : {
+         "file" : "lib/SNMP/Info/Layer2/Orinoco.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Sixnet" : {
+         "file" : "lib/SNMP/Info/Layer2/Sixnet.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Trapeze" : {
+         "file" : "lib/SNMP/Info/Layer2/Trapeze.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::Ubiquiti" : {
+         "file" : "lib/SNMP/Info/Layer2/Ubiquiti.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer2::ZyXEL_DSLAM" : {
+         "file" : "lib/SNMP/Info/Layer2/ZyXEL_DSLAM.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3" : {
+         "file" : "lib/SNMP/Info/Layer3.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Aironet" : {
+         "file" : "lib/SNMP/Info/Layer3/Aironet.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::AlcatelLucent" : {
+         "file" : "lib/SNMP/Info/Layer3/AlcatelLucent.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::AlteonAD" : {
+         "file" : "lib/SNMP/Info/Layer3/AlteonAD.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Altiga" : {
+         "file" : "lib/SNMP/Info/Layer3/Altiga.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Arista" : {
+         "file" : "lib/SNMP/Info/Layer3/Arista.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Aruba" : {
+         "file" : "lib/SNMP/Info/Layer3/Aruba.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::BayRS" : {
+         "file" : "lib/SNMP/Info/Layer3/BayRS.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::BlueCoatSG" : {
+         "file" : "lib/SNMP/Info/Layer3/BlueCoatSG.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::C3550" : {
+         "file" : "lib/SNMP/Info/Layer3/C3550.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::C4000" : {
+         "file" : "lib/SNMP/Info/Layer3/C4000.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::C6500" : {
+         "file" : "lib/SNMP/Info/Layer3/C6500.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::CheckPoint" : {
+         "file" : "lib/SNMP/Info/Layer3/CheckPoint.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Cisco" : {
+         "file" : "lib/SNMP/Info/Layer3/Cisco.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::CiscoASA" : {
+         "file" : "lib/SNMP/Info/Layer3/CiscoASA.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::CiscoFWSM" : {
+         "file" : "lib/SNMP/Info/Layer3/CiscoFWSM.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::CiscoSwitch" : {
+         "file" : "lib/SNMP/Info/Layer3/CiscoSwitch.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Contivity" : {
+         "file" : "lib/SNMP/Info/Layer3/Contivity.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Cumulus" : {
+         "file" : "lib/SNMP/Info/Layer3/Cumulus.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::DLink" : {
+         "file" : "lib/SNMP/Info/Layer3/DLink.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Dell" : {
+         "file" : "lib/SNMP/Info/Layer3/Dell.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::ERX" : {
+         "file" : "lib/SNMP/Info/Layer3/ERX.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Enterasys" : {
+         "file" : "lib/SNMP/Info/Layer3/Enterasys.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Extreme" : {
+         "file" : "lib/SNMP/Info/Layer3/Extreme.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::F5" : {
+         "file" : "lib/SNMP/Info/Layer3/F5.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Force10" : {
+         "file" : "lib/SNMP/Info/Layer3/Force10.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Fortinet" : {
+         "file" : "lib/SNMP/Info/Layer3/Fortinet.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Foundry" : {
+         "file" : "lib/SNMP/Info/Layer3/Foundry.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Genua" : {
+         "file" : "lib/SNMP/Info/Layer3/Genua.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::H3C" : {
+         "file" : "lib/SNMP/Info/Layer3/H3C.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::HP9300" : {
+         "file" : "lib/SNMP/Info/Layer3/HP9300.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Huawei" : {
+         "file" : "lib/SNMP/Info/Layer3/Huawei.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::IBMGbTor" : {
+         "file" : "lib/SNMP/Info/Layer3/IBMGbTor.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Juniper" : {
+         "file" : "lib/SNMP/Info/Layer3/Juniper.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Lantronix" : {
+         "file" : "lib/SNMP/Info/Layer3/Lantronix.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Microsoft" : {
+         "file" : "lib/SNMP/Info/Layer3/Microsoft.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Mikrotik" : {
+         "file" : "lib/SNMP/Info/Layer3/Mikrotik.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::N1600" : {
+         "file" : "lib/SNMP/Info/Layer3/N1600.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::NetSNMP" : {
+         "file" : "lib/SNMP/Info/Layer3/NetSNMP.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Netscreen" : {
+         "file" : "lib/SNMP/Info/Layer3/Netscreen.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Nexus" : {
+         "file" : "lib/SNMP/Info/Layer3/Nexus.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::OneAccess" : {
+         "file" : "lib/SNMP/Info/Layer3/OneAccess.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::PacketFront" : {
+         "file" : "lib/SNMP/Info/Layer3/PacketFront.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::PaloAlto" : {
+         "file" : "lib/SNMP/Info/Layer3/PaloAlto.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Passport" : {
+         "file" : "lib/SNMP/Info/Layer3/Passport.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Pf" : {
+         "file" : "lib/SNMP/Info/Layer3/Pf.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Pica8" : {
+         "file" : "lib/SNMP/Info/Layer3/Pica8.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::SonicWALL" : {
+         "file" : "lib/SNMP/Info/Layer3/SonicWALL.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Steelhead" : {
+         "file" : "lib/SNMP/Info/Layer3/Steelhead.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Sun" : {
+         "file" : "lib/SNMP/Info/Layer3/Sun.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Tasman" : {
+         "file" : "lib/SNMP/Info/Layer3/Tasman.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::Timetra" : {
+         "file" : "lib/SNMP/Info/Layer3/Timetra.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::VMware" : {
+         "file" : "lib/SNMP/Info/Layer3/VMware.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer3::VyOS" : {
+         "file" : "lib/SNMP/Info/Layer3/VyOS.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer7" : {
+         "file" : "lib/SNMP/Info/Layer7.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer7::APC" : {
+         "file" : "lib/SNMP/Info/Layer7/APC.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer7::Arbor" : {
+         "file" : "lib/SNMP/Info/Layer7/Arbor.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer7::CiscoIPS" : {
+         "file" : "lib/SNMP/Info/Layer7/CiscoIPS.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer7::Gigamon" : {
+         "file" : "lib/SNMP/Info/Layer7/Gigamon.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer7::Liebert" : {
+         "file" : "lib/SNMP/Info/Layer7/Liebert.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer7::Neoteris" : {
+         "file" : "lib/SNMP/Info/Layer7/Neoteris.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::Layer7::Netscaler" : {
+         "file" : "lib/SNMP/Info/Layer7/Netscaler.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::MAU" : {
+         "file" : "lib/SNMP/Info/MAU.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::MRO" : {
+         "file" : "lib/SNMP/Info/MRO.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::NortelStack" : {
+         "file" : "lib/SNMP/Info/NortelStack.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::PowerEthernet" : {
+         "file" : "lib/SNMP/Info/PowerEthernet.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::RapidCity" : {
+         "file" : "lib/SNMP/Info/RapidCity.pm",
+         "version" : "3.66"
+      },
+      "SNMP::Info::SONMP" : {
+         "file" : "lib/SNMP/Info/SONMP.pm",
+         "version" : "3.66"
+      }
+   },
+   "release_status" : "stable",
+   "resources" : {
+      "bugtracker" : {
+         "web" : "https://github.com/netdisco/snmp-info/issues"
+      },
+      "homepage" : "http://netdisco.org/",
+      "license" : [
+         "http://opensource.org/licenses/BSD-3-Clause"
+      ],
+      "repository" : {
+         "url" : "https://github.com/netdisco/snmp-info"
+      },
+      "x_IRC" : "irc://irc.freenode.org/#netdisco",
+      "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/snmp-info-users"
+   },
+   "version" : "3.66",
+   "x_serialization_backend" : "JSON::PP version 2.97001"
+}
--- a/META.yml
+++ b/META.yml
@@ -0,0 +1,432 @@
+---
+abstract: 'OO Interface to Network devices and MIBs through SNMP'
+author:
+  - 'Eric A. Miller <emiller@cpan.org>'
+build_requires:
+  Class::Inspector: '0'
+  File::Find: '0'
+  File::Slurper: '0'
+  Module::Find: '0'
+  NetSNMP::default_store: '0'
+  Path::Class: '0'
+  Test::Class::Most: '0'
+  Test::Distribution: '0'
+  Test::Exception: '0.43'
+  Test::MockObject::Extends: '0'
+  Test::More: '0.88'
+configure_requires:
+  Module::Build: '0.42'
+dynamic_config: 1
+generated_by: 'Module::Build version 0.4224, CPAN::Meta::Converter version 2.150010'
+license: bsd
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: '1.4'
+name: SNMP-Info
+provides:
+  SNMP::Info:
+    file: lib/SNMP/Info.pm
+    version: '3.66'
+  SNMP::Info::AMAP:
+    file: lib/SNMP/Info/AMAP.pm
+    version: '3.66'
+  SNMP::Info::AdslLine:
+    file: lib/SNMP/Info/AdslLine.pm
+    version: '3.66'
+  SNMP::Info::Aggregate:
+    file: lib/SNMP/Info/Aggregate.pm
+    version: '3.66'
+  SNMP::Info::Airespace:
+    file: lib/SNMP/Info/Airespace.pm
+    version: '3.66'
+  SNMP::Info::Bridge:
+    file: lib/SNMP/Info/Bridge.pm
+    version: '3.66'
+  SNMP::Info::CDP:
+    file: lib/SNMP/Info/CDP.pm
+    version: '3.66'
+  SNMP::Info::CiscoAgg:
+    file: lib/SNMP/Info/CiscoAgg.pm
+    version: '3.66'
+  SNMP::Info::CiscoConfig:
+    file: lib/SNMP/Info/CiscoConfig.pm
+    version: '3.66'
+  SNMP::Info::CiscoPortSecurity:
+    file: lib/SNMP/Info/CiscoPortSecurity.pm
+    version: '3.66'
+  SNMP::Info::CiscoPower:
+    file: lib/SNMP/Info/CiscoPower.pm
+    version: '3.66'
+  SNMP::Info::CiscoQOS:
+    file: lib/SNMP/Info/CiscoQOS.pm
+    version: '3.66'
+  SNMP::Info::CiscoRTT:
+    file: lib/SNMP/Info/CiscoRTT.pm
+    version: '3.66'
+  SNMP::Info::CiscoStack:
+    file: lib/SNMP/Info/CiscoStack.pm
+    version: '3.66'
+  SNMP::Info::CiscoStats:
+    file: lib/SNMP/Info/CiscoStats.pm
+    version: '3.66'
+  SNMP::Info::CiscoStpExtensions:
+    file: lib/SNMP/Info/CiscoStpExtensions.pm
+    version: '3.66'
+  SNMP::Info::CiscoVTP:
+    file: lib/SNMP/Info/CiscoVTP.pm
+    version: '3.66'
+  SNMP::Info::EDP:
+    file: lib/SNMP/Info/EDP.pm
+    version: '3.66'
+  SNMP::Info::Entity:
+    file: lib/SNMP/Info/Entity.pm
+    version: '3.66'
+  SNMP::Info::EtherLike:
+    file: lib/SNMP/Info/EtherLike.pm
+    version: '3.66'
+  SNMP::Info::FDP:
+    file: lib/SNMP/Info/FDP.pm
+    version: '3.66'
+  SNMP::Info::IEEE802dot11:
+    file: lib/SNMP/Info/IEEE802dot11.pm
+    version: '3.66'
+  SNMP::Info::IEEE802dot3ad:
+    file: lib/SNMP/Info/IEEE802dot3ad.pm
+    version: '3.66'
+  SNMP::Info::IPv6:
+    file: lib/SNMP/Info/IPv6.pm
+    version: '3.66'
+  SNMP::Info::LLDP:
+    file: lib/SNMP/Info/LLDP.pm
+    version: '3.66'
+  SNMP::Info::Layer1:
+    file: lib/SNMP/Info/Layer1.pm
+    version: '3.66'
+  SNMP::Info::Layer1::Allied:
+    file: lib/SNMP/Info/Layer1/Allied.pm
+    version: '3.66'
+  SNMP::Info::Layer1::Asante:
+    file: lib/SNMP/Info/Layer1/Asante.pm
+    version: '3.66'
+  SNMP::Info::Layer1::Bayhub:
+    file: lib/SNMP/Info/Layer1/Bayhub.pm
+    version: '3.66'
+  SNMP::Info::Layer1::Cyclades:
+    file: lib/SNMP/Info/Layer1/Cyclades.pm
+    version: '3.66'
+  SNMP::Info::Layer1::S3000:
+    file: lib/SNMP/Info/Layer1/S3000.pm
+    version: '3.66'
+  SNMP::Info::Layer2:
+    file: lib/SNMP/Info/Layer2.pm
+    version: '3.66'
+  SNMP::Info::Layer2::3Com:
+    file: lib/SNMP/Info/Layer2/3Com.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Adtran:
+    file: lib/SNMP/Info/Layer2/Adtran.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Aerohive:
+    file: lib/SNMP/Info/Layer2/Aerohive.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Airespace:
+    file: lib/SNMP/Info/Layer2/Airespace.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Aironet:
+    file: lib/SNMP/Info/Layer2/Aironet.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Allied:
+    file: lib/SNMP/Info/Layer2/Allied.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Atmedia:
+    file: lib/SNMP/Info/Layer2/Atmedia.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Baystack:
+    file: lib/SNMP/Info/Layer2/Baystack.pm
+    version: '3.66'
+  SNMP::Info::Layer2::C1900:
+    file: lib/SNMP/Info/Layer2/C1900.pm
+    version: '3.66'
+  SNMP::Info::Layer2::C2900:
+    file: lib/SNMP/Info/Layer2/C2900.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Catalyst:
+    file: lib/SNMP/Info/Layer2/Catalyst.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Centillion:
+    file: lib/SNMP/Info/Layer2/Centillion.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Cisco:
+    file: lib/SNMP/Info/Layer2/Cisco.pm
+    version: '3.66'
+  SNMP::Info::Layer2::CiscoSB:
+    file: lib/SNMP/Info/Layer2/CiscoSB.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Exinda:
+    file: lib/SNMP/Info/Layer2/Exinda.pm
+    version: '3.66'
+  SNMP::Info::Layer2::HP:
+    file: lib/SNMP/Info/Layer2/HP.pm
+    version: '3.66'
+  SNMP::Info::Layer2::HP4000:
+    file: lib/SNMP/Info/Layer2/HP4000.pm
+    version: '3.66'
+  SNMP::Info::Layer2::HPVC:
+    file: lib/SNMP/Info/Layer2/HPVC.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Kentrox:
+    file: lib/SNMP/Info/Layer2/Kentrox.pm
+    version: '3.66'
+  SNMP::Info::Layer2::N2270:
+    file: lib/SNMP/Info/Layer2/N2270.pm
+    version: '3.66'
+  SNMP::Info::Layer2::NAP222x:
+    file: lib/SNMP/Info/Layer2/NAP222x.pm
+    version: '3.66'
+  SNMP::Info::Layer2::NWSS2300:
+    file: lib/SNMP/Info/Layer2/NWSS2300.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Netgear:
+    file: lib/SNMP/Info/Layer2/Netgear.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Nexans:
+    file: lib/SNMP/Info/Layer2/Nexans.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Orinoco:
+    file: lib/SNMP/Info/Layer2/Orinoco.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Sixnet:
+    file: lib/SNMP/Info/Layer2/Sixnet.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Trapeze:
+    file: lib/SNMP/Info/Layer2/Trapeze.pm
+    version: '3.66'
+  SNMP::Info::Layer2::Ubiquiti:
+    file: lib/SNMP/Info/Layer2/Ubiquiti.pm
+    version: '3.66'
+  SNMP::Info::Layer2::ZyXEL_DSLAM:
+    file: lib/SNMP/Info/Layer2/ZyXEL_DSLAM.pm
+    version: '3.66'
+  SNMP::Info::Layer3:
+    file: lib/SNMP/Info/Layer3.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Aironet:
+    file: lib/SNMP/Info/Layer3/Aironet.pm
+    version: '3.66'
+  SNMP::Info::Layer3::AlcatelLucent:
+    file: lib/SNMP/Info/Layer3/AlcatelLucent.pm
+    version: '3.66'
+  SNMP::Info::Layer3::AlteonAD:
+    file: lib/SNMP/Info/Layer3/AlteonAD.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Altiga:
+    file: lib/SNMP/Info/Layer3/Altiga.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Arista:
+    file: lib/SNMP/Info/Layer3/Arista.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Aruba:
+    file: lib/SNMP/Info/Layer3/Aruba.pm
+    version: '3.66'
+  SNMP::Info::Layer3::BayRS:
+    file: lib/SNMP/Info/Layer3/BayRS.pm
+    version: '3.66'
+  SNMP::Info::Layer3::BlueCoatSG:
+    file: lib/SNMP/Info/Layer3/BlueCoatSG.pm
+    version: '3.66'
+  SNMP::Info::Layer3::C3550:
+    file: lib/SNMP/Info/Layer3/C3550.pm
+    version: '3.66'
+  SNMP::Info::Layer3::C4000:
+    file: lib/SNMP/Info/Layer3/C4000.pm
+    version: '3.66'
+  SNMP::Info::Layer3::C6500:
+    file: lib/SNMP/Info/Layer3/C6500.pm
+    version: '3.66'
+  SNMP::Info::Layer3::CheckPoint:
+    file: lib/SNMP/Info/Layer3/CheckPoint.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Cisco:
+    file: lib/SNMP/Info/Layer3/Cisco.pm
+    version: '3.66'
+  SNMP::Info::Layer3::CiscoASA:
+    file: lib/SNMP/Info/Layer3/CiscoASA.pm
+    version: '3.66'
+  SNMP::Info::Layer3::CiscoFWSM:
+    file: lib/SNMP/Info/Layer3/CiscoFWSM.pm
+    version: '3.66'
+  SNMP::Info::Layer3::CiscoSwitch:
+    file: lib/SNMP/Info/Layer3/CiscoSwitch.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Contivity:
+    file: lib/SNMP/Info/Layer3/Contivity.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Cumulus:
+    file: lib/SNMP/Info/Layer3/Cumulus.pm
+    version: '3.66'
+  SNMP::Info::Layer3::DLink:
+    file: lib/SNMP/Info/Layer3/DLink.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Dell:
+    file: lib/SNMP/Info/Layer3/Dell.pm
+    version: '3.66'
+  SNMP::Info::Layer3::ERX:
+    file: lib/SNMP/Info/Layer3/ERX.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Enterasys:
+    file: lib/SNMP/Info/Layer3/Enterasys.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Extreme:
+    file: lib/SNMP/Info/Layer3/Extreme.pm
+    version: '3.66'
+  SNMP::Info::Layer3::F5:
+    file: lib/SNMP/Info/Layer3/F5.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Force10:
+    file: lib/SNMP/Info/Layer3/Force10.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Fortinet:
+    file: lib/SNMP/Info/Layer3/Fortinet.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Foundry:
+    file: lib/SNMP/Info/Layer3/Foundry.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Genua:
+    file: lib/SNMP/Info/Layer3/Genua.pm
+    version: '3.66'
+  SNMP::Info::Layer3::H3C:
+    file: lib/SNMP/Info/Layer3/H3C.pm
+    version: '3.66'
+  SNMP::Info::Layer3::HP9300:
+    file: lib/SNMP/Info/Layer3/HP9300.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Huawei:
+    file: lib/SNMP/Info/Layer3/Huawei.pm
+    version: '3.66'
+  SNMP::Info::Layer3::IBMGbTor:
+    file: lib/SNMP/Info/Layer3/IBMGbTor.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Juniper:
+    file: lib/SNMP/Info/Layer3/Juniper.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Lantronix:
+    file: lib/SNMP/Info/Layer3/Lantronix.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Microsoft:
+    file: lib/SNMP/Info/Layer3/Microsoft.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Mikrotik:
+    file: lib/SNMP/Info/Layer3/Mikrotik.pm
+    version: '3.66'
+  SNMP::Info::Layer3::N1600:
+    file: lib/SNMP/Info/Layer3/N1600.pm
+    version: '3.66'
+  SNMP::Info::Layer3::NetSNMP:
+    file: lib/SNMP/Info/Layer3/NetSNMP.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Netscreen:
+    file: lib/SNMP/Info/Layer3/Netscreen.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Nexus:
+    file: lib/SNMP/Info/Layer3/Nexus.pm
+    version: '3.66'
+  SNMP::Info::Layer3::OneAccess:
+    file: lib/SNMP/Info/Layer3/OneAccess.pm
+    version: '3.66'
+  SNMP::Info::Layer3::PacketFront:
+    file: lib/SNMP/Info/Layer3/PacketFront.pm
+    version: '3.66'
+  SNMP::Info::Layer3::PaloAlto:
+    file: lib/SNMP/Info/Layer3/PaloAlto.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Passport:
+    file: lib/SNMP/Info/Layer3/Passport.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Pf:
+    file: lib/SNMP/Info/Layer3/Pf.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Pica8:
+    file: lib/SNMP/Info/Layer3/Pica8.pm
+    version: '3.66'
+  SNMP::Info::Layer3::SonicWALL:
+    file: lib/SNMP/Info/Layer3/SonicWALL.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Steelhead:
+    file: lib/SNMP/Info/Layer3/Steelhead.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Sun:
+    file: lib/SNMP/Info/Layer3/Sun.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Tasman:
+    file: lib/SNMP/Info/Layer3/Tasman.pm
+    version: '3.66'
+  SNMP::Info::Layer3::Timetra:
+    file: lib/SNMP/Info/Layer3/Timetra.pm
+    version: '3.66'
+  SNMP::Info::Layer3::VMware:
+    file: lib/SNMP/Info/Layer3/VMware.pm
+    version: '3.66'
+  SNMP::Info::Layer3::VyOS:
+    file: lib/SNMP/Info/Layer3/VyOS.pm
+    version: '3.66'
+  SNMP::Info::Layer7:
+    file: lib/SNMP/Info/Layer7.pm
+    version: '3.66'
+  SNMP::Info::Layer7::APC:
+    file: lib/SNMP/Info/Layer7/APC.pm
+    version: '3.66'
+  SNMP::Info::Layer7::Arbor:
+    file: lib/SNMP/Info/Layer7/Arbor.pm
+    version: '3.66'
+  SNMP::Info::Layer7::CiscoIPS:
+    file: lib/SNMP/Info/Layer7/CiscoIPS.pm
+    version: '3.66'
+  SNMP::Info::Layer7::Gigamon:
+    file: lib/SNMP/Info/Layer7/Gigamon.pm
+    version: '3.66'
+  SNMP::Info::Layer7::Liebert:
+    file: lib/SNMP/Info/Layer7/Liebert.pm
+    version: '3.66'
+  SNMP::Info::Layer7::Neoteris:
+    file: lib/SNMP/Info/Layer7/Neoteris.pm
+    version: '3.66'
+  SNMP::Info::Layer7::Netscaler:
+    file: lib/SNMP/Info/Layer7/Netscaler.pm
+    version: '3.66'
+  SNMP::Info::MAU:
+    file: lib/SNMP/Info/MAU.pm
+    version: '3.66'
+  SNMP::Info::MRO:
+    file: lib/SNMP/Info/MRO.pm
+    version: '3.66'
+  SNMP::Info::NortelStack:
+    file: lib/SNMP/Info/NortelStack.pm
+    version: '3.66'
+  SNMP::Info::PowerEthernet:
+    file: lib/SNMP/Info/PowerEthernet.pm
+    version: '3.66'
+  SNMP::Info::RapidCity:
+    file: lib/SNMP/Info/RapidCity.pm
+    version: '3.66'
+  SNMP::Info::SONMP:
+    file: lib/SNMP/Info/SONMP.pm
+    version: '3.66'
+recommends:
+  Class::ISA: '0'
+  File::Slurp: '0'
+  Module::Info: '0'
+  Module::Load: '0'
+  PPI: '0'
+requires:
+  Math::BigInt: '0'
+  NetAddr::IP: '4.068'
+  SNMP: '0'
+resources:
+  IRC: irc://irc.freenode.org/#netdisco
+  MailingList: https://lists.sourceforge.net/lists/listinfo/snmp-info-users
+  bugtracker: https://github.com/netdisco/snmp-info/issues
+  homepage: http://netdisco.org/
+  license: http://opensource.org/licenses/BSD-3-Clause
+  repository: https://github.com/netdisco/snmp-info
+version: '3.66'
+x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,39 +0,0 @@
-# Module makefile for SNMP::Info (using ExtUtils::MakeMaker)
-# $Id$
-
-require 5.006;
-
-use strict;
-use warnings;
-use ExtUtils::MakeMaker;
-
-WriteMakefile(
-    NAME          => 'SNMP::Info',
-    AUTHOR        => 'Eric A. Miller <emiller@cpan.org>',
-    VERSION_FROM  => 'Info.pm',
-    ABSTRACT_FROM => 'Info.pm',
-    PREREQ_PM     => {
-        'Test::More'   => 0,
-        'Math::BigInt' => 0,
-        'SNMP'         => 0,
-    },
-    PMLIBDIRS => [ 'Info', '$(BASEEXT)' ],
-    dist      => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
-    clean     => { FILES    => 'SNMP-Info-*' },
-    realclean => { FILES    => 'Makefile.old' },
-    (     ( ExtUtils::MakeMaker->VERSION() lt '6.25' ) ? ( 'PL_FILES' => {} )
-        : ()
-    ),
-    (   ( ExtUtils::MakeMaker->VERSION() gt '6.30' ) ? ( 'LICENSE' => 'bsd' )
-        : ()
-    ),
-
-);
-
-sub MY::postamble {
-    "
-.PHONY: readme
-readme: README
-README: Info.pm
-	pod2text -l Info.pm > README";
-}
--- a/410
+++ b/410
@@ -1,46 +1,43 @@
 NAME
-
    SNMP::Info - OO Interface to Network devices and MIBs through SNMP

 VERSION
-
-    SNMP::Info - Version 3.10
+    SNMP::Info - Version 3.66

 AUTHOR
-
    SNMP::Info is maintained by team of Open Source authors headed by Eric
    Miller, Bill Fenner, Max Baker, Jeroen van Ingen and Oliver Gorwits.

-    Please visit <http://sourceforge.net/projects/snmp-info/> for most
+    Please visit <https://github.com/netdisco/snmp-info/> for the most
    up-to-date list of developers.

    SNMP::Info was originally created at UCSC for the Netdisco project
    <http://netdisco.org> by Max Baker.

 DEVICES SUPPORTED
-
-    See <http://netdisco.org/doc/DeviceMatrix.html> or DeviceMatrix.txt for
-    more details.
+    There are now generic classes for most types of device and so the
+    authors recommend loading SNMP::Info with AutoSpecify, and then
+    reporting to the mail list any missing functionality (such as neighbor
+    discovery tables).

 SYNOPSIS
-
     use SNMP::Info;

-     my $info = new SNMP::Info( 
+     my $info = new SNMP::Info(
                                # Auto Discover more specific Device Class
                                AutoSpecify => 1,
                                Debug       => 1,
                                # The rest is passed to SNMP::Session
                                DestHost    => 'router',
                                Community   => 'public',
-                                Version     => 2 
+                                Version     => 2
                              ) or die "Can't connect to device.\n";

     my $err = $info->error();
     die "SNMP Community or Version probably wrong connecting to device. $err\n" if defined $err;

-     $name  = $info->name();
-     $class = $info->class();
+     my $name  = $info->name();
+     my $class = $info->class();
     print "SNMP::Info is using this device class : $class\n";

     # Find out the Duplex status for the ports
@@ -64,7 +61,7 @@ SYNOPSIS
        # The CDP Table has table entries different than the interface tables.
        # So we use c_if to get the map from cdp table to interface table.

-        my %c_map = reverse %$c_if; 
+        my %c_map = reverse %$c_if;
        my $c_key = $c_map{$iid};
        unless (defined $c_key) {
             print "\n\n";
@@ -79,13 +76,11 @@ SYNOPSIS
     }

 SUPPORT
-
    Please direct all support, help, and bug requests to the snmp-info-users
    Mailing List at
    <http://lists.sourceforge.net/lists/listinfo/snmp-info-users>.

 DESCRIPTION
-
    SNMP::Info gives an object oriented interface to information obtained
    through SNMP.

@@ -112,7 +107,6 @@ DESCRIPTION
    a couple hashes. See EXTENDING SNMP::INFO.

 REQUIREMENTS
-
    1. Net-SNMP
        To use this module, you must have Net-SNMP installed on your system.
        More specifically you need the Perl modules that come with it.
@@ -143,14 +137,12 @@ REQUIREMENTS

        If you are using SNMP::Info separate from Netdisco, download the
        Netdisco MIB package at
-        <http://sourceforge.net/project/showfiles.php?group_id=80033&package
-        _id=135517>
+        <https://github.com/netdisco/netdisco-mibs/releases/latest/>

        Make sure that your snmp.conf is updated to point to your MIB
        directory and that the MIBs are world-readable.

 DESIGN GOALS
-
    1. Use of textual MIB leaf identifier and enumerated values

        *   All values are retrieved via MIB Leaf node names
@@ -176,18 +168,16 @@ DESIGN GOALS
        See the section EXTENDING SNMP::INFO for more details.

        When you make a new subclass for a device, please be sure to send it
-        back to the developers (via Source Forge or the mailing list) for
-        inclusion in the next version.
+        back to the developers (via a github pull request or the mailing
+        list) for inclusion in the next version.

 SUBCLASSES
-
    These are the subclasses that implement MIBs and support devices:

    Required MIBs not included in the install instructions above are noted
    here.

  MIB Subclasses
-
    These subclasses implement method to access one or more MIBs. These are
    not used directly, but rather inherited from device subclasses.

@@ -200,6 +190,11 @@ SUBCLASSES

        See documentation in SNMP::Info::AdslLine for details.

+    SNMP::Info::Aggregate
+        SNMP Interface to IF-MIB "ifStackTable" Aggregated Links
+
+        See documentation in SNMP::Info::Aggregate for details.
+
    SNMP::Info::Airespace
        AIRESPACE-WIRELESS-MIB and AIRESPACE-SWITCHING-MIB. Inherited by
        devices based on the Airespace wireless platform.
@@ -213,11 +208,16 @@ SUBCLASSES
        See documentation in SNMP::Info::AMAP for details.

    SNMP::Info::Bridge
-        BRIDGE-MIB (RFC1286). QBRIDGE-MIB. Inherited by devices with Layer2
+        BRIDGE-MIB (RFC1286). Q-BRIDGE-MIB. Inherited by devices with Layer2
        support.

        See documentation in SNMP::Info::Bridge for details.

+    SNMP::Info::CiscoAgg
+        SNMP Interface to Cisco Aggregated Links
+
+        See documentation in SNMP::Info::CiscoAgg for details.
+
    SNMP::Info::CDP
        CISCO-CDP-MIB. Cisco Discovery Protocol (CDP) Support. Inherited by
        Cisco, Enterasys, and HP devices.
@@ -230,12 +230,6 @@ SUBCLASSES

        See documentation in SNMP::Info::CiscoConfig for details.

-    SNMP::Info::CiscoImage
-        CISCO-IMAGE-MIB. A collection of OIDs providing IOS image
-        characteristics.
-
-        See documentation in SNMP::Info::CiscoImage for details.
-
    SNMP::Info::CiscoPortSecurity
        CISCO-PORT-SECURITY-MIB and CISCO-PAE-MIB.

@@ -315,6 +309,11 @@ SUBCLASSES

        See documentation in SNMP::Info::IEEE802dot11 for details.

+    SNMP::Info::IEEE802dot3ad
+        SNMP Interface to IEEE Aggregated Links. IEEE8023-LAG-MIB
+
+        See documentation in SNMP::Info::IEEE802dot3ad for details.
+
    SNMP::Info::LLDP
        LLDP-MIB, LLDP-EXT-DOT1-MIB, and LLDP-EXT-DOT3-MIB. Link Layer
        Discovery Protocol (LLDP) Support.
@@ -323,10 +322,15 @@ SUBCLASSES

    SNMP::Info::MAU
        MAU-MIB (RFC2668). Some Layer2 devices use this for extended
-        Ethernet (Media Access Unit) interface information.
+        Ethernet (Medium Attachment Unit) interface information.

        See documentation in SNMP::Info::MAU for details.

+    SNMP::Info::MRO
+        Method resolution introspection for SNMP::Info
+
+        See documentation in SNMP::Info::MRO for details.
+
    SNMP::Info::NortelStack
        S5-AGENT-MIB, S5-CHASSIS-MIB.

@@ -351,7 +355,6 @@ SUBCLASSES
        See documentation in SNMP::Info::SONMP for details.

  Device Subclasses
-
    These subclasses inherit from one or more classes to provide a common
    interface to data obtainable from network devices.

@@ -384,7 +387,7 @@ SUBCLASSES
            See documentation in SNMP::Info::Layer1::Bayhub for details.

        SNMP::Info::Layer1::Cyclades
-            Subclass for Cyclades terminal servers.
+            Subclass for Cyclades/Avocent terminal servers.

            See documentation in SNMP::Info::Layer1::Cyclades for details.

@@ -399,6 +402,21 @@ SUBCLASSES

        See documentation in SNMP::Info::Layer2 for details.

+        SNMP::Info::Layer2::3Com
+            Subclass for L2 3Com Switches.
+
+            See documentation in SNMP::Info::Layer2::3Com for details.
+
+        SNMP::Info::Layer2::Adtran
+            Subclass for Adtran devices.
+
+            See documentation in SNMP::Info::Layer2::Adtran for details.
+
+        SNMP::Info::Layer2::Aerohive
+            Subclass for Aerohive Access Points.
+
+            See documentation in SNMP::Info::Layer2::Aerohive for details.
+
        SNMP::Info::Layer2::Airespace
            Subclass for Cisco (Airespace) wireless controllers.

@@ -406,7 +424,8 @@ SUBCLASSES

        SNMP::Info::Layer2::Aironet
            Class for Cisco Aironet wireless devices that run IOS. See also
-            Layer3::Aironet for Aironet devices that don't run IOS.
+            SNMP::Info::Layer3::Aironet for Aironet devices that don't run
+            IOS.

            See documentation in SNMP::Info::Layer2::Aironet for details.

@@ -415,6 +434,11 @@ SUBCLASSES

            See documentation in SNMP::Info::Layer2::Allied for details.

+        SNMP::Info::Layer2::Atmedia
+            Subclass for atmedia encryptors.
+
+            See documentation in SNMP::Info::Layer2::Atmedia for details.
+
        SNMP::Info::Layer2::Baystack
            Subclass for Avaya/Nortel/Bay Ethernet Switch/Baystack switches.
            This includes 303, 304, 350, 380, 410, 420, 425, 450, 460, 470
@@ -424,10 +448,6 @@ SUBCLASSES

            See documentation in SNMP::Info::Layer2::Baystack for details.

-        SNMP::Info::Layer2::Kentrox
-            Class for Kentrox DataSMART DSU/CSU. See
-            SNMP::Info::Layer2::Kentrox for details.
-
        SNMP::Info::Layer2::C1900
            Subclass for Cisco Catalyst 1900 and 1900c Devices running
            CatOS.
@@ -454,8 +474,9 @@ SUBCLASSES
            See documentation in SNMP::Info::Layer2::Centillion for details.

        SNMP::Info::Layer2::Cisco
-            Generic Cisco subclass for layer2 devices that are not yet
-            supported in more specific subclasses.
+            Generic Cisco subclass for layer 2 devices that are not yet
+            supported in more specific subclassesand the base layer 2 Cisco
+            class for other device specific layer 2 Cisco classes.

            See documentation in SNMP::Info::Layer2::Cisco for details.

@@ -466,8 +487,13 @@ SUBCLASSES

            See documentation in SNMP::Info::Layer2::CiscoSB for details.

+        SNMP::Info::Layer2::Exinda
+            Subclass for Exinda / GFI Network Orchestrator traffic shapers.
+
+            See documentation in SNMP::Info::Layer2::Exinda for details.
+
        SNMP::Info::Layer2::HP
-            Subclass for more recent HP Procurve Switches
+            Subclass for more recent HP Procurve Switches.

            Requires HP-ICF-OID and ENTITY-MIB downloaded from HP.

@@ -485,6 +511,11 @@ SUBCLASSES

            See documentation in SNMP::Info::Layer2::HPVC for details.

+        SNMP::Info::Layer2::Kentrox
+            Class for Kentrox DataSMART DSU/CSU.
+
+            See documentation in SNMP::Info::Layer2::Kentrox for details.
+
        SNMP::Info::Layer2::N2270
            Subclass for Nortel 2270 wireless switches.

@@ -500,6 +531,11 @@ SUBCLASSES

            See documentation in SNMP::Info::Layer2::Netgear for details.

+        SNMP::Info::Layer2::Nexans
+            Subclass for Nexans switches
+
+            See documetion in SNMP::Info::Layer2::Nexans for details.
+
        SNMP::Info::Layer2::NWSS2300
            SNMP Interface to Avaya (Trapeze) Wireless Controllers

@@ -515,6 +551,16 @@ SUBCLASSES

            See documentation in SNMP::Info::Layer2::Trapeze for details.

+        SNMP::Info::Layer2::Sixnet
+            SNMP Interface to Sixnet industrial switches
+
+            See documentation in SNMP::Info::Layer2::Sixnet for details.
+
+        SNMP::Info::Layer2::Ubiquiti
+            SNMP Interface to Ubiquiti Access Points and other devices
+
+            See documentation in SNMP::Info::Layer2::Ubiquiti for details.
+
        SNMP::Info::Layer2::ZyXEL_DSLAM
            Zyxel DSLAMs. Need I say more?

@@ -533,7 +579,7 @@ SUBCLASSES
            MIBs for these devices now included in v2.tar.gz available from
            ftp.cisco.com.

-            Note Layer2::Aironet
+            Note SNMP::Info::Layer2::Aironet

            See documentation in SNMP::Info::Layer3::Aironet for details.

@@ -588,9 +634,15 @@ SUBCLASSES

            See documentation in SNMP::Info::Layer3::C6500 for details.

+        SNMP::Info::Layer3::CheckPoint
+            Subclass for CheckPoint devices.
+
+            See documentation in SNMP::Info::Layer3::CheckPoint for details.
+
        SNMP::Info::Layer3::Cisco
-            This is a simple wrapper around Layer3 for IOS devices. It adds
-            on CiscoVTP.
+            This is a simple wrapper around layer 3 for IOS devices and the
+            base layer 3 Cisco class for other device specific layer 3 Cisco
+            classes.

            See documentation in SNMP::Info::Layer3::Cisco for details.

@@ -604,15 +656,29 @@ SUBCLASSES

            See documentation in SNMP::Info::Layer3::CiscoFWSM for details.

+        SNMP::Info::Layer3::CiscoSwitch
+            Base class for L3 Cisco switches. See documentation in
+            SNMP::Info::Layer3::CiscoSwitch for details.
+
        SNMP::Info::Layer3::Contivity
            Subclass for Avaya/Nortel Contivity/VPN Routers.

            See documentation in SNMP::Info::Layer3::Contivity for details.

+        SNMP::Info::Layer3::Cumulus
+            Subclass for Cumulus Networks Routers.
+
+            See documentation in SNMP::Info::Layer3::Cumulus for details.
+
+        SNMP::Info::Layer3::DLink
+            Subclass for DLink devices.
+
+            See documentation in SNMP::Info::Layer3::DLink for details.
+
        SNMP::Info::Layer3::Dell
-            Subclass for Dell PowerConnect switches. D-Link, the IBM
-            BladeCenter Gigabit Ethernet Switch Module and some Linksys
-            switches also use this module based upon MIB support.
+            Subclass for Dell PowerConnect switches. The IBM BladeCenter
+            Gigabit Ethernet Switch Module and some Linksys switches also
+            use this module based upon MIB support.

            See documentation in SNMP::Info::Layer3::Dell for details.

@@ -621,6 +687,11 @@ SUBCLASSES

            See documentation in SNMP::Info::Layer3::Enterasys for details.

+        SNMP::Info::Layer3::ERX
+            Subclass for Juniper ERX switches.
+
+            See documentation in SNMP::Info::Layer3::ERX for details.
+
        SNMP::Info::Layer3::Extreme
            Subclass for Extreme Networks switches.

@@ -636,11 +707,21 @@ SUBCLASSES

            See documentation in SNMP::Info::Layer3::Force10 for details.

+        SNMP::Info::Layer3::Fortinet
+            Subclass for Fortinet devices.
+
+            See documentation in SNMP::Info::Layer3::Fortinet for details.
+
        SNMP::Info::Layer3::Foundry
            Subclass for Brocade (Foundry) Network devices.

            See documentation in SNMP::Info::Layer3::Foundry for details.

+        SNMP::Info::Layer3::Genua
+            Subclass for Genua security devices.
+
+            See documentation in SNMP::Info::Layer3::Genua for details.
+
        SNMP::Info::Layer3::H3C
            SNMP Interface to Layer 3 Devices, H3C & HP A-series.

@@ -653,19 +734,25 @@ SUBCLASSES

            See documentation in SNMP::Info::Layer3::HP9300 for details.

+        SNMP::Info::Layer3::Huawei
+            SNMP Interface to Huawei Layer 3 switches and routers.
+
+            See documentation in SNMP::Info::Layer3::Huawei for details.
+
        SNMP::Info::Layer3::IBMGbTor
            SNMP Interface to IBM Rackswitch (formerly Blade Network
-            Technologies) network devices.
+            Technologies) network devices. Lenovo acquired these from IBM
+            and is now selling them under the Lenovo brand.

            See documentation in SNMP::Info::Layer3::IBMGbTor for details.

        SNMP::Info::Layer3::Juniper
-            Subclass for Juniper devices
+            Subclass for Juniper devices.

            See documentation in SNMP::Info::Layer3::Juniper for details.

        SNMP::Info::Layer3::Lantronix
-            Subclass for Lantronix devices
+            Subclass for Lantronix devices.

            See documentation in SNMP::Info::Layer3::Lantronix for details.

@@ -696,16 +783,26 @@ SUBCLASSES
            See documentation in SNMP::Info::Layer3::Netscreen for details.

        SNMP::Info::Layer3::Nexus
-            Subclass for Cisco Nexus devices running NX-OS
+            Subclass for Cisco Nexus devices running NX-OS.

            See documentation in SNMP::Info::Layer3::Nexus for details.

+        SNMP::Info::Layer3::OneAccess
+            Subclass for OneAccess routers.
+
+            See documentation in SNMP::Info::Layer3::OneAccess for details.
+
        SNMP::Info::Layer3::PacketFront
            Subclass for PacketFront DRG series CPE.

            See documentation in SNMP::Info::Layer3::PacketFront for
            details.

+        SNMP::Info::Layer3::PaloAlto
+            Subclass for Palo Alto firewalls.
+
+            See documentation in SNMP::Info::Layer3::PaloAlto for details.
+
        SNMP::Info::Layer3::Passport
            Subclass for Avaya/Nortel Ethernet Routing Switch/Passport 8000
            series, Accelar, and VSP 9000 series switches.
@@ -723,12 +820,14 @@ SUBCLASSES
            See documentation in SNMP::Info::Layer3::Pica8 for details.

        SNMP::Info::Layer3::SonicWALL
-            Subclass for generic SonicWALL devices. See documentation in
-            SNMP::Info::Layer3::SonicWALL for details.
+            Subclass for generic SonicWALL devices.
+
+            See documentation in SNMP::Info::Layer3::SonicWALL for details.

        SNMP::Info::Layer3::Steelhead
-            Subclass for Riverbed Steelhead WAN optimization appliances. See
-            documentation in SNMP::Info::Layer3::Steelhead for details.
+            Subclass for Riverbed Steelhead WAN optimization appliances.
+
+            See documentation in SNMP::Info::Layer3::Steelhead for details.

        SNMP::Info::Layer3::Sun
            Subclass for Generic Sun Routers running SunOS.
@@ -745,41 +844,68 @@ SUBCLASSES

            See documentation in SNMP::Info::Layer3::Timetra for details.

+        SNMP::Info::Layer3::VyOS
+            Subclass for VyOS routers.
+
+            See documentation in SNMP::Info::Layer3::VyOS for details.
+
+        SNMP::Info::Layer3::VMware
+            Subclass for VMware ESXi hosts.
+
+            See documentation in SNMP::Info::Layer3::VMware for details.
+
    SNMP::Info::Layer7
        Generic Layer7 Devices.

        See documentation in SNMP::Info::Layer7 for details.

        SNMP::Info::Layer7::APC
-            SNMP Interface to APC UPS devices
+            Subclass for APC UPS devices.

            See documentation in SNMP::Info::Layer7::APC for details.

-        SNMP::Info::Layer7::Netscaler
-            SNMP Interface to Citrix Netscaler appliances
+        SNMP::Info::Layer7::Arbor
+            Subclass for Arbor appliances.

-            See documentation in SNMP::Info::Layer7::Netscaler for details.
+            See documentation in SNMP::Info::Layer7::Arbor for details.
+
+        SNMP::Info::Layer7::CiscoIPS
+            Subclass for Cisco IPS devices.
+
+            See documentation in SNMP::Info::Layer7::CiscoIPS for details.
+
+        SNMP::Info::Layer7::Gigamon
+            Subclass for Gigamon devices.
+
+            See documentation in SNMP::Info::Layer7::Gigamon for details.
+
+        SNMP::Info::Layer7::Liebert
+            Subclass for Liebert devices.
+
+            See documentation in SNMP::Info::Layer7::Liebert for details.

        SNMP::Info::Layer7::Neoteris
-            SNMP Interface to Juniper SSL VPN appliances
+            Subclass for Juniper SSL VPN appliances.

            See documentation in SNMP::Info::Layer7::Neoteris for details.

-Thanks
+        SNMP::Info::Layer7::Netscaler
+            Subclass for Citrix Netscaler appliances.

+            See documentation in SNMP::Info::Layer7::Netscaler for details.
+
+Thanks
    Thanks for testing and coding help (in no particular order) to :
    Alexander Barthel, Andy Ford, Alexander Hartmaier, Andrew Herrick, Alex
    Kramarov, Bernhard Augenstein, Bradley Baetz, Brian Chow, Brian Wilson,
    Carlos Vicente, Dana Watanabe, David Pinkoski, David Sieborger, Douglas
    McKeown, Greg King, Ivan Auger, Jean-Philippe Luiggi, Jeroen van Ingen,
    Justin Hunter, Kent Hamilton, Matthew Tuttle, Michael Robbert, Mike
-    Hunter, Nicolai Petri, Ralf Gross, Robert Kerr and people listed on the
-    Netdisco README!
+    Hunter, Nicolai Petri, Ralf Gross, Robert Kerr, Nick Nauwelaerts and
+    people listed on the Netdisco README!

 USAGE
-
  Constructor
-
    new()
        Creates a new object and connects via SNMP::Session.

@@ -878,6 +1004,19 @@ USAGE

            (default creates session automatically)

+        Offline
+            Causes SNMP::Info to avoid network activity and return data only
+            from its cache. If you ask for something not in the cache, an
+            error is thrown. See also the "cache()" and "offline()" methods.
+
+            (default 0, which means "online")
+
+        Cache
+            Pass in a HashRef to prime the cache of retrieved data. Useful
+            for creating an instance in "Offline" mode from a previously
+            dumped cache. See also the "cache()" method to retrieve a cache
+            after running actial queries.
+
        OTHER
            All other arguments are passed to SNMP::Session.

@@ -916,7 +1055,6 @@ USAGE
        identify the device.

  Data is Cached
-
    Methods and subroutines requesting data from a device will only load the
    data once, and then return cached versions of that data.

@@ -926,8 +1064,10 @@ USAGE
    Run $info->clear_cache() to clear the cache to allow reload of both
    globals and table methods.

-  Object Scalar Methods
+    The cache can be retrieved or set using the $info->cache() method. This
+    works together with the "Offline" option.

+  Object Scalar Methods
    These are for package related data, not directly supplied from SNMP.

    $info->clear_cache()
@@ -938,6 +1078,17 @@ USAGE
        Returns current debug status, and optionally toggles debugging info
        for this object.

+    $info->offline([1|0])
+        Returns if offline mode is currently turned on for this object.
+
+        Optionally sets the Offline parameter.
+
+    $info->cache([new_cache])
+        Returns a HashRef of all cached data in this object. There will be a
+        "store" key for table data and then one key for each leaf.
+
+        Optionally sets the cache parameters if passed a HashRef.
+
    $info->bulkwalk([1|0])
        Returns if bulkwalk is currently turned on for this object.

@@ -961,10 +1112,6 @@ USAGE
        If the device still can be connected to via SNMP::Info, then
        SNMP::Info is returned.

-        See <http://netdisco.org/doc/DeviceMatrix.html> or DeviceMatrix.txt
-        for more details about device support, or view "device_type()" in
-        Info.pm.
-
    $info->error(no_clear)
        Returns Error message if there is an error, or undef if there is
        not.
@@ -1004,7 +1151,6 @@ USAGE
        Indexing.html>

  Globals (Scalar Methods)
-
    These are methods to return scalar data from RFC1213.

    Some subset of these is probably available for any network device that
@@ -1028,7 +1174,7 @@ USAGE
        This returns a binary encoded string where each digit represents a
        layer of the OSI model served by the device.

-            eg: 01000010  means layers 2 (physical) and 7 (Application) 
+            eg: 01000010  means layers 2 (physical) and 7 (Application)
                          are served.

        Note: This string is 8 digits long.
@@ -1053,7 +1199,6 @@ USAGE
        ("ipForwarding")

  Table Methods
-
    Each of these methods returns a hash_reference to a hash keyed on the
    interface index in SNMP.

@@ -1068,7 +1213,6 @@ USAGE
    cases changes between reboots of the network device.

  Partial Table Fetches
-
    If you want to get only a part of an SNMP table or a single instance
    from the table and you know the IID for the part of the table that you
    want, you can specify it in the call:
@@ -1083,7 +1227,6 @@ USAGE
    Partial table results are not cached.

  Interface Information
-
    $info->interfaces()
        This methods is overridden in each subclass to provide a mapping
        between the Interface Table Index (iid) and the physical port name.
@@ -1178,7 +1321,6 @@ USAGE
        ("ifAlias")

  Interface Statistics
-
    $info->i_octet_in(), $info->i_octets_out(), $info->i_octet_in64(),
    $info->i_octets_out64()
        Bandwidth.
@@ -1268,33 +1410,41 @@ USAGE

        ("ifSpecific")

-  IP Address Table
+  IPv4 Address Table
+    Each entry in this table is an IPv4 address in use on this device.
+    Usually this is implemented in Layer3 Devices. These methods try the
+    deprecated IPv4 address table "IP-MIB::ipAddrTable" first due to its
+    prevalence and will try the current "IP-MIB::ipAddressTable" if it
+    doesn't return any results. "IP-MIB::ipAddressTable" results are
+    filtered to only return IPv4 unicast addresses and modified to match the
+    return format of the older table for backwards compatibility.

-    Each entry in this table is an IP address in use on this device. Usually
-    this is implemented in Layer3 Devices.
+    See documentation in SNMP::Info::IPv6 for IPv6 Address Table.

    $info->ip_index()
-        Maps the IP Table to the IID
+        Maps the IPv4 addresses to the interface index

-        ("ipAdEntIfIndex")
+        ("ipAdEntIfIndex") or filtered and index modified
+        ("ipAddressIfIndex")

    $info->ip_table()
-        Maps the Table to the IP address
+        Maps the Table to the IPv4 address

-        ("ipAdEntAddr")
+        ("ipAdEntAddr") or address extracted from ("ipAddressIfIndex")

    $info->ip_netmask()
-        Gives netmask setting for IP table entry.
+        Gives netmask setting for IPv4 table entry.

-        ("ipAdEntNetMask")
+        ("ipAdEntNetMask") or netmask calculated from ("ipAddressPrefix")

    $info->ip_broadcast()
-        Gives broadcast address for IP table entry.
+        Gives the value of the least-significant bit in the IPv4 broadcast
+        address either 1 or 0.

-        ("ipAdEntBcastAddr")
+        ("ipAdEntBcastAddr"), there is no equivalent from the
+        "IP-MIB::ipAddressTable"

  IP Routing Table
-
    $info->ipr_route()
        The route in question. A value of 0.0.0.0 is the default gateway
        route.
@@ -1411,7 +1561,6 @@ USAGE
        ("ipRouteInfo")

  Topology Information
-
    Based upon the manufacturer and software version devices may support
    some combination of Layer 2 topology protocol information. SNMP::Info
    supports querying Link Layer Discovery Protocol (LLDP), Cisco Discovery
@@ -1429,7 +1578,6 @@ USAGE
    AMAP: See SNMP::Info::AMAP for details.

   Topology Capabilities
-
    $info->has_topo()
        Reports Layer 2 topology protocols which are supported and running
        on a device.
@@ -1439,7 +1587,6 @@ USAGE
        protocols are supported or running.

   Common Topology Table Information
-
    The common topology table methods below will query the device for
    information from the specified topology protocols and return a single
    hash combining all information. As a result, there may be identical
@@ -1500,7 +1647,6 @@ USAGE
        Note: Only CDP and LLDP support this method.

 SETTING DATA VIA SNMP
-
    This section explains how to use SNMP::Info to do SNMP Set operations.

    $info->set_METHOD($value)
@@ -1519,7 +1665,7 @@ SETTING DATA VIA SNMP

         # Disable a port administratively
         my %if_map = reverse %{$info->interfaces()}
-         $info->set_i_up_admin('down', $if_map{'FastEthernet0/0'}) 
+         $info->set_i_up_admin('down', $if_map{'FastEthernet0/0'})
            or die "Couldn't disable the port. ",$info->error(1);

    NOTE: You must be connected to your device with a "ReadWrite" community
@@ -1530,7 +1676,6 @@ SETTING DATA VIA SNMP
    subroutines will need to be added if they haven't been already.

 Quiet Mode
-
    SNMP::Info will not chirp anything to STDOUT unless there is a serious
    error (in which case it will probably die).

@@ -1545,7 +1690,6 @@ Quiet Mode
     my $name = $info->name() or die "Couldn't get sysName!" . $name->error();

 EXTENDING SNMP::INFO
-
    To support a new class (vendor or platform) of device, add a Perl
    package with the data structures and methods listed below.

@@ -1555,14 +1699,13 @@ EXTENDING SNMP::INFO
    to verify the implementation.

  Gathering MIB data for SNMP::Info Developers
-
-    The preference is to open a feature request in the SourceForge project.
-    This allows all developers to have visibility into the request. Please
+    The preference is to open a pull request in the github project. This
+    allows all developers to have visibility into the request. Please
    include pointers to the applicable platform MIBs. For development we
    will need an "snmpwalk" of the device. There is a tool now included in
    the SNMP::Info distribution to help with this task, although you'll most
    likely need to download the distribution from CPAN as it's included in
-    the ""t/util"" directory.
+    the ""contrib/util"" directory.

    The utility is named "make_snmpdata.pl". Run it with a command line
    like:
@@ -1575,13 +1718,11 @@ EXTENDING SNMP::INFO
    This will print to the file every MIB entry with data in a format that
    the developers can use to emulate read operations without needing access
    to the device. Preference would be to mask any sensitive data in the
-    output, zip the file, and upload as an attachment to the Sourceforge
-    tracker. However, if you do not feel comfortable uploading the output to
-    the tracker you could e-mail it to the developer that has claimed the
-    ticket.
+    output, zip the file, and attach it to the github pull request. However,
+    if you do not feel comfortable uploading the output to the tracker you
+    could e-mail it to the developer that has claimed the ticket.

  Data Structures required in new Subclass
-
    A class inheriting this class must implement these data structures :

    $INIT
@@ -1638,7 +1779,6 @@ EXTENDING SNMP::INFO
         )

  Sample Subclass
-
    Let's make a sample Layer 2 Device subclass. This class will inherit the
    Cisco Vlan module as an example.

@@ -1706,7 +1846,7 @@ EXTENDING SNMP::INFO
         return 'Fire' if $power =~ /reallyhot/i;
         return 'Ice'  if $power =~ /reallycold/i;

-         # Else 
+         # Else
         return $power;
     }

@@ -1726,14 +1866,8 @@ EXTENDING SNMP::INFO
     1; # don't forget this line
    ----------------------- snip --------------------------------

-    Be sure and send the debugged version to
-    snmp-info-users@lists.sourceforge.net to be included in the next version
-    of SNMP::Info.
-
 SNMP::INFO INTERNALS
-
  Object Namespace
-
    Internal data is stored with bareword keys. For example $info->{debug}

    SNMP Data is stored or marked cached with keys starting with an
@@ -1743,7 +1877,6 @@ SNMP::INFO INTERNALS
    above.

  Package Globals
-
    These set the default value for an object upon creation.

    $DEBUG
@@ -1765,21 +1898,20 @@ SNMP::INFO INTERNALS
        for more info. Can change by passing BulkRepeaters option in new()

  Data Munging Callback Subroutines
-
    munge_speed()
-        Makes human friendly speed ratings using %SPEED_MAP
+        Makes human friendly speed ratings using %SPEED_MAP.

         %SPEED_MAP = (
                        '56000'      => '56 kbps',
                        '64000'      => '64 kbps',
                        '115000'     => '115 kpbs',
                        '1500000'    => '1.5 Mbps',
-                        '1536000'    => 'T1',      
+                        '1536000'    => 'T1',
                        '1544000'    => 'T1',
                        '2000000'    => '2.0 Mbps',
                        '2048000'    => '2.048 Mbps',
                        '3072000'    => 'Dual T1',
-                        '3088000'    => 'Dual T1',   
+                        '3088000'    => 'Dual T1',
                        '4000000'    => '4.0 Mbps',
                        '10000000'   => '10 Mbps',
                        '11000000'   => '11 Mbps',
@@ -1795,15 +1927,17 @@ SNMP::INFO INTERNALS
                        '54000000'   => '54 Mbps',
                        '64000000'   => '64 Mbps',
                        '100000000'  => '100 Mbps',
+                        '200000000'  => '200 Mbps',
                        '149760000'  => 'ATM on OC-3',
                        '155000000'  => 'OC-3',
                        '155519000'  => 'OC-3',
                        '155520000'  => 'OC-3',
                        '400000000'  => '400 Mbps',
-                        '599040000'  => 'ATM on OC-12', 
+                        '599040000'  => 'ATM on OC-12',
                        '622000000'  => 'OC-12',
                        '622080000'  => 'OC-12',
                        '1000000000' => '1.0 Gbps',
+                        '2000000000' => '2.0 Gbps',
                        '2488000000' => 'OC-48',
                     )

@@ -1814,10 +1948,10 @@ SNMP::INFO INTERNALS
        speeds up to terabit levels this way.

    munge_highspeed()
-        Makes human friendly speed ratings for "ifHighSpeed"
+        Makes human friendly speed ratings for "ifHighSpeed".

    munge_ip()
-        Takes a binary IP and makes it dotted ASCII
+        Takes a binary IP and makes it dotted ASCII.

    munge_mac()
        Takes an octet stream (HEX-STRING) and returns a colon separated
@@ -1827,20 +1961,24 @@ SNMP::INFO INTERNALS
        Takes an 8-byte octet stream (HEX-STRING) and returns a colon
        separated ASCII hex string.

+    munge_prio_port()
+        Takes an 2-byte octet stream (HEX-STRING) and returns a colon
+        separated ASCII hex string.
+
    munge_octet2hex()
-        Takes a binary octet stream and returns an ASCII hex string
+        Takes a binary octet stream and returns an ASCII hex string.

    munge_dec2bin()
-        Takes a binary char and returns its ASCII binary representation
+        Takes a binary char and returns its ASCII binary representation.

-    munge_bits
-        Takes a SNMP2 'BITS' field and returns the ASCII bit string
+    munge_bits()
+        Takes a SNMP2 'BITS' field and returns the ASCII bit string.

-    munge_counter64
+    munge_counter64()
        If $BIGINT is set to true, then a Math::BigInt object is returned.
        See Math::BigInt for details.

-    munge_i_up
+    munge_i_up()
        Net-SNMP tends to load "RFC1213-MIB" first, and so ignores the
        updated enumeration for "ifOperStatus" in "IF-MIB". This munge
        handles the "newer" definitions for the enumeration in IF-MIB.
@@ -1848,7 +1986,7 @@ SNMP::INFO INTERNALS
        TODO: Get the precedence of MIBs and overriding of MIB data in
        Net-SNMP figured out. Heirarchy/precendence of MIBS in SNMP::Info.

-    munge_port_list
+    munge_port_list()
        Takes an octet string representing a set of ports and returns a
        reference to an array of binary values each array element
        representing a port.
@@ -1857,12 +1995,18 @@ SNMP::INFO INTERNALS
        set of ports; the port is not included if it has a value of '0'.

    munge_null()
-        Removes control characters from a string
+        Removes control characters from a string.

    munge_e_type()
        Takes an OID and return the object name if the right MIB is loaded.

  Internally Used Functions
+    resolve_desthost()
+        Takes the SNMP::Session "DestHost" argument and determines if it is
+        an 'IPv4' or 'IPv6' host. 'IPv6' hosts are prefixed with the "udp6:"
+        "transport-specifier" as required by the undelying "Net-SNMP"
+        library. If unable to determine the type of address or resolve a DNS
+        name, dies with "croak".

    $info->init()
        Used internally. Loads all entries in %MIBS.
@@ -2041,7 +2185,6 @@ SNMP::INFO INTERNALS
        Returns undef if the method does not exist and can not be created.

  AUTOLOAD
-
    Each entry in either %FUNCS, %GLOBALS, or MIB Leaf node names present in
    loaded MIBs are used by AUTOLOAD() to create dynamic methods. Generated
    methods are inserted into the symbol table so that subsequent calls can
@@ -2064,7 +2207,6 @@ SNMP::INFO INTERNALS
    subclass.

 COPYRIGHT AND LICENSE
-
    Changes from SNMP::Info Version 0.7 and on are: Copyright (c) 2003-2010
    Max Baker and SNMP::Info Developers All rights reserved.

@@ -2080,8 +2222,8 @@ COPYRIGHT AND LICENSE
        * 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
--- a/contrib/DEVELOP
+++ b/contrib/DEVELOP
@@ -4,26 +4,30 @@ Coding Guidelines:
    - tab-width of 4, no tab characters
    - keep POD documentation up-to-date
    - always update ChangeLog before committing
-    - always update DeviceMatrix.txt before committing
    - check-in required mibs to netdisco-mibs and release new package if needed

-Release and Testing Instructions: 
-    - Please see misc/RELEASE in Netdisco
-      ( http://netdisco.cvs.sourceforge.net/viewvc/netdisco/misc/RELEASE?view=markup )
-      and follow all testing and release guidelines
+Release and Testing Instructions:
+    - for netdisco see:
+        -> https://github.com/netdisco/netdisco/wiki/Developing
+        -> https://metacpan.org/pod/App::Netdisco
+    - for snmp::info see:
+        -> https://github.com/netdisco/snmp-info/wiki/Release-Process
+        -> https://metacpan.org/pod/SNMP::Info#EXTENDING-SNMP::INFO
+    - for netdisco-mibs see:
+        -> https://github.com/netdisco/netdisco-mibs/wiki

 FAQ:
-    - Do I have to update the version number and timestamp in modified files before committing? 
+    - Do I have to update the version number and timestamp in modified files before committing?
    -> No.  These are RCS tags that are automatically updated by CVS when you commit

    - Should I add changes at the top of the ChangeLog?
    -> Yes. The changelog is created one commit at a time.  If there isn't a
        section for the current version, then add one at the top and put your
-        changes after.  You can leave the date field for the release empty (). 
+        changes after.  You can leave the date field for the release empty ().

    - What should I change the $VERSION to?
    -> If you are the first person to get to a file after a release, update it
-       to either  release++ or "release++ dash cvs".   
+       to either  release++ or "release++ dash cvs".
       Example: File is marked 2.01, change it to 2.02-cvs with your new changes.
       Example: File is marked 2.02-cvs,  no change until packaging for release when the -cvs is removed.
       TODO: Is there still an odd/even scheme as introduced by Eric?
--- a/contrib/util/docmunge
+++ b/contrib/util/docmunge
--- a/contrib/util/make_dev_matrix.pl
+++ b/contrib/util/make_dev_matrix.pl
@@ -28,7 +28,7 @@ if ($@) {
            } else {
                $graph{$vendor}->{$family}=[];
            }
-            
+
        }
    }
    my $now = scalar localtime;
@@ -83,7 +83,7 @@ foreach my $vendor (sort sort_nocase keys %$matrix){
                } 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";
@@ -141,7 +141,7 @@ sub parse_data {

        my ($cmd,$value);
        if ($line =~ /^([a-z-_]+)\s*:\s*(.*)$/) {
-            $cmd = $1;  $value = $2; 
+            $cmd = $1;  $value = $2;
        } else {
            print "What do i do with this line : $line \n";
            next;
@@ -164,18 +164,18 @@ sub parse_data {
            $family = $value;
            $model = undef;
            print "$family has no vendor.\n" unless defined $vendor;
-            $Matrix->{$vendor}->{families}->{$family} = {} 
+            $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} = {} 
+            $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';
@@ -233,7 +233,7 @@ sub html_head {
    .vendor { font-size:12pt; color:#777777; }
    .family { font-size:12pt; color:blue; }
    .model  { font-size:12pt; color:red; }
-    .note   { color:red; } 
+    .note   { color:red; }
 //-->
 </STYLE>
 </HEAD>
@@ -304,7 +304,7 @@ be assumed working.
        Discovery Protocol (LLDP), Cisco Discovery Protocol (CDP),
        SynOptics/Bay/Nortel/Avaya Network Management Protocol (SONMP),
        Foundry/Brocade Discovery Protocol (FDP), Extreme Discovery
-        Protocol (EDP), and Alcatel Mapping Adjacency Protocol (AMAP). 
+        Protocol (EDP), and Alcatel Mapping Adjacency Protocol (AMAP).
    </TD>
 </TR>
 <TR>
@@ -325,7 +325,7 @@ be assumed working.
 </BODY>
 </HTML>
 end_tail
-    
+
 }

 sub print_headers {
--- a/contrib/util/make_snmpdata.pl
+++ b/contrib/util/make_snmpdata.pl
@@ -80,7 +80,7 @@ unless ( defined $sysdescr ) {

 SNMP::loadModules(@ARGV);

-# Create a hash of MIB Modules for which we want results 
+# Create a hash of MIB Modules for which we want results
 my %mib_hash = map {$_ => 1} @ARGV;
 # Add the common MIB Modules we always want
 my @common_mibs = ('SNMPv2-MIB', 'IF-MIB');
--- a/contrib/util/push_ver
+++ b/contrib/util/push_ver
@@ -3,9 +3,9 @@

 use File::Glob qw/bsd_glob/;

-my @pms = glob_rec("../Info");
+my @pms = glob_rec("./lib");

-$new_version = shift @ARGV || '3.01';
+$new_version = shift @ARGV || die "missing new version\n";

 foreach my $p (@pms) {
    print "$p\n";
@@ -16,6 +16,7 @@ foreach my $p (@pms) {

    while (<O>) {
        s/^\s*\$VERSION\s+=\s*'[^']+'\s*;/\$VERSION = '$new_version';/;
+        s/^SNMP::Info - Version [\d.]+$/SNMP::Info - Version $new_version/;
        print P;
    }

@@ -34,7 +35,7 @@ sub glob_rec {

    foreach my $f (@files) {
        next if $f eq '\.$';
-        
+
        if (-d $f) {
            push @pms, glob_rec($f);
            next;
--- a/contrib/util/run_test
+++ b/contrib/util/run_test
--- a/contrib/util/test_class.pl
+++ b/contrib/util/test_class.pl
@@ -42,6 +42,7 @@ my $EMPTY = q{};
 my $class  = $EMPTY;
 my @dump   = ();
 my $debug  = 0;
+my $cache  = 0;
 my $device = '';
 my $comm   = '';
 my $ver    = 2;
@@ -58,9 +59,10 @@ GetOptions(
    'v|ver=i'    => \$ver,
    'i|ignore'   => \$ignore,
    'p|print=s'  => \@dump,
-    'x|debug+'   => \$debug,
    'm|mibdir=s' => \$mibdirs,
    'n|nobulk'   => \$nobulk,
+    'x|debug+'   => \$debug,
+    'k|cache'    => \$cache,
    'h|?|help'   => sub { pod2usage(1); },
 );

@@ -170,6 +172,15 @@ foreach my $fn (@dump) {
    if ( !$dumped{$fn} ) { test_fn( $dev, $fn ) }
 }

+if ($cache) {
+    eval {
+        require Data::Printer;
+    } && eval {
+        print "\nDumping cache...\n\n";
+        Data::Printer::p $dev;
+    };
+}
+
 #--------------------------------

 sub test_global {
@@ -239,15 +250,16 @@ test_class.pl [options]

 Options:

-    -c|class    SNMP::Info class to use, Layer2::Catalyst    
+    -c|class    SNMP::Info class to use, Layer2::Catalyst
    -d|dev      Device
    -s|comm     SNMP community
    -v|ver      SNMP version
-    -p|print    Print values 
-    -x|debug    Debugging flag
+    -p|print    Print values
    -i|ignore   Ignore Net-SNMP configuration file
    -m|mibdir   Directory containing MIB Files
    -n|nobulk   Disable bulkwalk
+    -x|debug    Debugging flag
+    -k|cache    Dump cache (requires Data::Printer to be installed)
    -h|?|help   Brief help message

 =head1 OPTIONS
@@ -282,16 +294,10 @@ SNMP version. Default 2.
 =item B<-print>

 Print values of a class method rather than summarizing.  May be repeated
-multiple times. 
+multiple times.

 -print i_description -print i_type

-=item B<-debug>
-
-Turns on SNMP::Info debug.
-
-debug
-
 =item B<-ignore >

 Ignore Net-SNMP configuration file snmp.conf.  If this used mibdirs must be
@@ -302,7 +308,7 @@ provided.
 =item B<-mibdir>

 Directory containing MIB Files.  Multiple directories should be separated by a
-colon ':'. 
+colon ':'.

 -mibdir /usr/local/share/snmp/mibs/rfc:/usr/local/share/snmp/mibs/net-snmp

@@ -312,6 +318,19 @@ Disable SNMP bulkwalk. Default bulkwalk is on and utilized with version 2.

 -nobulk

+=item B<-debug>
+
+Turns on SNMP::Info debug.
+
+-debug
+
+=item B<-cache>
+
+Dumps the table and leaf cache at the end of running. Requires that the
+L<Data::Printer> module be installed, otherwise does nothing.
+
+-cache
+
 =item B<-help>

 Print help message and exits.
--- a/contrib/util/test_class_mocked.pl
+++ b/contrib/util/test_class_mocked.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #
 # test_class_mocked.pl
 #
@@ -33,7 +33,7 @@ use strict;
 use warnings;
 use Carp;
 use FindBin;
-use lib "$FindBin::Bin/../../..";
+use lib "$FindBin::Bin/../../lib";
 use File::Slurp qw(slurp);
 use Getopt::Long;
 use Pod::Usage;
@@ -385,9 +385,9 @@ test_class_mocked.pl [options]

 Options:

-    -class    SNMP::Info class to use, Layer2::Catalyst    
+    -class    SNMP::Info class to use, Layer2::Catalyst
    -file     File containing data gathered using make_snmpdata.pl
-    -print    Print values 
+    -print    Print values
    -debug    Debugging flag
    -ignore   Ignore Net-SNMP configuration file
    -mibdir   Directory containing MIB Files
@@ -414,7 +414,7 @@ mandatory option.
 =item B<-print>

 Print values of a class method rather than summarizing.  May be repeated
-multiple times. 
+multiple times.

 -print i_description -print i_type

@@ -434,7 +434,7 @@ provided.
 =item B<-mibdir>

 Directory containing MIB Files.  Multiple directories should be separated by a
-colon ':'. 
+colon ':'.

 -mibdir /usr/local/share/snmp/mibs/rfc:/usr/local/share/snmp/mibs/net-snmp

--- a/lib/SNMP/Info.pm
+++ b/lib/SNMP/Info.pm
--- a/lib/SNMP/Info/AMAP.pm
+++ b/lib/SNMP/Info/AMAP.pm
@@ -33,12 +33,12 @@ use strict;
 use Exporter;
 use SNMP::Info;

-@SNMP::Info::LLDP::ISA       = qw/SNMP::Info Exporter/;
-@SNMP::Info::LLDP::EXPORT_OK = qw//;
+@SNMP::Info::AMAP::ISA       = qw/SNMP::Info Exporter/;
+@SNMP::Info::AMAP::EXPORT_OK = qw//;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS
    = ( 'ALCATEL-IND1-INTERSWITCH-PROTOCOL-MIB' => 'aipAMAPRemDeviceType', );
@@ -240,10 +240,10 @@ Eric Miller

 =head1 SYNOPSIS

- my $amap = new SNMP::Info ( 
+ my $amap = new SNMP::Info (
                             AutoSpecify => 1,
                             Debug       => 1,
-                             DestHost    => 'router', 
+                             DestHost    => 'router',
                             Community   => 'public',
                             Version     => 2
                           );
@@ -269,7 +269,7 @@ Eric Miller

 =head1 DESCRIPTION

-SNMP::Info::AMAP is a subclass of SNMP::Info that provides an object oriented 
+SNMP::Info::AMAP is a subclass of SNMP::Info that provides an object oriented
 interface to Alcatel Mapping Adjacency Protocol (AMAP) information through
 SNMP.

@@ -299,7 +299,7 @@ These are methods that return scalar values from SNMP

 =item $amap->hasAMAP()

-Is AMAP is active in this device?  
+Is AMAP is active in this device?

 =back

@@ -322,7 +322,7 @@ Returns the mapping to the SNMP Interface Table.

 Returns remote IPv4 addresses.  Note: AMAP returns all IP addresses associated
 with the remote device.  It would be preferable to include only one address
-since they should all originate from the same device, but amap_ip() can not 
+since they should all originate from the same device, but amap_ip() can not
 determine if all addresses are reachable from the network management
 application therefore all addresses are returned and the calling application
 must determine which address to use and if they are in fact from the same
--- a/lib/SNMP/Info/AdslLine.pm
+++ b/lib/SNMP/Info/AdslLine.pm
@@ -38,7 +38,7 @@ use SNMP::Info;

 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = ( 'ADSL-LINE-MIB' => 'adslLineType' );

@@ -50,7 +50,7 @@ $VERSION = '3.10';
    'adsl_atuc_curr_tx_rate'        => 'adslAtucChanCurrTxRate',
    'adsl_atuc_prev_tx_rate'        => 'adslAtucChanPrevTxRate',
    'adsl_atuc_crc_block_len'       => 'adslAtucChanCrcBlockLength',
-    
+
    # ADSL-LINE-MIB::adslAturChanTable
    'adsl_atur_interleave_delay'    => 'adslAturChanInterleaveDelay',
    'adsl_atur_curr_tx_rate'        => 'adslAturChanCurrTxRate',
@@ -73,14 +73,14 @@ Alexander Hartmaier

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $info = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myrouter',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class = $info->class();
@@ -88,7 +88,7 @@ Alexander Hartmaier

 =head1 DESCRIPTION

-SNMP::Info::AdslLine is a subclass of SNMP::Info that provides 
+SNMP::Info::AdslLine is a subclass of SNMP::Info that provides
 information about the adsl interfaces of a device.

 Use or create in a subclass of SNMP::Info.  Do not use directly.
--- a/lib/SNMP/Info/Aggregate.pm
+++ b/lib/SNMP/Info/Aggregate.pm
@@ -1,6 +1,6 @@
-# $Id$
+# SNMP::Info::Aggregate
 #
-# Copyright (c) 2005 Matt Tuttle
+# Copyright (c) 2014 SNMP::Info Developers
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -27,88 +27,104 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.

-package SNMP::Info::CiscoImage;
+package SNMP::Info::Aggregate;

 use strict;
 use Exporter;
 use SNMP::Info;

-@SNMP::Info::CiscoImage::ISA       = qw/SNMP::Info Exporter/;
-@SNMP::Info::CiscoImage::EXPORT_OK = qw//;
+@SNMP::Info::Aggregate::ISA       = qw/SNMP::Info Exporter/;
+@SNMP::Info::Aggregate::EXPORT_OK = qw/agg_ports_ifstack/;

 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

-%MIBS = ( 'CISCO-IMAGE-MIB' => 'ciscoImageString', );
+# Load MIB for leafs referenced within class
+%MIBS = ('IF-MIB' => 'ifIndex',);

 %GLOBALS = ();

-%FUNCS = ( 'ci_images' => 'ciscoImageString', );
+%FUNCS = ();

 %MUNGE = ();

+sub agg_ports_ifstack {
+  my $dev = shift;
+  my $partial = shift;
+
+  my $ifStack = $dev->ifStackStatus();
+  # TODO: if we want to do partial, we need to use inverse status
+  my $ifType = $dev->ifType();
+
+  my $ret = {};
+
+  foreach my $idx ( keys %$ifStack ) {
+      my ( $higher, $lower ) = split /\./, $idx;
+      next if ( $higher == 0 or $lower == 0 );
+      if ( $ifType->{ $higher } eq 'ieee8023adLag'  or $ifType->{ $higher } eq 'propMultiplexor') {
+          $ret->{ $lower } = $higher;
+      }
+  }
+
+  return $ret;
+}
+
 1;
+
 __END__

 =head1 NAME

-SNMP::Info::CiscoImage - SNMP Interface to image strings for Cisco Devices
+SNMP::Info::Aggregate - SNMP Interface to ifStackTable Aggregated Links

 =head1 AUTHOR

-Matt Tuttle (C<mtuttle@americanhebrewacademy.org>)
+SNMP::Info Developers

 =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
-                )
+ my $info = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myrouter',
+                          Community   => 'public',
+                          Version     => 2
+                        )
    or die "Can't connect to DestHost.\n";

- my $class = $ci->class();
+ my $class = $info->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.
+This class provides access to Aggregated Links configuration on devices
+supporting C<ifStackTable>.

 Use or create in a subclass of SNMP::Info.  Do not use directly.

 =head2 Inherited Classes

-None.
+L<SNMP::Info>

 =head2 Required MIBs

 =over

-=item F<CISCO-IMAGE-MIB>
+=item F<IF-MIB>

 =back

-MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
+=head1 METHODS

-=head1 GLOBALS
+=over 4

-None.
+=item C<agg_ports_ifstack>

-=head1 TABLE METHODS
-
-=over
-
-=item $ci->ci_images()
-
-Returns the table of image strings.
-
-C<ciscoImageString>
+Returns a HASH reference mapping from slave to master port for each member of
+a port bundle on the device. Keys are ifIndex of the slave ports, Values are
+ifIndex of the corresponding master ports.

 =back

--- a/lib/SNMP/Info/Airespace.pm
+++ b/lib/SNMP/Info/Airespace.pm
@@ -39,7 +39,7 @@ use SNMP::Info;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::MIBS,
@@ -84,7 +84,7 @@ $VERSION = '3.10';
    'airespace_ess_ifname'    => 'bsnDot11EssInterfaceName',
    'airespace_ess_aclname'   => 'bsnDot11EssAclName',
    'airespace_ess_bcast'     => 'bsnDot11EssBroadcastSsid',
-    
+
    # AIRESPACE-WIRELESS-MIB::bsnAPTable
    'airespace_ap_mac'      => 'bsnAPDot3MacAddress',
    'airespace_ap_name'     => 'bsnAPName',
@@ -508,8 +508,8 @@ sub ip_index {
    my $airespace = shift;
    my $partial   = shift;

-    my $ip_index = $airespace->orig_ip_index($partial) || {};
-    my $if_ip    = $airespace->airespace_if_ip()       || {};
+    my $ip_index = $airespace->SUPER::ip_index($partial) || {};
+    my $if_ip    = $airespace->airespace_if_ip()         || {};

    my %ip_index;
    foreach my $ip ( keys %$ip_index ) {
@@ -534,9 +534,9 @@ sub ip_netmask {
    my $airespace = shift;
    my $partial   = shift;

-    my $ip_mask = $airespace->orig_ip_netmask($partial) || {};
-    my $if_ip   = $airespace->airespace_if_ip()         || {};
-    my $if_mask = $airespace->airespace_if_mask()       || {};
+    my $ip_mask = $airespace->SUPER::ip_netmask($partial) || {};
+    my $if_ip   = $airespace->airespace_if_ip()           || {};
+    my $if_mask = $airespace->airespace_if_mask()         || {};

    my %ip_netmask;
    foreach my $ip ( keys %$ip_mask ) {
@@ -577,6 +577,13 @@ sub bp_index {
    return \%bp_index;
 }

+sub fw_mac {
+    my $airespace = shift;
+    my $partial   = shift;
+
+    return $airespace->SUPER::fw_mac($partial);
+}
+
 sub fw_port {
    my $airespace = shift;
    my $partial   = shift;
@@ -757,14 +764,14 @@ sub dot11_cur_tx_pwr_mw {
    my $partial   = shift;
    my $cur       = $airespace->airespace_apif_power($partial);
    my $pwr_abs   = $airespace->airespace_apif_a_pwr($partial);
-    
+
    my $dot11_cur_tx_pwr_mw = {};
    foreach my $idx ( keys %$cur ) {
        my $pwr = $cur->{$idx};
        if ( $pwr >= 1 && $pwr <= 8 ) {

-            my @pwr_list = split(/,/, $pwr_abs->{$idx} ); 
-            $dot11_cur_tx_pwr_mw->{$idx} = $pwr_list[$pwr-1]; 
+            my @pwr_list = split(/,/, $pwr_abs->{$idx} );
+            $dot11_cur_tx_pwr_mw->{$idx} = $pwr_list[$pwr-1];

        }
        else {
@@ -1080,7 +1087,7 @@ Eric Miller
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )

    or die "Can't connect to DestHost.\n";

@@ -1197,7 +1204,7 @@ valid only when the Transfer Mode is tftp.
 =item $airespace->airespace_ul_path()

 Transfer upload tftp path configures the directory path where the file is to
-be uploaded to. The switch remembers the last file path used. 
+be uploaded to. The switch remembers the last file path used.

 (C<agentTransferUploadPath>)

@@ -1272,7 +1279,7 @@ radio interface.
 =item $airespace->i_ssidmac()

 With the same keys as i_ssidlist, returns the Basic service set
-identification (BSSID), MAC address, the AP is using for the SSID. 
+identification (BSSID), MAC address, the AP is using for the SSID.

 =back

@@ -1339,7 +1346,7 @@ Name of the interface used by this WLAN.
 Name of ACL for the WLAN. This is applicable only when Web Authentication is
 enabled.

-(C<bsnDot11EssAclName>)           
+(C<bsnDot11EssAclName>)

 =item $airespace->airespace_ess_bcast()

@@ -1665,14 +1672,14 @@ to an empty string.

 =item $airespace->i_index()

-Returns reference to map of IIDs to Interface index. 
+Returns reference to map of IIDs to Interface index.

 Extends C<ifIndex> to support thin APs and WLAN virtual interfaces as device
 interfaces.

 =item $airespace->interfaces()

-Returns reference to map of IIDs to ports.  Thin APs are implemented as device 
+Returns reference to map of IIDs to ports.  Thin APs are implemented as device
 interfaces.  The thin AP MAC address airespace_ap_mac() and Slot ID
 airespace_apif_slot() are used as the port identifier.  Virtual interfaces
 use airespace_if_name() as the port identifier.
@@ -1710,7 +1717,7 @@ for thin AP interfaces.
 =item $airespace->i_mac()

 Returns reference to map of IIDs to MAC address of the interface.  Returns
-C<ifPhysAddress> for Ethernet interfaces and airespace_if_mac() for virtual 
+C<ifPhysAddress> for Ethernet interfaces and airespace_if_mac() for virtual
 interfaces.

 =item $airespace->i_vlan()
@@ -1744,7 +1751,7 @@ the interface iid.
 =item $airespace->fw_port()

 Returns reference to a hash, value being airespace_sta_mac() and
-airespace_sta_slot() combined to match the interface iid.  
+airespace_sta_slot() combined to match the interface iid.

 =item $airespace->fw_mac()

--- a/lib/SNMP/Info/Bridge.pm
+++ b/lib/SNMP/Info/Bridge.pm
@@ -42,11 +42,12 @@ use SNMP::Info;

 use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    'BRIDGE-MIB'   => 'dot1dBaseBridgeAddress',
    'Q-BRIDGE-MIB' => 'dot1qPvid',
+    'RSTP-MIB'     => 'dot1dStpPortOperEdgePort',
 );

 %GLOBALS = (
@@ -84,6 +85,17 @@ $VERSION = '3.10';
    'bs_to'     => 'dot1dStaticAllowedToGoTo',
    'bs_status' => 'dot1dStaticStatus',

+    # These leafs are not part of a table, but placed here
+    # to return a hash reference to ease API compatibility with
+    # MST and PVST implementations indexed by a spanning tree
+    # instance id
+    'stp_i_mac'       => 'dot1dBaseBridgeAddress',
+    'stp_i_time'      => 'dot1dStpTimeSinceTopologyChange',
+    'stp_i_ntop'      => 'dot1dStpTopChanges',
+    'stp_i_root'      => 'dot1dStpDesignatedRoot',
+    'stp_i_root_port' => 'dot1dStpRootPort',
+    'stp_i_priority'  => 'dot1dStpPriority',
+
    # Spanning Tree Protocol Table : dot1dStpPortTable
    'stp_p_id'       => 'dot1dStpPort',
    'stp_p_priority' => 'dot1dStpPortPriority',
@@ -93,6 +105,10 @@ $VERSION = '3.10';
    'stp_p_bridge'   => 'dot1dStpPortDesignatedBridge',
    'stp_p_port'     => 'dot1dStpPortDesignatedPort',

+    # Rapid Spanning Tree Protocol Table : dot1dStpExtPortEntry
+    'is_edgeport_admin' => 'dot1dStpPortAdminEdgePort',
+    'is_edgeport_oper'  => 'dot1dStpPortOperEdgePort',
+
    # Q-BRIDGE-MIB : dot1qPortVlanTable
    'qb_i_vlan'        => 'dot1qPvid',
    'qb_i_vlan_type'   => 'dot1qPortAcceptableFrameTypes',
@@ -125,15 +141,18 @@ $VERSION = '3.10';
    'b_mac'            => \&SNMP::Info::munge_mac,
    'fw_mac'           => \&SNMP::Info::munge_mac,
    'bs_mac'           => \&SNMP::Info::munge_mac,
-    'stp_root'         => \&SNMP::Info::munge_mac,
+    'stp_root'         => \&SNMP::Info::munge_prio_mac,
+    'stp_i_mac'        => \&SNMP::Info::munge_mac,
+    'stp_i_root'       => \&SNMP::Info::munge_prio_mac,
    'stp_p_root'       => \&SNMP::Info::munge_prio_mac,
    'stp_p_bridge'     => \&SNMP::Info::munge_prio_mac,
-    'stp_p_port'       => \&SNMP::Info::munge_prio_mac,
+    'stp_p_port'       => \&SNMP::Info::munge_prio_port,
    'qb_cv_egress'     => \&SNMP::Info::munge_port_list,
    'qb_cv_untagged'   => \&SNMP::Info::munge_port_list,
    'qb_v_egress'      => \&SNMP::Info::munge_port_list,
    'qb_v_fbdn_egress' => \&SNMP::Info::munge_port_list,
    'qb_v_untagged'    => \&SNMP::Info::munge_port_list,
+    'qb_cv_untagged'   => \&SNMP::Info::munge_port_list,

 );

@@ -163,10 +182,20 @@ sub qb_fw_vlan {
    my $partial = shift;

    my $qb_fw_port = $bridge->qb_fw_port($partial);
+    my $qb_fdb_ids = $bridge->qb_fdb_index() || {};
+
+
    my $qb_fw_vlan = {};
    foreach my $idx ( keys %$qb_fw_port ) {
        my ( $fdb_id, $mac ) = _qb_fdbtable_index($idx);
-        $qb_fw_vlan->{$idx} = $fdb_id;
+        # Many devices do not populate the dot1qVlanCurrentTable, so default
+        # to FDB ID = VID, but if we have a mapping use it.
+        my $vlan = $fdb_id;
+        # defined as test since some devices have a vlan 0
+        if (defined $qb_fdb_ids->{$fdb_id}) {
+            $vlan = $qb_fdb_ids->{$fdb_id};
+        }
+        $qb_fw_vlan->{$idx} = $vlan;
    }
    return $qb_fw_vlan;
 }
@@ -189,6 +218,54 @@ sub qb_i_vlan_t {
    return $i_vlan;
 }

+sub qb_fdb_index {
+    my $bridge  = shift;
+    my $partial = shift;
+
+    # Some devices may not implement TimeFilter in a standard manner
+    # appearing to loop on this request.  Override in the device class,
+    # see Enterasys for example.
+    my $qb_fdb_ids = $bridge->dot1qVlanFdbId() || {};
+
+    # Strip the TimeFilter
+    my $vl_fdb_index = {};
+    for my $fdb_entry (keys(%$qb_fdb_ids)) {
+        (my $vlan = $fdb_entry) =~ s/^\d+\.//;
+        $vl_fdb_index->{$qb_fdb_ids->{$fdb_entry}} = $vlan;
+    }
+
+    return $vl_fdb_index;
+}
+
+# Most devices now support Q-BRIDGE-MIB, fall back to
+# BRIDGE-MIB for those that don't.
+sub fw_mac {
+    my $bridge = shift;
+
+    my $qb = $bridge->qb_fw_mac();
+    return $qb if (ref {} eq ref $qb and scalar keys %$qb);
+
+    return $bridge->SUPER::fw_mac();
+}
+
+sub fw_port {
+    my $bridge = shift;
+
+    my $qb = $bridge->qb_fw_port();
+    return $qb if (ref {} eq ref $qb and scalar keys %$qb);
+
+    return $bridge->SUPER::fw_port();
+}
+
+sub fw_status {
+    my $bridge = shift;
+
+    my $qb = $bridge->qb_fw_status();
+    return $qb if (ref {} eq ref $qb and scalar keys %$qb);
+
+    return $bridge->SUPER::fw_status();
+}
+
 sub i_stp_state {
    my $bridge  = shift;
    my $partial = shift;
@@ -314,20 +391,31 @@ 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.
+    my $v_ports = $bridge->qb_cv_egress() || $bridge->qb_v_egress();
+
+    return $bridge->_vlan_hoa($v_ports, $partial);
+}
+
+sub i_vlan_membership_untagged {
+    my $bridge  = shift;
+    my $partial = shift;

    # Use VlanCurrentTable if available since it will include dynamic
    # VLANs.  However, some devices do not populate the table.
+    my $v_ports = $bridge->qb_cv_untagged() || $bridge->qb_v_untagged();

-    # 11/07 - Todo: Issue with some devices trying to query VlanCurrentTable
-    # as table may grow very large with frequent VLAN changes.
-    # 06/08 - VlanCurrentTable may be due to timefilter, should query with
-    # zero partial for no time filter.
-    # my $v_ports = $bridge->qb_cv_egress() || $bridge->qb_v_egress();
+    return $bridge->_vlan_hoa($v_ports, $partial);
+}

-    my $v_ports = $bridge->qb_v_egress() || {};
+sub _vlan_hoa {
+    my $bridge = shift;
+    my ( $v_ports, $partial ) = @_;

-    my $i_vlan_membership = {};
+    my $index = $bridge->bp_index();
+
+    my $vlan_hoa = {};
    foreach my $idx ( keys %$v_ports ) {
        next unless ( defined $v_ports->{$idx} );
        my $portlist = $v_ports->{$idx};
@@ -347,10 +435,10 @@ sub i_vlan_membership {
            my $ifindex = $index->{$port};
            next unless ( defined($ifindex) );    # shouldn't happen
            next if ( defined $partial and $ifindex !~ /^$partial$/ );
-            push( @{ $i_vlan_membership->{$ifindex} }, $vlan );
+            push( @{ $vlan_hoa->{$ifindex} }, $vlan );
        }
    }
-    return $i_vlan_membership;
+    return $vlan_hoa;
 }

 sub set_i_pvid {
@@ -467,10 +555,10 @@ Max Baker

 =head1 SYNOPSIS

- my $bridge = new SNMP::Info ( 
+ my $bridge = new SNMP::Info (
                             AutoSpecify => 1,
                             Debug       => 1,
-                             DestHost    => 'switch', 
+                             DestHost    => 'switch',
                             Community   => 'public',
                             Version     => 2
                             );
@@ -491,7 +579,7 @@ Max Baker
    my $port  = $interfaces->{$iid};

    print "Port:$port forwarding to $mac\n";
- } 
+ }

 =head1 DESCRIPTION

@@ -500,12 +588,12 @@ MAC Forwarding Table and Spanning Tree Protocol info.

 F<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>.  
+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 
+For debugging you can call new() directly as you would in SNMP::Info

 my $bridge = new SNMP::Info::Bridge(...);

@@ -569,19 +657,19 @@ Returns root of STP.

 (C<dot1dStpDesignatedRoot>)

-=item $bridge->qb_vlans_max() 
+=item $bridge->qb_vlans_max()

 Maximum number of VLANS supported on this device.

 (C<dot1qMaxSupportedVlans>)

-=item $bridge->qb_vlans() 
+=item $bridge->qb_vlans()

 Current number of VLANs that are configured in this device.

 (C<dot1qNumVlans>)

-=item $bridge->qb_next_vlan_index() 
+=item $bridge->qb_next_vlan_index()

 The next available value for C<dot1qVlanIndex> of a local VLAN entry in
 C<dot1qVlanStaticTable>
@@ -613,18 +701,28 @@ 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";
  }

+=item $bridge->i_vlan_membership_untagged()
+
+Returns reference to hash of arrays: key = C<ifIndex>, value = array of VLAN
+IDs.  These are the VLANs which are members of the untagged egress list for
+the port.
+
 =item $bridge->qb_i_vlan_t()

 Returns reference to hash: key = C<dot1dBasePort>, value = either 'trunk' for
 tagged ports or the VLAN ID.

+=item $bridge->qb_fdb_index()
+
+Returns reference to hash: key = FDB ID, value = VLAN ID.
+
 =item $bridge->v_index()

 Returns VLAN IDs
@@ -633,7 +731,7 @@ Returns VLAN IDs

 =head2 Forwarding Table (C<dot1dTpFdbEntry>)

-=over 
+=over

 =item $bridge->fw_mac()

@@ -678,6 +776,48 @@ to this port.

 =back

+=head2 Spanning Tree Instance Globals
+
+These are not part of a table, but return a hash reference to ease API
+compatibility with MST and PVST implementations indexed by a spanning tree
+instance id.
+
+=over
+
+=item $bridge->stp_i_time()
+
+Returns time since last topology change detected. (100ths/second)
+
+(C<dot1dStpTimeSinceTopologyChange>)
+
+=item $bridge->stp_i_time()
+
+Returns the total number of topology changes detected.
+
+(C<dot1dStpTopChanges>)
+
+=item $bridge->stp_i_root()
+
+Returns root of STP.
+
+(C<dot1dStpDesignatedRoot>)
+
+=item $bridge->stp_i_root_port()
+
+Returns the port number of the port that offers the lowest cost path
+to the root bridge.
+
+(C<dot1dStpRootPort>)
+
+=item $bridge->stp_i_priority()
+
+Returns the port number of the port that offers the lowest cost path
+to the root bridge.
+
+(C<dot1dStpPriority>)
+
+=back
+
 =head2 Spanning Tree Protocol Table (C<dot1dStpPortTable>)

 Descriptions are straight from F<BRIDGE-MIB.my>
@@ -809,7 +949,7 @@ The set of ports which are assigned to the egress list for this VLAN.
 =item $bridge->qb_cv_untagged()

 The set of ports which should transmit egress packets for this VLAN as
-untagged. 
+untagged.

 (C<dot1qVlanCurrentUntaggedPorts>)

@@ -847,7 +987,7 @@ for this VLAN.
 =item $bridge->qb_v_untagged()

 The set of ports which should transmit egress packets for this VLAN as
-untagged. 
+untagged.

 (C<dot1qVlanStaticUntaggedPorts>)

@@ -887,13 +1027,13 @@ Returns reference to hash of forwarding table entries status
 (C<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. 
+operations.

 =over

--- a/lib/SNMP/Info/CDP.pm
+++ b/lib/SNMP/Info/CDP.pm
@@ -43,7 +43,7 @@ use SNMP::Info;
 use vars
    qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT %CDP_CAPABILITIES/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 # Five data structures required by SNMP::Info
 %MIBS = ( 'CISCO-CDP-MIB' => 'cdpGlobalRun' );
@@ -54,19 +54,17 @@ $VERSION = '3.10';
    'cdp_run'      => 'cdpGlobalRun',
    'cdp_interval' => 'cdpGlobalMessageInterval',
    'cdp_holdtime' => 'cdpGlobalHoldTime',
-    'cdp_gid'       => 'cdpGlobalDeviceId',
+    'cdp_gid'      => 'cdpGlobalDeviceId',
 );

 %FUNCS = (
-    'cdp_index'        => 'cdpCacheIfIndex',
    'cdp_proto'        => 'cdpCacheAddressType',
    'cdp_addr'         => 'cdpCacheAddress',
    'cdp_ver'          => 'cdpCacheVersion',
-    'cdp_id'           => 'cdpCacheDeviceId',
-    'cdp_port'         => 'cdpCacheDevicePort',
+    'cdp_dev_id'       => 'cdpCacheDeviceId',
+    'cdp_dev_port'     => 'cdpCacheDevicePort',
    'cdp_platform'     => 'cdpCachePlatform',
    'cdp_capabilities' => 'cdpCacheCapabilities',
-    'cdp_cap_hex'      => 'cdpCacheCapabilities',
    'cdp_domain'       => 'cdpCacheVTPMgmtDomain',
    'cdp_vlan'         => 'cdpCacheNativeVLAN',
    'cdp_duplex'       => 'cdpCacheDuplex',
@@ -78,12 +76,9 @@ $VERSION = '3.10';
 );

 %MUNGE = (
-    'cdp_cap_hex'      => \&SNMP::Info::munge_octet2hex,
    'cdp_capabilities' => \&SNMP::Info::munge_bits,
    'cdp_platform'     => \&SNMP::Info::munge_null,
    'cdp_domain'       => \&SNMP::Info::munge_null,
-    'cdp_port'         => \&SNMP::Info::munge_null,
-    'cdp_id'           => \&SNMP::Info::munge_null,
    'cdp_ver'          => \&SNMP::Info::munge_null,
    'cdp_ip'           => \&SNMP::Info::munge_ip,
    'cdp_power'        => \&munge_power,
@@ -114,28 +109,21 @@ sub munge_power {
 sub hasCDP {
    my $cdp = shift;

-    my $ver = $cdp->{_version};
+    # Check the global that is supposed to indicate CDP is running
+    my $cdp_run = $cdp->cdp_run();
+    return 1 if $cdp_run;

-    # SNMP v1 clients dont have the globals
-    if ( defined $ver and $ver == 1 ) {
-        my $cdp_ip = $cdp->cdp_ip();
+    # SNMP v1 clients don't have the globals, fallback
+    # by checking if it would report neighbors
+    my $cdp_ip = $cdp->cdp_ip() || {};
+    return 1 if scalar keys %$cdp_ip;

-        # See if anything in cdp cache, if so we have cdp
-        return 1 if ( defined $cdp_ip and scalar( keys %$cdp_ip ) );
-        return;
-    }
-
-    return $cdp->cdp_run();
+    return;
 }

 sub cdp_if {
    my $cdp = shift;

-    # See if by some miracle Cisco implemented the cdpCacheIfIndex entry
-    my $cdp_index = $cdp->cdp_index();
-    return $cdp_index if defined $cdp_index;
-
-    # Nope, didn't think so. Now we fake it.
    my $cdp_ip = $cdp->cdp_ip();
    unless ( defined $cdp_ip ) {
        $cdp->error_throw(
@@ -181,22 +169,69 @@ sub cdp_cap {
    my $cdp     = shift;
    my $partial = shift;

-    my $cdp_caps  = $cdp->cdp_cap_hex($partial)  || {};
+    # Some devices return a hex-string, others return a space separated
+    # string, we need the raw data to determine return value and
+    # take appropriate action
+    my $cdp_caps = $cdp->cdp_capabilities_raw($partial) || {};

    my %cdp_cap;
    foreach my $key ( keys %$cdp_caps ) {
-        my $cap_hex = $cdp_caps->{$key};
-        next unless $cap_hex;
+        my $cap_raw = $cdp_caps->{$key};
+        next unless $cap_raw;

-        foreach my $capability (keys %CDP_CAPABILITIES) {
-            if ( (hex $cap_hex) & $CDP_CAPABILITIES{$capability}) {
-                push ( @{$cdp_cap{$key}}, $capability);
+        # Simple check, smallest single string is either Host or IGMP with a
+        # space added on the end for a length of 5, hex string is normally
+        # 4 bytes, but since only one byte was traditionally needed process
+        # as hex for a length of 4 or less
+        if ( length $cap_raw < 5 ) {
+            my $cap_hex = join( '',
+                map { sprintf "%x", $_ } unpack( 'C*', $cap_raw ) );
+            foreach my $capability ( keys %CDP_CAPABILITIES ) {
+                if ( ( hex $cap_hex ) & $CDP_CAPABILITIES{$capability} ) {
+                    push( @{ $cdp_cap{$key} }, $capability );
+                }
            }
        }
+        else {
+            my @caps = split /\s/, $cap_raw;
+            push( @{ $cdp_cap{$key} }, @caps );
+        }
    }
    return \%cdp_cap;
 }

+sub cdp_id {
+    my $cdp    = shift;
+    my $partial = shift;
+
+    my $ch = $cdp->cdp_dev_id($partial) || {};
+
+    my %cdp_id;
+    foreach my $key ( sort keys %$ch ) {
+        my $id = $ch->{$key};
+        next unless $id;
+        $id = SNMP::Info::munge_mac($id) || SNMP::Info::munge_null($id);
+        $cdp_id{$key} = $id;
+    }
+    return \%cdp_id;
+}
+
+sub cdp_port {
+    my $cdp    = shift;
+    my $partial = shift;
+
+    my $ch = $cdp->cdp_dev_port($partial) || {};
+
+    my %cdp_port;
+    foreach my $key ( sort keys %$ch ) {
+        my $port = $ch->{$key};
+        next unless $port;
+        $port = SNMP::Info::munge_mac($port) || SNMP::Info::munge_null($port);
+        $cdp_port{$key} = $port;
+    }
+    return \%cdp_port;
+}
+
 1;
 __END__

@@ -210,10 +245,10 @@ Max Baker

 =head1 SYNOPSIS

- my $cdp = new SNMP::Info ( 
+ my $cdp = new SNMP::Info (
                             AutoSpecify => 1,
                             Debug       => 1,
-                             DestHost    => 'router', 
+                             DestHost    => 'router',
                             Community   => 'public',
                             Version     => 2
                           );
@@ -239,7 +274,7 @@ Max Baker

 =head1 DESCRIPTION

-SNMP::Info::CDP is a subclass of SNMP::Info that provides an object oriented 
+SNMP::Info::CDP is a subclass of SNMP::Info that provides an object oriented
 interface to CDP information through SNMP.

 CDP is a Layer 2 protocol that supplies topology information of devices that
@@ -249,7 +284,7 @@ some HP devices.
 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. 
+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
@@ -274,7 +309,7 @@ These are methods that return scalar values from SNMP

 =item  $cdp->hasCDP()

-Is CDP is active in this device?  
+Is CDP is active in this device?

 Accounts for SNMP version 1 devices which may have CDP but not cdp_run()

@@ -293,13 +328,13 @@ Interval in seconds at which CDP messages are generated.

 =item $cdp->cdp_holdtime()

-Time in seconds that CDP messages are kept. 
+Time in seconds that CDP messages are kept.

 (C<cdpGlobalHoldTime>)

-=item  $cdp->cdp_gid() 
+=item  $cdp->cdp_gid()

-Returns CDP device ID.  
+Returns CDP device ID.

 This is the device id broadcast via CDP to other devices, and is what is
 retrieved from remote devices with $cdp->id().
@@ -320,9 +355,9 @@ to a hash.
 =item $cdp->cdp_capabilities()

 Returns Device Functional Capabilities.  Results are munged into an ascii
-binary string, MSB.  Each digit represents a bit from the table below from 
+binary string, MSB.  Each digit represents a bit from the table below from
 the CDP Capabilities Mapping to Smartport Type table within the
-Cisco Small Business 200 Series Smart Switch Administration Guide, 
+Cisco Small Business 200 Series Smart Switch Administration Guide,
 L<http://www.cisco.com/c/en/us/support/switches/small-business-200-series-smart-switches/products-maintenance-guides-list.html>:

 (Bit) - Description
@@ -372,7 +407,7 @@ C<CISCO-VTP-MIB::managementDomainName>

 (C<cdpCacheVTPMgmtDomain>)

-=item $cdp->cdp_duplex() 
+=item $cdp->cdp_duplex()

 Returns the port duplex status from remote devices.

@@ -389,7 +424,7 @@ Returns remote device id string
 Returns the mapping to the SNMP Interface Table.

 Note that a lot devices don't implement $cdp->cdp_index(),  So if it isn't
-around, we fake it. 
+around, we fake it.

 In order to map the cdp table entry back to the interfaces() entry, we
 truncate the last number off of it :
@@ -400,7 +435,7 @@ truncate the last number off of it :

  # if not, let's fake it
  my $cdp_ip       = $device->cdp_ip();
-    
+
  my %cdp_if
  foreach my $key (keys %$cdp_ip){
      $iid = $key;
@@ -408,13 +443,13 @@ truncate the last number off of it :
      $iid =~ s/\.\d+$//;
      $cdp_if{$key} = $iid;
  }
- 
+
  return \%cdp_if;


 =item $cdp->cdp_index()

-Returns the mapping to the SNMP2 Interface table for CDP Cache Entries. 
+Returns the mapping to the SNMP2 Interface table for CDP Cache Entries.

 Most devices don't implement this, so you probably want to use $cdp->cdp_if()
 instead.
@@ -436,9 +471,9 @@ Returns remote address

 (C<cdpCacheAddress>)

-=item $cdp->cdp_platform() 
+=item $cdp->cdp_platform()

-Returns remote platform id 
+Returns remote platform id

 (C<cdpCachePlatform>)

@@ -454,7 +489,7 @@ Returns remote address type received.  Usually IP.

 (C<cdpCacheAddressType>)

-=item $cdp->cdp_ver() 
+=item $cdp->cdp_ver()

 Returns remote hardware version

@@ -473,7 +508,7 @@ for decimal placement.

 (C<cdpCachePowerConsumption>)

-=item  $cdp->cdp_cap() 
+=item  $cdp->cdp_cap()

 Returns hash of arrays with each array containing the system capabilities
 supported by the remote system.  Possible elements in the array are
--- a/lib/SNMP/Info/CiscoAgg.pm
+++ b/lib/SNMP/Info/CiscoAgg.pm
@@ -0,0 +1,254 @@
+# SNMP::Info::CiscoAgg
+#
+# Copyright (c) 2019 SNMP::Info Developers
+# 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::CiscoAgg;
+
+use strict;
+#use warnings;
+use Exporter;
+use SNMP::Info::IEEE802dot3ad;
+
+@SNMP::Info::CiscoAgg::ISA = qw/
+  SNMP::Info::IEEE802dot3ad
+  Exporter
+/;
+
+@SNMP::Info::CiscoAgg::EXPORT_OK = qw/
+  agg_ports
+  agg_ports_cisco
+  agg_ports_lag
+  agg_ports_pagp
+/;
+
+use vars qw/$DEBUG $VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+
+$VERSION = '3.66';
+
+%MIBS = (
+  %SNMP::Info::IEEE802dot3ad::MIBS,
+  'CISCO-PAGP-MIB'         => 'pagpGroupIfIndex',
+  'CISCO-LAG-MIB'          => 'clagAggPortListPorts',
+  'CISCO-IF-EXTENSION-MIB' => 'cieIfLastInTime',
+);
+
+%GLOBALS = ();
+
+%FUNCS = (
+  %SNMP::Info::IEEE802dot3ad::FUNCS,
+  'lag_ports'         => 'clagAggPortListPorts',
+  'lag_members'       => 'clagAggPortListInterfaceIndexList',
+);
+
+%MUNGE = (
+  %SNMP::Info::IEEE802dot3ad::MUNGE,
+  'lag_ports'     => \&SNMP::Info::munge_port_list,
+  'lag_members'   => \&munge_port_ifindex,
+);
+
+sub munge_port_ifindex {
+    my $plist = shift;
+    return unless defined $plist;
+    return unless length $plist;
+
+    my $list = [ map {sprintf "%d", hex($_)} unpack( "(A8)*", join( '' ,  map { sprintf "%02x", $_} unpack( "(C4)*", $plist ) ))  ];
+
+    return $list;
+}
+
+sub agg_ports_cisco {
+  my $dev = shift;
+  my $group = $dev->lag_members;
+
+  my $mapping = {};
+  for my $master (keys %$group) {
+    my $slaves = $group->{$master};
+    for my $slave (@$slaves) {
+      $mapping->{$slave} = $master;
+    }
+  }
+
+  return $mapping;
+}
+
+sub agg_ports_pagp {
+  my $dev = shift;
+
+  # Note that this mapping will miss any interfaces that are down during
+  # polling. If one of the members is up, we could use
+  # pagpAdminGroupCapability to figure things out, but if they're all
+  # down, we're hosed. Since we could be hosed anyway, we skip the fancy
+  # stuff.
+  my $mapping = {};
+  my $group = $dev->pagpGroupIfIndex;
+  for my $slave (keys %$group) {
+    my $master = $group->{$slave};
+    next if($master == 0 || $slave == $master);
+
+    $mapping->{$slave} = $master;
+  }
+
+  return $mapping;
+}
+
+sub agg_ports_lag {
+  my $dev = shift;
+
+  # same note as for agg_ports_pagp, it will miss mappings if interfaces
+  # are down or lacp is not synced.
+
+  my $mapping = {};
+  my $group = $dev->dot3adAggPortSelectedAggID;
+  for my $slave (keys %$group) {
+    my $master = $group->{$slave};
+    next if($master == 0 || $slave == $master);
+
+    $mapping->{$slave} = $master;
+  }
+
+  return $mapping;
+}
+
+
+# combine PAgP, LAG & Cisco proprietary data
+sub agg_ports {
+  my $ret = {%{agg_ports_pagp(@_)}, %{agg_ports_lag(@_)}, %{agg_ports_cisco(@_)}};
+  return $ret;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SNMP::Info::CiscoAgg - SNMP Interface to Cisco Aggregated Links
+
+=head1 AUTHOR
+
+SNMP::Info Developers
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you.
+ my $info = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myrouter',
+                          Community   => 'public',
+                          Version     => 2
+                        )
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $info->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+This class provides access to Aggregated Links configuration on Cisco devices.
+It combines Cisco PAgP, Cisco proprietary info and IEEE 802.3ad information.
+
+Use or create in a subclass of SNMP::Info.  Do not use directly.
+
+=head2 Inherited Classes
+
+L<SNMP::Info::IEEE802dot3ad>
+
+=head2 Required MIBs
+
+=over
+
+=item F<CISCO-PAGP-MIB>
+
+=item F<CISCO-LAG-MIB>
+
+=item F<CISCO-IF-EXTENSION-MIB>
+
+=back
+
+MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
+
+=head1 METHODS
+
+=over 4
+
+=item C<agg_ports>
+
+Returns a HASH reference mapping from slave to master port for each member of
+a port bundle on the device. Keys are ifIndex of the slave ports, Values are
+ifIndex of the corresponding master ports.
+
+=item C<agg_ports_cisco>
+
+Implements the cisco LAG info retrieval. Merged into C<agg_ports> data
+automatically. Will fetch all members of C<clagAggPortListInterfaceIndexList>
+even if they are not running an aggregation protocol.
+
+=item C<agg_ports_pagp>
+
+Implements the PAgP LAG info retrieval. Merged into C<agg_ports> data
+automatically.
+
+=item C<lag_members>
+
+Mimics C<ad_lag_ports> from L<SNMP::Info::IEEE802dot3ad> but based on ifindex
+instead of instead of bp_index.
+
+=back
+
+=head2 OVERRIDES
+
+=over
+
+=item C<agg_ports_lag>
+
+This will retrieve LAG ports based on C<dot3adAggPortSelectedAggID> data.
+It will be merged into C<agg_ports> data.
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::IEEE802dot3ad
+
+=over
+
+See documentation in L<SNMP::Info::IEEE802dot3ad> for details.
+
+=back
+
+=head1 MUNGES
+
+=over
+
+=item C<munge_port_ifindex>
+
+Takes C<clagAggPortListInterfaceIndexList>, uses the index as master port, then
+returns all members as ifindex. Works with single or multiple slaves to a master.
+
+=back
+
+=cut
--- a/lib/SNMP/Info/CiscoConfig.pm
+++ b/lib/SNMP/Info/CiscoConfig.pm
@@ -39,7 +39,7 @@ use SNMP::Info;

 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    'CISCO-CONFIG-COPY-MIB' => 'ccCopyTable',
@@ -97,6 +97,10 @@ sub copy_run_tftp {
        print "Using new method, row iid: $rand\n" if $ciscoconfig->debug();

        #Check each set, delete created row if any fail
+        unless ( $ciscoconfig->set_config_row_status( 5, $rand ) ) {
+            $ciscoconfig->error_throw("Initializing config copy instruction failed");
+            return;
+        }
        unless ( $ciscoconfig->set_config_source_type( 4, $rand ) ) {
            $ciscoconfig->error_throw("Setting source type failed");
            unless ( $ciscoconfig->set_config_row_status( 6, $rand ) ) {
@@ -275,7 +279,7 @@ Justin Hunter, Eric Miller
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )

    or die "Can't connect to DestHost.\n";

@@ -332,10 +336,6 @@ 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.

-=over
-
-=back
-
 =head2 Config Copy Request Table  (C<ccCopyTable>)

 =over
@@ -431,7 +431,7 @@ Table of Flash copy operation entries.
 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. 
+operations.

 =over

@@ -448,7 +448,7 @@ 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') 
+ $ciscoconfig->copy_run_tftp('1.2.3.4', 'myconfig')
    or die "Couldn't save config. ",$ciscoconfig->error(1);

 =item $ciscoconfig->copy_run_start()
--- a/lib/SNMP/Info/CiscoPortSecurity.pm
+++ b/lib/SNMP/Info/CiscoPortSecurity.pm
@@ -32,18 +32,20 @@ package SNMP::Info::CiscoPortSecurity;

 use strict;
 use Exporter;
+use SNMP::Info;

-@SNMP::Info::CiscoPortSecurity::ISA       = qw/Exporter/;
+@SNMP::Info::CiscoPortSecurity::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::CiscoPortSecurity::EXPORT_OK = qw//;

 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PAECAPABILITIES/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    'CISCO-PORT-SECURITY-MIB' => 'ciscoPortSecurityMIB',
    'CISCO-PAE-MIB'           => 'ciscoPaeMIB',
    'IEEE8021-PAE-MIB'        => 'dot1xAuthLastEapolFrameSource',
+    'CISCO-ERR-DISABLE-MIB'   => 'ciscoErrDisableMIB',
 );

 %GLOBALS = (
@@ -81,30 +83,27 @@ $VERSION = '3.10';
    # 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',

    # IEEE8021-PAE-MIB::dot1xPaePortEntry
    'pae_i_capabilities'            => 'dot1xPaePortCapabilities',
    'pae_i_last_eapol_frame_source' => 'dot1xAuthLastEapolFrameSource',
+
+    # CISCO-ERR-DISABLE-MIB::cErrDisableIfStatusEntry
+    'cerr_i_cause' => 'cErrDisableIfStatusCause',
 );

 %MUNGE = (
    'cps_i_mac'                     => \&SNMP::Info::munge_mac,
-    'cps_m_mac'                     => \&SNMP::Info::munge_mac,
-    'cps_i_v_mac'                   => \&SNMP::Info::munge_mac,
    'pae_i_last_eapol_frame_source' => \&SNMP::Info::munge_mac,
    'pae_i_capabilities'            => \&munge_pae_capabilities,
 );
@@ -123,13 +122,29 @@ sub munge_pae_capabilities {
    return join( ' ', @vals );
 }

+# Define a generic method to show the cause for a port to be err-disabled.
+# Cisco indexes cErrDisableIfStatusCause by {ifindex,vlan}, but for a more
+# generic method, using ifIndex only makes it easier to implement across
+# device classes. Besides, several (most?) err-disable features will disable
+# the whole interface anyway, and not just a vlan on the interface.
+sub i_err_disable_cause {
+    my $cps = shift;
+    my $ret;
+    my $causes = $cps->cerr_i_cause() || {};
+    foreach my $interfacevlan (keys %$causes) {
+        my ($iid, $vid) = split(/\./, $interfacevlan);
+        $ret->{$iid} = $causes->{$interfacevlan};
+    }
+    return $ret;
+}
+
 1;
 __END__

 =head1 NAME

 SNMP::Info::CiscoPortSecurity - SNMP Interface to data from
-F<CISCO-PORT-SECURITY-MIB> and F<CISCO-PAE-MIB>
+F<CISCO-PORT-SECURITY-MIB>, F<CISCO-PAE-MIB> and F<CISCO-ERR-DISABLE-MIB>.

 =head1 AUTHOR

@@ -137,14 +152,14 @@ Eric Miller

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $cps = new SNMP::Info(
                        AutoSpecify => 1,
                        Debug       => 1,
                        DestHost    => 'myswitch',
                        Community   => 'public',
                        Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $cps->class();
@@ -153,8 +168,9 @@ Eric Miller
 =head1 DESCRIPTION

 SNMP::Info::CiscoPortSecurity is a subclass of SNMP::Info that provides
-an interface to the F<CISCO-PORT-SECURITY-MIB> and F<CISCO-PAE-MIB>.  These
-MIBs are used across the Catalyst family under CatOS and IOS.
+an interface to the F<CISCO-PORT-SECURITY-MIB>, F<CISCO-PAE-MIB> and
+F<CISCO-ERR-DISABLE-MIB>. These MIBs are used across the Catalyst
+family under CatOS and IOS.

 Use or create in a subclass of SNMP::Info.  Do not use directly.

@@ -172,16 +188,14 @@ None.

 =item F<IEEE8021-PAE-MIB>

+=item F<CISCO-ERR-DISABLE-MIB>
+
 =back

 =head1 GLOBALS

 These are methods that return scalar values from SNMP

-=over
-
-=back
-
 =head2 F<CISCO-PORT-SECURITY-MIB> globals

 =over
@@ -300,10 +314,6 @@ These are methods that return scalar values from SNMP

 (C<cpsIfVlanMaxSecureMacAddr>)

-=item $cps->cps_i_v()
-
-(C<cpsIfVlanIndex>)
-
 =back

 =head2 C<CISCO-PORT-SECURITY-MIB::cpsIfVlanSecureMacAddrTable>
@@ -322,14 +332,6 @@ These are methods that return scalar values from SNMP

 (C<cpsIfVlanSecureMacAddrType>)

-=item $cps->cps_i_v_vlan()
-
-(C<cpsIfVlanSecureVlanIndex>)
-
-=item $cps->cps_i_v_mac()
-
-(C<cpsIfVlanSecureMacAddress>)
-
 =back

 =head2 C<CISCO-PORT-SECURITY-MIB::cpsSecureMacAddressTable>
@@ -348,10 +350,6 @@ These are methods that return scalar values from SNMP

 (C<cpsSecureMacAddrType>)

-=item $cps->cps_m_mac()
-
-(C<cpsSecureMacAddress>)
-
 =back

 =head2 C<IEEE8021-PAE-MIB::dot1xPaePortEntry>
@@ -374,6 +372,31 @@ The source MAC address carried in the most recently received EAPOL frame.

 =back

+=head2 C<CISCO-ERR-DISABLE-MIB::cErrDisableIfStatusEntry>
+
+=over
+
+=item $cps->cerr_i_cause()
+
+C<cErrDisableIfStatusCause>
+
+Indicates the feature/event that caused the {interface, vlan} (or the entire
+interface) to be error-disabled.
+
+=back
+
+=head1 METHODS
+
+=over
+
+=item C<i_err_disable_cause>
+
+Returns a HASH reference mapping ifIndex to err-disabled cause. The returned
+data is sparse, so if the ifIndex is not present in the return value, the port
+is not err-disabled.
+
+=back
+
 =head1 Data Munging Callback Subroutines

 =over
--- a/lib/SNMP/Info/CiscoPower.pm
+++ b/lib/SNMP/Info/CiscoPower.pm
@@ -39,16 +39,16 @@ use SNMP::Info;

 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = ( 'CISCO-POWER-ETHERNET-EXT-MIB' => 'cpeExtPsePortEntPhyIndex',
          'CISCO-CDP-MIB' => 'cdpCachePowerConsumption' );

 %GLOBALS = ();

-%FUNCS = ( 
-    'cpeth_ent_phy'     => 'cpeExtPsePortEntPhyIndex', 
-    'peth_port_power'   => 'cpeExtPsePortPwrConsumption', 
+%FUNCS = (
+    'cpeth_ent_phy'     => 'cpeExtPsePortEntPhyIndex',
+    'peth_port_power'   => 'cpeExtPsePortPwrConsumption',
 );

 %MUNGE = ();
@@ -113,14 +113,14 @@ Bill Fenner

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $poe = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $poe->class();
@@ -176,7 +176,7 @@ Maps the C<pethPsePortTable> to C<ifIndex> by way of the F<ENTITY-MIB>.

 Power supplied by PoE ports, in milliwatts
 (C<cpeExtPsePortPwrConsumption>)
- 
+
 =back

 =head2 CDP Port table
--- a/lib/SNMP/Info/CiscoQOS.pm
+++ b/lib/SNMP/Info/CiscoQOS.pm
@@ -39,7 +39,7 @@ use SNMP::Info;

 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = ( 'CISCO-CLASS-BASED-QOS-MIB' => 'cbQosIfIndex', );

@@ -86,14 +86,14 @@ Alexander Hartmaier

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $qos = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class = $qos->class();
@@ -101,7 +101,7 @@ Alexander Hartmaier

 =head1 DESCRIPTION

-SNMP::Info::CiscoQOS is a subclass of SNMP::Info that provides 
+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.
--- a/lib/SNMP/Info/CiscoRTT.pm
+++ b/lib/SNMP/Info/CiscoRTT.pm
@@ -39,7 +39,7 @@ use SNMP::Info;

 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = ( 'CISCO-RTTMON-MIB' => 'rttMonCtrlAdminOwner', );

@@ -67,14 +67,14 @@ Alexander Hartmaier

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $rtt = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class = $rtt->class();
@@ -82,7 +82,7 @@ Alexander Hartmaier

 =head1 DESCRIPTION

-SNMP::Info::CiscoRTT is a subclass of SNMP::Info that provides 
+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.
--- a/lib/SNMP/Info/CiscoStack.pm
+++ b/lib/SNMP/Info/CiscoStack.pm
@@ -32,14 +32,13 @@ package SNMP::Info::CiscoStack;

 use strict;
 use Exporter;
-use SNMP::Info;

-@SNMP::Info::CiscoStack::ISA       = qw/SNMP::Info Exporter/;
+@SNMP::Info::CiscoStack::ISA       = qw/Exporter/;
@SNMP::Info::CiscoStack::EXPORT_OK = qw//;

 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = ( 'CISCO-STACK-MIB' => 'ciscoStackMIB', );

@@ -195,7 +194,7 @@ sub i_duplex_admin {
        next if ( defined $partial and $iid !~ /^$partial$/ );

        # Test for gigabit
-        if ( defined $p_duplex_cap->{$port} and $p_duplex_cap->{$port} == 1 ) {
+        if ( defined $p_duplex_cap->{$port} and $p_duplex_cap->{$port} == 0 ) {
            $i_duplex_admin->{$iid} = 'full';
        }

@@ -296,14 +295,14 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $ciscostats = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class = $ciscostats->class();
@@ -387,7 +386,7 @@ 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. 
+Crosses p_port() with p_type() and returns the results.

 Overrides with C<ifType> if p_type() isn't available.

@@ -426,7 +425,7 @@ C<portAdminSpeed>

    Example:
    my %if_map = reverse %{$stack->interfaces()};
-    $stack->set_i_speed_admin('auto', $if_map{'FastEthernet0/1'}) 
+    $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)
@@ -440,7 +439,7 @@ C<portAdminSpeed>

    Example:
    my %if_map = reverse %{$stack->interfaces()};
-    $stack->set_i_duplex_admin('auto', $if_map{'FastEthernet0/1'}) 
+    $stack->set_i_duplex_admin('auto', $if_map{'FastEthernet0/1'})
        or die "Couldn't change port duplex. ",$stack->error(1);

 =back
--- a/lib/SNMP/Info/CiscoStats.pm
+++ b/lib/SNMP/Info/CiscoStats.pm
@@ -42,14 +42,14 @@ use SNMP::Info;

 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    'SNMPv2-MIB'            => 'sysDescr',
    'CISCO-PROCESS-MIB'     => 'cpmCPUTotal5sec',
    'CISCO-MEMORY-POOL-MIB' => 'ciscoMemoryPoolUsed',
    'OLD-CISCO-SYSTEM-MIB'  => 'writeMem',
-    'CISCO-PRODUCTS-MIB'    => 'sysName',
+    'CISCO-PRODUCTS-MIB'    => 'ciscoIGS',
    'ENTITY-MIB'            => 'entPhysicalSoftwareRev',
    'CISCO-IMAGE-MIB'       => 'ciscoImageString',

@@ -88,6 +88,9 @@ $VERSION = '3.10';

    # CISCO-FLASH-MIB::ciscoFlashDeviceTable
    'cisco_flash_size' => 'ciscoFlashDeviceSize',
+
+    # CISCO-IMAGE-MIB
+    'ci_images' => 'ciscoImageString',
 );

 %MUNGE = ();
@@ -331,7 +334,7 @@ Eric Miller, Max Baker, Sam Stickland

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $ciscostats = new SNMP::Info(
                    AutoSpecify => 1,
                    Debug       => 1,
@@ -339,7 +342,7 @@ Eric Miller, Max Baker, Sam Stickland
                    DestHost    => 'myswitch',
                    Community   => 'public',
                    Version     => 2
-                    ) 
+                    )
    or die "Can't connect to DestHost.\n";

 my $class      = $ciscostats->class();
@@ -348,7 +351,7 @@ Eric Miller, Max Baker, Sam Stickland
 =head1 DESCRIPTION

 SNMP::Info::CiscoStats is a subclass of SNMP::Info that provides cpu, memory,
-os and version information about Cisco Devices. 
+os and version information about Cisco Devices.

 Use or create in a subclass of SNMP::Info.  Do not use directly.

@@ -444,7 +447,7 @@ Tries to parse C<ROMMON> version from rom_id() string

 Current CPU usage in percent.

-C<1.3.6.1.4.1.9.2.1.56.0> = 
+C<1.3.6.1.4.1.9.2.1.56.0> =
 C<OLD-CISCO-CPU-MIB:avgBusyPer>

 =item $ciscostats->ios_cpu_1min()
@@ -539,4 +542,16 @@ zero if the device has been removed.

 =back

+=head2 Cisco Image Table (C<ciscoImageTable>)
+
+=over
+
+=item $ci->ci_images()
+
+Returns the table of image strings.
+
+C<ciscoImageString>
+
+=back
+
 =cut
--- a/lib/SNMP/Info/CiscoStpExtensions.pm
+++ b/lib/SNMP/Info/CiscoStpExtensions.pm
@@ -1,29 +1,29 @@
 # SNMP::Info::CiscoStpExtensions
 #
 # Copyright (c)2009 Carlos Vicente
-# All rights reserved.  
+# 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 author nor the 
-#       names of its contributors may be used to endorse or promote products 
+#     * 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 
+# 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::CiscoStpExtensions;
@@ -36,7 +36,7 @@ use SNMP::Info::Bridge;

 use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT $INIT/;

-$VERSION = '3.10';
+$VERSION = '3.66';

@SNMP::Info::CiscoStpExtensions::ISA = qw/SNMP::Info::Bridge SNMP::Info Exporter/;
@SNMP::Info::CiscoStpExtensions::EXPORT_OK = qw//;
@@ -54,12 +54,15 @@ $VERSION = '3.10';
            'stpx_stp_type'          => 'stpxSpanningTreeType',
            'stpx_bpduguard_enable'  => 'stpxFastStartBpduGuardEnable',
            'stpx_bpdufilter_enable' => 'stpxFastStartBpduFilterEnable',
+            'stpx_faststart_default' => 'stpxFastStartGlobalDefaultMode',
           );

 %FUNCS   = (
            %SNMP::Info::Bridge::FUNCS,
            'stpx_rootguard_enabled'      => 'stpxRootGuardConfigEnabled',
            'stpx_loopguard_enabled'      => 'stpxLoopGuardConfigEnabled',
+            'stpx_faststart_enabled'      => 'stpxFastStartPortEnable',
+            'stpx_faststart_operational'  => 'stpxFastStartPortMode',
            'stpx_port_bpduguard_mode'    => 'stpxFastStartPortBpduGuardMode',
            'stpx_port_bpdufilter_mode'   => 'stpxFastStartPortBpduFilterMode',
            'stpx_smst_root'              => 'stpxSMSTInstanceCISTRegionalRoot',
@@ -69,7 +72,7 @@ $VERSION = '3.10';

 %MUNGE   = (
            %SNMP::Info::Bridge::MUNGE,
-           'stpx_mst_config_digest'     => \&SNMP::Info::CiscoStpExtensions::oct2str,
+           'stpx_mst_config_digest'      => \&SNMP::Info::CiscoStpExtensions::oct2str,
           );


@@ -103,11 +106,11 @@ sub mst_region_rev {

 sub mst_vlan2instance {
    my $self = shift;
-    
+
    # Get MST vlan-to-instance mapping
    my $m1k2k = $self->stpx_smst_vlans_mapped_1k2k;
    my $m3k4k = $self->stpx_smst_vlans_mapped_3k4k;
-   
+
    # Get list of VLANs
    my $vlan_membership = $self->i_vlan_membership;
    my @vlans;
@@ -137,7 +140,7 @@ sub mst_vlan2instance {
                    $res{$vlan} = $inst;
                    last;
                }
-            }       
+            }
        }
    }
    return \%res;
@@ -159,7 +162,7 @@ sub i_rootguard_enabled {
        $res{$iid} = $enabled;
    }
    return \%res;
-}  
+}

 sub i_loopguard_enabled {
    my $self    = shift;
@@ -177,7 +180,7 @@ sub i_loopguard_enabled {
        $res{$iid} = $enabled;
    }
    return \%res;
-}  
+}

 sub i_bpduguard_enabled {
    my $self    = shift;
@@ -186,7 +189,7 @@ sub i_bpduguard_enabled {
    my $bpdugm_default = $self->stpx_bpduguard_enable();
    my $bp_index       = $self->bp_index($partial);
    my $bpdugm         = $self->stpx_port_bpduguard_mode();
-    
+
    my %res;
    foreach my $index ( keys %$bpdugm ){
        my $mode = $bpdugm->{$index};
@@ -209,7 +212,7 @@ sub i_bpdufilter_enabled {
    my $bpdufm_default = $self->stpx_bpdufilter_enable();
    my $bp_index       = $self->bp_index($partial);
    my $bpdufm         = $self->stpx_port_bpdufilter_mode();
-    
+
    my %res;
    foreach my $index ( keys %$bpdufm ){
        my $mode = $bpdufm->{$index};
@@ -225,6 +228,36 @@ sub i_bpdufilter_enabled {
    return \%res;
 }

+sub i_faststart_enabled {
+    my $self    = shift;
+    my $partial = shift;
+
+    my $faststart_default = $self->stpx_faststart_default();
+    my $bp_index          = $self->bp_index($partial);
+    my $faststart         = $self->stpx_faststart_enabled();
+    my $faststart_oper    = $self->stpx_faststart_operational();
+
+    my %res;
+    # stpxFastStartPortEnable is deprecated in favour of stpxFastStartPortMode
+    # see https://github.com/netdisco/netdisco/issues/12
+    foreach my $index ( keys %$faststart, keys %$faststart_oper ){
+        my $mode = $faststart_oper->{$index} || $faststart->{$index};
+        my $iid  = $bp_index->{$index};
+        next unless defined $iid;
+        next unless defined $mode;
+        if ( $mode eq 'default' ){
+            $res{$iid} =  $faststart_default;
+        }else{
+            $res{$iid} = $mode;
+        }
+        $res{$iid} = 'enable'  if $res{$iid} eq 'true';
+        $res{$iid} = 'disable' if $res{$iid} eq 'false';
+        $res{$iid} = 1 if $res{$iid} =~ m/enable/i; # enableForTrunk
+        $res{$iid} = 0 if $res{$iid} eq 'disable';
+    }
+    return \%res;
+}
+

 sub oct2str {
    my ($v) = @_;
@@ -244,12 +277,25 @@ Carlos Vicente

 =head1 SYNOPSIS

+   my $stpx = new SNMP::Info(
+                         AutoSpecify => 1,
+                         Debug       => 1,
+                         DestHost    => 'myswitch',
+                         Community   => 'public',
+                         Version     => 2
+                       )
+
+   or die "Can't connect to DestHost.\n";
+
+   my $class = $stpx->class();
+   print " Using device sub class : $class\n";
+
 =head1 DESCRIPTION

 Create or use a subclass of SNMP::Info that inherits this class.  Do not use
 directly.

-For debugging you can call new() directly as you would in SNMP::Info 
+For debugging you can call new() directly as you would in SNMP::Info

 my $stpx = new SNMP::Info::CiscoStpExtensions(...);

@@ -257,9 +303,17 @@ For debugging you can call new() directly as you would in SNMP::Info

 =over

-=item SNMP::Info 
+=item SNMP::Info

-=item SNMP::Info::Bridge 
+=item SNMP::Info::Bridge
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<CISCO-STP-EXTENSIONS-MIB>

 =back

@@ -273,7 +327,7 @@ These are methods that return scalar values from SNMP

 =item $stpx->stp_ver()

-Returns the particular STP version running on this device.  
+Returns the particular STP version running on this device.
 Meant to override SNMP::Info::Brigde::stp_ver()

 Values: C<pvstPlus>, C<mistp>, C<mistpPvstPlus>, C<mst>, C<rapidPvstPlus>
@@ -291,25 +345,25 @@ to a hash.

 =item $stpx->mst_config_digest()

-Returns the Multiple Spanning Tree (MST) configuration digest 
+Returns the Multiple Spanning Tree (MST) configuration digest

 (C<stpxSMSTConfigDigest>)

 =item $stpx->mst_region_name()

-Returns the Multiple Spanning Tree (MST) region name 
+Returns the Multiple Spanning Tree (MST) region name

 (C<stpxMSTRegionName>)

 =item $stpx->mst_region_rev()

-Returns the Multiple Spanning Tree (MST) region name 
+Returns the Multiple Spanning Tree (MST) region name

 (C<stpxSMSTRegionRevision>)

 =item $stpx->mst_vlan2instance()

-Returns the mapping of vlan to MST instance in the form of a hash reference 
+Returns the mapping of vlan to MST instance in the form of a hash reference
 with key = VLAN id, value = STP instance

 =item $stpx->i_rootguard_enabled()
@@ -340,6 +394,13 @@ Format is a hash reference with key = C<ifIndex>, value = [1|0]

 (C<stpxFastStartBpduFilterEnable>)

+=item $stpx->i_faststart_enabled()
+
+Returns 1 or 0 depending on whether FastStart (aka PortFast) is enabled on a
+given port.  Format is a hash reference with key = C<ifIndex>, value = [1|0]
+
+(C<stpxFastStartPortEnable> and C<stpxFastStartPortMode>)
+
 =back

 =head1 MUNGES
--- a/lib/SNMP/Info/CiscoVTP.pm
+++ b/lib/SNMP/Info/CiscoVTP.pm
@@ -41,7 +41,7 @@ use SNMP::Info;

 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    'CISCO-VTP-MIB'                       => 'vtpVlanName',
@@ -61,7 +61,6 @@ $VERSION = '3.10';
 %FUNCS = (

    # CISCO-VTP-MIB::managementDomainTable
-    'vtp_d_index'     => 'managementDomainIndex',
    'vtp_d_name'      => 'managementDomainName',
    'vtp_d_mode'      => 'managementDomainLocalMode',
    'vtp_d_rev'       => 'managementDomainConfigRevNumber',
@@ -149,6 +148,7 @@ sub i_vlan {

    my $port_vlan      = $vtp->vtp_trunk_native($partial)   || {};
    my $i_vlan         = $vtp->i_vlan2($partial)            || {};
+    my $trunk_dyn      = $vtp->vtp_trunk_dyn($partial)      || {};
    my $trunk_dyn_stat = $vtp->vtp_trunk_dyn_stat($partial) || {};

    my %i_vlans;
@@ -165,15 +165,23 @@ sub i_vlan {
    foreach my $port ( keys %$port_vlan ) {
        my $vlan = $port_vlan->{$port};
        next unless defined $vlan;
+
+        # ports up and trunking should have a trunking status
        my $stat = $trunk_dyn_stat->{$port};
-        if ( defined $stat and $stat =~ /^trunking/ ) {
+
+        # vtp_trunk_dyn_stat is not useful for down ports
+        # so we use vtp_trunk_dyn to see if trunking is set
+        my $dyn = $trunk_dyn->{$port};
+
+        if (($stat and $stat =~ /^trunking/ )
+            or ($dyn and (($dyn eq 'on') or ($dyn eq 'onNoNegotiate'))))
+        {
            $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
+    # Used for traditional Cisco Routers and Aironet

    my $v_cvi_if = $vtp->v_cvi_if();
    if ( defined $v_cvi_if ) {
@@ -218,6 +226,8 @@ sub i_vlan_membership {
    my $vtp_vlans      = $vtp->v_state();
    my $i_vlan         = $vtp->i_vlan2($partial)            || {};
    my $trunk_dyn_stat = $vtp->vtp_trunk_dyn_stat($partial) || {};
+    my $trunk_dyn      = $vtp->vtp_trunk_dyn($partial)      || {};
+    my $i_voice_vlan   = $vtp->i_voice_vlan($partial)       || {};

    my $i_vlan_membership = {};

@@ -225,14 +235,24 @@ sub i_vlan_membership {
    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/ ) {
+        my $dyn = $trunk_dyn->{$port};
+        unless ($dyn and (($dyn eq 'on') or ($dyn eq 'onNoNegotiate'))) {
+            push( @{ $i_vlan_membership->{$port} }, $vlan );
+        }
+    }
+
+    # Get voice VLANs
+    foreach my $port ( keys %$i_voice_vlan ) {
+        my $vlan = $i_voice_vlan->{$port};
+        next unless defined $vlan;
+        next unless ($vlan =~ m/[[:digit:]]+/ and $vlan < 4095);
+        my $dyn = $trunk_dyn->{$port};
+        unless ($dyn and (($dyn eq 'on') or ($dyn eq 'onNoNegotiate'))) {
            push( @{ $i_vlan_membership->{$port} }, $vlan );
        }
    }

    # Get trunk ports
-
    my %oper_vlans;
    foreach my $iid ( keys %$vtp_vlans ) {
        my $vlan    = 0;
@@ -249,7 +269,9 @@ sub i_vlan_membership {

    foreach my $port ( keys %$ports_vlans ) {
        my $stat = $trunk_dyn_stat->{$port};
-        if ( defined $stat and $stat =~ /^trunking/ ) {
+        my $dyn = $trunk_dyn->{$port};
+        if (($stat and $stat =~ /^trunking/ )
+            or ($dyn and (($dyn eq 'on') or ($dyn eq 'onNoNegotiate')))) {
            my $k     = 0;
            my $list1 = $ports_vlans->{$port} || '0';
            my $list2 = $ports_vlans_2k->{$port} || '0';
@@ -271,6 +293,20 @@ sub i_vlan_membership {
    return $i_vlan_membership;
 }

+sub i_vlan_membership_untagged {
+    my $vtp  = shift;
+    my $partial = shift;
+
+    my $vlans = $vtp->i_vlan($partial);
+    my $i_vlan_membership = {};
+    foreach my $port (keys %$vlans) {
+        my $vlan = $vlans->{$port};
+        push( @{ $i_vlan_membership->{$port} }, $vlan );
+    }
+
+    return $i_vlan_membership;
+}
+
 sub set_i_pvid {
    my $vtp = shift;
    my ( $vlan_id, $ifindex ) = @_;
@@ -493,14 +529,14 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $vtp = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class = $vtp->class();
@@ -508,7 +544,7 @@ Max Baker

 =head1 DESCRIPTION

-SNMP::Info::CiscoVTP is a subclass of SNMP::Info that provides 
+SNMP::Info::CiscoVTP is a subclass of SNMP::Info that provides
 information about a Cisco device's VLAN and VTP Domain membership.

 Use or create in a subclass of SNMP::Info.  Do not use directly.
@@ -584,13 +620,19 @@ 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";
  }

+=item $vtp->i_vlan_membership_untagged()
+
+Returns reference to hash of arrays: key = C<ifIndex>, value = array of VLAN
+IDs.  These are the VLANs which are members of the untagged egress list for
+the port.
+
 =back

 =head2 VLAN Table (C<CISCO-VTP-MIB::vtpVlanTable>)
@@ -680,7 +722,7 @@ for a good treaty of how to connect to the VLANs

 =item $vtp->i_vlan_type()

-Static, Dynamic, or multiVlan.  
+Static, Dynamic, or multiVlan.

 (C<vmVlanType>)

@@ -727,7 +769,7 @@ Each bit represents a VLAN.  This is 3072 through 4095

 =over

-=item $vtp->i_voice_vlan() 
+=item $vtp->i_voice_vlan()

 (C<vmVoiceVlanId>)

@@ -737,10 +779,6 @@ Each bit represents a VLAN.  This is 3072 through 4095

 =over

-=item $vtp->vtp_d_index()
-
-(C<managementDomainIndex>)
-
 =item $vtp->vtp_d_name()

 (C<managementDomainName>)
@@ -846,7 +884,7 @@ Each bit represents a VLAN.  This is 3072 through 4095
 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. 
+operations.

 =over

@@ -858,7 +896,7 @@ VLAN ID and port C<ifIndex>.  This method should only be used on end station

  Example:
  my %if_map = reverse %{$vtp->interfaces()};
-  $vtp->set_i_vlan('2', $if_map{'FastEthernet0/1'}) 
+  $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 )
@@ -868,7 +906,7 @@ port C<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'}) 
+  $vtp->set_i_pvid('2', $if_map{'FastEthernet0/1'})
    or die "Couldn't change port default VLAN. ",$vtp->error(1);

 =item $vtp->set_i_untagged ( vlan, ifIndex )
@@ -884,7 +922,7 @@ numeric VLAN ID and port C<ifIndex>.

  Example:
  my %if_map = reverse %{$vtp->interfaces()};
-  $vtp->set_add_i_vlan_tagged('2', $if_map{'FastEthernet0/1'}) 
+  $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 )
@@ -894,7 +932,7 @@ with the numeric VLAN ID and port C<ifIndex>.

  Example:
  my %if_map = reverse %{$vtp->interfaces()};
-  $vtp->set_remove_i_vlan_tagged('2', $if_map{'FastEthernet0/1'}) 
+  $vtp->set_remove_i_vlan_tagged('2', $if_map{'FastEthernet0/1'})
    or die "Couldn't add port to egress list. ",$vtp->error(1);

 =back
--- a/lib/SNMP/Info/EDP.pm
+++ b/lib/SNMP/Info/EDP.pm
@@ -34,12 +34,12 @@ use strict;
 use Exporter;
 use SNMP::Info;

-@SNMP::Info::LLDP::ISA       = qw/SNMP::Info Exporter/;
-@SNMP::Info::LLDP::EXPORT_OK = qw//;
+@SNMP::Info::EDP::ISA       = qw/SNMP::Info Exporter/;
+@SNMP::Info::EDP::EXPORT_OK = qw//;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    'EXTREME-EDP-MIB'   => 'extremeEdpPortIfIndex',
@@ -64,7 +64,7 @@ sub hasEDP {
    my $edp_ip = $edp->extremeEdpNeighborVlanIpAddress() || {};

    return 1 if ( scalar( keys %$edp_ip ) );
-    
+
    return;
 }

@@ -80,7 +80,7 @@ sub _edp_index {
    my $edp = shift;

    my $edp_ip  = $edp->extremeEdpNeighborVlanIpAddress() || {};
-    
+
    my %edp_index;
    foreach my $key ( keys %$edp_ip ) {
        my $ip = $edp_ip->{$key};
@@ -103,7 +103,7 @@ sub edp_if {
        $iid = $1 if $iid =~ /^(\d+)\./;
        $edp_if{$key} = $iid;
    }
- 
+
  return \%edp_if;
 }

@@ -193,10 +193,10 @@ Eric Miller

 =head1 SYNOPSIS

- my $edp = new SNMP::Info ( 
+ my $edp = new SNMP::Info (
                             AutoSpecify => 1,
                             Debug       => 1,
-                             DestHost    => 'router', 
+                             DestHost    => 'router',
                             Community   => 'public',
                             Version     => 2
                           );
@@ -222,7 +222,7 @@ Eric Miller

 =head1 DESCRIPTION

-SNMP::Info::EDP is a subclass of SNMP::Info that provides an object oriented 
+SNMP::Info::EDP is a subclass of SNMP::Info that provides an object oriented
 interface to EDP information through SNMP.

 EDP is a Layer 2 protocol that allows a network device to advertise its
@@ -251,7 +251,7 @@ These are methods that return scalar values from SNMP

 =item $edp->hasEDP()

-Is EDP is active in this device?  
+Is EDP is active in this device?

 =back

@@ -285,7 +285,7 @@ Returns remote port ID

 Returns the operating system version of the remote system.

-Nulls are removed before the value is returned. 
+Nulls are removed before the value is returned.

 (C<extremeEdpNeighborSoftwareVersion>)

--- a/lib/SNMP/Info/Entity.pm
+++ b/lib/SNMP/Info/Entity.pm
@@ -41,7 +41,7 @@ use SNMP::Info;

 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = ( 'ENTITY-MIB' => 'entPhysicalSerialNum' );

@@ -109,6 +109,57 @@ sub e_port {
    return \%e_port;
 }

+sub entity_derived_serial {
+    my $entity  = shift;
+
+    my $e_parent = $entity->e_parent() || {};
+    my $e_class  = $entity->e_class() || {};
+
+    # Sort keys to return a consistent result between runs
+    foreach my $iid ( sort keys %$e_parent ) {
+        my $parent = $e_parent->{$iid};
+        my $class = $e_class->{$iid} || '';
+        # Only consider serial numbers for entries without a parent, or
+        # if they are of type "chassis"
+        if ( $parent eq '0' or $class eq 'chassis') {
+            my $serial = $entity->e_serial($iid);
+            if ( $serial && $serial->{$iid} ) {
+                return $serial->{$iid};
+            }
+            else {
+                my $descr = $entity->e_descr($iid);
+                if ( $descr and $descr->{$iid} =~ /serial#?:\s*([a-z0-9]+)/i )
+                {
+                    return $1;
+                }
+            }
+        }
+    }
+    return;
+}
+
+sub entity_derived_os_ver {
+    my $entity  = shift;
+
+    my $e_parent = $entity->e_parent() || {};
+    my $e_class  = $entity->e_class() || {};
+
+    # Sort keys to return a consistent result between runs
+    foreach my $iid ( sort keys %$e_parent ) {
+        my $parent = $e_parent->{$iid};
+        my $class = $e_class->{$iid} || '';
+        # Only consider serial numbers for entries without a parent, or
+        # if they are of type "chassis"
+        if ( $parent eq '0' or $class eq 'chassis') {
+            my $os_ver = $entity->e_swver($iid);
+            if ( $os_ver && $os_ver->{$iid} ) {
+                return $os_ver->{$iid};
+            }
+        }
+    }
+    return;
+}
+
 1;

 __END__
@@ -123,14 +174,14 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $entity = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $entity->class();
@@ -173,6 +224,23 @@ none.
 These are methods that return tables of information in the form of a reference
 to a hash.

+=over
+
+=item $entity->entity_derived_serial()
+
+Tries to determine the device serial number from the F<ENTITY-MIB>. Only
+considers serial numbers for entries without a parent, or if they are of type
+chassis. Looks at C<entPhysicalSerialNum> and then C<entPhysicalDescr> for
+serial number.
+
+=item $entity->entity_derived_os_ver()
+
+Tries to determine the device OS version from the F<ENTITY-MIB>. Only
+considers serial numbers for entries without a parent, or if they are of type
+chassis. Looks at C<entPhysicalSoftwareRev> for the version.
+
+=back
+
 =head2 Entity Table

 =over
--- a/lib/SNMP/Info/EtherLike.pm
+++ b/lib/SNMP/Info/EtherLike.pm
@@ -41,7 +41,7 @@ use SNMP::Info;

 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = ( 'EtherLike-MIB' => 'etherMIB' );

@@ -68,7 +68,6 @@ $VERSION = '3.10';
    'el_xmit_defer'      => 'dot3StatsDeferredTransmissions',

    # Ethernet-like Collision Statistics Group
-    'el_coll_count' => 'dot3CollCount',
    'el_coll_freq'  => 'dot3CollFrequencies'
 );

@@ -96,14 +95,14 @@ Max Baker

 =head1 SYNOPSIS

- my $el = new SNMP::Info ( 
+ my $el = new SNMP::Info (
                             AutoSpecify => 1,
                             Debug       => 1,
-                             DestHost    => 'router', 
+                             DestHost    => 'router',
                             Community   => 'public',
                             Version     => 2
                           );
- 
+
 my $class = $cdp->class();
 print " Using device sub class : $class\n";

@@ -111,7 +110,7 @@ Max Baker
 # ETHERLIKE-MIB
 my $interfaces = $el->interfaces();
 my $el_index   = $el->el_index();
- my $el_duplex  = $el->el_duplex(); 
+ my $el_duplex  = $el->el_duplex();

 foreach my $el_port (keys %$el_duplex){
    my $duplex = $el_duplex->{$el_port};
@@ -123,7 +122,7 @@ Max Baker

 =head1 DESCRIPTION

-SNMP::Info::EtherLike is a subclass of SNMP::Info that supplies 
+SNMP::Info::EtherLike is a subclass of SNMP::Info that supplies
 access to the F<ETHERLIKE-MIB> used by some Layer 3 Devices such as
 Cisco routers.

@@ -134,7 +133,7 @@ directly.

 =head2 Inherited Classes

-None.  
+None.

 =head2 Required MIBs

--- a/lib/SNMP/Info/FDP.pm
+++ b/lib/SNMP/Info/FDP.pm
@@ -42,7 +42,7 @@ use SNMP::Info;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = ( 'FOUNDRY-SN-SWITCH-GROUP-MIB' => 'snFdpGlobalRun' );

@@ -50,11 +50,9 @@ $VERSION = '3.10';
    'fdp_run'      => 'snFdpGlobalRun',
    'fdp_interval' => 'snFdpGlobalMessageInterval',
    'fdp_holdtime' => 'snFdpGlobalHoldTime',
-    'fdp_id'       => 'snFdpGlobalDeviceId',
 );

 %FUNCS = (
-    'fdp_index'        => 'snFdpCacheIfIndex',
    'fdp_proto'        => 'snFdpCacheAddressType',
    'fdp_ip'           => 'snFdpCacheAddress',
    'fdp_ver'          => 'snFdpCacheVersion',
@@ -62,9 +60,7 @@ $VERSION = '3.10';
    'fdp_port'         => 'snFdpCacheDevicePort',
    'fdp_platform'     => 'snFdpCachePlatform',
    'fdp_capabilities' => 'snFdpCacheCapabilities',
-    'fdp_domain'       => 'snFdpCacheVTPMgmtDomain',
-    'fdp_vlan'         => 'snFdpCacheNativeVLAN',
-    'fdp_duplex'       => 'snFdpCacheDuplex',
+    'fdp_cache_type'   => 'snFdpCacheVendorId',
 );

 %MUNGE = (
@@ -84,9 +80,7 @@ sub fdp_run {
 sub hasFDP {
    my $fdp = shift;

-    my $ver = $fdp->{_version};
-
-    #my $ver = $fdp->fdp_ver;
+    my $ver = $fdp->snmp_ver();

    # SNMP v1 clients dont have the globals
    if ( defined $ver and $ver == 1 ) {
@@ -103,11 +97,6 @@ sub hasFDP {
 sub fdp_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->fdp_ip();
    unless ( defined $fdp_ip ) {
        $fdp->error_throw(
@@ -143,10 +132,10 @@ Bruce Rodger, Max Baker

 =head1 SYNOPSIS

- my $fdp = new SNMP::Info ( 
+ my $fdp = new SNMP::Info (
                             AutoSpecify => 1,
                             Debug       => 1,
-                             DestHost    => 'router', 
+                             DestHost    => 'router',
                             Community   => 'public',
                             Version     => 2
                           );
@@ -172,7 +161,7 @@ Bruce Rodger, Max Baker

 =head1 DESCRIPTION

-SNMP::Info::FDP is a subclass of SNMP::Info that provides an object oriented 
+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
@@ -183,7 +172,7 @@ virtually identical.  FDP is implemented in Brocade (Foundry) devices.
 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. 
+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
@@ -197,7 +186,7 @@ None.
 =item F<FOUNDRY-SN-SWITCH-GROUP-MIB>

 Needs a reasonably recent MIB. Works OK with B2R07604A.mib, but doesn't
-work with B2R07600C. 
+work with B2R07600C.

 =back

@@ -209,13 +198,13 @@ These are methods that return scalar values from SNMP

 =item  $fdp->hasFDP()

-Is FDP is active in this device?  
+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?  
+Is FDP enabled on this device?

 (C<fdpGlobalRun>)

@@ -227,19 +216,10 @@ Interval in seconds at which FDP messages are generated.

 =item $fdp->fdp_holdtime()

-Time in seconds that FDP messages are kept. 
+Time in seconds that FDP messages are kept.

 (C<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().
-
-(C<fdpGlobalDeviceId>)
-
 =back

 =head2 Overrides
@@ -256,13 +236,13 @@ Interval in seconds at which FDP messages are generated.

 =item $fdp->fdp_holdtime()

-Time in seconds that FDP messages are kept. 
+Time in seconds that FDP messages are kept.

 (C<fdpGlobalHoldTime>)

-=item  $fdp->fdp_id() 
+=item  $fdp->fdp_id()

-Returns FDP device 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().
@@ -323,19 +303,6 @@ Thanks to Martin Lorensen for a pointer to this information.

 (C<fdpCacheCapabilities>)

-=item $fdp->fdp_domain()
-
-The CDP version of this returns remote VTP Management Domain as defined
-in C<CISCO-VTP-MIB::managementDomainName>
-
-(C<fdpCacheVTPMgmtDomain>)
-
-=item $fdp->fdp_duplex() 
-
-Returns the port duplex status from remote devices.
-
-(C<fdpCacheDuplex>)
-
 =item $fdp->fdp_id()

 Returns remote device id string
@@ -346,19 +313,11 @@ Returns remote device id string

 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;
@@ -366,30 +325,18 @@ truncate the last number off of it :
      $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.
-
-(C<fdpCacheIfIndex>)
-
 =item  $fdp->fdp_ip()

 Returns remote IP address

 (C<fdpCacheAddress>)

-=item $fdp->fdp_platform() 
+=item $fdp->fdp_platform()

-Returns remote platform id 
+Returns remote platform id

 (C<fdpCachePlatform>)

@@ -405,17 +352,17 @@ Returns remote address type received.  Usually IP.

 (C<fdpCacheAddressType>)

-=item $fdp->fdp_ver() 
+=item $fdp->fdp_ver()

 Returns remote hardware version

 (C<fdpCacheVersion>)

-=item $fdp->fdp_vlan()
+=item $fdp->fdp_cache_type()

-Returns the remote interface native VLAN.
+Returns type of entry received, either FDP or CDP.

-(C<fdpCacheNativeVLAN>)
+(C<snFdpCacheVendorId>)

 =back

--- a/lib/SNMP/Info/IEEE802dot11.pm
+++ b/lib/SNMP/Info/IEEE802dot11.pm
@@ -32,13 +32,14 @@ package SNMP::Info::IEEE802dot11;

 use strict;
 use Exporter;
+use SNMP::Info;

-@SNMP::Info::IEEE802dot11::ISA       = qw/Exporter/;
+@SNMP::Info::IEEE802dot11::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::IEEE802dot11::EXPORT_OK = qw//;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = ( 'IEEE802dot11-MIB' => 'dot11DesiredSSID', );

@@ -202,7 +203,7 @@ Eric Miller
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )

    or die "Can't connect to DestHost.\n";

--- a/lib/SNMP/Info/IEEE802dot3ad.pm
+++ b/lib/SNMP/Info/IEEE802dot3ad.pm
@@ -0,0 +1,152 @@
+# SNMP::Info::IEEE802dot3ad
+#
+# Copyright (c) 2018 SNMP::Info Developers
+# 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::IEEE802dot3ad;
+
+use strict;
+use Exporter;
+use SNMP::Info::Aggregate;
+
+@SNMP::Info::IEEE802dot3ad::ISA = qw/
+  SNMP::Info::Aggregate
+  Exporter
+/;
+@SNMP::Info::IEEE802dot3ad::EXPORT_OK = qw/
+  agg_ports_lag
+/;
+
+use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+
+$VERSION = '3.66';
+
+%MIBS = (
+  %SNMP::Info::Aggregate::MIBS,
+  'IEEE8023-LAG-MIB' => 'dot3adAggPortSelectedAggID',
+);
+
+%GLOBALS = ();
+
+%FUNCS = (
+  'ad_lag_ports'    => 'dot3adAggPortListPorts',
+ );
+
+%MUNGE = (
+  'ad_lag_ports' => \&SNMP::Info::munge_port_list,
+ );
+
+sub agg_ports_lag {
+  my $dev = shift;
+
+  # TODO: implement partial
+  my $ports  = $dev->ad_lag_ports();
+  my $index  = $dev->bp_index() || {};
+
+  return {} unless ref {} eq ref $ports and scalar keys %$ports;
+
+  my $ret = {};
+  foreach my $m ( keys %$ports ) {
+    my $idx = $m;
+    my $portlist = $ports->{$m};
+    next unless $portlist;
+
+    # While dot3adAggTable is indexed by ifIndex, the portlist is indexed
+    # with a dot1dBasePort, so we need to use dot1dBasePortIfIndex to map to
+    # the ifIndex. If we don't have dot1dBasePortIfIndex assume
+    # dot1dBasePort = ifIndex
+    for ( my $i = 0; $i <= scalar(@$portlist); $i++ ) {
+      my $ifindex = $i+1;
+      if ( exists($index->{$i+1}) and defined($index->{$i+1}) ) {
+        $ifindex = $index->{$i+1};
+      }
+      $ret->{$ifindex} = $idx if ( @$portlist[$i] );
+    }
+  }
+
+  return $ret;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SNMP::Info::IEEE802dot3ad - SNMP Interface to IEEE Aggregated Links
+
+=head1 AUTHOR
+
+SNMP::Info Developers
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you.
+ my $info = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myrouter',
+                          Community   => 'public',
+                          Version     => 2
+                        )
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $info->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+This class provides access to Aggregated Links configuration on devices
+implementing C<IEEE8023-LAG-MIB>.
+
+Use or create in a subclass of SNMP::Info.  Do not use directly.
+
+=head2 Inherited Classes
+
+L<SNMP::Info::Aggregate>
+
+=head2 Required MIBs
+
+=over
+
+=item F<IEEE8023-LAG-MIB>
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item C<agg_ports_lag>
+
+Returns a HASH reference mapping from slave to master port for each member of
+a port bundle on the device. Keys are ifIndex of the slave ports, Values are
+ifIndex of the corresponding master ports.
+
+=back
+
+=cut
--- a/lib/SNMP/Info/IPv6.pm
+++ b/lib/SNMP/Info/IPv6.pm
@@ -44,19 +44,19 @@ use constant {
    IPV6MIB => 3,
 };

-$VERSION = '3.10';
+$VERSION = '3.66';



-%MIBS = ( 
+%MIBS = (
    'IP-MIB'            => 'ipv6InterfaceTableLastChange',
    'IPV6-MIB'          => 'ipv6IfTableLastChange',
-    'CISCO-IETF-IP-MIB' => 'cInetNetToMediaNetAddress', 
+    'CISCO-IETF-IP-MIB' => 'cInetNetToMediaNetAddress',
 );

 %GLOBALS = ();

-%FUNCS = ( 
+%FUNCS = (
    'ip_n2p_phys_addr'  => 'ipNetToPhysicalPhysAddress',    # IP-MIB
    'c_inet_phys_addr'  => 'cInetNetToMediaPhysAddress',    # CISCO-IETF-IP-MIB
    'i6_n2p_phys_addr'  => 'ipv6NetToMediaPhysAddress',     # IPV6-MIB
@@ -67,20 +67,24 @@ $VERSION = '3.10';

    'ip_n2p_phys_state' => 'ipNetToPhysicalState',          # IP-MIB
    'c_inet_phys_state' => 'cInetNetToMediaState',          # CISCO-IETF-IP-MIB
-    'i6_n2p_phys_state' => 'ipv6NetToMediaState',           # IPV6-MIB
+    'i6_n2p_phys_state' => 'ipv6IfNetToMediaState',         # IPV6-MIB

    'ip_pfx_origin'     => 'ipAddressPrefixOrigin',         # IP-MIB
-    'c_pfx_origin'      => 'cIpAddressPfxOrigin',           # CISCO-IETF-IP-MIB 
+    'c_pfx_origin'      => 'cIpAddressPfxOrigin',           # CISCO-IETF-IP-MIB

-    'ip_addr6_pfx'      => 'ipAddressPrefix',              # IP-MIB 
-    'c_addr6_pfx'       => 'cIpAddressPrefix',              # CISCO-IETF-IP-MIB 
+    'ip_addr6_pfx'      => 'ipAddressPrefix',               # IP-MIB
+    'c_addr6_pfx'       => 'cIpAddressPrefix',              # CISCO-IETF-IP-MIB

-    'ip_addr6_index'    => 'ipAddressIfIndex',              # IP-MIBw
-    'c_addr6_index'     => 'cIpAddressIfIndex',             # CISCO-IETF-IP-MIB 
+    # Commented out are not-accessible according to MIB
+    #'ip_addr6_pfxlen'   => 'ipAddressPrefixLength',        # IP-MIB
+    #'c_addr6_pfxlen'    => 'cIpAddressPfxLength',          # CISCO-IETF-IP-MIB
+    'i6_addr_pfxlen'    => 'ipv6AddrPfxLength',             # IPV6-MIB
+
+    'ip_addr6_index'    => 'ipAddressIfIndex',              # IP-MIB
+    'c_addr6_index'     => 'cIpAddressIfIndex',             # CISCO-IETF-IP-MIB

    'ip_addr6_type'     => 'ipAddressType',                 # IP-MIB
    'c_addr6_type'      => 'cIpAddressType',                # CISCO-IETF-IP-MIB
-    
 );

 %MUNGE = (
@@ -102,8 +106,8 @@ sub ipv6_n2p_mac {
    foreach my $row (keys %$phys_addr) {
        if ($row =~ /^(\d+)\.(\d+)\.(\d+)\.([\d\.]+)$/) {
            my $ifindex = $1; my $addrtype = $2; my $addrsize = $3; my $v6addr = $4;
-            if ($info::METHOD == IPV6MIB) { 
-                # IPV6-MIB doesn't include the addrtype in the index; 
+            if ($info::METHOD == IPV6MIB) {
+                # IPV6-MIB doesn't include the addrtype in the index;
                # also, address syntax is IPv6Address (fixed 16 bytes) and not InetAddress (length field followed by address bytes)
                $v6addr = join('.', $addrtype, $addrsize, $v6addr);
                $addrtype = 2;
@@ -129,8 +133,8 @@ sub ipv6_n2p_addr {
    foreach my $row (keys %$net_addr) {
        if ($row =~ /^(\d+)\.(\d+)\.(\d+)\.([\d\.]+)$/) {
            my $ifindex = $1; my $addrtype = $2; my $addrsize = $3; my $v6addr = $4;
-            if ($info::METHOD == IPV6MIB) { 
-                # IPV6-MIB doesn't include the addrtype in the index; 
+            if ($info::METHOD == IPV6MIB) {
+                # IPV6-MIB doesn't include the addrtype in the index;
                # also, address syntax is IPv6Address (fixed 16 bytes) and not InetAddress (length field followed by address bytes)
                $v6addr = join('.', $addrtype, $addrsize, $v6addr);
                $addrtype = 2;
@@ -138,10 +142,16 @@ sub ipv6_n2p_addr {
            if ($addrtype == 2) { # IPv6
                my $v6_packed = pack("C*", split(/\./, $v6addr));
                if (length($v6_packed) == 15) {
-                    # Workaround for some some IP-MIB implementations, eg on Cisco Nexus: no explicit addrsize, 
+                    # Workaround for some some IP-MIB implementations, eg on Cisco Nexus: no explicit addrsize,
                    # so what we've collected in that variable is actually the first byte of the address.
                    $v6_packed = pack('C', $addrsize) . $v6_packed;
                }
+                if (length($v6_packed) == 17) {
+                    # Workaround for IPV6-MIB on Windows 2012: if the address is one byte too long, the SNMP agent probably has an incorrect
+                    # implementation where a length field precedes the actual IPv6 address.
+                    # In that case, the first character should be chr(16), ie 0x10; strip it if that's the case.
+                    $v6_packed =~ s/^\x10//;
+                }
                if (length($v6_packed) == 16) {
                    $v6addr = join(':', map { sprintf("%04x", $_) } unpack("n*", $v6_packed) );
                    $return->{$row} = $v6addr;
@@ -167,8 +177,8 @@ sub ipv6_n2p_if {
    foreach my $row (keys %$phys_addr) {
        if ($row =~ /^(\d+)\.(\d+)\.(\d+)\.([\d\.]+)$/) {
            my $ifindex = $1; my $addrtype = $2; my $addrsize = $3; my $v6addr = $4;
-            if ($info::METHOD == IPV6MIB) { 
-                # IPV6-MIB doesn't include the addrtype in the index; 
+            if ($info::METHOD == IPV6MIB) {
+                # IPV6-MIB doesn't include the addrtype in the index;
                # also, address syntax is IPv6Address (fixed 16 bytes) and not InetAddress (length field followed by address bytes)
                $v6addr = join('.', $addrtype, $addrsize, $v6addr);
                $addrtype = 2;
@@ -194,8 +204,8 @@ sub ipv6_n2p_type {
    foreach my $row (keys %$phys_type) {
        if ($row =~ /^(\d+)\.(\d+)\.(\d+)\.([\d\.]+)$/) {
            my $ifindex = $1; my $addrtype = $2; my $addrsize = $3; my $v6addr = $4;
-            if ($info::METHOD == IPV6MIB) { 
-                # IPV6-MIB doesn't include the addrtype in the index; 
+            if ($info::METHOD == IPV6MIB) {
+                # IPV6-MIB doesn't include the addrtype in the index;
                # also, address syntax is IPv6Address (fixed 16 bytes) and not InetAddress (length field followed by address bytes)
                $v6addr = join('.', $addrtype, $addrsize, $v6addr);
                $addrtype = 2;
@@ -221,8 +231,8 @@ sub ipv6_n2p_state {
    foreach my $row (keys %$phys_state) {
        if ($row =~ /^(\d+)\.(\d+)\.(\d+)\.([\d\.]+)$/) {
            my $ifindex = $1; my $addrtype = $2; my $addrsize = $3; my $v6addr = $4;
-            if ($info::METHOD == IPV6MIB) { 
-                # IPV6-MIB doesn't include the addrtype in the index; 
+            if ($info::METHOD == IPV6MIB) {
+                # IPV6-MIB doesn't include the addrtype in the index;
                # also, address syntax is IPv6Address (fixed 16 bytes) and not InetAddress (length field followed by address bytes)
                $v6addr = join('.', $addrtype, $addrsize, $v6addr);
                $addrtype = 2;
@@ -307,7 +317,9 @@ sub ipv6_addr_prefix {
    foreach my $row (keys %$ipv6_addr_prefix){
        if ($row =~ /^(\d+)\.[\d\.]+$/) {
            my $type = $1;
-            if ($type == 2) { # IPv6
+	    if (($type == 2) or ($type == 4)) { # IPv6
+		# Remove interface specific part from vrf interfaces
+		if ($row =~ /^((\d+\.){17}\d+)/) { $row = $1 }
 		# Remove the OID part from the value
 		my $val = $ipv6_addr_prefix->{$row};
 		if ( $val =~ /^.+?((?:\d+\.){19}\d+)$/ ){
@@ -321,9 +333,60 @@ sub ipv6_addr_prefix {
    return $return;
 }

+sub ipv6_addr_prefixlength {
+    my $info = shift;
+    my $return;
+    my $ipv6_addr_prefix = &_test_methods( $info, {
+        ip_addr6_pfx  => IPMIB,
+        c_addr6_pfx   => CISCO,
+    });
+    return unless defined $ipv6_addr_prefix;
+    foreach my $row (keys %$ipv6_addr_prefix) {
+        if ($row =~ /^(\d+)\.[\d\.]+$/) {
+            my $type = $1;
+            if (($type == 2) or ($type == 4)) { # IPv6
+                # Remove interface specific part from vrf interfaces
+                if ($row =~ /^((\d+\.){17}\d+)/) { $row = $1 }
+                # Remove the OID part from the value
+                my $val = $ipv6_addr_prefix->{$row};
+                if ( $val =~ /^.+?((?:\d+\.){19}(\d+))$/ ) {
+                    $val = $2;
+                    $return->{$row} = $val;
+                }
+            }
+        }
+    }
+    printf("%s: data comes from %s.\n", &_my_sub_name, $info->_method_used() ) if $info->debug();
+    return $return;
+}
+
+sub ipv6_addr {
+    my $info = shift;
+    my $return;
+    my $indexes = $info->ipv6_index();
+    foreach my $row (keys %$indexes) {
+        my @parts = split(/\./, $row);
+        my $is_valid = 0;
+        if (scalar @parts == 18) {
+            my $addrtype = shift @parts;
+            $is_valid = 1;
+        } elsif (scalar @parts == 17) {
+            $is_valid = 1;
+        }
+        my $addrsize = shift @parts; # First element now is addrsize, should be 16
+        if ($is_valid && $addrsize == 16) {
+            $return->{$row} = join(':', unpack('(H4)*', pack('C*', @parts)));
+        } else {
+            warn sprintf("%s: unable to decode table index to IPv6 address. Raw data is [%s].\n", &_my_sub_name, $row);
+        }
+    }
+    return $return;
+}
+
 sub _method_used {
    my $info = shift;
    my $return = 'none of the MIBs';
+    # FIXME ugh! a global. makes order of calls important for debug.
    if (defined $info::METHOD) {
        if ($info::METHOD eq IPMIB) {
            $return = 'IP-MIB';
@@ -343,6 +406,7 @@ sub _test_methods {
    foreach my $method (sort {$test->{$a} <=> $test->{$b}} keys %$test) {
        $return = $info->$method || {};
        if (scalar keys %$return) {
+            # FIXME ugh! a global. makes order of calls important for debug.
            $info::METHOD = $test->{$method};
            last;
        }
@@ -378,14 +442,14 @@ Jeroen van Ingen and Carlos Vicente

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $info = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $info->class();
@@ -393,12 +457,12 @@ Jeroen van Ingen and Carlos Vicente

 =head1 DESCRIPTION

-The SNMP::Info::IPv6 class implements functions to for mapping IPv6 addresses 
+The SNMP::Info::IPv6 class implements functions to for mapping IPv6 addresses
 to MAC addresses, interfaces and more. It will use data from the F<IP-MIB>,
 F<IPV6-MIB>, or the F<CISCO-IETF-IP-MIB>, whichever is supported by the
 device.

-This class is inherited by Info::Layer3 to provide IPv6 node tracking across  
+This class is inherited by Info::Layer3 to provide IPv6 node tracking across
 device classes.

 For debugging purposes you can call this class directly as you would
@@ -455,10 +519,18 @@ Maps an IPv6 address to its type (unicast, anycast, etc.)

 Maps an IPv6 prefix with its origin (manual, well-known, dhcp, etc.)

-=item $info->ipv6_addr_prefix() 
+=item $info->ipv6_addr_prefix()

 Maps IPv6 addresses with their prefixes

+=item $info->ipv6_addr_prefixlength()
+
+Maps IPv6 addresses with their prefix length
+
+=item $info->ipv6_addr()
+
+Maps a table instance to an IPv6 address
+
 =back

 =head2  Internet Address Translation Table
@@ -473,7 +545,7 @@ Maps an address of type C<cInetNetToMediaNetAddressType> on interface C<ifIndex>

 =head1 MUNGES

-=over 
+=over

 =item munge_physaddr()

--- a/lib/SNMP/Info/LLDP.pm
+++ b/lib/SNMP/Info/LLDP.pm
@@ -1,7 +1,7 @@
 # SNMP::Info::LLDP
 # $Id$
 #
-# Copyright (c) 2008 Eric Miller
+# Copyright (c) 2018 Eric Miller
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -39,10 +39,11 @@ use SNMP::Info;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    'LLDP-MIB'          => 'lldpLocSysCapEnabled',
+    'LLDP-EXT-MED-MIB'  => 'lldpXMedMIB',
    'LLDP-EXT-DOT1-MIB' => 'lldpXdot1MIB',
    'LLDP-EXT-DOT3-MIB' => 'lldpXdot3MIB',
 );
@@ -69,6 +70,18 @@ $VERSION = '3.10';
    'lldp_rem_sys_cap'  => 'lldpRemSysCapEnabled',
    'lldp_rem_cap_spt'  => 'lldpRemSysCapSupported',

+    # LLDP-MIB::lldpXMedRemInventoryTable
+    'lldp_rem_hw_rev' => 'lldpXMedRemHardwareRev',
+    'lldp_rem_fw_rev' => 'lldpXMedRemFirmwareRev',
+    'lldp_rem_sw_rev' => 'lldpXMedRemSoftwareRev',
+    'lldp_rem_serial' => 'lldpXMedRemSerialNum',
+    'lldp_rem_vendor' => 'lldpXMedRemMfgName',
+    'lldp_rem_model'  => 'lldpXMedRemModelName',
+    'lldp_rem_asset'  => 'lldpXMedRemAssetID',
+
+    'lldp_rem_media_cap'     => 'lldpXMedRemCapCurrent',
+    'lldp_rem_media_cap_spt' => 'lldpXMedRemCapSupported',
+
    # LLDP-MIB::lldpRemManAddrTable
    'lldp_rman_addr' => 'lldpRemManAddrIfSubtype',
 );
@@ -82,6 +95,17 @@ $VERSION = '3.10';
    'lldp_sys_cap'       => \&SNMP::Info::munge_bits,
    'lldp_rem_sys_cap'   => \&SNMP::Info::munge_bits,
    'lldp_rem_cap_spt'   => \&SNMP::Info::munge_bits,
+
+    'lldp_rem_hw_rev' => \&SNMP::Info::munge_null,
+    'lldp_rem_fw_rev' => \&SNMP::Info::munge_null,
+    'lldp_rem_sw_rev' => \&SNMP::Info::munge_null,
+    'lldp_rem_serial' => \&SNMP::Info::munge_null,
+    'lldp_rem_vendor' => \&SNMP::Info::munge_null,
+    'lldp_rem_model'  => \&SNMP::Info::munge_null,
+    'lldp_rem_asset'  => \&SNMP::Info::munge_null,
+
+    'lldp_rem_media_cap'     => \&SNMP::Info::munge_bits,
+    'lldp_rem_media_cap_spt' => \&SNMP::Info::munge_bits,
 );

 sub hasLLDP {
@@ -90,8 +114,13 @@ sub hasLLDP {
    # 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;
+
+    # If the device doesn't return local system capabilities, fallback
+    # by checking if it would report neighbors
+    my $lldp_rem = $lldp->lldp_rem_id() || {};
+    return 1 if scalar keys %$lldp_rem;
+
    return;
 }

@@ -100,29 +129,35 @@ sub lldp_if {
    my $partial = shift;

    my $addr    = $lldp->lldp_rem_pid($partial) || {};
-    my $i_descr = $lldp->i_description() || {};
-    my $i_alias = $lldp->i_alias() || {};
+    my $i_descr = $lldp->i_description()        || {};
+    my $i_alias = $lldp->i_alias()              || {};
    my %r_i_descr = reverse %$i_descr;
    my %r_i_alias = reverse %$i_alias;
-    
+
    my %lldp_if;
    foreach my $key ( keys %$addr ) {
        my @aOID = split( '\.', $key );
        my $port = $aOID[1];
        next unless $port;
-        # Local LLDP port may not equate to ifIndex, see LldpPortNumber TEXTUAL-CONVENTION in LLDP-MIB.
-        # Cross reference lldpLocPortDesc with ifDescr and ifAlias to get ifIndex,
-        # prefer ifDescr over ifAlias because using cross ref with description is correct behavior 
-        # according to the LLDP-MIB. Some devices (eg H3C gear) seem to use ifAlias though.
+
+        # Local LLDP port may not equate to ifIndex, see LldpPortNumber
+        # TEXTUAL-CONVENTION in LLDP-MIB. Cross reference lldpLocPortDesc
+        # with ifDescr and ifAlias to get ifIndex, prefer ifDescr over
+        # ifAlias because using cross ref with description is correct
+        # behavior according to the LLDP-MIB. Some devices (eg H3C gear)
+        # seem to use ifAlias though.
        my $lldp_desc = $lldp->lldpLocPortDesc($port);
-        my $desc = $lldp_desc->{$port};
-        # If cross reference is successful use it, otherwise stick with lldpRemLocalPortNum
-        if ( exists $r_i_descr{$desc} ) {
+        my $desc      = $lldp_desc->{$port};
+
+        # If cross reference is successful use it, otherwise stick with
+        # lldpRemLocalPortNum
+        if ( $desc && exists $r_i_descr{$desc} ) {
            $port = $r_i_descr{$desc};
-        } elsif ( exists $r_i_alias{$desc} ) {
+        }
+        elsif ( $desc && exists $r_i_alias{$desc} ) {
            $port = $r_i_alias{$desc};
        }
-        
+
        $lldp_if{$key} = $port;
    }
    return \%lldp_if;
@@ -136,7 +171,7 @@ sub lldp_ip {

    my %lldp_ip;
    foreach my $key ( keys %$rman_addr ) {
-        my ( $index, $proto, $addr ) = _lldp_addr_index($key);
+        my ( $index, $proto, $addr ) = $lldp->_lldp_addr_index($key);
        next unless defined $index;
        next unless $proto == 1;
        $lldp_ip{$index} = $addr;
@@ -144,6 +179,38 @@ sub lldp_ip {
    return \%lldp_ip;
 }

+sub lldp_ipv6 {
+    my $lldp    = shift;
+    my $partial = shift;
+
+    my $rman_addr = $lldp->lldp_rman_addr($partial) || {};
+
+    my %lldp_ipv6;
+    foreach my $key ( keys %$rman_addr ) {
+        my ( $index, $proto, $addr ) = $lldp->_lldp_addr_index($key);
+        next unless defined $index;
+        next unless $proto == 2;
+        $lldp_ipv6{$index} = $addr;
+    }
+    return \%lldp_ipv6;
+}
+
+sub lldp_mac {
+    my $lldp    = shift;
+    my $partial = shift;
+
+    my $rman_addr = $lldp->lldp_rman_addr($partial) || {};
+
+    my %lldp_ipv6;
+    foreach my $key ( keys %$rman_addr ) {
+        my ( $index, $proto, $addr ) = $lldp->_lldp_addr_index($key);
+        next unless defined $index;
+        next unless $proto == 6;
+        $lldp_ipv6{$index} = $addr;
+    }
+    return \%lldp_ipv6;
+}
+
 sub lldp_addr {
    my $lldp    = shift;
    my $partial = shift;
@@ -152,7 +219,7 @@ sub lldp_addr {

    my %lldp_ip;
    foreach my $key ( keys %$rman_addr ) {
-        my ( $index, $proto, $addr ) = _lldp_addr_index($key);
+        my ( $index, $proto, $addr ) = $lldp->_lldp_addr_index($key);
        next unless defined $index;
        $lldp_ip{$index} = $addr;
    }
@@ -166,12 +233,17 @@ sub lldp_port {
    my $pdesc = $lldp->lldp_rem_desc($partial)     || {};
    my $pid   = $lldp->lldp_rem_pid($partial)      || {};
    my $ptype = $lldp->lldp_rem_pid_type($partial) || {};
+    my $desc  = $lldp->lldp_rem_sysdesc($partial)  || {};

    my %lldp_port;
    foreach my $key ( sort keys %$pid ) {
        my $port = $pdesc->{$key};
        my $type = $ptype->{$key};
-        if ( $type and $type eq 'interfaceName' ) {
+        if (    $type
+            and ( $type eq 'interfaceName' or $type eq 'local' )
+            and ( defined $pid->{$key} and $pid->{$key} !~ /^\d+$/ ) )
+        {
+
            # If the pid claims to be an interface name,
            # believe it.
            $port = $pid->{$key};
@@ -183,15 +255,18 @@ sub lldp_port {

          # May need to format other types in the future, i.e. Network address
            if ( $type =~ /mac/ ) {
-                $port = join( ':',
-                    map { sprintf "%02x", $_ } unpack( 'C*', $port ) );
+                $port = SNMP::Info::munge_mac($port)
            }
        }

        # Avaya/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";
+        if ( defined $desc->{$key}
+            && $desc->{$key}
+            =~ /^Ethernet\s(?:Routing\s)?Switch\s\d|^Virtual\sServices\sPlatform\s\d/
+            && $port =~ /^(Unit\s+(\d+)\s+)?Port\s+(\d+)$/ )
+        {
+            $port = defined $1 ? "$2.$3" : "1.$3";
        }

        $lldp_port{$key} = $port;
@@ -215,12 +290,16 @@ sub lldp_id {

        # May need to format other types in the future
        if ( $type =~ /mac/ ) {
-            $id = join( ':', map { sprintf "%02x", $_ } unpack( 'C*', $id ) );
+            $id = SNMP::Info::munge_mac($id)
        }
-        elsif ($type eq 'networkAddress') {
-            if ( length(unpack('H*', $id)) == 10 ) {
-                # IP address (first octet is sign, I guess)
-                my @octets = (map { sprintf "%02x",$_ } unpack('C*', $id))[1..4];
+        elsif ( $type eq 'networkAddress' ) {
+            if ( length( unpack( 'H*', $id ) ) == 10 ) {
+
+                # IP address - first octet is IANA Address Family Number, need
+                # walk with IPv6
+                my @octets
+                    = ( map { sprintf "%02x", $_ } unpack( 'C*', $id ) )
+                    [ 1 .. 4 ];
                $id = join '.', map { hex($_) } @octets;
            }
        }
@@ -233,39 +312,77 @@ sub lldp_platform {
    my $lldp    = shift;
    my $partial = shift;

-    my $rid  = $lldp->lldp_rem_id($partial) || {};
+    my $rid  = $lldp->lldp_rem_id($partial)      || {};
    my $desc = $lldp->lldp_rem_sysdesc($partial) || {};
    my $name = $lldp->lldp_rem_sysname($partial) || {};
-    
+
    my %lldp_platform;
-    foreach my $key (keys %$rid) {
+    foreach my $key ( keys %$rid ) {
        $lldp_platform{$key} = $desc->{$key} || $name->{$key};
    }
    return \%lldp_platform;
 }

 sub lldp_cap {
-    my $lldp     = shift;
+    my $lldp    = shift;
    my $partial = shift;

-    my $lldp_caps  = $lldp->lldp_rem_cap_spt($partial)  || {};
-    
+    my $lldp_caps = $lldp->lldp_rem_cap_spt($partial) || {};
+
    # Encoded as BITS which Perl Net-SNMP implementation doesn't seem to
    # be able to enumerate for us, so we have to get it from the MIB
    # and enumerate ourselves
-    my $oid = SNMP::translateObj('lldpRemSysCapEnabled',0,1) || '';
-    my $enums = ((ref {} eq ref $SNMP::MIB{$oid}{'enums'}) ? $SNMP::MIB{$oid}{'enums'} : {});
+    my $oid
+        = SNMP::translateObj( 'LLDP-MIB::lldpRemSysCapEnabled', 0, 1 ) || '';
+    my $enums = (
+        ( ref {} eq ref $SNMP::MIB{$oid}{'enums'} )
+        ? $SNMP::MIB{$oid}{'enums'}
+        : {}
+    );
    my %r_enums = reverse %$enums;

    my %lldp_cap;
    foreach my $key ( keys %$lldp_caps ) {
        my $cap_bits = $lldp_caps->{$key};
        next unless $cap_bits;
-        
+
        my $count = 0;
-        foreach my $bit (split //,$cap_bits) {
-            if ( $bit ) {
-                push ( @{$lldp_cap{$key}}, $r_enums{$count});
+        foreach my $bit ( split //, $cap_bits ) {
+            if ($bit) {
+                push( @{ $lldp_cap{$key} }, $r_enums{$count} );
+            }
+            $count++;
+        }
+    }
+    return \%lldp_cap;
+}
+
+sub lldp_media_cap {
+    my $lldp    = shift;
+    my $partial = shift;
+
+    my $lldp_caps = $lldp->lldp_rem_media_cap_spt($partial) || {};
+
+    # Encoded as BITS which Perl Net-SNMP implementation doesn't seem to
+    # be able to enumerate for us, so we have to get it from the MIB
+    # and enumerate ourselves
+    my $oid = SNMP::translateObj( 'lldpXMedRemCapCurrent', 0, 1 ) || '';
+    my $enums = (
+        ( ref {} eq ref $SNMP::MIB{$oid}{'enums'} )
+        ? $SNMP::MIB{$oid}{'enums'}
+        : {}
+    );
+    my %r_enums = reverse %$enums;
+
+    my %lldp_cap;
+    foreach my $key ( keys %$lldp_caps ) {
+        my $cap_bits = $lldp_caps->{$key};
+        next unless $cap_bits;
+
+        my $count = 0;
+        foreach my $bit ( split //, $cap_bits ) {
+            if ($bit) {
+                push( @{ $lldp_cap{$key} }, $r_enums{$count} );
            }
            $count++;
        }
@@ -294,24 +411,32 @@ sub lldp_cap {
 # 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);
+    my $lldp = shift;
+    my $idx  = shift;
+
+    my @oids = split( /\./, $idx );
+    my $index = join( '.', splice( @oids, 0, 3 ) );
+    my $proto = shift(@oids);
+    shift(@oids) if scalar @oids > 4;    # $length

    # IPv4
    if ( $proto == 1 ) {
        return ( $index, $proto, join( '.', @oids ) );
    }

+    # IPv6
+    elsif ( $proto == 2 ) {
+        return ( $index, $proto,
+            join( ':', unpack( '(H4)*', pack( 'C*', @oids ) ) ) );
+    }
+
    # MAC
    elsif ( $proto == 6 ) {
        return ( $index, $proto,
            join( ':', map { sprintf "%02x", $_ } @oids ) );
    }

-    # TODO - Need to handle other protocols, i.e. IPv6
+    # TODO - Other protocols may be used as well; implement when needed?
    else {
        return;
    }
@@ -330,10 +455,10 @@ Eric Miller

 =head1 SYNOPSIS

- my $lldp = new SNMP::Info ( 
+ my $lldp = new SNMP::Info (
                             AutoSpecify => 1,
                             Debug       => 1,
-                             DestHost    => 'router', 
+                             DestHost    => 'router',
                             Community   => 'public',
                             Version     => 2
                           );
@@ -359,7 +484,7 @@ Eric Miller

 =head1 DESCRIPTION

-SNMP::Info::LLDP is a subclass of SNMP::Info that provides an object oriented 
+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
@@ -379,6 +504,8 @@ None.

 =item F<LLDP-MIB>

+=item F<LLDP-EXT-MED-MIB>
+
 =item F<LLDP-EXT-DOT1-MIB>

 =item F<LLDP-EXT-DOT3-MIB>
@@ -393,7 +520,7 @@ These are methods that return scalar values from SNMP

 =item $lldp->hasLLDP()

-Is LLDP is active in this device?  
+Is LLDP is active in this device?

 Note:  LLDP may be active, but nothing in C<lldpRemoteSystemsData> Tables so
 the device would not return any useful topology information.
@@ -404,7 +531,7 @@ The string value used to identify the system name of the local system.  If the
 local agent supports IETF RFC 3418, C<lldpLocSysName> object should have the
 same value of C<sysName> object.

-Nulls are removed before the value is returned. 
+Nulls are removed before the value is returned.

 (C<lldpLocSysName>)

@@ -418,7 +545,7 @@ Nulls are removed before the value is returned.

 (C<lldpLocSysDesc>)

-=item  $lldp->lldp_sys_cap() 
+=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
@@ -468,8 +595,8 @@ with the remote system.

 =item $lldp->lldp_if()

-Returns the mapping to the SNMP Interface Table. Tries to cross reference 
-(C<lldpLocPortDesc>) with (C<ifDescr>) and (C<ifAlias>) to get (C<ifIndex>), 
+Returns the mapping to the SNMP Interface Table. Tries to cross reference
+(C<lldpLocPortDesc>) with (C<ifDescr>) and (C<ifAlias>) to get (C<ifIndex>),
 if unable defaults to (C<lldpRemLocalPortNum>).

 =item  $lldp->lldp_ip()
@@ -477,10 +604,24 @@ if unable defaults to (C<lldpRemLocalPortNum>).
 Returns remote IPv4 address.  Returns for all other address types, use
 lldp_addr if you want any return address type.

+=item  $lldp->lldp_ipv6()
+
+Returns remote IPv6 address, if known.  Returns for all other address types,
+use lldp_addr if you don't care about return address type.
+
+=item  $lldp->lldp_mac()
+
+Returns remote (management) MAC address, if known.  Returns for all other
+address types, use lldp_addr if you don't care about 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.
+Currently only returns IPv4, IPv6 or MAC addresses. If the remote device
+returns more than one address type, this method will give only one. Which one
+is returned is decided by chance, phase of the moon and Perl hash ordering.
+
+Use lldp_mac, lldp_ip or lldp_ipv6 if you want a specific address type.

 =item $lldp->lldp_port()

@@ -491,12 +632,18 @@ Returns remote port ID
 Tries to return something useful from C<lldp_rem_sysdesc()> or
 C<lldp_rem_sysname()>.

-=item  $lldp->lldp_cap() 
+=item  $lldp->lldp_cap()

 Returns hash of arrays with each array containing the system capabilities
 supported by the remote system.  Possible elements in the array are
 enumerated from C<LldpSystemCapabilitiesMap>.

+=item  $lldp->lldp_media_cap()
+
+Returns hash of arrays with each array containing the media capabilities
+supported by the remote system.  Possible elements in the array are
+enumerated from C<LldpXMedCapabilities>.
+
 =back

 =head2 LLDP Remote Table (C<lldpRemTable>)
@@ -512,7 +659,7 @@ the remote system.

 =item $lldp->lldp_rem_id()

-Returns the string value used to identify the chassis component    associated
+Returns the string value used to identify the chassis component associated
 with the remote system.

 (C<lldpRemChassisId>)
@@ -536,7 +683,7 @@ the remote system.
 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. 
+Nulls are removed before the value is returned.

 (C<lldpRemPortDesc>)

@@ -545,7 +692,7 @@ Nulls are removed before the value is returned.
 Returns the string value used to identify the system name of the remote
 system.

-Nulls are removed before the value is returned. 
+Nulls are removed before the value is returned.

 (C<lldpRemSysName>)

@@ -554,11 +701,70 @@ Nulls are removed before the value is returned.
 Returns the string value used to identify the system description of the
 remote system.

-Nulls are removed before the value is returned. 
+Nulls are removed before the value is returned.

 (C<lldpRemSysDesc>)

-=item  $lldp->lldp_rem_sys_cap() 
+=item $lldp->lldp_rem_hw_rev()
+
+Returns the string value used to identify the hardware revision of the
+remote system. Nulls are removed before the value is returned.
+
+(C<lldpXMedRemHardwareRev>)
+
+=item $lldp->lldp_rem_fw_rev()
+
+Returns the string value used to identify the firmware revision of the
+remote system. Nulls are removed before the value is returned.
+
+(C<lldpXMedRemHardwareRev>)
+
+=item $lldp->lldp_rem_sw_rev()
+
+Returns the string value used to identify the software revision of the
+remote system. Nulls are removed before the value is returned.
+
+(C<lldpXMedRemSoftwareRev>)
+
+=item $lldp->lldp_rem_serial()
+
+Returns the string value used to identify the serial number of the
+remote system. Nulls are removed before the value is returned.
+
+(C<lldpXMedRemSerialNum>)
+
+=item $lldp->lldp_rem_vendor()
+
+Returns the string value used to identify the manufacturer of the
+remote system. Nulls are removed before the value is returned.
+
+(C<lldpXMedRemMfgName>)
+
+=item $lldp->lldp_rem_asset()
+
+Returns the string value used to identify the asset number of the
+remote system. Nulls are removed before the value is returned.
+
+(C<lldpXMedRemAssetID>)
+
+=item $lldp->lldp_rem_model()
+
+Returns the string value used to identify the model of the
+remote system. Nulls are removed before the value is returned.
+
+(C<lldpXMedRemModelName>)
+
+=item  $lldp->lldp_rem_media_cap_spt()
+
+Returns which media capabilities are supported on the remote system. Results
+are munged into an ascii binary string, LSB.
+
+=item  $lldp->lldp_rem_media_cap()
+
+Returns which media capabilities are enabled on the remote system. Results
+are munged into an ascii binary string, LSB.
+
+=item  $lldp->lldp_rem_sys_cap()

 Returns which system capabilities are enabled on the remote system.  Results
 are munged into an ascii binary string, LSB.  Each digit represents a bit
--- a/lib/SNMP/Info/Layer1.pm
+++ b/lib/SNMP/Info/Layer1.pm
@@ -41,7 +41,7 @@ use SNMP::Info;

 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = ( %SNMP::Info::MIBS, 'SNMP-REPEATER-MIB' => 'rptrPortGroupIndex' );

@@ -172,14 +172,14 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $l1 = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 1
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class = $l1->class();
@@ -203,15 +203,15 @@ 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 
+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. 
+after determining a more specific class using the method above.

 my $l1 = new SNMP::Info::Layer1(...);

-=head2 Inherited Classes 
+=head2 Inherited Classes

 =over

@@ -219,7 +219,7 @@ after determining a more specific class using the method above.

 =back

-=head2 Required MIBs 
+=head2 Required MIBs

 =over

@@ -242,7 +242,7 @@ These are methods that return scalar value from SNMP

 =item $l1->ports_managed()

-Gets the number of ports under the interface mib 
+Gets the number of ports under the interface mib

 (C<ifNumber>)

--- a/lib/SNMP/Info/Layer1/Allied.pm
+++ b/lib/SNMP/Info/Layer1/Allied.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer1;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, 'root_ip' => 'actualIPAddr', );
@@ -71,6 +71,7 @@ sub os_ver {
    if ( $descr =~ m/version (\d+\.\d+)/ ) {
        return $1;
    }
+    return;
 }

 sub model {
@@ -78,7 +79,7 @@ sub model {

    my $desc = $allied->description();

-    if ( $desc =~ /(AT-\d{4}\S{1}?)/ ) {
+    if ( $desc =~ /(AT-\d{4}\S{1})/ ) {
        return $1;
    }
    return;
@@ -127,14 +128,14 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $allied = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myhub',
                          Community   => 'public',
                          Version     => 1
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class = $allied->class();
@@ -142,8 +143,8 @@ Max Baker

 =head1 DESCRIPTION

-Provides abstraction to the configuration information obtainable from a 
-Allied device through SNMP. See inherited classes' documentation for 
+Provides abstraction to the configuration information obtainable from a
+Allied device through SNMP. See inherited classes' documentation for
 inherited methods.

 =head2 Inherited Classes
@@ -180,7 +181,7 @@ Returns 'allied' :)

 =item $allied->os()

-Returns 'allied' 
+Returns 'allied'

 =item $allied->os_ver()

--- a/lib/SNMP/Info/Layer1/Asante.pm
+++ b/lib/SNMP/Info/Layer1/Asante.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer1;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, );
@@ -50,11 +50,11 @@ $VERSION = '3.10';
    %SNMP::Info::Layer1::FUNCS,
    'asante_port'  => 'ePortIndex',
    'asante_group' => 'ePortGrpIndex',
-    'i_type'       => 'ePortStateType',
+    'i_type'       => 'ePortGrpIndex',
    'asante_up'    => 'ePortStateLinkStatus',
 );

-%MIBS = ( %SNMP::Info::Layer1::MIBS, 'ASANTE-HUB1012-MIB' => 'asante' );
+%MIBS = ( %SNMP::Info::Layer1::MIBS, 'ASANTE-AH1012-MIB' => 'asante' );

 %MUNGE = ( %SNMP::Info::Layer1::MUNGE, );

@@ -84,6 +84,7 @@ sub os_ver {
    if ( $descr =~ /software v(\d+\.\d+)/ ) {
        return $1;
    }
+    return;
 }

 sub vendor {
@@ -94,7 +95,7 @@ sub model {
    my $asante = shift;

    my $id    = $asante->id();
-    my $model = &SNMP::translateObj($id);
+    my $model = SNMP::translateObj($id);

    return $model;
 }
@@ -108,8 +109,8 @@ sub i_up {
    my $i_up = {};
    foreach my $port ( keys %$asante_up ) {
        my $up = $asante_up->{$port};
-        $i_up->{$port} = 'down' if $up =~ /on/;
-        $i_up->{$port} = 'up'   if $up =~ /off/;
+        $i_up->{$port} = 'down' if $up =~ /off/;
+        $i_up->{$port} = 'up'   if $up =~ /on/;
    }

    return $i_up;
@@ -149,7 +150,7 @@ sub i_name {
    my $asante  = shift;
    my $partial = shift;

-    my $i_name = $asante->orig_i_descr($partial) || {};
+    my $i_name = $asante->orig_i_description($partial) || {};

    my %i_name;

@@ -172,14 +173,14 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $asante = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class = $asante->class();
@@ -187,7 +188,7 @@ Max Baker

 =head1 DESCRIPTION

-Provides abstraction to the configuration information obtainable from a 
+Provides abstraction to the configuration information obtainable from a
 Asante device through SNMP.

 =head2 Inherited Classes
@@ -202,7 +203,7 @@ Asante device through SNMP.

 =over

-=item F<ASANTE-HUB1012-MIB>
+=item F<ASANTE-AH1012-MIB>

 =back

@@ -230,7 +231,7 @@ Returns 'asante' :)

 =item $asante->model()

-Cross references $asante->id() to the F<ASANTE-HUB1012-MIB> and returns
+Cross references $asante->id() to the F<ASANTE-AH1012-MIB> and returns
 the results.

 =back
@@ -249,7 +250,7 @@ See L<SNMP::Info::Layer1/"GLOBALS"> for details.

 Returns reference to the map between IID and physical Port.

-=item $asante->i_description() 
+=item $asante->i_description()

 Description of the interface.

--- a/lib/SNMP/Info/Layer1/Bayhub.pm
+++ b/lib/SNMP/Info/Layer1/Bayhub.pm
@@ -42,7 +42,7 @@ use SNMP::Info::Layer2;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
@@ -334,6 +334,13 @@ sub bp_index {
    return \%bp_index;
 }

+sub fw_mac {
+    my $bayhub = shift;
+    my $partial   = shift;
+
+    return $bayhub->SUPER::fw_mac($partial);
+}
+
 sub fw_port {
    my $bayhub  = shift;
    my $partial = shift;
@@ -485,7 +492,7 @@ Eric Miller
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )

    or die "Can't connect to DestHost.\n";

@@ -494,12 +501,12 @@ Eric Miller

 =head1 DESCRIPTION

-Provides abstraction to the configuration information obtainable from a 
+Provides abstraction to the configuration information obtainable from a
 Bay hub device through SNMP.  Also provides device MAC to port mapping through
-the proprietary MIB. 
+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. 
+after determining a more specific class using the method above.

 my $bayhub = new SNMP::Info::Layer1::Bayhub(...);

@@ -600,18 +607,18 @@ to a hash.

 =item $bayhub->i_index()

-Returns reference to map of IIDs to Interface index. 
+Returns reference to map of IIDs to Interface index.

 Since hubs do not support C<ifIndex>, the interface index is created using the
 formula (board * 256 + port).

 =item $bayhub->interfaces()

-Returns reference to map of IIDs to physical ports. 
+Returns reference to map of IIDs to physical ports.

 =item $bayhub->i_duplex()

-Returns half, hubs do not support full duplex. 
+Returns half, hubs do not support full duplex.

 =item $bayhub->i_duplex_admin()

@@ -637,7 +644,7 @@ State choices are 'up' or 'down'

 Example:
  my %if_map = reverse %{$bayhub->interfaces()};
-  $bayhub->set_i_up_admin('down', $if_map{'1.1'}) 
+  $bayhub->set_i_up_admin('down', $if_map{'1.1'})
      or die "Couldn't change port state. ",$bayhub->error(1);

 =item $bayhub->bp_index()
@@ -664,51 +671,51 @@ L<SNMP::Info::NortelStack/"TABLE METHODS"> for details.

 =over

-=item $bayhub->e_index() 
+=item $bayhub->e_index()

 Returns ns_e_index().

-=item $bayhub->e_class() 
+=item $bayhub->e_class()

 Returns ns_e_class().

-=item $bayhub->e_descr() 
+=item $bayhub->e_descr()

 Returns ns_e_descr().

-=item $bayhub->e_name() 
+=item $bayhub->e_name()

 Returns ns_e_name().

-=item $bayhub->e_fwver() 
+=item $bayhub->e_fwver()

 Returns ns_e_fwver().

-=item $bayhub->e_hwver() 
+=item $bayhub->e_hwver()

 Returns ns_e_hwver().

-=item $bayhub->e_parent() 
+=item $bayhub->e_parent()

 Returns ns_e_parent().

-=item $bayhub->e_pos() 
+=item $bayhub->e_pos()

 Returns ns_e_pos().

-=item $bayhub->e_serial() 
+=item $bayhub->e_serial()

 Returns ns_e_serial().

-=item $bayhub->e_swver() 
+=item $bayhub->e_swver()

 Returns ns_e_swver().

-=item $bayhub->e_type() 
+=item $bayhub->e_type()

 Returns ns_e_type().

-=item $bayhub->e_vendor() 
+=item $bayhub->e_vendor()

 Returns ns_e_vendor().

--- a/lib/SNMP/Info/Layer1/Cyclades.pm
+++ b/lib/SNMP/Info/Layer1/Cyclades.pm
@@ -0,0 +1,643 @@
+# SNMP::Info::Layer1::Cyclades
+# $Id$
+#
+# Copyright (c) 2018 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::Layer1::Cyclades;
+
+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/;
+
+$VERSION = '3.66';
+
+%MIBS = (
+    %SNMP::Info::Layer1::MIBS,
+    'CYCLADES-ACS-SYS-MIB'    => 'cyACSversion',
+    'CYCLADES-ACS5K-SYS-MIB'  => 'cyACS5Kversion',
+    'CYCLADES-ACS-CONF-MIB'   => 'cyACSConf',
+    'CYCLADES-ACS5K-CONF-MIB' => 'cyACS5KConf',
+    'CYCLADES-ACS-INFO-MIB'   => 'cyACSInfo',
+    'CYCLADES-ACS5K-INFO-MIB' => 'cyACS5KInfo',
+    'ACS-MIB'                 => 'acs6016',
+    'ACS8000-MIB'             => 'acs8048',
+);
+
+%GLOBALS = (
+
+    %SNMP::Info::Layer1::GLOBALS,
+
+    # CYCLADES-ACS-SYS-MIB
+    'cy_os_ver'     => 'cyACSversion',
+    'cy_model'      => 'cyACSpname',
+    'cy_serial'     => 'cyACSDevId',
+    'cy_ps1_status' => 'cyACSPw1',
+    'cy_ps2_status' => 'cyACSPw2',
+
+    # CYCLADES-ACS-CONF-MIB
+    'cy_root_ip' => 'CYCLADES_ACS_CONF_MIB__cyEthIPaddr',
+
+    # CYCLADES-ACS5K-SYS-MIB
+    'cy5k_os_ver'     => 'cyACS5Kversion',
+    'cy5k_model'      => 'cyACS5Kpname',
+    'cy5k_serial'     => 'cyACS5KDevId',
+    'cy5k_ps1_status' => 'cyACS5KPw1',
+    'cy5k_ps2_status' => 'cyACS5KPw2',
+
+    # CYCLADES-ACS5K-CONF-MIB
+    'cy5k_root_ip'   => 'CYCLADES_ACS5K_CONF_MIB__cyEthIPaddr',
+
+    # ACS-MIB
+    'acs_os_ver'     => 'ACS_MIB__acsFirmwareVersion',
+    'acs_model'      => 'ACS_MIB__acsProductModel',
+    'acs_serial'     => 'ACS_MIB__acsSerialNumber',
+    'acs_ps1_status' => 'ACS_MIB__acsPowerSupplyStatePw1',
+    'acs_ps2_status' => 'ACS_MIB__acsPowerSupplyStatePw2',
+
+    # ACS8000-MIB
+    'acs8k_os_ver'     => 'ACS8000_MIB__acsFirmwareVersion',
+    'acs8k_model'      => 'ACS8000_MIB__acsProductModel',
+    'acs8k_serial'     => 'ACS8000_MIB__acsSerialNumber',
+    'acs8k_ps1_status' => 'ACS8000_MIB__acsPowerSupplyStatePw1',
+    'acs8k_ps2_status' => 'ACS8000_MIB__acsPowerSupplyStatePw2',
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer1::FUNCS,
+
+    # CYCLADES-ACS-INFO-MIB::cyInfoSerialTable
+    'cy_port_tty'   => 'CYCLADES_ACS_INFO_MIB__cyISPortTty',
+    'cy_port_name'  => 'CYCLADES_ACS_INFO_MIB__cyISPortName',
+    'cy_port_speed' => 'CYCLADES_ACS_INFO_MIB__cyISPortSpeed',
+    'cy_port_cd'    => 'CYCLADES_ACS_INFO_MIB__cyISPortSigCD',
+
+    # CYCLADES-ACS-CONF-MIB::cySerialPortTable
+    'cy_port_socket' => 'CYCLADES_ACS_CONF_MIB__cySPortSocketPort',
+
+    # CYCLADES-ACS5K-INFO-MIB::cyInfoSerialTable
+    'cy5k_port_tty'   => 'CYCLADES_ACS5K_INFO_MIB__cyISPortTty',
+    'cy5k_port_name'  => 'CYCLADES_ACS5K_INFO_MIB__cyISPortName',
+    'cy5k_port_speed' => 'CYCLADES_ACS5K_INFO_MIB__cyISPortSpeed',
+    'cy5k_port_cd'    => 'CYCLADES_ACS5K_INFO_MIB__cyISPortSigCD',
+
+    # CYCLADES-ACS5K-CONF-MIB::cySerialPortTable
+    'cy5k_port_socket' => 'CYCLADES_ACS5K_CONF_MIB__cySPortSocketPort',
+
+    # ACS-MIB::acsSerialPortTable
+    'acs_port_tty'   => 'ACS_MIB__acsSerialPortTableDeviceName',
+    'acs_port_name'  => 'ACS_MIB__acsSerialPortTableName',
+    'acs_port_speed' => 'ACS_MIB__acsSerialPortTableComSpeed',
+    'acs_port_cd'    => 'ACS_MIB__acsSerialPortTableSignalStateDCD',
+
+    # Equivalent to cySPortSocketPort doesn't exist in ACS-MIB
+    # Use 'acsSerialPortTableDeviceName' as an equivalent, it just needs
+    # to be unique so that we can differentiate between the index in the
+    # acsSerialPortTable from ifIndex which are both integers
+    # ACS-MIB::acsSerialPortTableEntry
+    'acs_port_socket' => 'ACS_MIB__acsSerialPortTableDeviceName',
+
+    # ACS8000-MIB::acsSerialPortTable
+    'acs8k_port_tty'   => 'ACS8000_MIB__acsSerialPortTableDeviceName',
+    'acs8k_port_name'  => 'ACS8000_MIB__acsSerialPortTableName',
+    'acs8k_port_speed' => 'ACS8000_MIB__acsSerialPortTableComSpeed',
+    'acs8k_port_cd'    => 'ACS8000_MIB__acsSerialPortTableSignalStateDCD',
+
+    # Equivalent to cySPortSocketPort doesn't exist in ACS-MIB
+    # Use 'acsSerialPortTableDeviceName' as an equivalent, it just needs
+    # to be unique so that we can differentiate between the index in the
+    # acsSerialPortTable from ifIndex which are both integers
+    # ACS8000-MIB::acsSerialPortTableEntry
+    'acs8k_port_socket' => 'ACS8000_MIB__acsSerialPortTableDeviceName',
+);
+
+%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 'avocent';
+}
+
+# Use "short circuit" to return the first MIB instance that returns data to
+# reduce network communications
+# We'll try newest (acs*) first assuming those are most likely deployed
+sub os_ver {
+    my $cyclades = shift;
+
+    return
+           $cyclades->acs_os_ver()
+        || $cyclades->acs8k_os_ver()
+        || $cyclades->cy5k_os_ver()
+        || $cyclades->cy_os_ver()
+        || undef;
+}
+
+sub vendor {
+    return 'vertiv';
+}
+
+sub model {
+    my $cyclades = shift;
+
+    my $model
+        = $cyclades->acs_model()
+        || $cyclades->acs8k_model()
+        || $cyclades->cy5k_model()
+        || $cyclades->cy_model()
+        || undef;
+
+    return lc($model) if ( defined $model );
+
+    my $id   = $cyclades->id();
+    my $prod = SNMP::translateObj($id);
+
+    return $prod || $id;
+}
+
+sub serial {
+    my $cyclades = shift;
+
+    return
+           $cyclades->acs_serial()
+        || $cyclades->acs8k_serial()
+        || $cyclades->cy5k_serial()
+        || $cyclades->cy_serial()
+        || undef;
+}
+
+sub root_ip {
+    my $cyclades = shift;
+
+    return
+           $cyclades->cy5k_root_ip()
+        || $cyclades->cy_root_ip()
+        || undef;
+}
+
+sub ps1_status {
+    my $cyclades = shift;
+
+    return
+           $cyclades->acs_ps1_status()
+        || $cyclades->acs8k_ps1_status()
+        || $cyclades->cy5k_ps1_status()
+        || $cyclades->cy_ps1_status()
+        || undef;
+}
+
+sub ps2_status {
+    my $cyclades = shift;
+
+    return
+           $cyclades->acs_ps2_status()
+        || $cyclades->acs8k_ps2_status()
+        || $cyclades->cy5k_ps2_status()
+        || $cyclades->cy_ps2_status()
+        || undef;
+}
+
+# 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->acs_port_socket()
+        || $cyclades->acs8k_port_socket()
+        || $cyclades->cy5k_port_socket()
+        || $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->acs_port_socket()
+        || $cyclades->acs8k_port_socket()
+        || $cyclades->cy5k_port_socket()
+        || $cyclades->cy_port_socket()
+        || {};
+    my $cy_p_tty
+        = $cyclades->acs_port_tty()
+        || $cyclades->acs8k_port_tty()
+        || $cyclades->cy5k_port_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->acs_port_socket()
+        || $cyclades->acs8k_port_socket()
+        || $cyclades->cy5k_port_socket()
+        || $cyclades->cy_port_socket()
+        || {};
+    my $cy_p_speed
+        = $cyclades->acs_port_speed()
+        || $cyclades->acs8k_port_speed()
+        || $cyclades->cy5k_port_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->acs_port_socket()
+        || $cyclades->acs8k_port_socket()
+        || $cyclades->cy5k_port_socket()
+        || $cyclades->cy_port_socket()
+        || {};
+    my $cy_p_up
+        = $cyclades->acs_port_cd()
+        || $cyclades->acs8k_port_cd()
+        || $cyclades->cy5k_port_cd()
+        || $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->acs_port_socket()
+        || $cyclades->acs8k_port_socket()
+        || $cyclades->cy5k_port_socket()
+        || $cyclades->cy_port_socket()
+        || {};
+    my $cy_p_desc
+        = $cyclades->acs_port_name()
+        || $cyclades->acs8k_port_name()
+        || $cyclades->cy5k_port_name()
+        || $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->acs_port_socket()
+        || $cyclades->acs8k_port_socket()
+        || $cyclades->cy5k_port_socket()
+        || $cyclades->cy_port_socket()
+        || {};
+    my $cy_p_desc
+        = $cyclades->acs_port_name()
+        || $cyclades->acs8k_port_name()
+        || $cyclades->cy5k_port_name()
+        || $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/Avocent 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/Avocent 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 F<CYCLADES-ACS-SYS-MIB>
+
+=item F<CYCLADES-ACS-CONF-MIB>
+
+=item F<CYCLADES-ACS-INFO-MIB>
+
+=item F<CYCLADES-ACS5K-SYS-MIB>
+
+=item F<CYCLADES-ACS5K-CONF-MIB>
+
+=item F<CYCLADES-ACS5K-INFO-MIB>
+
+=item F<ACS6000-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()
+
+(C<acsFirmwareVersion>), (C<cyACS5Kversion>), or (C<cyACSversion>)
+
+=item $cyclades->serial()
+
+(C<acsSerialNumber>), (C<cyACS5KDevId>), or (C<cyACSDevId>)
+
+=item $cyclades->root_ip()
+
+(C<cyEthIPaddr>)
+
+=item $cyclades->ps1_status()
+
+(C<acsPowerSupplyStatePw1>), (C<cyACS5KPw1>), or (C<cyACSPw1>)
+
+=item $cyclades->ps2_status()
+
+(C<acsPowerSupplyStatePw2>), (C<cyACS5KPw2>), or (C<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 'vertiv'
+
+=item $cyclades->os()
+
+Returns 'avocent'
+
+=item $cyclades->model()
+
+Returns lower case (C<cyACSpname>) or (C<acsProductModel>) if it exists
+otherwise tries to reference $cyclades->id() to one of the MIBs listed above
+
+=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, either the listening socket
+port C<cySPortSocketPort> or C<acsSerialPortTableDeviceName> name to avoid
+conflicts with C<ifIndex>.
+
+=item $cyclades->interfaces()
+
+Returns reference to map of IIDs to physical ports.  Extended to include
+serial ports, C<acsSerialPortTableDeviceName> or C<cyISPortTty>.
+
+=item $cyclades->i_speed()
+
+Returns interface speed.  Extended to include serial ports,
+C<acsSerialPortTableComSpeed> or C<cyISPortSpeed>.
+
+=item $cyclades->i_up()
+
+Returns link status for each port.  Extended to include serial ports,
+C<acsSerialPortTableSignalStateDCD> or C<cyISPortSigCD>.
+
+=item $cyclades->i_description()
+
+Returns description of each port.  Extended to include serial ports,
+C<acsSerialPortTableName> or C<cyISPortName>.
+
+=item $cyclades->i_name()
+
+Returns name of each port.  Extended to include serial ports,
+C<acsSerialPortTableName> or C<cyISPortName>.
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer1
+
+See L<SNMP::Info::Layer1/"TABLE METHODS"> for details.
+
+=cut
--- a/lib/SNMP/Info/Layer1/S3000.pm
+++ b/lib/SNMP/Info/Layer1/S3000.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
@@ -324,6 +324,13 @@ sub bp_index {
    return \%bp_index;
 }

+sub fw_mac {
+    my $s3000 = shift;
+    my $partial   = shift;
+
+    return $s3000->SUPER::fw_mac($partial);
+}
+
 sub fw_port {
    my $s3000   = shift;
    my $partial = shift;
@@ -366,7 +373,7 @@ Eric Miller
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )

    or die "Can't connect to DestHost.\n";

@@ -375,12 +382,12 @@ Eric Miller

 =head1 DESCRIPTION

-Provides abstraction to the configuration information obtainable from a 
+Provides abstraction to the configuration information obtainable from a
 Bay hub 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. 
+after determining a more specific class using the method above.

 my $s3000 = new SNMP::Info::Layer1::S3000(...);

@@ -440,7 +447,7 @@ Returns the firmware version. (C<s3AgentFwVer>)

 =item $s3000->mac()

-Returns MAC of the advertised IP address of the device. 
+Returns MAC of the advertised IP address of the device.

 =back

@@ -470,7 +477,7 @@ to a hash.

 =item $s3000->i_index()

-Returns reference to map of IIDs to Interface index. 
+Returns reference to map of IIDs to Interface index.

 Since hubs do not support C<ifIndex>, the interface index is created using the
 formula (board * 256 + port).  This is required to support devices with more
@@ -478,11 +485,11 @@ than one module.

 =item $s3000->interfaces()

-Returns reference to map of IIDs to physical ports. 
+Returns reference to map of IIDs to physical ports.

 =item $s3000->i_duplex()

-Returns half, hubs do not support full duplex. 
+Returns half, hubs do not support full duplex.

 =item $s3000->i_duplex_admin()

@@ -509,7 +516,7 @@ State choices are 'up' or 'down'

 Example:
  my %if_map = reverse %{$s3000->interfaces()};
-  $s3000->set_i_up_admin('down', $if_map{'1.1'}) 
+  $s3000->set_i_up_admin('down', $if_map{'1.1'})
      or die "Couldn't change port state. ",$s3000->error(1);

 =item $s3000->bp_index()
--- a/lib/SNMP/Info/Layer2.pm
+++ b/lib/SNMP/Info/Layer2.pm
@@ -38,18 +38,20 @@ use SNMP::Info;
 use SNMP::Info::Bridge;
 use SNMP::Info::Entity;
 use SNMP::Info::PowerEthernet;
+use SNMP::Info::LLDP;

@SNMP::Info::Layer2::ISA
-    = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::Entity SNMP::Info::PowerEthernet Exporter/;
+    = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::Entity SNMP::Info::PowerEthernet SNMP::Info::LLDP Exporter/;
@SNMP::Info::Layer2::EXPORT_OK = qw//;

 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::MIBS,         %SNMP::Info::Bridge::MIBS,
    %SNMP::Info::Entity::MIBS, %SNMP::Info::PowerEthernet::MIBS,
+    %SNMP::Info::LLDP::MIBS,
 );

 %GLOBALS = (
@@ -57,6 +59,7 @@ $VERSION = '3.10';
    %SNMP::Info::Bridge::GLOBALS,
    %SNMP::Info::Entity::GLOBALS,
    %SNMP::Info::PowerEthernet::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
    'serial1' =>
        '.1.3.6.1.4.1.9.3.6.3.0',    # OLD-CISCO-CHASSIS-MIB::chassisId.0
 );
@@ -64,6 +67,7 @@ $VERSION = '3.10';
 %FUNCS = (
    %SNMP::Info::FUNCS,         %SNMP::Info::Bridge::FUNCS,
    %SNMP::Info::Entity::FUNCS, %SNMP::Info::PowerEthernet::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,
 );

 %MUNGE = (
@@ -73,6 +77,7 @@ $VERSION = '3.10';
    %SNMP::Info::Bridge::MUNGE,
    %SNMP::Info::Entity::MUNGE,
    %SNMP::Info::PowerEthernet::MUNGE,
+    %SNMP::Info::LLDP::MUNGE,
 );

 # Method OverRides
@@ -113,41 +118,18 @@ 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*$/ );
-
-    if ( defined $chassis and $chassis =~ /serial#?:\s*([a-z0-9]+)/i ) {
-        return $1;
+    my $entity_serial = $l2->entity_derived_serial();
+    if ( defined $entity_serial and $entity_serial !~ /^\s*$/ ){
+        return $entity_serial;
    }

-    return $serial1 if ( defined $serial1 and $serial1 !~ /^\s*$/ );
+    my $serial1  = $l2->serial1();
+    if ( defined $serial1 and $serial1 !~ /^\s*$/ ) {
+        return $serial1;
+    }

    return;
-}

-sub i_ignore {
-    my $l2      = shift;
-    my $partial = shift;
-
-    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|other|cpu)/i;
-    }
-
-    return \%i_ignore;
 }

 sub interfaces {
@@ -187,14 +169,14 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $l2 = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $l2->class();
@@ -217,11 +199,11 @@ 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 
+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. 
+after determining a more specific class using the method above.

 my $l2 = new SNMP::Info::Layer2(...);

@@ -235,6 +217,8 @@ after determining a more specific class using the method above.

 =item SNMP::Info::Entity

+=item SNMP::Info::LLDP
+
 =back

 =head2 Required MIBs
@@ -259,7 +243,7 @@ These are methods that return scalar value from SNMP

 =item $l2->model()

-Cross references $l2->id() with product IDs in the 
+Cross references $l2->id() with product IDs in the
 Cisco MIBs.

 For HP devices, removes C<'hpswitch'> from the name
@@ -272,7 +256,7 @@ Tries to discover the vendor from $l2->model() and $l2->description()

 =item $l2->serial()

-Returns serial number if available through SNMP
+Returns a serial number if found from F<ENTITY-MIB> and F<OLD-CISCO->... MIB.

 =back

@@ -288,6 +272,10 @@ See documentation in L<SNMP::Info::Bridge/"GLOBALS"> for details.

 See documentation in L<SNMP::Info::Entity/"GLOBALS"> for details.

+=head2 Globals 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
@@ -304,12 +292,6 @@ name.

 Defaults to C<ifDescr> but checks and overrides with C<ifName>

-=item $l2->i_ignore()
-
-Returns reference to hash.  Increments value of IID if port is to be ignored.
-
-Ignores ports with C<ifType> of loopback, propvirtual, other, and cpu
-
 =back

 =head2 Table Methods imported from SNMP::Info
@@ -324,4 +306,8 @@ See documentation in L<SNMP::Info::Bridge/"TABLE METHODS"> for details.

 See documentation in L<SNMP::Info::Entity/"TABLE METHODS"> for details.

+=head2 Table Methods imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
+
 =cut
--- a/lib/SNMP/Info/Layer2/3Com.pm
+++ b/lib/SNMP/Info/Layer2/3Com.pm
@@ -0,0 +1,206 @@
+# SNMP::Info::Layer2::3Com - SNMP Interface to 3Com Devices
+#
+# Copyright (c) 2019 by The Netdisco Developer Team.
+#
+# 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::3Com;
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer2;
+use SNMP::Info::LLDP;
+use SNMP::Info::CDP;
+
+@SNMP::Info::Layer2::3Com::ISA       = qw/SNMP::Info::LLDP SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::3Com::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/;
+
+$VERSION = '3.66';
+
+%MIBS = (
+    %SNMP::Info::LLDP::MIBS,
+    %SNMP::Info::Layer2::MIBS,
+    'A3Com-products-MIB' => 'wlanAP7760',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer2::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,
+);
+
+%MUNGE = (
+    %SNMP::Info::Layer2::MUNGE,
+    %SNMP::Info::LLDP::MUNGE,
+);
+
+
+sub os {
+    return '3Com';
+}
+
+sub serial {
+    my $dev  = shift;
+    my $e_serial = $dev->e_serial();
+
+    # Find entity table entry for this unit
+    foreach my $e ( sort keys %$e_serial ) {
+        if (defined $e_serial->{$e} and $e_serial->{$e} !~ /^\s*$/) {
+            return $e_serial->{$e};
+        }
+    }
+    return;
+}
+
+sub os_ver {
+
+    my $dev = shift;
+    my $e_swver  = $dev->e_swver();
+    # Find entity table entry for this unit
+    foreach my $e ( sort keys %$e_swver ) {
+        if (defined $e_swver->{$e} and $e_swver->{$e} !~ /^\s*$/) {
+            return $e_swver->{$e};
+        }
+    }
+    return;
+}
+
+sub vendor {
+    return '3Com';
+}
+
+sub model {
+
+    my $dsmodel = shift;
+    my $descr = $dsmodel->description();
+    if ( $descr =~ /^([\S ]+) Software.*/){
+        return $1;
+    } else {
+        return $descr;
+    }
+    return;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::3Com - SNMP Interface to L2 3Com Switches
+
+=head1 AUTHOR
+
+Max Kosmach
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you.
+ my $router = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          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 3Com L2 devices
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<A3Com-products-MIB>
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer2/"Required MIBs"> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=head2 Overrides
+
+=over
+
+=item $device->vendor()
+
+Returns '3Com'
+
+=item $device->os()
+
+Returns '3Com'
+
+=item $device->os_ver()
+
+Return os version
+
+=item $device->model()
+
+Returns device model extracted from description
+
+=item $device->serial()
+
+Returns serial number
+
+=back
+
+=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::Layer2
+
+See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=cut
+
--- a/lib/SNMP/Info/Layer2/Adtran.pm
+++ b/lib/SNMP/Info/Layer2/Adtran.pm
@@ -0,0 +1,314 @@
+# SNMP::Info::Layer2::Adtran - SNMP Interface to Adtran Devices
+#
+# Copyright (c) 2019 by The Netdisco Developer Team.
+#
+# 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::Adtran;
+
+use strict;
+use Exporter;
+use SNMP::Info::LLDP;
+use SNMP::Info::Layer2;
+use SNMP::Info::Layer3;
+
+@SNMP::Info::Layer2::Adtran::ISA       = qw/SNMP::Info::LLDP SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Adtran::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '3.66';
+
+# This will be filled in with the device's index into the EntPhysicalEntry
+# table by the serial() function.
+our $index = undef;
+
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS,
+    %SNMP::Info::Layer3::MIBS,
+#    'ADTRAN-GENEVC-MIB'     => 'adGenEVCMIB',
+#    'ADTRAN-GENMEF-MIB'     => 'adGenMEFMIB',
+#    'ADTRAN-GENPORT-MIB'    => 'adGenPort',
+    'ADTRAN-MIB'            => 'adtran',
+    'ADTRAN-AOSUNIT'     => 'adGenAOSUnitMib',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer2::GLOBALS,
+    %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
+    'serial'    => 'adProdSerialNumber',
+    'ad_mgmtevcvid' => 'adGenEVCSysMgmtEVCSTagVID',
+);
+
+%FUNCS = ( %SNMP::Info::Layer2::FUNCS,
+           %SNMP::Info::Layer3::FUNCS,
+           %SNMP::Info::LLDP::FUNCS,
+           'ad_evcstag' => 'adGenEVCLookupName',
+           'ad_menport' => 'adGenMenPortRowStatus',
+           'ad_evcnamevid' => 'adGenEVCSTagVID',
+           'ad_mgmtevcports' => 'adGenSysMgmtEVCInterfaceConnectionType',
+           'ad_evcmapuniport' => 'adGenMEFMapUNIPort',
+           'ad_evcmapevc' => 'adGenMEFMapAssociatedEVCAlias',
+           'ad_genportcustuse' => 'adGenPortCustomerUse',
+);
+
+%MUNGE = ( %SNMP::Info::Layer2::MUNGE, %SNMP::Info::LLDP::MUNGE, %SNMP::Info::Layer3::MUNGE );
+
+sub vendor {
+    return 'adtran';
+}
+sub os {
+    return 'aos';
+}
+
+sub layers {
+    my $adtran = shift;
+
+    my $layers = $adtran->SUPER::layers();
+    # Some netvantas don't report L2 properly
+    my $macs   = $adtran->fw_mac();
+
+    if (keys %$macs) {
+        my $l = substr $layers, 6, 1, "1";
+    }
+
+    return $layers;
+}
+
+sub os_ver {
+    my $adtran = shift;
+    my $ver = $adtran->adProdSwVersion() || undef;
+    return $ver if (defined $ver);
+    my $aos_ver = $adtran->adAOSDeviceVersion();
+    return $aos_ver;
+}
+sub model {
+    my $adtran = shift;
+    my $id = $adtran->id();
+    my $mod = $adtran->adProdName() || undef;
+    return $mod if (defined $mod);
+    my $model = $adtran->adAOSDeviceProductName() || undef;
+    return $model;
+}
+sub serial {
+    my $adtran = shift;
+    my $e_serial = $adtran->e_serial() || {};
+    my $serial2 = $e_serial->{1} || undef;
+    return $serial2 if ( defined $serial2 );
+    return $adtran->orig_serial();
+}
+
+sub i_name {
+    my $adtran = shift;
+    my $partial = shift;
+    my $i_name = $adtran->SUPER::i_alias() || undef;
+    return $i_name if (defined $i_name);
+    $i_name = {};
+    my $adname = $adtran->ad_genportcustuse() || undef;
+    if (defined $adname) {
+        foreach my $port (keys %$adname) {
+            my @split = split(/\./,$port);
+            $i_name->{@split[1]} = $adname->{$port};
+        }
+    }
+    return $i_name;
+}
+sub i_vlan {
+    my $adtran = shift;
+    my $partial = shift;
+    my $uniports = $adtran->ad_evcmapuniport() || undef;
+    my $evcmaps = $adtran->ad_evcmapevc() || undef;
+    my $v_names = $adtran->ad_evcnamevid() || undef;
+    if (defined $uniports) {
+        my $vlans = {};
+        foreach my $oid (keys %$v_names) {
+            my $name = pack("C*", split(/\./,$oid));
+            $vlans->{$name} = $v_names->{$oid};
+        }
+        my $i_vlan = {};
+        foreach my $evcmap (keys %$evcmaps) {
+            $i_vlan->{$uniports->{$evcmap}} = $vlans->{$evcmaps->{$evcmap}};
+        }
+        return $i_vlan;
+    }
+    return {};
+
+}
+
+sub i_vlan_membership {
+    my $adtran  = shift;
+    my $partial = shift;
+    my $i_vlan = $adtran->ad_menport();
+    if (defined $i_vlan) {
+        my $vlans = {};
+        my $v_name = $adtran->v_name();
+        foreach my $vid (keys %$v_name) {
+            $vlans->{$v_name->{$vid}} = $vid;
+        }
+        my $if_vlans = {};
+        foreach my $entry (keys %$i_vlan) {
+            my @split = split(/(\.0)+\./,$entry);
+            my $name = pack("C*", split(/\./,@split[0]));
+            push @{$if_vlans->{@split[2]}}, $vlans->{$name};
+        }
+        my $mgmtevcports = $adtran->ad_mgmtevcports();
+        my $mgmtevcid = $adtran->ad_mgmtevcvid();
+        foreach my $port (keys %$mgmtevcports) {
+           push @{$if_vlans->{$port}}, $mgmtevcid;
+        }
+        return $if_vlans;
+    }
+    return {};
+}
+
+sub v_name {
+    my $adtran = shift;
+    my $partial = shift;
+    my $v_index = $adtran->ad_evcstag();
+    return {} unless defined $v_index;
+    $v_index->{$adtran->ad_mgmtevcvid()} = 'system-management-evc';
+    return $v_index;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Adtran - SNMP Interface to Adtran Devices
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you.
+ my $adtran = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myrouter',
+                          Community   => 'public',
+                          Version     => 2
+                        )
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $adtran->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for adtran Devices running JUNOS
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=item SNMP::Info::LLDP
+
+=back
+
+=head2 Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::LLDP/"Required MIBs"> for its own MIB requirements.
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $adtran->vendor()
+
+Returns 'adtran'
+
+=item $adtran->os()
+
+Returns 'aos'
+
+=item $adtran->layers()
+
+Ensures that layer two is reported, at least.
+
+=item $adtran->os_ver()
+
+Returns the software version extracted first from C<adProdSwVersion> or
+C<adAOSDeviceVersion>.
+
+=item $adtran->model()
+
+Returns the model extracted first from C<adProdName> or
+C<adAOSDeviceProductName>.
+
+=item $adtran->serial()
+
+Returns serial number.
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
+
+=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.
+
+=over
+
+=item $adtran->v_name()
+
+VLAN names table.
+
+=item $adtran->i_name()
+
+Interface names table.
+
+=item $adtran->i_vlan()
+
+Returns a mapping between C<ifIndex> and the PVID or default VLAN.
+
+=item $adtran->i_vlan_membership()
+
+Returns reference to hash of arrays: key = C<ifIndex>, value = array of VLAN
+IDs.  These are the VLANs which are members of the egress list for the port.
+
+=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::LLDP
+
+See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
+
+=cut
--- a/lib/SNMP/Info/Layer2/Aerohive.pm
+++ b/lib/SNMP/Info/Layer2/Aerohive.pm
@@ -0,0 +1,513 @@
+# SNMP::Info::Layer2::Aerohive
+#
+# Copyright (c) 2018 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::Layer2::Aerohive;
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer2;
+
+@SNMP::Info::Layer2::Aerohive::ISA       = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Aerohive::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+
+$VERSION = '3.66';
+
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS,
+    'AH-SYSTEM-MIB'    => 'ahSystemSerial',
+    'AH-INTERFACE-MIB' => 'ahSSIDName',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer2::GLOBALS,
+
+    # AH-SYSTEM-MIB
+    'serial' => 'ahSystemSerial',
+    'os_bin' => 'ahFirmwareVersion',
+    # not documented in the most recent mib,
+    # but this is the base mac for the device
+    'ah_mac' => '.1.3.6.1.4.1.26928.1.3.2.0',
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,
+
+    # AH-INTERFACE-MIB::ahRadioAttributeTable
+    'i_80211channel'      => 'ahRadioChannel',
+    'dot11_cur_tx_pwr_mw' => 'ahRadioTxPower',
+
+    # AH-INTERFACE-MIB::ahXIfTable
+    'ah_i_ssidlist' => 'ahSSIDName',
+
+    # AH-INTERFACE-MIB::ahAssociationTable
+    'cd11_txrate'      => 'ahClientLastTxRate',
+    'cd11_uptime'      => 'ahClientLinkUptime',
+    'cd11_sigstrength' => 'ahClientRSSI',
+    'cd11_rxpkt'       => 'ahClientRxDataFrames',
+    'cd11_txpkt'       => 'ahClientTxDataFrames',
+    'cd11_rxbyte'      => 'ahClientRxDataOctets',
+    'cd11_txbyte'      => 'ahClientTxDataOctets',
+    'cd11_ssid'        => 'ahClientSSID',
+    'ah_c_vlan'        => 'ahClientVLAN',
+    'ah_c_ip'          => 'ahClientIP',
+);
+
+%MUNGE
+    = ( %SNMP::Info::Layer2::MUNGE, 'at_paddr' => \&SNMP::Info::munge_mac, );
+
+sub layers {
+    return '00000111';
+}
+
+sub vendor {
+    return 'aerohive';
+}
+
+sub os {
+    return 'hiveos';
+}
+
+sub serial {
+    my $aerohive = shift;
+
+    return $aerohive->ahSystemSerial()
+      || $aerohive->SUPER::serial();
+}
+
+sub os_ver {
+    my $aerohive = shift;
+    my $descr    = $aerohive->description();
+
+    if ( $descr =~ m/\bHiveOS\s(\d\.\w+)\b/ix ) {
+        return $1;
+    }
+    return;
+}
+
+
+sub mac {
+    my $aerohive = shift;
+    my $ahmac = $aerohive->ah_mac();
+
+    # newer hiveos version just return the mac address
+    if (defined $ahmac) {
+      # aerohive has a 0000:0000:0000 mac format by default,
+      # change to 00:00:00:00:00:00
+      $ahmac =~ s/(..)(..:?)/$1:$2/g;
+      return $ahmac;
+    }
+
+    my @macs;
+    my $macs = $aerohive->i_mac();
+    foreach my $iid (keys %$macs) {
+      if (defined $macs->{$iid}) {
+        push( @macs, $macs->{$iid} );
+      }
+      @macs = sort(@macs);
+    }
+    return $macs[0];
+}
+
+
+sub model {
+    my $aerohive = shift;
+    my $descr    = $aerohive->description();
+
+    if ( $descr =~ m/\b(?:Hive|)(AP\d+)\b/ix ) {
+        return $1;
+    }
+    return;
+}
+
+sub i_ssidlist {
+    my $aerohive = shift;
+    my $partial  = shift;
+
+    my $ssids = $aerohive->ah_i_ssidlist($partial) || {};
+
+    my %i_ssidlist;
+    foreach my $iid ( keys %$ssids ) {
+        my $ssid = $ssids->{$iid};
+        next if $ssid =~ /N\/A/i;
+
+        $i_ssidlist{$iid} = $ssid;
+    }
+    return \%i_ssidlist;
+}
+
+sub i_ssidmac {
+    my $aerohive = shift;
+    my $partial  = shift;
+
+    my $ssids = $aerohive->i_ssidlist($partial) || {};
+    my $macs  = $aerohive->i_mac($partial)      || {};
+
+    my %i_ssidmac;
+    foreach my $iid ( keys %$ssids ) {
+        my $mac = $macs->{$iid};
+        next unless $mac;
+
+        $i_ssidmac{$iid} = $mac;
+    }
+    return \%i_ssidmac;
+}
+
+# Break up the ahAssociationEntry INDEX into ifIndex and MAC Address.
+sub _ah_association_index {
+    my $idx     = shift;
+    my @values  = split( /\./, $idx );
+    my $ifindex = shift(@values);
+    my $length  = shift(@values);
+    return ( $ifindex, join( ':', map { sprintf "%02x", $_ } @values ) );
+}
+
+sub cd11_port {
+    my $aerohive = shift;
+
+    my $cd11_txrate = $aerohive->cd11_txrate();
+    my $interfaces  = $aerohive->interfaces();
+
+    my %ret;
+    foreach ( keys %$cd11_txrate ) {
+        my ( $ifindex, $mac ) = _ah_association_index($_);
+        $ret{$_} = $interfaces->{$ifindex};
+    }
+    return \%ret;
+}
+
+sub cd11_mac {
+    my $aerohive = shift;
+
+    my $cd11_txrate = $aerohive->cd11_txrate();
+
+    my %ret;
+    foreach ( keys %$cd11_txrate ) {
+        my ( $ifindex, $mac ) = _ah_association_index($_);
+        $ret{$_} = $mac;
+    }
+    return \%ret;
+}
+
+# Does not support the standard Bridge MIB
+sub bp_index {
+    my $aerohive = shift;
+    my $partial  = shift;
+
+    my $i_index = $aerohive->i_index($partial) || {};
+
+    my %bp_index;
+    foreach my $iid ( keys %$i_index ) {
+        my $index = $i_index->{$iid};
+        next unless defined $index;
+
+        $bp_index{$index} = $iid;
+    }
+
+    return \%bp_index;
+}
+
+sub qb_fw_port {
+    my $aerohive = shift;
+    my $partial  = shift;
+
+    my $txrate = $aerohive->cd11_txrate($partial) || {};
+
+    my $qb_fw_port = {};
+    foreach my $idx ( keys %$txrate ) {
+        my ( $fdb_id, $mac ) = _ah_association_index($idx);
+        $qb_fw_port->{$idx} = $fdb_id;
+    }
+    return $qb_fw_port;
+}
+
+sub qb_fw_mac {
+    my $aerohive = shift;
+    my $partial  = shift;
+
+    my $txrate = $aerohive->cd11_txrate($partial) || {};
+
+    my $qb_fw_mac = {};
+    foreach my $idx ( keys %$txrate ) {
+        my ( $fdb_id, $mac ) = _ah_association_index($idx);
+        $qb_fw_mac->{$idx} = $mac;
+    }
+    return $qb_fw_mac;
+}
+
+sub qb_fw_vlan {
+    my $aerohive = shift;
+    my $partial  = shift;
+
+    my $vlans = $aerohive->ah_c_vlan($partial) || {};
+
+    my $qb_fw_vlan = {};
+    foreach my $idx ( keys %$vlans ) {
+        my $vlan = $vlans->{$idx};
+        next unless defined $vlan;
+        $qb_fw_vlan->{$idx} = $vlan;
+    }
+    return $qb_fw_vlan;
+}
+
+# arpnip:
+#
+# This is the AP snooping on the MAC->IP mappings.
+# Pretending this is arpnip data allows us to get MAC->IP
+# mappings even for stations that only communicate locally.
+
+sub at_paddr {
+    my $aerohive = shift;
+
+    my $txrate = $aerohive->cd11_txrate() || {};
+
+    my $at_paddr = {};
+    foreach my $idx ( keys %$txrate ) {
+        my ( $fdb_id, $mac ) = _ah_association_index($idx);
+        $at_paddr->{$idx} = $mac;
+    }
+    return $at_paddr;
+}
+
+sub at_netaddr {
+    my $aerohive = shift;
+
+    my $ips = $aerohive->ah_c_ip() || {};
+
+    my $ret = {};
+    foreach my $idx ( keys %$ips ) {
+        next if ( $ips->{$idx} eq '0.0.0.0' );
+        $ret->{$idx} = $ips->{$idx};
+    }
+    return $ret;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Aerohive - SNMP Interface to Aerohive Access Points
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you.
+ my $aerohive = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        )
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $aerohive->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from an
+Aerohive wireless Access Point 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 $aerohive = new SNMP::Info::Layer2::Aerohive(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<AH-SYSTEM-MIB>
+
+=item F<AH-INTERFACE-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 $aerohive->vendor()
+
+Returns 'aerohive'.
+
+=item $aerohive->os()
+
+Returns 'hiveos'.
+
+=item $aerohive->serial()
+
+Returns the serial number extracted from C<ahSystemSerial>.
+
+=item $aerohive->os_ver()
+
+Returns the OS version extracted from C<sysDescr>.
+
+=item $aerohive->os_bin()
+
+Returns the firmware version extracted from C<ahFirmwareVersion>.
+
+=item $aerohive->mac()
+
+Returns the base mac address of the aerohive unit from an undocumented
+snmp oid. if this oid is not available it will walk all interfaces and
+return the lowest numbered mac address.
+
+=item $aerohive->model()
+
+Returns the model extracted from C<sysDescr>.
+
+=back
+
+=head2 Overrides
+
+=over
+
+=item $aerohive->layers()
+
+Returns 00000111. Layer 2 and Layer 3 functionality through proprietary MIBs.
+
+=back
+
+=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.
+
+=over
+
+=item $aerohive->i_ssidlist()
+
+Returns reference to hash. SSID's recognized by the radio interface.
+
+=item $aerohive->i_ssidmac()
+
+With the same keys as i_ssidlist, returns the Basic service set
+identification (BSSID), MAC address, the AP is using for the SSID.
+
+=item $aerohive->i_80211channel()
+
+Returns reference to hash.  Current operating frequency channel of the radio
+interface.
+
+C<ahRadioChannel>
+
+=item $aerohive->dot11_cur_tx_pwr_mw()
+
+Returns reference to hash.  Current transmit power, in milliwatts, of the
+radio interface.
+
+C<ahRadioTxPower>
+
+=item $aironet->cd11_port()
+
+Returns radio interfaces.
+
+=item $aironet->cd11_mac()
+
+Returns client radio interface MAC addresses.
+
+=back
+
+=head2 Overrides
+
+=over
+
+=item $aerohive->bp_index()
+
+Simulates bridge MIB by returning reference to a hash mapping i_index() to
+the interface iid.
+
+=item $aerohive->qb_fw_port()
+
+Returns reference to hash of forwarding table entries port interface
+identifier (iid).
+
+=item $aerohive->qb_fw_mac()
+
+Returns reference to hash of forwarding table MAC Addresses.
+
+C<ahClientMac>
+
+=item $aerohive->qb_fw_vlan()
+
+Returns reference to hash of forwarding table entries VLAN ID.
+
+C<ahClientVLAN>
+
+=back
+
+=head2 Arp Cache Table Augmentation
+
+The AP has knowledge of MAC->IP mappings for wireless clients.
+Augmenting the arp cache data with these MAC->IP mappings enables visibility
+for stations that only communicate locally.
+
+=over
+
+=item $aerohive->at_paddr()
+
+C<ahClientMac>
+
+=item $aerohive->at_netaddr()
+
+C<ahClientIP>
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer2
+
+See L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=cut
--- a/lib/SNMP/Info/Layer2/Airespace.pm
+++ b/lib/SNMP/Info/Layer2/Airespace.pm
@@ -40,7 +40,7 @@ use SNMP::Info::Airespace;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::MIBS,      %SNMP::Info::Bridge::MIBS,
@@ -97,6 +97,14 @@ my $mcs_index = {
 	m13 => '104',
 	m14 => '117',
 	m15 => '130',
+	m16 => '19.5',
+	m17 => '39',
+	m18 => '58.5',
+	m19 => '78',
+	m20 => '117',
+	m21 => '156',
+	m22 => '175.5',
+	m23 => '195',
 	# This is a cheat for 802.11a bonded
 	m108 => '108',
    },
@@ -117,6 +125,14 @@ my $mcs_index = {
 	m13 => '240',
 	m14 => '270',
 	m15 => '300',
+	m16 => '45',
+	m17 => '90',
+	m18 => '135',
+	m19 => '180',
+	m20 => '270',
+	m21 => '360',
+	m22 => '405',
+	m23 => '450',
    }
 };

@@ -150,11 +166,11 @@ sub cd11_mac {

 sub cd11_txrate {
    my $airespace = shift;
-    
+
    my $rates  = $airespace->client_txrate() || {};
    my $protos = $airespace->cd11_proto()    || {};
    my $bws    = $airespace->cd11n_ch_bw()   || {};
-    
+
    my $cd11_txrate = {};
    foreach my $idx ( keys %$rates ) {
 	my $rate = $rates->{$idx} || '0.0';
@@ -165,6 +181,7 @@ sub cd11_txrate {
 	elsif ( $rate =~ /^m/ ) {
 	    my $band = $protos->{$idx};
 	    my $bw   = $bws->{$band};
+	    # FIXME throw some kind of error if we get an index/rate that we haven't implemented yet? Now we simply return "0.0"...
 	    $cd11_txrate->{$idx} = [ $mcs_index->{$bw}->{$rate} || '0.0' ];
 	}
 	else {
@@ -176,7 +193,7 @@ sub cd11_txrate {

 sub munge_cd11n_ch_bw {
    my $bw = shift;
-    
+
    if ( $bw =~ /forty/ ) {
 	return 40;
    }
@@ -185,7 +202,7 @@ sub munge_cd11n_ch_bw {

 sub munge_cd11_proto {
    my $bw = shift;
-    
+
    return 2 if ( $bw eq 'dot11n5' );

    return 1;
@@ -243,7 +260,7 @@ Eric Miller
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )

    or die "Can't connect to DestHost.\n";

@@ -252,11 +269,11 @@ Eric Miller

 =head1 DESCRIPTION

-Provides abstraction to the configuration information obtainable from 
+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. 
+after determining a more specific class using the method above.

 my $airespace = new SNMP::Info::Layer2::Airespace(...);

@@ -329,7 +346,7 @@ See documentation in L<SNMP::Info::Bridge/"GLOBALS"> for details.
 These are methods that return tables of information in the form of a reference
 to a hash.

-=over 
+=over

 =item cd11_mac()

@@ -339,7 +356,7 @@ Returns client radio interface MAC addresses.

 Returns client transmission speed in Mbs.

-=back 
+=back

 =head2 Overrides

--- a/lib/SNMP/Info/Layer2/Aironet.pm
+++ b/lib/SNMP/Info/Layer2/Aironet.pm
@@ -49,7 +49,7 @@ use SNMP::Info::IEEE802dot11;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %GLOBALS = (
    %SNMP::Info::IEEE802dot11::GLOBALS,
@@ -60,7 +60,7 @@ $VERSION = '3.10';
    %SNMP::Info::CiscoConfig::GLOBALS,
    %SNMP::Info::CDP::GLOBALS,
    'serial' => 'entPhysicalSerialNum.1',
-    'descr'  => 'sysDescr'
+    'ps1_type' => 'cpoePdCurrentPowerSource'
 );

 %FUNCS = (
@@ -97,6 +97,7 @@ $VERSION = '3.10';
    'CISCO-DOT11-ASSOCIATION-MIB'         => 'cDot11ClientSubIfIndex',
    'CISCO-DOT11-SSID-SECURITY-MIB'       => 'cdot11SecVlanNameId',
    'CISCO-VLAN-IFTABLE-RELATIONSHIP-MIB' => 'cviRoutedVlanIfIndex',
+    'CISCO-POE-PD-MIB'                    => 'cpoePdCurrentPowerSource',
 );

 %MUNGE = (
@@ -134,7 +135,7 @@ sub interfaces {
 # Tag on e_descr.1
 sub description {
    my $aironet = shift;
-    my $descr   = $aironet->descr();
+    my $descr   = $aironet->SUPER::description();
    my $e_descr = $aironet->e_descr();

    $descr = "$e_descr->{1}  $descr" if defined $e_descr->{1};
@@ -442,7 +443,7 @@ sub i_ssidmac {
    my $partial    = shift;
    my $mbss_mac_addr = $aironet->mbss_mac_addr();

-    # Same logic as i_ssidbcast to return same indexes as i_ssidlist 
+    # Same logic as i_ssidbcast to return same indexes as i_ssidlist
    my $map = {};
    foreach my $key ( keys %$mbss_mac_addr ) {
        my ( $interface, @idx ) = split( /\./, $key );
@@ -457,6 +458,18 @@ sub i_ssidmac {
    return $i_ssidmac;
 }

+###
+# PoE status.  The ps1_type is the PoE injector type, which is just
+# a scalar; the status is a little more complex.
+sub ps1_status {
+    my $aironet = shift;
+    my $idx = $aironet->cpoePdCurrentPowerLevel();
+    my $mw = $aironet->cpoePdSupportedPower( $idx );
+    my $descr = $aironet->cpoePdSupportedPowerMode( $idx );
+
+    return sprintf( "%.2fW (%s)", $mw->{$idx} * 0.001, $descr->{$idx} );
+}
+
 1;
 __END__

@@ -471,14 +484,14 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $aironet = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $aironet->class();
@@ -504,7 +517,7 @@ This class is for devices running Cisco IOS software (newer)
 =back

 For speed or debugging purposes you can call the subclass directly, but not
-after determining a more specific class using the method above. 
+after determining a more specific class using the method above.

 my $aironet = new SNMP::Info::Layer2::Aironet(...);

@@ -540,17 +553,13 @@ These are methods that return scalar value from SNMP

 =over

-=item $aironet->discription()
-
-Adds info from method e_descr() from SNMP::Info::Entity
-
 =item $aironet->vendor()

 Returns 'cisco'

 =item $aironet->description()

-System description
+System description. Adds info from method e_descr() from SNMP::Info::Entity

 =back

@@ -646,7 +655,12 @@ being broadcast.
 =item $aironet->i_ssidmac()

 With the same keys as i_ssidlist, returns the Basic service set
-identification (BSSID), MAC address, the AP is using for the SSID. 
+identification (BSSID), MAC address, the AP is using for the SSID.
+
+=item $aironet ps1_status()
+
+Returns the PoE injector status based on C<cpoePdSupportedPower> and
+C<cpoePdSupportedPowerMode>.

 =back

--- a/lib/SNMP/Info/Layer2/Allied.pm
+++ b/lib/SNMP/Info/Layer2/Allied.pm
@@ -40,7 +40,7 @@ use SNMP::Info::Layer1;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );

@@ -73,6 +73,7 @@ sub os_ver {
    if ( $descr =~ m/version (\d+\.\d+)/ ) {
        return $1;
    }
+    return;
 }

 sub model {
@@ -137,14 +138,14 @@ Max Baker, Dmitry Sergienko <dmitry@trifle.net>

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $allied = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myhub',
                          Community   => 'public',
                          Version     => 1
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class = $allied->class();
@@ -152,8 +153,8 @@ Max Baker, Dmitry Sergienko <dmitry@trifle.net>

 =head1 DESCRIPTION

-Provides abstraction to the configuration information obtainable from a 
-Allied device through SNMP. See inherited classes' documentation for 
+Provides abstraction to the configuration information obtainable from a
+Allied device through SNMP. See inherited classes' documentation for
 inherited methods.

 =head2 Inherited Classes
@@ -194,7 +195,7 @@ Returns 'allied' :)

 =item $allied->os()

-Returns 'allied' 
+Returns 'allied'

 =item $allied->os_ver()

@@ -212,7 +213,7 @@ Tries to cull out C<AT-nnnnX> out of the description field.

 =item $allied->mac()

-Returns device MAC. 
+Returns device MAC.

 =back

--- a/lib/SNMP/Info/Layer2/Atmedia.pm
+++ b/lib/SNMP/Info/Layer2/Atmedia.pm
@@ -0,0 +1,165 @@
+# SNMP::Info::Layer2::Atmedia
+#
+# Copyright (c) 2018 Netdisco Developers
+# 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::Atmedia;
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer2;
+
+@SNMP::Info::Layer2::Atmedia::ISA       = qw/SNMP::Info::Layer2/;
+@SNMP::Info::Layer2::Atmedia::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+
+$VERSION = '3.66';
+
+%MIBS = ( %SNMP::Info::Layer2::MIBS );
+
+%GLOBALS = (
+    %SNMP::Info::Layer2::GLOBALS,
+    'os_ver'          => '.1.3.6.1.4.1.13458.1.2.1.0',
+    'atm_serial'      => '.1.3.6.1.4.1.13458.1.1.2.0',
+    'atm_hardversion' => '.1.3.6.1.4.1.13458.1.3.1.0',
+    'atm_model'       => '.1.3.6.1.4.1.13458.1.1.6.0',
+);
+
+%FUNCS = (%SNMP::Info::Layer2::FUNCS);
+
+%MUNGE = (%SNMP::Info::Layer2::MUNGE);
+
+sub serial {
+    my $atmedia = shift;
+
+    return $atmedia->atm_serial();
+}
+
+sub os {
+    return 'Atmedia-OS';
+}
+
+sub model {
+    my $atmedia = shift;
+
+    my $atmedia_model = $atmedia->atm_model();
+    $atmedia_model =~ s/\<|\>//g;
+    $atmedia_model =~ s/\//_/g;
+
+    return $atmedia_model;
+}
+
+sub vendor {
+    return 'atmedia';
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Atmedia - SNMP Interface to atmedia encryptors
+
+=head1 AUTHOR
+
+Netdisco Developers
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you.
+ my $atmedia = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myhub',
+                          Community   => 'public',
+                          Version     => 1
+                        )
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $atmedia->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to information obtainable from a atmedia encryptor
+through SNMP. See inherited classes' documentation for inherited methods.
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+=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 $atmedia->vendor()
+
+Returns 'atmedia'
+
+=item $atmedia->os()
+
+Returns 'Atmedia-OS'
+
+=item $atmedia->os_ver()
+
+(C<acSoftVersion>)
+
+=item $atmedia->model()
+
+(C<acDescr>)
+
+=item $atmedia->serial()
+
+(C<acSerialNumber>)
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer2
+
+See L<SNMP::Info::Layer2/"GLOBALS"> for details.
+
+=head1 TABLE METHODS
+
+=head2 Table Methods imported from SNMP::Info::Layer2
+
+See L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=cut
--- a/lib/SNMP/Info/Layer2/Baystack.pm
+++ b/lib/SNMP/Info/Layer2/Baystack.pm
@@ -46,7 +46,7 @@ use SNMP::Info::Layer3;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,    %SNMP::Info::LLDP::MIBS,
@@ -136,7 +136,7 @@ sub model {
    return '303' if ( defined $descr and $descr =~ /\D303\D/ );
    return '304' if ( defined $descr and $descr =~ /\D304\D/ );
    return 'BPS' if ( $model =~ /BPS2000/i );
-    
+
    # Pull sreg- from all
    $model =~ s/^sreg-//;
    # Strip ES/ERS/BayStack etc. from those families
@@ -229,7 +229,7 @@ sub index_factor {
        if ( ( $model =~ /(470)/ )
        or ( $os =~ m/(boss|bes)/ ) and ( $op_mode eq 'pure' ) );
    $index_factor = 128
-        if ( ( $model =~ /(5[56]\d\d)|VSP/ )
+        if ( ( $model =~ /(5[56]\d\d)|VSP|4950|59100/ )
        and ( $os_ver >= 6 ) );

    return $index_factor;
@@ -341,6 +341,60 @@ sub peth_port_ifindex {
    return \%peth_port_ifindex;
 }

+# Currently only ERS 4800 v5.8+ support the rcBridgeSpbmMacTable
+# which holds the FDB for a SPBM edge deployment.
+#
+# Q-BRIDGE still holds some entries when the rcBridgeSpbmMacTable is in use
+# so we merge hash entries.
+
+sub fw_mac {
+    my $rapidcity = shift;
+
+    my $qb = $rapidcity->SUPER::fw_mac() || {};
+    my $spbm = $rapidcity->rc_spbm_fw_mac() || {};
+    my $fw_mac = { %$qb, %$spbm };
+
+    return $fw_mac;
+}
+
+sub fw_port {
+    my $rapidcity = shift;
+
+    my $qb = $rapidcity->SUPER::fw_port() || {};
+    my $spbm = $rapidcity->rc_spbm_fw_port() || {};
+    my $fw_port = { %$qb, %$spbm };
+
+    return $fw_port;
+}
+
+sub fw_status {
+    my $rapidcity = shift;
+
+    my $qb = $rapidcity->SUPER::fw_status() || {};
+    my $spbm = $rapidcity->rc_spbm_fw_status() || {};
+    my $fw_status = { %$qb, %$spbm };
+
+    return $fw_status;
+}
+
+sub qb_fw_vlan {
+    my $rapidcity = shift;
+
+    my $qb = $rapidcity->SUPER::qb_fw_vlan() || {};
+    my $spbm = $rapidcity->rc_spbm_fw_vlan() || {};
+    my $qb_fw_vlan = { %$qb, %$spbm };
+
+    return $qb_fw_vlan;
+}
+
+# Baystack uses S5-AGENT-MIB (loaded in NortelStack) versus RAPID-CITY
+sub stp_ver {
+    my $rapidcity = shift;
+
+    return $rapidcity->s5AgSysSpanningTreeOperMode()
+      || $rapidcity->SUPER::stp_ver();
+}
+
 1;

 __END__
@@ -363,7 +417,7 @@ Eric Miller
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
  or die "Can't connect to DestHost.\n";

 my $class = $baystack->class();
@@ -373,10 +427,10 @@ Eric Miller

 Provides abstraction to the configuration information obtainable from an
 Avaya Ethernet Switch (formerly Nortel/Bay Baystack) and VSP 7000 series
-through SNMP. 
+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. 
+after determining a more specific class using the method above.

 my $baystack = new SNMP::Info::Layer2::Baystack(...);

@@ -444,6 +498,14 @@ Returns 'baystack' or 'boss' depending on software version.

 Returns the firmware version extracted from C<sysDescr>.

+=item $baystack->stp_ver()
+
+Returns the particular STP version running on this device.
+
+Values: C<nortelStpg>, C<pvst>, C<rstp>, C<mstp>, C<ieee8021d>
+
+(C<s5AgSysSpanningTreeOperMode>)
+
 =back

 =head2 Overrides
@@ -498,10 +560,10 @@ 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()
@@ -510,9 +572,9 @@ Returns reference to hash of IIDs to ignore.

 =item $baystack->i_mac()

-Returns the C<ifPhysAddress> table entries. 
+Returns the C<ifPhysAddress> table entries.

-Removes all entries matching '00:00:00:00:00:00' -- Certain 
+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()
@@ -540,66 +602,92 @@ L<SNMP::Info::NortelStack/"TABLE METHODS"> for details on ns_e_* methods.

 =over

-=item $baystack->e_index() 
+=item $baystack->e_index()

 If the device doesn't support C<entPhysicalDescr>, this will try ns_e_index().
 Note that this is based on C<entPhysicalDescr> due to implementation
 details of SNMP::Info::Entity::e_index().

-=item $baystack->e_class() 
+=item $baystack->e_class()

 If the device doesn't support C<entPhysicalClass>, this will try ns_e_class().

-=item $baystack->e_descr() 
+=item $baystack->e_descr()

 If the device doesn't support C<entPhysicalDescr>, this will try ns_e_descr().

-=item $baystack->e_name() 
+=item $baystack->e_name()

 If the device doesn't support C<entPhysicalName>, this will try ns_e_name().

-=item $baystack->e_fwver() 
+=item $baystack->e_fwver()

 If the device doesn't support C<entPhysicalFirmwareRev>, this will try
 ns_e_fwver().

-=item $baystack->e_hwver() 
+=item $baystack->e_hwver()

 If the device doesn't support C<entPhysicalHardwareRev>, this will try
 ns_e_hwver().

-=item $baystack->e_parent() 
+=item $baystack->e_parent()

 If the device doesn't support C<entPhysicalContainedIn>, this will try
 ns_e_parent().

-=item $baystack->e_pos() 
+=item $baystack->e_pos()

 If the device doesn't support C<entPhysicalParentRelPos>, this will try
 ns_e_pos().

-=item $baystack->e_serial() 
+=item $baystack->e_serial()

 If the device doesn't support C<entPhysicalSerialNum>, this will try
 ns_e_serial().

-=item $baystack->e_swver() 
+=item $baystack->e_swver()

 If the device doesn't support C<entPhysicalSoftwareRev>, this will try
 ns_e_swver().

-=item $baystack->e_type() 
+=item $baystack->e_type()

 If the device doesn't support C<entPhysicalVendorType>, this will try
 ns_e_type().

-=item $baystack->e_vendor() 
+=item $baystack->e_vendor()

 If the device doesn't support C<entPhysicalMfgName>, this will try
 ns_e_vendor().

 =back

+=head2 Layer 2 Forwarding Database
+
+These methods try to obtain the layer 2 forwarding database entries via the
+normal bridge methods as well as SPBM entries via rapid city methods.
+
+=over
+
+=item $baystack->fw_mac()
+
+Returns reference to hash of forwarding table MAC Addresses
+
+=item $baystack->fw_port()
+
+Returns reference to hash of forwarding table entries port interface
+identifier (iid)
+
+=item $baystack->qb_fw_vlan()
+
+Returns reference to hash of forwarding table entries VLAN ID
+
+=item $baystack->fw_status()
+
+Returns reference to hash of forwarding table entries status
+
+=back
+
 =head2 Table Methods imported from SNMP::Info::SONMP

 See L<SNMP::Info::SONMP/"TABLE METHODS"> for details.
--- a/lib/SNMP/Info/Layer2/C1900.pm
+++ b/lib/SNMP/Info/Layer2/C1900.pm
@@ -37,19 +37,23 @@ use Exporter;
 use SNMP::Info::CDP;
 use SNMP::Info::CiscoStats;
 use SNMP::Info::CiscoConfig;
+use SNMP::Info::CiscoStpExtensions;
+use SNMP::Info::CiscoAgg;
 use SNMP::Info::Layer2;

@SNMP::Info::Layer2::C1900::ISA = qw/SNMP::Info::CDP SNMP::Info::CiscoStats
-    SNMP::Info::CiscoConfig SNMP::Info::Layer2
+    SNMP::Info::CiscoConfig SNMP::Info::CiscoStpExtensions SNMP::Info::CiscoAgg SNMP::Info::Layer2
    Exporter/;
@SNMP::Info::Layer2::C1900::EXPORT_OK = qw//;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %GLOBALS = (
    %SNMP::Info::Layer2::GLOBALS,
+    %SNMP::Info::CiscoAgg::GLOBALS,
+    %SNMP::Info::CiscoStpExtensions::GLOBALS,
    %SNMP::Info::CiscoConfig::GLOBALS,
    %SNMP::Info::CiscoStats::GLOBALS,
    %SNMP::Info::CDP::GLOBALS,
@@ -58,6 +62,8 @@ $VERSION = '3.10';

 %FUNCS = (
    %SNMP::Info::Layer2::FUNCS,
+    %SNMP::Info::CiscoAgg::FUNCS,
+    %SNMP::Info::CiscoStpExtensions::FUNCS,
    %SNMP::Info::CiscoConfig::FUNCS,
    %SNMP::Info::CiscoStats::FUNCS,
    %SNMP::Info::CDP::FUNCS,
@@ -75,6 +81,8 @@ $VERSION = '3.10';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
+    %SNMP::Info::CiscoAgg::MIBS,
+    %SNMP::Info::CiscoStpExtensions::MIBS,
    %SNMP::Info::CiscoConfig::MIBS,
    %SNMP::Info::CiscoStats::MIBS,
    %SNMP::Info::CDP::MIBS,
@@ -84,8 +92,9 @@ $VERSION = '3.10';
 );

 %MUNGE = (
-    %SNMP::Info::Layer2::MUNGE,     %SNMP::Info::CiscoConfig::MUNGE,
-    %SNMP::Info::CiscoStats::MUNGE, %SNMP::Info::CDP::MUNGE,
+    %SNMP::Info::Layer2::MUNGE,             %SNMP::Info::CiscoAgg::MUNGE,
+    %SNMP::Info::CiscoStpExtensions::MUNGE, %SNMP::Info::CiscoConfig::MUNGE,
+    %SNMP::Info::CiscoStats::MUNGE,         %SNMP::Info::CDP::MUNGE,
 );

 sub bulkwalk_no         { return 1; }
@@ -191,6 +200,8 @@ sub set_i_duplex_admin {

    my $iid = $c1900->c1900_p_ifindex($port);

+    return 0 unless $iid->{$port};
+
    $duplex = lc($duplex);

    return 0 unless defined $duplexes{$duplex};
@@ -203,16 +214,17 @@ sub i_vlan {
    my $partial = shift;

    # Overlap allows more than one VLAN per port.  Unable to determine default
-    my $overlap = $c1900->bridgeGroupAllowMembershipOverlap()
+    my $overlap
+        = $c1900->bridgeGroupAllowMembershipOverlap()
        || $c1900->vlanAllowMembershipOverlap()
        || 'disabled';

    if ( $overlap eq 'enabled' ) {
-        return;
+        return {};
    }

    my $member_of = $c1900->bridgeGroupMemberPortOfBridgeGroup()
-        || $c1900->vlanMemberPortOfVlan();
+        || $c1900->vlanMemberPortOfVlan() || {};

    my $i_pvid = {};
    foreach my $idx ( keys %$member_of ) {
@@ -234,7 +246,7 @@ sub i_vlan_membership {
    my $partial = shift;

    my $member_of = $c1900->bridgeGroupMemberPortOfBridgeGroup()
-        || $c1900->vlanMemberPortOfVlan();
+        || $c1900->vlanMemberPortOfVlan() || {};

    my $i_vlan_membership = {};
    foreach my $idx ( keys %$member_of ) {
@@ -251,6 +263,8 @@ sub i_vlan_membership {
    return $i_vlan_membership;
 }

+sub i_vlan_membership_untagged { return {}; }
+
 sub bp_index {
    my $c1900   = shift;
    my $partial = shift;
@@ -258,7 +272,7 @@ sub bp_index {
    my $if_index = $c1900->i_index($partial);
    my $index = $c1900->orig_bp_index($partial) || {};
    foreach my $iid ( keys %$if_index ) {
-        $index->{$iid} = $iid if(!defined $index->{$iid});
+        $index->{$iid} = $iid if ( !defined $index->{$iid} );
    }
    return $index;
 }
@@ -277,14 +291,14 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $c1900 = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 1
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $c1900->class();
@@ -298,7 +312,7 @@ 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. 
+after determining a more specific class using the method above.

 my $c1900 = new SNMP::Info::Layer2::C1900(...);

@@ -312,6 +326,10 @@ after determining a more specific class using the method above.

 =item SNMP::Info::CiscoConfig

+=item SNMP::Info::CiscoStpExtensions
+
+=item SNMP::Info::CiscoAgg
+
 =item SNMP::Info::Layer2

 =back
@@ -336,6 +354,10 @@ 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::CiscoStpExtensions/"Required MIBs"> for its MIB requirements.
+
+See L<SNMP::Info::CiscoAgg/"Required MIBs"> for its MIB requirements.
+
 See L<SNMP::Info::Layer2/"Required MIBs"> for its MIB requirements.

 =head1 GLOBALS
@@ -357,8 +379,8 @@ Returns 'catalyst'

 =item $c1900->os_ver()

-Returns CatOS version if obtainable.  First tries to use 
-SNMP::Info::CiscoStats->os_ver() .  If that fails then it 
+Returns CatOS version if obtainable.  First tries to use
+SNMP::Info::CiscoStats->os_ver() .  If that fails then it
 checks for the presence of $c1900->c1900_flash_status() and culls
 the version from there.

@@ -394,6 +416,14 @@ See L<SNMP::Info::CiscoStats/"GLOBALS"> for details.

 See L<SNMP::Info::CiscoConfig/"GLOBALS"> for details.

+=head2 Globals imported from SNMP::Info::CiscoStpExtensions
+
+See L<SNMP::Info::CiscoStpExtensions/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoAgg
+
+See L<SNMP::Info::CiscoAgg/"GLOBALS"> for details.
+
 =head2 Globals imported from SNMP::Info::Layer2

 See L<SNMP::Info::Layer2/"GLOBALS"> for details.
@@ -437,13 +467,16 @@ 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";
  }

+=item $c1900->i_vlan_membership_untagged()
+
+Unsupported, returns nothing.

 =item $c1900->bp_index()

@@ -477,7 +510,7 @@ Gives admin setting for Duplex Info

 =item $c1900->c1900_p_name()

-Gives human set name for port 
+Gives human set name for port

 (C<swPortName>)

@@ -513,6 +546,14 @@ See L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.

 See L<SNMP::Info::CiscoConfig/"TABLE METHODS"> for details.

+=head2 Table Methods imported from SNMP::Info::CiscoStpExtensions
+
+See L<SNMP::Info::CiscoStpExtensions/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoAgg
+
+See L<SNMP::Info::CiscoAgg/"TABLE METHODS"> for details.
+
 =head2 Table Methods imported from SNMP::Info::Layer2

 See L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
@@ -522,7 +563,7 @@ See L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
 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. 
+operations.

 =over

@@ -533,7 +574,7 @@ choices are 'auto', 'half', 'full'.

  Example:
  my %if_map = reverse %{$c1900->interfaces()};
-  $c1900->set_i_duplex_admin('auto', $if_map{'1'}) 
+  $c1900->set_i_duplex_admin('auto', $if_map{'1'})
    or die "Couldn't change port duplex. ",$c1900->error(1);

 =back
--- a/lib/SNMP/Info/Layer2/C2900.pm
+++ b/lib/SNMP/Info/Layer2/C2900.pm
@@ -34,33 +34,21 @@ package SNMP::Info::Layer2::C2900;

 use strict;
 use Exporter;
-use SNMP::Info::CiscoVTP;
-use SNMP::Info::CDP;
-use SNMP::Info::CiscoStats;
-use SNMP::Info::CiscoConfig;
-use SNMP::Info::Layer2;
+use SNMP::Info::Layer2::Cisco;

-@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::ISA = qw/SNMP::Info::Layer2::Cisco Exporter/;
@SNMP::Info::Layer2::C2900::EXPORT_OK = qw//;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %GLOBALS = (
-    %SNMP::Info::Layer2::GLOBALS,     %SNMP::Info::CiscoConfig::GLOBALS,
-    %SNMP::Info::CiscoStats::GLOBALS, %SNMP::Info::CDP::GLOBALS,
-    %SNMP::Info::CiscoVTP::GLOBALS,
+    %SNMP::Info::Layer2::Cisco::GLOBALS,
 );

 %FUNCS = (
-    %SNMP::Info::Layer2::FUNCS,
-    %SNMP::Info::CiscoConfig::FUNCS,
-    %SNMP::Info::CiscoStats::FUNCS,
-    %SNMP::Info::CDP::FUNCS,
-    %SNMP::Info::CiscoVTP::FUNCS,
+    %SNMP::Info::Layer2::Cisco::FUNCS,
    'i_name' => 'ifAlias',

    # C2900PortEntry
@@ -71,15 +59,12 @@ $VERSION = '3.10';
 );

 %MIBS = (
-    %SNMP::Info::Layer2::MIBS,     %SNMP::Info::CiscoConfig::MIBS,
-    %SNMP::Info::CiscoStats::MIBS, %SNMP::Info::CDP::MIBS,
-    %SNMP::Info::CiscoVTP::MIBS, 'CISCO-C2900-MIB' => 'ciscoC2900MIB',
+    %SNMP::Info::Layer2::Cisco::MIBS,
+    'CISCO-C2900-MIB' => 'ciscoC2900MIB',
 );

 %MUNGE = (
-    %SNMP::Info::Layer2::MUNGE,     %SNMP::Info::CiscoConfig::MUNGE,
-    %SNMP::Info::CiscoStats::MUNGE, %SNMP::Info::CDP::MUNGE,
-    %SNMP::Info::CiscoVTP::MUNGE,
+    %SNMP::Info::Layer2::Cisco::MUNGE,
 );

 sub vendor {
@@ -143,25 +128,24 @@ sub i_speed_admin {
    my $c2900   = shift;
    my $partial = shift;

-    my %i_speed_admin;
-    my $p_port        = $c2900->p_port() || {};
    my $interfaces    = $c2900->interfaces($partial);
    my $c2900_p_index = $c2900->c2900_p_index() || {};
+    my $c2900_p_admin = $c2900->c2900_p_speed_admin();

    my %reverse_2900 = reverse %$c2900_p_index;
-    my $c2900_p_speed
-        = $c2900->c2900_p_speed_admin( $reverse_2900{$partial} );

-    my %speeds = (
-        'autoDetect' => 'auto',
-        's10000000'  => '10 Mbps',
-        's100000000' => '100 Mbps',
-    );
-
-    %i_speed_admin
-        = map { $c2900_p_index->{$_} => $speeds{ $c2900_p_speed->{$_} } }
-        keys %$c2900_p_index;
+    my %i_speed_admin;
+    foreach my $if ( keys %$interfaces ) {
+        my $port_2900 = $reverse_2900{$if};
+        next unless defined $port_2900;
+        my $speed = $c2900_p_admin->{$port_2900};
+        next unless defined $speed;

+        $speed = 'auto' if $speed eq 'autoDetect';
+        $speed = '10 Mbps' if $speed eq 's10000000';
+        $speed = '100 Mbps' if $speed eq 's100000000';
+        $i_speed_admin{$if} = $speed;
+    }
    return \%i_speed_admin;
 }

@@ -205,7 +189,7 @@ sub set_i_duplex_admin {
    return $c2900->set_c2900_p_duplex_admin( $duplexes{$duplex}, $iid );
 }

-# Use i_descritption for port key, cuz i_name can be manually entered.
+# Use i_description for port key, cuz i_name can be manually entered.
 sub interfaces {
    my $c2900   = shift;
    my $partial = shift;
@@ -241,7 +225,7 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $c2900 = new SNMP::Info(
                        AutoSpecify => 1,
                        Debug       => 1,
@@ -249,7 +233,7 @@ Max Baker
                        DestHost    => 'myswitch',
                        Community   => 'public',
                        Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class = $c2900->class();
@@ -257,11 +241,11 @@ Max Baker

 =head1 DESCRIPTION

-Provides abstraction to the configuration information obtainable from a 
-C2900 device through SNMP. 
+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. 
+after determining a more specific class using the method above.

 my $c2900 = new SNMP::Info::Layer2::C2900(...);

@@ -269,15 +253,7 @@ after determining 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
+=item SNMP::Info::Layer2::Cisco

 =back

@@ -293,15 +269,7 @@ Part of the v2 MIBs from Cisco.

 =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.
+See L<SNMP::Info::Layer2::Cisco/"Required MIBs"> for its MIB requirements.

 =head1 GLOBALS

@@ -321,25 +289,9 @@ Returns 1.  Use vlan indexing.

 =back

-=head2 Globals imported from SNMP::Info::CiscoVTP
+=head2 Globals imported from SNMP::Info::Layer2::Cisco

-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 L<SNMP::Info::Layer2/"GLOBALS"> for details.
+See L<SNMP::Info::Layer2::Cisco/"GLOBALS"> for details.

 =head1 TABLE METHODS

@@ -357,8 +309,8 @@ 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.

-Next all dots are changed for forward slashes so that the physical port name 
-is the same as the broad-casted CDP port name. 
+Next all dots are changed for forward slashes so that the physical port name
+is the same as the broad-casted CDP port name.
    (Ethernet0.1 -> Ethernet0/1)

 Also, any weird characters are removed, as I saw a few pop up.
@@ -381,7 +333,7 @@ Returns reference to hash of IIDs to admin speed setting.

 =back

-=head2 F<C2900-MIB> Port Entry Table 
+=head2 F<C2900-MIB> Port Entry Table

 =over

@@ -405,38 +357,22 @@ Gives admin setting for Duplex Info

 =item $c2900->c2900_p_speed_admin()

-Gives Admin speed of port 
+Gives Admin speed of port

 (C<c2900PortAdminSpeed>)

 =back

-=head2 Table Methods imported from SNMP::Info::CiscoVTP
+=head2 Table Methods imported from SNMP::Info::Layer2::Cisco

-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 L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+See L<SNMP::Info::Layer2::Cisco/"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. 
+operations.

 =over

@@ -451,7 +387,7 @@ port C<ifIndex>.

    Example:
    my %if_map = reverse %{$c2900->interfaces()};
-    $c2900->set_i_speed_admin('auto', $if_map{'FastEthernet0/1'}) 
+    $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)
@@ -465,7 +401,7 @@ port C<ifIndex>.

    Example:
    my %if_map = reverse %{$c2900->interfaces()};
-    $c2900->set_i_duplex_admin('auto', $if_map{'FastEthernet0/1'}) 
+    $c2900->set_i_duplex_admin('auto', $if_map{'FastEthernet0/1'})
        or die "Couldn't change port duplex. ",$c2900->error(1);

 =back
--- a/lib/SNMP/Info/Layer2/Catalyst.pm
+++ b/lib/SNMP/Info/Layer2/Catalyst.pm
@@ -34,48 +34,34 @@ package SNMP::Info::Layer2::Catalyst;
 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 SNMP::Info::Layer2::Cisco;

@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/;
+    = qw/SNMP::Info::CiscoStack SNMP::Info::Layer2::Cisco Exporter/;
@SNMP::Info::Layer2::Catalyst::EXPORT_OK = qw//;

 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %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,
+    %SNMP::Info::Layer2::Cisco::MIBS,
+    %SNMP::Info::CiscoStack::MIBS,
 );

 %GLOBALS = (
-    %SNMP::Info::Layer2::GLOBALS,
-    %SNMP::Info::CiscoPortSecurity::GLOBALS,
-    %SNMP::Info::CiscoStats::GLOBALS,
-    %SNMP::Info::CDP::GLOBALS,
-    %SNMP::Info::CiscoVTP::GLOBALS,
+    %SNMP::Info::Layer2::Cisco::GLOBALS,
    %SNMP::Info::CiscoStack::GLOBALS,
 );

 %FUNCS = (
-    %SNMP::Info::Layer2::FUNCS,     %SNMP::Info::CiscoPortSecurity::FUNCS,
-    %SNMP::Info::CiscoStats::FUNCS, %SNMP::Info::CDP::FUNCS,
-    %SNMP::Info::CiscoVTP::FUNCS,   %SNMP::Info::CiscoStack::FUNCS,
+    %SNMP::Info::Layer2::Cisco::FUNCS,
+    %SNMP::Info::CiscoStack::FUNCS,
 );

 %MUNGE = (
-    %SNMP::Info::Layer2::MUNGE,     %SNMP::Info::CiscoPortSecurity::MUNGE,
-    %SNMP::Info::CiscoStats::MUNGE, %SNMP::Info::CDP::MUNGE,
-    %SNMP::Info::CiscoVTP::MUNGE,   %SNMP::Info::CiscoStack::MUNGE,
+    %SNMP::Info::Layer2::Cisco::MUNGE,
+    %SNMP::Info::CiscoStack::MUNGE,
 );

 # Overidden Methods
@@ -84,7 +70,7 @@ $VERSION = '3.10';
 sub i_physical {
    my $cat = shift;

-    my $p_port = $cat->p_port();
+    my $p_port = $cat->p_port() || {};

    my %i_physical;
    foreach my $port ( keys %$p_port ) {
@@ -118,8 +104,8 @@ sub os_ver {
 # Workaround for incomplete bp_index
 sub bp_index {
    my $cat     = shift;
-    my $p_index = $cat->p_port();
-    my $b_index = $cat->p_oidx();
+    my $p_index = $cat->p_port() || {};
+    my $b_index = $cat->p_oidx() || {};

    my %bp_index;
    foreach my $iid ( keys %$p_index ) {
@@ -187,14 +173,14 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $cat = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $cat->class();
@@ -220,7 +206,7 @@ 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. 
+after determining a more specific class using the method above.

 my $cat = new SNMP::Info::Layer2::Catalyst(...);

@@ -228,18 +214,10 @@ after determining a more specific class using the method above.

 =over

+=item SNMP::Info::Layer2::Cisco
+
 =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

 =head2 Required MIBs
@@ -248,19 +226,10 @@ after determining a more specific class using the method above.

 =item Inherited Classes' MIBs

+See L<SNMP::Info::Layer2::Cisco/"Required MIBs"> 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

 These MIBs are found in the standard v2 MIBs from Cisco.
@@ -277,7 +246,7 @@ Returns 'catalyst'

 =item $cat->os_ver()

-Tries to use the value from SNMP::Info::CiscoStats->os_ver() and if it fails 
+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->vendor()
@@ -290,30 +259,14 @@ Returns 1.  Use vlan indexing.

 =back

+=head2 Global Methods imported from SNMP::Info::Layer2::Cisco
+
+See documentation in L<SNMP::Info::Layer2::Cisco/"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::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 L<SNMP::Info::Layer2/"GLOBALS"> for details.
-
 =head1 TABLE METHODS

 These are methods that return tables of information in the form of a reference
@@ -326,11 +279,11 @@ to a hash.
 =item $cat->interfaces()

 Returns the map between SNMP Interface Identifier (iid) and physical port
-name. 
+name.

 =item $cat->i_name()

-Returns reference to hash of iid to human set name. 
+Returns reference to hash of iid to human set name.

 C<portName>

@@ -348,29 +301,12 @@ have problems with F<BRIDGE-MIB>

 =back

+=head2 Table Methods imported from SNMP::Info::Layer2::Cisco
+
+See documentation in L<SNMP::Info::Layer2::Cisco/"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::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::CiscoPortSecurity
-
-See documentation in L<SNMP::Info::CiscoPortSecurity/"TABLE METHODS"> for
-details.
-
-=head2 Table Methods imported from SNMP::Info::Layer2
-
-See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
-
 =cut
--- a/lib/SNMP/Info/Layer2/Centillion.pm
+++ b/lib/SNMP/Info/Layer2/Centillion.pm
@@ -43,7 +43,7 @@ use SNMP::Info::SONMP;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::MIBS,
@@ -246,6 +246,20 @@ sub slot_offset {
    return 0;
 }

+sub fw_mac {
+    my $centillion = shift;
+    my $partial   = shift;
+
+    return $centillion->SUPER::fw_mac($partial);
+}
+
+sub fw_port {
+    my $centillion = shift;
+    my $partial   = shift;
+
+    return $centillion->SUPER::fw_port($partial);
+}
+
 1;
 __END__

@@ -260,14 +274,14 @@ Eric Miller

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $centillion = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $centillion->class();
@@ -275,14 +289,14 @@ Eric Miller

 =head1 DESCRIPTION

-Provides abstraction to the configuration information obtainable from a 
-Centillion device through SNMP. 
+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. 
+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.

@@ -371,11 +385,6 @@ Returns 'Centillion'

 =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
@@ -421,7 +430,7 @@ to a hash.
    formula:
      port = index % 256
      slot = int(index / 256)
- 
+
    The physical port name is returned as slot.port.

 =item $centillion->i_duplex()
@@ -460,13 +469,13 @@ Returns a mapping between C<ifIndex> and the VLAN.

 =item $centillion->centillion_p_index()

-Returns reference to hash.  Maps table IIDs to Interface IIDs 
+Returns reference to hash.  Maps table IIDs to Interface IIDs

 (C<cnDot3ExtnIfIndex>)

 =item $centillion->centillion_p_duplex()

-Returns reference to hash.  Maps port operational duplexes to IIDs 
+Returns reference to hash.  Maps port operational duplexes to IIDs

 (C<cnDot3ExtnIfOperConnectionType>)

@@ -484,19 +493,19 @@ Returns reference to hash.  Maps port admin duplexes to IIDs

 =item $centillion->centillion_i_vlan_index()

-Returns reference to hash.  Key: Table entry, Value: Index 
+Returns reference to hash.  Key: Table entry, Value: Index

 (C<cnVlanPortMemberIfIndex>)

 =item $centillion->centillion_i_vlan()

-Returns reference to hash.  Key: Table entry, Value: VLAN ID 
+Returns reference to hash.  Key: Table entry, Value: VLAN ID

 (C<cnVlanPortMemberVID>)

 =item $centillion->centillion_i_vlan_type()

-Returns reference to hash.  Key: Table entry, Value: VLAN Type 
+Returns reference to hash.  Key: Table entry, Value: VLAN Type

 (C<cnVlanPortMemberIngressType>)

--- a/lib/SNMP/Info/Layer2/Cisco.pm
+++ b/lib/SNMP/Info/Layer2/Cisco.pm
@@ -35,49 +35,71 @@ 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::CiscoPortSecurity;
+use SNMP::Info::CiscoStpExtensions;
+use SNMP::Info::CiscoAgg;
 use SNMP::Info::Layer2;

@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
+    SNMP::Info::CiscoStats SNMP::Info::CiscoRTT
+    SNMP::Info::CiscoConfig SNMP::Info::CiscoPortSecurity
+    SNMP::Info::CiscoStpExtensions SNMP::Info::CiscoAgg
+    SNMP::Info::Layer2
    Exporter/;
@SNMP::Info::Layer2::Cisco::EXPORT_OK = qw//;

 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %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,
+    %SNMP::Info::Layer2::MIBS,
+    %SNMP::Info::CiscoAgg::MIBS,
+    %SNMP::Info::CiscoStpExtensions::MIBS,
+    %SNMP::Info::CiscoPortSecurity::MIBS,
+    %SNMP::Info::CiscoConfig::MIBS,
+    %SNMP::Info::CiscoRTT::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,
+    %SNMP::Info::Layer2::GLOBALS,
+    %SNMP::Info::CiscoAgg::GLOBALS,
+    %SNMP::Info::CiscoStpExtensions::GLOBALS,
+    %SNMP::Info::CiscoPortSecurity::GLOBALS,
+    %SNMP::Info::CiscoConfig::GLOBALS,
+    %SNMP::Info::CiscoRTT::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,
+    %SNMP::Info::Layer2::FUNCS,
+    %SNMP::Info::CiscoAgg::FUNCS,
+    %SNMP::Info::CiscoStpExtensions::FUNCS,
+    %SNMP::Info::CiscoPortSecurity::FUNCS,
+    %SNMP::Info::CiscoConfig::FUNCS,
+    %SNMP::Info::CiscoRTT::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,
+    %SNMP::Info::Layer2::MUNGE,
+    %SNMP::Info::CiscoAgg::MUNGE,
+    %SNMP::Info::CiscoStpExtensions::MUNGE,
+    %SNMP::Info::CiscoPortSecurity::MUNGE,
+    %SNMP::Info::CiscoConfig::MUNGE,
+    %SNMP::Info::CiscoRTT::MUNGE,
+    %SNMP::Info::CiscoStats::MUNGE,
+    %SNMP::Info::CDP::MUNGE,
+    %SNMP::Info::CiscoVTP::MUNGE,
 );

 1;
@@ -85,8 +107,9 @@ __END__

 =head1 NAME

-SNMP::Info::Layer2::Cisco - SNMP Interface to L3 and L2+L3 IOS Cisco Device
-that are not covered in other classes.
+SNMP::Info::Layer2::Cisco - SNMP Interface to L2 Cisco devices that are
+not covered in other classes and the base L2 Cisco class for other device
+specific L2 Cisco classes.

 =head1 AUTHOR

@@ -94,7 +117,7 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $cisco = new SNMP::Info(
                        AutoSpecify => 1,
                        Debug       => 1,
@@ -102,7 +125,7 @@ Max Baker
                        DestHost    => 'myswitch',
                        Community   => 'public',
                        Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $cisco->class();
@@ -110,7 +133,8 @@ Max Baker

 =head1 DESCRIPTION

-Subclass for Generic Cisco Routers running IOS
+Subclass for Generic Layer 2 Cisco devices and the base L2 Cisco class for
+other device specific L2 Cisco classes.

 =head2 Inherited Classes

@@ -122,14 +146,16 @@ Subclass for Generic Cisco Routers running IOS

 =item SNMP::Info::CiscoStats

-=item SNMP::Info::CiscoImage
-
 =item SNMP::Info::CiscoRTT

-=item SNMP::Info::CiscoQOS
-
 =item SNMP::Info::CiscoConfig

+=item SNMP::Info::CiscoPortSecurity
+
+=item SNMP::Info::CiscoStpExtensions
+
+=item SNMP::Info::CiscoAgg
+
 =item SNMP::Info::Layer2

 =back
@@ -142,18 +168,20 @@ Subclass for Generic Cisco Routers running IOS

 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::CiscoStats/"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::CiscoPortSecurity/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoStpExtensions/"Required MIBs"> for its own MIB requirements.
+
+See L<SNMP::Info::CiscoAgg/"Required MIBs"> for its own MIB requirements.
+
 See L<SNMP::Info::Layer2/"Required MIBs"> for its own MIB requirements.

 =back
@@ -182,22 +210,26 @@ See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.

 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::CiscoPortSecurity
+
+See documentation in L<SNMP::Info::CiscoPortSecurity/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoStpExtensions
+
+See documentation in L<SNMP::Info::CiscoStpExtensions/"GLOBALS"> for details.
+
+=head2 Globals imported from SNMP::Info::CiscoAgg
+
+See documentation in L<SNMP::Info::CiscoAgg/"GLOBALS"> for details.
+
 =head2 Globals imported from SNMP::Info::Layer2

 See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
@@ -219,22 +251,26 @@ See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.

 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::CiscoPortSecurity
+
+See documentation in L<SNMP::Info::CiscoPortSecurity/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoStpExtensions
+
+See documentation in L<SNMP::Info::CiscoStpExtensions/"TABLE METHODS"> for details.
+
+=head2 Table Methods imported from SNMP::Info::CiscoAgg
+
+See documentation in L<SNMP::Info::CiscoAgg/"TABLE METHODS"> for details.
+
 =head2 Table Methods imported from SNMP::Info::Layer2

 See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
--- a/lib/SNMP/Info/Layer2/CiscoSB.pm
+++ b/lib/SNMP/Info/Layer2/CiscoSB.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer2::CiscoSB
-# $Id$
 #
 # Copyright (c) 2013 Nic Bernstein
 #
@@ -50,11 +49,7 @@ use SNMP::Info::CDP;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
-
-# This will be filled in with the device's index into the EntPhysicalEntry
-# table by the serial() function.
-our $index = undef;
+$VERSION = '3.66';

 %GLOBALS = (
    %SNMP::Info::Layer2::GLOBALS,
@@ -98,39 +93,46 @@ sub vendor {
    return 'cisco';
 }

-# Walk the entPhysicalSerialNum table and return both the first serial
-# number found as well as the index of that entry.
+sub os {
+    return 'ros';
+}
+
+# Walk the entPhysicalSerialNum table and return the first serial found
 sub serial {
    my $ciscosb  = shift;
-    my $serial   = undef;  
    my $e_serial = $ciscosb->e_serial();

    # Find entity table entry for this unit
-    foreach my $e ( keys %$e_serial ) {
-        if (defined ($e_serial->{$e}) and $e_serial->{$e} !~ /^\s*$/) {
-            $index = $e;
-            last;
+    foreach my $e ( sort keys %$e_serial ) {
+        if (defined $e_serial->{$e} and $e_serial->{$e} !~ /^\s*$/) {
+            return $e_serial->{$e};
        }
    }
-    return $e_serial->{$index} if defined $index;
 }

 sub os_ver {
    my $ciscosb = shift;
-    my $os_ver  = $ciscosb->e_swver();
+    my $e_swver  = $ciscosb->e_swver();

-    return $os_ver->{$index} if defined $index;
+    foreach my $e ( sort keys %$e_swver ) {
+        if (defined $e_swver->{$e} and $e_swver->{$e} !~ /^\s*$/) {
+            return $e_swver->{$e};
+        }
+    }
 }
-  
+
 # Grab e_model from Entity and tag on e_hwver
 sub model {
    my $ciscosb = shift;
-    my $e_model   = $ciscosb->e_model();
+    my $e_model = $ciscosb->e_model();
    my $e_hwver = $ciscosb->e_hwver();

-    if (defined ($index)) {
-        my $model = "$e_model->{$index} $e_hwver->{$index}";
-        return $model;
+    foreach my $e ( sort keys %$e_model ) {
+        if (defined $e_model->{$e} and $e_model->{$e} !~ /^\s*$/) {
+            return $e_model->{$e};
+            #my $model = "$e_model->{$e} $e_hwver->{$e}";
+            #return $model;
+        }
    }
    return $ciscosb->description();
 }
@@ -146,7 +148,6 @@ sub interfaces {
    return $interfaces;
 }

-
 1;
 __END__

@@ -160,14 +161,14 @@ Nic Bernstein (shamelessly stolen from Max Baker's Aironet code)

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $ciscosb = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $ciscosb->class();
@@ -182,15 +183,17 @@ managed switches. [i.e. those matching enterprises(1).cisco(9).otherEnterprises(

 =over

-=item SNMP::Info::Layer2
+=item SNMP::Info::CDP
+
+=item SNMP::Info::CiscoConfig
+
+=item SNMP::Info::CiscoStats

 =item SNMP::Info::Entity

 =item SNMP::Info::EtherLike

-=item SNMP::Info::CiscoStats
-
-=item SNMP::Info::CiscoConfig
+=item SNMP::Info::Layer2

 =back

@@ -206,14 +209,10 @@ MIBs required by the inherited classes listed above.

 =head1 GLOBALS

-These are methods that return scalar value from SNMP
+These are methods that return scalar value from SNMP.

 =over

-=item $ciscosb->vendor()
-
-Returns 'cisco'
-
 =item $ciscosb->os_ver()

 Returns software version (C<entPhysicalSoftwareRev>)
@@ -229,6 +228,20 @@ Returns model and hardware revision of unit

 =back

+=head2 Overrides
+
+=over
+
+=item $ciscosb->vendor()
+
+Returns 'cisco'.
+
+=item $ciscosb->os()
+
+Returns 'ros'.
+
+=back
+
 =head2 Globals imported from SNMP::Info::Layer2

 See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
--- a/lib/SNMP/Info/Layer2/Exinda.pm
+++ b/lib/SNMP/Info/Layer2/Exinda.pm
@@ -0,0 +1,204 @@
+# SNMP::Info::Layer2::Exinda
+#
+# Copyright (c) 2018 nick nauwelaerts
+# 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::Exinda;
+
+use strict;
+
+use Exporter;
+use SNMP::Info::Layer2;
+
+@SNMP::Info::Layer2::Exinda::ISA = qw/
+    SNMP::Info::Layer2
+    Exporter
+/;
+@SNMP::Info::Layer2::Exinda::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '3.66';
+
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS,
+    'EXINDA-MIB' => 'systemVersion',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer2::GLOBALS,
+    # EXINDA-MIB
+    'uptime' => 'systemUptime',
+    'os_ver' => 'systemVersion',
+    'serial1' => 'systemHostId',
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,
+);
+
+%MUNGE = (
+    %SNMP::Info::Layer2::MUNGE,
+);
+
+sub layers {
+    # layer 2: bridged shaping and failopen interfaces
+    # layer 3/4: ip and layer 4 protocol fiddling and accell
+    # layer 7: wccp supprt
+    return '01001110';
+}
+
+sub vendor {
+    return 'exinda';
+}
+
+sub model {
+    my $exinda = shift;
+
+    return $exinda->hardwareSeries();
+}
+
+sub mac {
+    # systemHostId is actually also a mac address
+    my $exinda = shift;
+    my $exinda_mac = $exinda->systemHostId();
+
+    $exinda_mac =~ s/(..)/$1:/g;
+    chop $exinda_mac;
+
+    return $exinda_mac;
+}
+
+sub os {
+    return 'exos';
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Exinda - SNMP Interface to exinda / gfi traffic shapers.
+
+=head1 AUTHORS
+
+nick nauwelaerts
+
+=head1 SYNOPSIS
+
+    # Let SNMP::Info determine the correct subclass for you.
+    my $exinda = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myrouter',
+                          Community   => 'public',
+                          Version     => 2
+                        )
+    or die "Can't connect to DestHost.\n";
+
+    my $class      = $exinda->class();
+    print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for exinda / gfi network orchestrator traffic shapers.
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<EXINDA-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 $exinda->layers()
+
+Returns '01001110'.
+
+=item $exinda->mac()
+
+Returns a mac address extracted from C<systemHostId>.
+
+=item $exinda->model()
+
+Returns the model extracted from C<hardwareSeries>.
+
+=item $exinda->os()
+
+Returns 'exos'.
+
+=item $exinda->os_ver()
+
+Returns the os version extracted from C<systemVersion>.
+
+=item $exinda->serial1()
+
+Returns the serial extracted from C<systemHostId>.
+
+=item $exinda->uptime()
+
+Returns the uptime extracted from C<systemUptime>.
+
+=item $exinda->vendor()
+
+Returns 'exinda'.
+
+=back
+
+=head2 Global Methods imported from SNMP::Info::Layer2
+
+See L<SNMP::Info::Layer2/"GLOBALS"> 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::Layer2
+
+See L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=cut
--- a/lib/SNMP/Info/Layer2/HP.pm
+++ b/lib/SNMP/Info/Layer2/HP.pm
@@ -36,39 +36,45 @@ use strict;
 use Exporter;
 use SNMP::Info::Layer3;
 use SNMP::Info::MAU;
-use SNMP::Info::LLDP;
 use SNMP::Info::CDP;
+use SNMP::Info::Aggregate 'agg_ports_ifstack';

-@SNMP::Info::Layer2::HP::ISA
-    = qw/SNMP::Info::Layer3 SNMP::Info::MAU SNMP::Info::LLDP
-    SNMP::Info::CDP Exporter/;
+@SNMP::Info::Layer2::HP::ISA = qw/
+    SNMP::Info::Aggregate
+    SNMP::Info::Layer3
+    SNMP::Info::MAU
+    SNMP::Info::CDP
+    Exporter
+/;
@SNMP::Info::Layer2::HP::EXPORT_OK = qw//;

 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
    %SNMP::Info::MAU::MIBS,
-    %SNMP::Info::LLDP::MIBS,
    %SNMP::Info::CDP::MIBS,
-    'RFC1271-MIB'    => 'logDescription',
-    'HP-ICF-OID'     => 'hpSwitch4000',
-    'STATISTICS-MIB' => 'hpSwitchCpuStat',
-    'NETSWITCH-MIB'  => 'hpMsgBufFree',
-    'CONFIG-MIB'     => 'hpSwitchConfig',
-    'HP-ICF-CHASSIS' => 'hpicfSensorObjectId',
-    'HP-ICF-BRIDGE'  => 'hpicfBridgeRstpForceVersion',
-    'HP-ICF-POE-MIB' => 'hpicfPoePethPsePortCurrent',
-    'SEMI-MIB'       => 'hpHttpMgSerialNumber',
+    %SNMP::Info::Aggregate::MIBS,
+    'RFC1271-MIB'            => 'logDescription',
+    'HP-ICF-OID'             => 'hpSwitch4000',
+    'STATISTICS-MIB'         => 'hpSwitchCpuStat',
+    'NETSWITCH-MIB'          => 'hpMsgBufFree',
+    'CONFIG-MIB'             => 'hpSwitchConfig',
+    'HP-ICF-CHASSIS'         => 'hpicfSensorObjectId',
+    'HP-ICF-BRIDGE'          => 'hpicfBridgeRstpForceVersion',
+    'HP-ICF-POE-MIB'         => 'hpicfPoePethPsePortCurrent',
+    'SEMI-MIB'               => 'hpHttpMgSerialNumber',
+    'HP-SWITCH-PL-MIB'       => 'hpSwitchProliant',
+    'BLADETYPE4-NETWORK-MIB' => 'hpProLiant-GbE2c-InterconnectSwitch',
 );

 %GLOBALS = (
    %SNMP::Info::Layer3::GLOBALS,
    %SNMP::Info::MAU::GLOBALS,
-    %SNMP::Info::LLDP::GLOBALS,
    %SNMP::Info::CDP::GLOBALS,
+    %SNMP::Info::Aggregate::GLOBALS,
    'serial1'      => 'entPhysicalSerialNum.1',
    'serial2'      => 'hpHttpMgSerialNumber.0',
    'hp_cpu'       => 'hpSwitchCpuStat.0',
@@ -85,8 +91,8 @@ $VERSION = '3.10';
 %FUNCS = (
    %SNMP::Info::Layer3::FUNCS,
    %SNMP::Info::MAU::FUNCS,
-    %SNMP::Info::LLDP::FUNCS,
    %SNMP::Info::CDP::FUNCS,
+    %SNMP::Info::Aggregate::FUNCS,
    'i_type2'   => 'ifType',

    # RFC1271
@@ -101,7 +107,7 @@ $VERSION = '3.10';
    'hp_s_oid'    => 'hpicfSensorObjectId',
    'hp_s_name'   => 'hpicfSensorDescr',
    'hp_s_status' => 'hpicfSensorStatus',
-    
+
    # HP-ICF-POE-MIB
    'peth_port_power'   => 'hpicfPoePethPsePortPower',
 );
@@ -110,17 +116,19 @@ $VERSION = '3.10';
    # Inherit all the built in munging
    %SNMP::Info::Layer3::MUNGE,
    %SNMP::Info::MAU::MUNGE,
-    %SNMP::Info::LLDP::MUNGE,
    %SNMP::Info::CDP::MUNGE,
+    %SNMP::Info::Aggregate::MUNGE,
    'c_id'   => \&munge_hp_c_id,
 );


 # Model map, reverse sorted by common model name (sort -k2 -r)
-# Potential sources for model information: http://www.hp.com/rnd/software/switches.htm or HP-ICF-OID MIB 
+# Potential sources for model information: http://www.hp.com/rnd/software/switches.htm or HP-ICF-OID MIB
 %MODEL_MAP = (
    'J8131A' => 'WAP-420-WW',
    'J8130A' => 'WAP-420-NA',
+    'J9833A' => 'PS1810-8G',
+    'J9834A' => 'PS1810-24G',
    'J8133A' => 'AP520WL',
    'J8680A' => '9408sl',
    'J9091A' => '8212zl',
@@ -135,8 +143,10 @@ $VERSION = '3.10';
    'J8992A' => '6200yl-24G',
    'J4902A' => '6108',
    'J8698A' => '5412zl',
+    'J9851A' => '5412R-zl2',
    'J8719A' => '5408yl',
    'J8697A' => '5406zl',
+    'J9850A' => '5406R-zl2',
    'J8718A' => '5404yl',
    'J4819A' => '5308XL',
    'J4850A' => '5304XL',
@@ -148,6 +158,12 @@ $VERSION = '3.10';
    'J8771A' => '4202vl-48G',
    'J4865A' => '4108GL',
    'J4887A' => '4104GL',
+    'JL074A' => '3810M-48G-PoE+',
+    'JL072A' => '3810M-48G',
+    'JL076A' => '3810M-40G-8SR-PoE+',
+    'JL073A' => '3810M-24G-PoE+',
+    'JL071A' => '3810M-24G',
+    'JL075A' => '3810M-16SFP+',
    'J9588A' => '3800-48G-PoE+-4XG',
    'J9574A' => '3800-48G-PoE+-4SFP+',
    'J9586A' => '3800-48G-4XG',
@@ -167,9 +183,30 @@ $VERSION = '3.10';
    'J4905A' => '3400cl-24G',
    'J4815A' => '3324XL',
    'J4851A' => '3124',
+    'JL322A' => '2930M-48G-PoE+',
+    'JL321A' => '2930M-48G',
+    'JL323A' => '2930M-40G-8SR-PoE+',
+    'JL320A' => '2930M-24G-PoE+',
+    'JL324A' => '2930M-24G-8SR-PoE+',
+    'JL319A' => '2930M-24G',
+    'JL258A' => '2930F-8G-PoE+-2SFP+',
+    'JL558A' => '2930F-48G-PoE+-4SFP+-740W',
+    'JL557A' => '2930F-48G-PoE+-4SFP-740W',
+    'JL256A' => '2930F-48G-PoE+-4SFP+',
+    'JL262A' => '2930F-48G-PoE+-4SFP',
+    'JL254A' => '2930F-48G-4SFP+',
+    'JL260A' => '2930F-48G-4SFP',
+    'JL255A' => '2930F-24G-PoE+-4SFP+',
+    'JL261A' => '2930F-24G-PoE+-4SFP',
+    'JL253A' => '2930F-24G-4SFP+',
+    'JL259A' => '2930F-24G-4SFP',
+    'J9729A' => '2920-48G-PoE+',
    'J9729A' => '2920-48G-PoE+',
    'J9728A' => '2920-48G',
+    'J9728A' => '2920-48G',
    'J9727A' => '2920-24G-PoE+',
+    'J9727A' => '2920-24G-PoE+',
+    'J9726A' => '2920-24G',
    'J9726A' => '2920-24G',
    'J9562A' => '2915-8G-PoE',
    'J9148A' => '2910al-48G-PoE+',
@@ -182,30 +219,47 @@ $VERSION = '3.10';
    'J4903A' => '2824',
    'J9022A' => '2810-48G',
    'J9021A' => '2810-24G',
-    'J4899C' => '2650C',
    'J8165A' => '2650-PWR',
    'J4899B' => '2650-CR',
+    'J4899C' => '2650C',
    'J4899A' => '2650',
-    'J4900C' => '2626C',
    'J8164A' => '2626-PWR',
    'J4900B' => '2626-CR',
+    'J4900C' => '2626C',
    'J4900A' => '2626',
    'J9627A' => '2620-48-PoE+',
    'J9626A' => '2620-48',
-    'J9625A' => '2620-24-PoE+',
    'J9624A' => '2620-24-PPoE+',
+    'J9625A' => '2620-24-PoE+',
    'J9623A' => '2620-24',
    'J9565A' => '2615-8-PoE',
    'J9089A' => '2610-48-PWR',
    'J9088A' => '2610-48',
-    'J9086A' => '2610-24/12PWR',
    'J9087A' => '2610-24-PWR',
+    'J9086A' => '2610-24/12PWR',
    'J9085A' => '2610-24',
    'J8762A' => '2600-8-PWR',
+    'JL357A' => '2540-48G-PoE+-4SFP+',
+    'JL355A' => '2540-48G-4SFP+',
+    'JL356A' => '2540-24G-PoE+-4SFP+',
+    'JL354A' => '2540-24G-4SFP+',
+    'JL070A' => '2530-8-PoE+ Internal PS',
+    'J9780A' => '2530-8-PoE+',
+    'J9774A' => '2530-8G-PoEP',
+    'J9777A' => '2530-8G',
+    'J9783A' => '2530-8',
+    'J9778A' => '2530-48-PoE+',
+    'J9853A' => '2530-48G-PoE+-2SFP+',
    'J9772A' => '2530-48G-PoE+',
+    'J9855A' => '2530-48G-2SFP+',
    'J9775A' => '2530-48G',
+    'J9781A' => '2530-48',
+    'J9779A' => '2530-24-PoE+',
+    'J9854A' => '2530-24G-PoE+-2SFP+',
    'J9773A' => '2530-24G-PoE+',
+    'J9856A' => '2530-24G-2SFP+',
    'J9776A' => '2530-24G',
+    'J9782A' => '2530-24',
    'J4813A' => '2524',
    'J9298A' => '2520G-8-PoE',
    'J9299A' => '2520G-24-PoE',
@@ -221,6 +275,8 @@ $VERSION = '3.10';
    'J4817A' => '2312',
    'J9449A' => '1810G-8',
    'J9450A' => '1810G-24',
+    'J9802A' => '1810-8G',
+    'J9803A' => '1810-24G',
    'J9029A' => '1800-8G',
    'J9028A' => '1800-24G',
 );
@@ -259,7 +315,7 @@ sub os_ver {
    return;
 }

-# Regular managed ProCurve switches have the serial num in entity mib, 
+# Regular managed ProCurve switches have the serial num in entity mib,
 # the web-managed models in the semi mib (hphttpmanageable).
 sub serial {
    my $hp = shift;
@@ -277,7 +333,7 @@ sub model {
    my $model = &SNMP::translateObj($id);
    return $id unless defined $model;

-    $model =~ s/^hpswitch//i;
+    $model =~ s/^(hp|aruba)switch//i;

    return defined $MODEL_MAP{$model} ? $MODEL_MAP{$model} : $model;
 }
@@ -524,6 +580,8 @@ sub set_i_vlan_tagged {
    return;
 }

+sub agg_ports { return agg_ports_ifstack(@_) }
+
 1;
 __END__

@@ -537,14 +595,14 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $hp = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $hp->class();
@@ -552,15 +610,15 @@ Max Baker

 =head1 DESCRIPTION

-Provides abstraction to the configuration information obtainable from a 
-HP ProCurve Switch via SNMP. 
+Provides abstraction to the configuration information obtainable from a
+HP ProCurve Switch via SNMP.

 Note:  Some HP Switches will connect via SNMP version 1, but a lot of config
 data will not be available.  Make sure you try and connect with Version 2
 first, and then fail back to 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. 
+after determining a more specific class using the method above.

 my $hp = new SNMP::Info::Layer2::HP(...);

@@ -570,8 +628,6 @@ after determining a more specific class using the method above.

 =item SNMP::Info::Layer2

-=item SNMP::Info::LLDP
-
 =item SNMP::Info::MAU

 =back
@@ -598,6 +654,14 @@ Included in V2 mibs from Cisco

 =item F<HP-ICF-POE-MIB>

+=item F<HP-ICF-CHASSIS>
+
+=item F<SEMI-MIB>
+
+=item F<HP-SWITCH-PL-MIB>
+
+=item F<BLADETYPE4-NETWORK-MIB>
+
 =back

 The last four MIBs listed are from HP and can be found at
@@ -797,10 +861,6 @@ Returns what version of STP the device is running.

 See documentation in L<SNMP::Info::Layer2/"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::MAU

 See documentation in L<SNMP::Info::MAU/"GLOBALS"> for details.
@@ -812,9 +872,9 @@ to a hash.

 =head2 Overrides

-=over
+=over 4

-=item $hp->interfaces() 
+=item $hp->interfaces()

 Uses $hp->i_description()

@@ -840,16 +900,18 @@ Crosses i_name() with $hp->e_name() using $hp->e_port() and i_alias()
 Returns reference to hash of power Ethernet port table entries map back to
 interface index (c<ifIndex>)

+=item C<agg_ports>
+
+Returns a HASH reference mapping from slave to master port for each member of
+a port bundle on the device. Keys are ifIndex of the slave ports, Values are
+ifIndex of the corresponding master ports.
+
 =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::LLDP
-
-See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
-
 =head2 Table Methods imported from SNMP::Info::MAU

 See documentation in L<SNMP::Info::MAU/"TABLE METHODS"> for details.
@@ -869,7 +931,7 @@ Munge for c_id which handles CDP and LLDP.
 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. 
+operations.

 =over

--- a/lib/SNMP/Info/Layer2/HP4000.pm
+++ b/lib/SNMP/Info/Layer2/HP4000.pm
@@ -44,7 +44,7 @@ use SNMP::Info::CDP;

 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
@@ -376,6 +376,20 @@ sub i_vlan_membership {
    return $i_vlan_membership;
 }

+sub i_vlan_membership_untagged {
+    my $hp  = shift;
+    my $partial = shift;
+
+    my $vlans = $hp->i_vlan($partial);
+    my $i_vlan_membership = {};
+    foreach my $port (keys %$vlans) {
+        my $vlan = $vlans->{$port};
+        push( @{ $i_vlan_membership->{$port} }, $vlan );
+    }
+
+    return $i_vlan_membership;
+}
+
 sub set_i_vlan {
    my $hp = shift;
    my $rv;
@@ -468,14 +482,14 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $hp = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $hp->class();
@@ -483,15 +497,15 @@ Max Baker

 =head1 DESCRIPTION

-Provides abstraction to the configuration information obtainable from a 
-HP ProCurve Switch via SNMP. 
+Provides abstraction to the configuration information obtainable from a
+HP ProCurve Switch via SNMP.

 Note:  Some HP Switches will connect via SNMP version 1, but a lot of config
 data will not be available.  Make sure you try and connect with Version 2
 first, and then fail back to 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. 
+after determining a more specific class using the method above.

 my $hp = new SNMP::Info::Layer2::HP4000(...);

@@ -569,7 +583,7 @@ Returns bytes of used memory
 Returns the model number of the HP Switch.  Will translate between the HP Part
 number and the common model number with this map :

- %MODEL_MAP = ( 
+ %MODEL_MAP = (
                'J4093A' => '2424M',
                'J4110A' => '8000M',
                'J4120A' => '1600M',
@@ -638,7 +652,7 @@ to a hash.

 =over

-=item $hp->interfaces() 
+=item $hp->interfaces()

 Uses $hp->i_description()

@@ -673,13 +687,19 @@ It is the union of tagged, untagged, and auto ports.
  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->i_vlan_membership_untagged()
+
+Returns reference to hash of arrays: key = C<ifIndex>, value = array of VLAN
+IDs.  These are the VLANs which are members of the untagged egress list for
+the port.
+
 =item $hp->v_index()

 Returns VLAN IDs
@@ -711,7 +731,7 @@ See documentation in L<SNMP::Info::MAU/"TABLE METHODS"> for details.
 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. 
+operations.

 =over

--- a/lib/SNMP/Info/Layer2/HPVC.pm
+++ b/lib/SNMP/Info/Layer2/HPVC.pm
@@ -33,17 +33,19 @@ package SNMP::Info::Layer2::HPVC;
 use strict;
 use Exporter;
 use SNMP::Info::Layer2;
+use SNMP::Info::LLDP;

@SNMP::Info::Layer2::HPVC::ISA
-    = qw/SNMP::Info::Layer2 Exporter/;
+    = qw/SNMP::Info::Layer2 SNMP::Info::LLDP Exporter/;
@SNMP::Info::Layer2::HPVC::EXPORT_OK = qw//;

 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
+    %SNMP::Info::LLDP::MIBS,
    'HPVC-MIB'       => 'vcDomainName',
    'CPQSINFO-MIB'   => 'cpqSiSysSerialNum',
    'HPVCMODULE-MIB' => 'vcModuleDomainName',
@@ -51,6 +53,7 @@ $VERSION = '3.10';

 %GLOBALS = (
    %SNMP::Info::Layer2::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
    'serial1'      => 'cpqSiSysSerialNum.0',
    'os_ver'       => 'cpqHoSWRunningVersion.1',
    'os_bin'       => 'cpqHoFwVerVersion.1',
@@ -59,12 +62,14 @@ $VERSION = '3.10';

 %FUNCS = (
    %SNMP::Info::Layer2::FUNCS,
-    
+    %SNMP::Info::LLDP::FUNCS,
+
 );

 %MUNGE = (
    # Inherit all the built in munging
    %SNMP::Info::Layer2::MUNGE,
+    %SNMP::Info::LLDP::MUNGE,
 );


@@ -97,14 +102,14 @@ Jeroen van Ingen

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $hp = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $hp->class();
@@ -112,11 +117,11 @@ Jeroen van Ingen

 =head1 DESCRIPTION

-Provides abstraction to the configuration information obtainable from a 
-HP Virtual Connect Switch via SNMP. 
+Provides abstraction to the configuration information obtainable from a
+HP Virtual Connect Switch via SNMP.

 For speed or debugging purposes you can call the subclass directly, but not
-after determining a more specific class using the method above. 
+after determining a more specific class using the method above.

 my $hp = new SNMP::Info::Layer2::HPVC(...);

@@ -183,27 +188,15 @@ See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
 These are methods that return tables of information in the form of a reference
 to a hash.

-=head2 Overrides
-
-=over
-
-=back
-
 =head2 Table Methods imported from SNMP::Info::Layer2

 See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.

-=head1 MUNGES
-
-=over
-
-=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. 
+operations.

 =cut
--- a/lib/SNMP/Info/Layer2/Kentrox.pm
+++ b/lib/SNMP/Info/Layer2/Kentrox.pm
@@ -36,7 +36,7 @@ use SNMP::Info::Layer2;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
@@ -66,6 +66,7 @@ sub os_ver {
    if ( $descr =~ /^\S+\s\S+\s\S+\s(\S+)/){
        return $1;
    }
+    return;
 }

 sub serial {
@@ -75,7 +76,7 @@ sub serial {
        my $str = substr($1,8,10);
        return $str;
    }
-
+    return;
 }
 sub vendor {
    return 'Kentrox';
@@ -87,6 +88,7 @@ sub model {
    if ( $descr =~ /^(\S+\s\S+)/){
        return $1;
    }
+    return;
 }

 1;
@@ -166,12 +168,6 @@ See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
 These are methods that return tables of information in the form of a reference
 to a hash.

-=head2 Overrides
-
-=over
-
-=back
-
 =head2 Table Methods imported from SNMP::Info::Layer2

 See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
--- a/lib/SNMP/Info/Layer2/N2270.pm
+++ b/lib/SNMP/Info/Layer2/N2270.pm
@@ -43,7 +43,7 @@ use SNMP::Info::Airespace;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::MIBS,        %SNMP::Info::Bridge::MIBS,
@@ -114,7 +114,7 @@ Eric Miller
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )

    or die "Can't connect to DestHost.\n";

@@ -123,11 +123,11 @@ Eric Miller

 =head1 DESCRIPTION

-Provides abstraction to the configuration information obtainable from a 
+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. 
+after determining a more specific class using the method above.

 my $n2270 = new SNMP::Info::Layer2::N2270(...);

--- a/lib/SNMP/Info/Layer2/NAP222x.pm
+++ b/lib/SNMP/Info/Layer2/NAP222x.pm
@@ -42,7 +42,7 @@ use SNMP::Info::Layer2;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS, %SNMP::Info::IEEE802dot11::MIBS,
@@ -375,14 +375,14 @@ Eric Miller

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $nap222x = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class = $nap222x->class();
@@ -391,10 +391,10 @@ Eric Miller
 =head1 DESCRIPTION

 Provides abstraction to the configuration information obtainable from a Nortel
-2220 series wireless Access Points through SNMP. 
+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. 
+after determining a more specific class using the method above.

 my $nap222x = new SNMP::Info::Layer2::NAP222x(...);

@@ -526,7 +526,7 @@ to a hash.

 =item $nap222x->interfaces()

-Returns reference to map of IIDs to physical ports. 
+Returns reference to map of IIDs to physical ports.

 =item $nap222x->i_duplex()

@@ -548,7 +548,7 @@ Returns a human name based upon port description.

 Returns a mapping between C<ifIndex> and the Bridge Table.  This does not
 exist in the MIB and bridge port index is not the same as C<ifIndex> so it is
-created. 
+created.

 =item $nap222x->i_ssidlist()

--- a/lib/SNMP/Info/Layer2/NWSS2300.pm
+++ b/lib/SNMP/Info/Layer2/NWSS2300.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Bridge;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::MIBS,
@@ -49,6 +49,7 @@ $VERSION = '3.10';
    'NTWS-CLIENT-SESSION-MIB'       => 'ntwsClSessTotalSessions',
    'NTWS-SYSTEM-MIB'               => 'ntwsSysCpuAverageLoad',
    'NTWS-BASIC-MIB'                => 'ntwsVersionString',
+    'NTWS-AP-CONFIG-MIB'            => 'ntwsApConfServProfBeaconEnabled',
 );

 %GLOBALS = (
@@ -158,7 +159,7 @@ sub model {
    return $id unless defined $model;

    $model =~ s/^ntwsSwitch//i;
-    return $model;    
+    return $model;
 }

 sub _ap_serial {
@@ -388,7 +389,7 @@ sub bp_index {
 sub fw_mac {
    my $nwss2300 = shift;
    my $partial  = shift;
-    
+
    my $serials = $nwss2300->nwss2300_sta_serial($partial) || {};

    my %fw_mac;
@@ -400,7 +401,7 @@ sub fw_mac {
 	
        $fw_mac{$iid} = $mac;
    }
-    return \%fw_mac;    
+    return \%fw_mac;
 }

 sub fw_port {
@@ -493,7 +494,7 @@ sub dot11_cur_tx_pwr_mw {
    my $partial  = shift;

    my $cur = $nwss2300->nwss2300_apif_power($partial);
-    
+
    my $dot11_cur_tx_pwr_mw = {};
    foreach my $idx ( keys %$cur ) {
        my $pwr_dbm = $cur->{$idx};
@@ -501,7 +502,7 @@ sub dot11_cur_tx_pwr_mw {
 	#Convert to milliWatts = 10(dBm/10)
        my $pwr = int (10 ** ($pwr_dbm / 10));
 	
-        $dot11_cur_tx_pwr_mw->{$idx} = $pwr; 
+        $dot11_cur_tx_pwr_mw->{$idx} = $pwr;
    }
    return $dot11_cur_tx_pwr_mw;
 }
@@ -513,7 +514,7 @@ sub e_index {

    # Try new first, fall back to depreciated
    my $ap_num = $nwss2300->nwss2300_ap_num() || $nwss2300->nwss2300_ap_dapnum() || {};
-  
+
    my %e_index;

    # Chassis
@@ -796,7 +797,7 @@ Eric Miller
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )

    or die "Can't connect to DestHost.\n";

@@ -805,7 +806,7 @@ Eric Miller

 =head1 DESCRIPTION

-Provides abstraction to the configuration information obtainable from 
+Provides abstraction to the configuration information obtainable from
 Avaya (Trapeze) Wireless Controllers through SNMP.

 This class emulates bridge functionality for the wireless switch. This enables
@@ -813,7 +814,7 @@ 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. 
+after determining a more specific class using the method above.

 my $nwss2300 = new SNMP::Info::Layer2::NWSS2300(...);

@@ -907,7 +908,7 @@ See documentation in L<SNMP::Info::Bridge/"GLOBALS"> for details.
 These are methods that return tables of information in the form of a reference
 to a hash.

-=over 
+=over

 =item $nwss2300->i_ssidlist()

@@ -1138,7 +1139,7 @@ These emulate the F<CISCO-DOT11-MIB>

 (C<ntwsClSessClientSessStatsUniPktOut>)

-=back 
+=back

 =head2 Table Methods imported from SNMP::Info

@@ -1154,14 +1155,14 @@ See documentation in L<SNMP::Info::Bridge/"TABLE METHODS"> for details.

 =item $nwss2300->i_index()

-Returns reference to map of IIDs to Interface index. 
+Returns reference to map of IIDs to Interface index.

 Extends C<ifIndex> to support thin APs and WLAN virtual interfaces as device
 interfaces.

 =item $nwss2300->interfaces()

-Returns reference to map of IIDs to ports.  Thin APs are implemented as device 
+Returns reference to map of IIDs to ports.  Thin APs are implemented as device
 interfaces.  The thin AP MAC address and Slot ID nwss2300_apif_slot() are
 used as the port identifier.

@@ -1206,7 +1207,7 @@ the interface iid.
 =item $nwss2300->fw_port()

 Returns reference to a hash, value being mac and
-nwss2300_sta_slot() combined to match the interface iid.  
+nwss2300_sta_slot() combined to match the interface iid.

 =item $nwss2300->fw_mac()

--- a/lib/SNMP/Info/Layer2/Netgear.pm
+++ b/lib/SNMP/Info/Layer2/Netgear.pm
@@ -33,32 +33,31 @@ package SNMP::Info::Layer2::Netgear;
 use strict;
 use Exporter;
 use SNMP::Info::Layer2;
-use SNMP::Info::Entity;
 use SNMP::Info::LLDP;

-@SNMP::Info::Layer2::Netgear::ISA       = qw/SNMP::Info::LLDP SNMP::Info::Entity SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Netgear::ISA       = qw/SNMP::Info::LLDP SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Netgear::EXPORT_OK = qw//;

 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 # This will be filled in with the device's index into the EntPhysicalEntry
 # table by the serial() function.
 our $index = undef;

-%MIBS = ( %SNMP::Info::Layer2::MIBS, %SNMP::Info::Entity::MIBS, %SNMP::Info::LLDP::MIBS, );
+%MIBS = ( %SNMP::Info::Layer2::MIBS, %SNMP::Info::LLDP::MIBS, );

 %GLOBALS = (
-    %SNMP::Info::Layer2::GLOBALS, %SNMP::Info::Entity::GLOBALS, %SNMP::Info::LLDP::GLOBALS,
+    %SNMP::Info::Layer2::GLOBALS, %SNMP::Info::LLDP::GLOBALS,
    ng_fsosver   => '.1.3.6.1.4.1.4526.11.11.1.0',
    ng_gsmserial => '.1.3.6.1.4.1.4526.10.1.1.1.4.0',
    ng_gsmosver  => '.1.3.6.1.4.1.4526.10.1.1.1.13.0',
 );

-%FUNCS = ( %SNMP::Info::Layer2::FUNCS, %SNMP::Info::Entity::FUNCS, %SNMP::Info::LLDP::FUNCS, );
+%FUNCS = ( %SNMP::Info::Layer2::FUNCS, %SNMP::Info::LLDP::FUNCS, );

-%MUNGE = ( %SNMP::Info::Layer2::MUNGE, %SNMP::Info::Entity::MUNGE, %SNMP::Info::LLDP::MUNGE, );
+%MUNGE = ( %SNMP::Info::Layer2::MUNGE, %SNMP::Info::LLDP::MUNGE, );

 sub vendor {
    return 'netgear';
@@ -75,7 +74,7 @@ sub os {
 sub serial {
    my $netgear = shift;
    my $serial = undef;
-    
+
    my $e_serial = $netgear->e_serial();
    if (defined($e_serial)) { # This unit sports the Entity-MIB
        # Find entity table entry for this unit
@@ -90,7 +89,7 @@ sub serial {

    # Without Enitity-MIB, we've got to work our way through a bunch of
    # different locales...
-    return $netgear->ng_gsmserial() if defined $netgear->model and $netgear->model =~ m/GSM\d/i;;
+    return $netgear->ng_gsmserial() if defined $netgear->model and $netgear->model =~ m/[FG]SM\d/i;;
    return 'none';
 }

@@ -109,7 +108,7 @@ sub model {
 }

 # ifDescr is the same for all interfaces in a class, but the ifName is
-# unique, so let's use that for port name.  If all else fails, 
+# unique, so let's use that for port name.  If all else fails,
 # concatentate ifDesc and ifIndex.
 sub interfaces {
    my $netgear = shift;
@@ -140,26 +139,7 @@ sub interfaces {
    return $interfaces;
 }

-
-# 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;
-}
-
-# these seem to work for GSM models but not GS
+# these seem to work for GSM/FSM models but not GS
 # https://sourceforge.net/tracker/?func=detail&aid=3085413&group_id=70362&atid=527529
 sub os_ver {
    my $netgear = shift;
@@ -168,138 +148,10 @@ sub os_ver {
        my $os_ver  = $netgear->e_swver();
        return $os_ver->{$index} if defined $os_ver;
    }
-    return $netgear->ng_gsmosver() if defined  $netgear->model and $netgear->model =~ m/GSM\d/i;
+    return $netgear->ng_gsmosver() if defined  $netgear->model and $netgear->model =~ m/[FG]SM\d/i;
    return $netgear->ng_fsosver() if defined  $netgear->model and $netgear->model =~ m/FS\d/i;
 }

-#  Use LLDP
-
-sub hasCDP {
-    my $netgear = shift;
-    return $netgear->hasLLDP() || $netgear->SUPER::hasCDP();
-}
-
-sub c_ip {
-    my $netgear = shift;
-    my $partial = shift;
-
-    my $cdp  = $netgear->SUPER::c_ip($partial) || {};
-    my $lldp = $netgear->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 $netgear = shift;
-    my $partial  = shift;
-
-    my $lldp = $netgear->lldp_if($partial)     || {};
-    my $cdp  = $netgear->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 $netgear = shift;
-    my $partial  = shift;
-
-    my $lldp = $netgear->lldp_port($partial)     || {};
-    my $cdp  = $netgear->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 $netgear = shift;
-    my $partial  = shift;
-
-    my $lldp = $netgear->lldp_id($partial)     || {};
-    my $cdp  = $netgear->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 $netgear = shift;
-    my $partial  = shift;
-
-    my $lldp = $netgear->lldp_rem_sysdesc($partial)  || {};
-    my $cdp  = $netgear->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__
@@ -310,20 +162,20 @@ SNMP::Info::Layer2::Netgear - SNMP Interface to Netgear switches

 =head1 AUTHOR

- Bill Fenner and Zoltan Erszenyi, 
- Hacked in LLDP support from Baystack.pm by 
+ Bill Fenner and Zoltan Erszenyi,
+ Hacked in LLDP support from Baystack.pm by
 Nic Bernstein <nic@onlight.com>

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $netgear = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $netgear->class();
@@ -331,8 +183,8 @@ SNMP::Info::Layer2::Netgear - SNMP Interface to Netgear switches

 =head1 DESCRIPTION

-Provides abstraction to the configuration information obtainable from a 
-Netgear device through SNMP. See inherited classes' documentation for 
+Provides abstraction to the configuration information obtainable from a
+Netgear device through SNMP. See inherited classes' documentation for
 inherited methods.

 =head2 Inherited Classes
@@ -374,11 +226,11 @@ Returns 'netgear'

 =item $netgear->os()

-Returns 'netgear' 
+Returns 'netgear'

 =item $netgear->model()

-Returns concatenation of $e_model and $e_hwver if Entity MIB present, 
+Returns concatenation of $e_model and $e_hwver if Entity MIB present,
 otherwise returns description()

 =item $netgear->os_ver()
@@ -413,72 +265,12 @@ a reference to a hash.

 =over

-=item $netgear->fw_mac()
-
-Returns reference to hash of forwarding table MAC Addresses.
-
-Some devices don't implement the C<BRIDGE-MIB> forwarding table, so we use
-the C<Q-BRIDGE-MIB> forwarding table.  Fall back to the C<BRIDGE-MIB> if
-C<Q-BRIDGE-MIB> doesn't return anything.
-
-=item $netgear->fw_port()
-
-Returns reference to hash of forwarding table entries port interface
-identifier (iid)
-
-Some devices don't implement the C<BRIDGE-MIB> forwarding table, so we use
-the C<Q-BRIDGE-MIB> forwarding table.  Fall back to the C<BRIDGE-MIB> if
-C<Q-BRIDGE-MIB> doesn't return anything.
-
 =item $netgear->interfaces()

 Uses the i_name() field.

 =back

-=head2 Topology information
-
-Based upon the software version devices may support Link Layer Discovery 
-Protocol (LLDP).
-
-=over
-
-=item $netgear->hasCDP()
-
-Returns true if the device is running LLDP.
-
-=item $netgear->c_if()
-
-Returns reference to hash.  Key: iid Value: local device port (interfaces)
-
-=item $netgear->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-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 $netgear->c_port()
-
-Returns reference to hash. Key: iid Value: remote port (interfaces)
-
-=item $netgear->c_id()
-
-Returns reference to hash. Key: iid Value: string value used to identify the
-chassis component associated with the remote system.
-
-=item $netgear->c_platform()
-
-Returns reference to hash.  Key: iid Value: Remote Device Type
-
-=back
-
 =head2 Table Methods imported from SNMP::Info::Layer2

 See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
--- a/lib/SNMP/Info/Layer2/Nexans.pm
+++ b/lib/SNMP/Info/Layer2/Nexans.pm
@@ -0,0 +1,253 @@
+# SNMP::Info::Layer2::Nexans
+#
+# Copyright (c) 2018 Christoph Neuhaus
+# 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::Nexans;
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer2;
+
+@SNMP::Info::Layer2::Nexans::ISA = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Nexans::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
+
+$VERSION = '3.66';
+
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS,
+    'NEXANS-MIB'    => 'nexansANS',
+    'NEXANS-BM-MIB' => 'infoDescr',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer2::GLOBALS,
+    'mac'   => 'adminAgentPhysAddress.0',
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,
+    'i_duplex'          => 'portLinkState', #NEXANS-BM-MIB
+    'i_duplex_admin'    => 'portSpeedDuplexSetup', #NEXANS-BM-MIB
+    'nexans_i_name'     => 'ifAlias',
+);
+
+%MUNGE = (
+    %SNMP::Info::Layer2::MUNGE,
+    'i_duplex'          => \&munge_i_duplex,
+    'i_duplex_admin'    => \&munge_i_duplex_admin,
+);
+
+sub munge_i_duplex {
+    my $duplex   = shift;
+    return unless defined $duplex;
+    $duplex = 'half' if $duplex =~/Hdx/;
+    $duplex = 'full' if $duplex =~/Fdx/;
+    return $duplex;
+}
+
+sub munge_i_duplex_admin {
+    my $duplex_admin    = shift;
+    return unless defined $duplex_admin;
+    $duplex_admin = 'full' if $duplex_admin =~/Fdx/;
+    $duplex_admin = 'half' if $duplex_admin =~/Hdx/;
+    $duplex_admin = 'auto' if $duplex_admin =~/autoneg/;
+    return $duplex_admin;
+}
+
+sub vendor {
+    return 'nexans';
+}
+
+sub model {
+    my $nexans  = shift;
+    my $id      = $nexans->id() || '';
+    my $model   = &SNMP::translateObj($id);
+    return $id unless defined $model;
+    return $model;
+}
+
+sub os {
+    return 'nexanos';
+}
+
+sub os_ver {
+    my $nexans  = shift;
+    my $ver     = $nexans->infoMgmtFirmwareVersion() || '';
+    return $ver;
+}
+
+sub serial {
+    my $nexans = shift;
+    return $nexans->infoSeriesNo();
+}
+
+sub i_name {
+    my $nexans  = shift;
+    my $return  = $nexans->nexans_i_name();
+    # replace i_name where possible
+    foreach my $iid ( keys %$return ) {
+        next unless $return->{$iid} eq "";
+        $return->{$iid} = $iid;
+    }
+    return \%$return;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Nexans - SNMP Interface to Nexans network devices.
+
+=head1 AUTHOR
+
+Christoph Neuhaus
+
+=head1 SYNOPSIS
+
+# Let SNMP::Info determine the correct subclass for you.
+
+    my $nexans = new SNMP::Info(
+                            AutoSpecify => 1,
+                            Debug       => 1,
+                            DestHost    => 'myswitch',
+                            Community   => 'public',
+                            Version     => 2
+                            )
+    or die "Can't connect to DestHost.\n";
+
+    my $class = $nexans->class();
+    print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Abstraction subclass for Nexans network devices.
+
+tested devices:
+
+    fiberSwitch100BmPlus version 3.61
+    gigaSwitch641DeskSfpTp version 3.68, 4.14W
+    gigaSwitchV3d2SfpSfp version 3.68, 4.02, 4.02B, 4.10C, 4,14W
+
+For speed or debugging purposes you can call the subclass directly, but not
+after determining a more specific class using the method above.
+
+    my $nexans = new SNMP::Info::Layer2::Nexans(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<NEXANS>
+
+=item F<NEXANS-BM>
+
+=item Inherited Classes' MIBs
+
+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 $nexans->vendor()
+
+Returns 'nexans'
+
+=item $nexans->model()
+
+Returns the chassis model.
+
+=item $nexans->os()
+
+Returns 'nexanos'
+
+=item $nexans->os_ver()
+
+Returns the software version.
+
+=item $nexans->serial()
+
+Returns the chassis serial number.
+
+(C<infoSeriesNo>)
+
+=back
+
+=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.
+
+=over
+
+=item $nexans->i_name()
+
+Returns reference to map of IIDs to human-set port name.
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer2
+
+See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=head1 Data Munging Callback Subroutines
+
+=over
+
+=item munge_i_duplex()
+
+Converts duplex returned by C<portLinkState> to either 'full' or 'half'.
+
+=item munge_i_duplex_admin()
+
+Converts duplex returned by C<portSpeedDuplexSetup> to either 'full', 'half',
+or 'auto'.
+
+=back
+
+=cut
--- a/lib/SNMP/Info/Layer2/Orinoco.pm
+++ b/lib/SNMP/Info/Layer2/Orinoco.pm
@@ -41,13 +41,11 @@ use SNMP::Info::Layer2;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
    %SNMP::Info::IEEE802dot11::MIBS,
-
-    #'ORiNOCO-MIB' => 'orinoco',
 );

 %GLOBALS
@@ -56,12 +54,6 @@ $VERSION = '3.10';
 %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, );
@@ -165,22 +157,6 @@ sub interfaces {
    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__

@@ -194,14 +170,14 @@ Eric Miller

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $orinoco = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class = $orinoco->class();
@@ -214,7 +190,7 @@ Orinoco Access Point through SNMP.  Orinoco devices have been manufactured
 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. 
+after determining a more specific class using the method above.

 my $orinoco = new SNMP::Info::Layer2::Orinoco(...);

@@ -293,7 +269,7 @@ to a hash.

 =item $orinoco->interfaces()

-Returns reference to map of IIDs to physical ports. 
+Returns reference to map of IIDs to physical ports.

 =item $orinoco->i_ignore()

--- a/lib/SNMP/Info/Layer2/Sixnet.pm
+++ b/lib/SNMP/Info/Layer2/Sixnet.pm
@@ -0,0 +1,182 @@
+# SNMP::Info::Layer2::Sixnet
+#
+# Copyright (c) 2018 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::Layer2::Sixnet;
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer2;
+
+@SNMP::Info::Layer2::Sixnet::ISA       = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Sixnet::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
+
+$VERSION = '3.66';
+
+%MIBS = (%SNMP::Info::Layer2::MIBS, 'SIXNET-MIB' => 'sxid',);
+
+%GLOBALS = (
+  %SNMP::Info::Layer2::GLOBALS,
+  'os_ver'     => 'firmwareRevision',
+  's_model'    => 'sxid',
+  'ps1_status' => 'p1status',
+  'ps2_status' => 'p2status',
+);
+
+%FUNCS = (%SNMP::Info::Layer2::FUNCS,);
+
+%MUNGE = (%SNMP::Info::Layer2::MUNGE,);
+
+
+sub vendor {
+  return 'sixnet';
+}
+
+sub os {
+  return 'sixnet';
+}
+
+sub model {
+  my $sixnet = shift;
+
+  my $s_model = $sixnet->s_model();
+  return $s_model if defined $s_model;
+
+  my $id = $sixnet->id();
+  return unless defined $id;
+
+  my $model = SNMP::translateObj($id);
+  return $model ? $model : $id;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Sixnet - SNMP Interface to Sixnet industrial switches
+
+=head1 AUTHOR
+
+Eric Miller
+
+=head1 SYNOPSIS
+
+    my $sixnet = new SNMP::Info(
+              AutoSpecify => 1,
+              Debug       => 1,
+              DestHost    => 'myswitch',
+              Community   => 'public',
+              Version     => 2
+            )
+
+    or die "Can't connect to DestHost.\n";
+
+    my $class = $sixnet->class();
+    print " Using device sub class : $class\n";
+
+=head1 DESCRIPTION
+
+SNMP::Info::Layer2::Sixnet is a subclass of SNMP::Info that provides an
+interface to Sixnet industrial 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 $sixnet = new SNMP::Info::Layer2::Sixnet(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<SIXNET-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 $sixnet->vendor()
+
+Returns 'sixnet'
+
+=item $sixnet->os()
+
+Returns 'sixnet'
+
+=item $sixnet->os_ver()
+
+Returns the software version returned by C<firmwareRevision>
+
+=item $sixnet->model()
+
+Returns model type. Returns C<sxid> if it exists, otherwise cross references
+$sixnet->id() with the F<SIXNET-MIB>.
+
+=item $sixnet->ps1_status()
+
+(C<p1status>)
+
+=item $sixnet->ps2_status()
+
+(C<p2status>)
+
+=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 Table Methods imported from SNMP::Info::Layer2
+
+See L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
+
+=cut
--- a/lib/SNMP/Info/Layer2/Trapeze.pm
+++ b/lib/SNMP/Info/Layer2/Trapeze.pm
@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::MIBS,
@@ -51,6 +51,7 @@ $VERSION = '3.10';
    'TRAPEZE-NETWORKS-CLIENT-SESSION-MIB'       => 'trpzClSessTotalSessions',
    'TRAPEZE-NETWORKS-SYSTEM-MIB'               => 'trpzSysCpuAverageLoad',
    'TRAPEZE-NETWORKS-BASIC-MIB'                => 'trpzVersionString',
+    'TRAPEZE-NETWORKS-AP-CONFIG-MIB'  => 'trpzApConfServProfBeaconEnabled',
 );

 %GLOBALS = (
@@ -162,7 +163,7 @@ sub model {
    return $id unless defined $model;

    $model =~ s/^wirelessLANController//i;
-    return $model;    
+    return $model;
 }

 sub _ap_serial {
@@ -392,7 +393,7 @@ sub bp_index {
 sub fw_mac {
    my $trapeze = shift;
    my $partial  = shift;
-    
+
    my $serials = $trapeze->trapeze_sta_serial($partial) || {};

    my %fw_mac;
@@ -404,7 +405,7 @@ sub fw_mac {
 	
        $fw_mac{$iid} = $mac;
    }
-    return \%fw_mac;    
+    return \%fw_mac;
 }

 sub fw_port {
@@ -497,7 +498,7 @@ sub dot11_cur_tx_pwr_mw {
    my $partial  = shift;

    my $cur = $trapeze->trapeze_apif_power($partial);
-    
+
    my $dot11_cur_tx_pwr_mw = {};
    foreach my $idx ( keys %$cur ) {
        my $pwr_dbm = $cur->{$idx};
@@ -505,7 +506,7 @@ sub dot11_cur_tx_pwr_mw {
 	#Convert to milliWatts = 10(dBm/10)
        my $pwr = int (10 ** ($pwr_dbm / 10));
 	
-        $dot11_cur_tx_pwr_mw->{$idx} = $pwr; 
+        $dot11_cur_tx_pwr_mw->{$idx} = $pwr;
    }
    return $dot11_cur_tx_pwr_mw;
 }
@@ -517,7 +518,7 @@ sub e_index {

    # Try new first, fall back to depreciated
    my $ap_num = $trapeze->trapeze_ap_num() || $trapeze->trapeze_ap_dapnum() || {};
-  
+
    my %e_index;

    # Chassis
@@ -800,7 +801,7 @@ Eric Miller
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )

    or die "Can't connect to DestHost.\n";

@@ -809,7 +810,7 @@ Eric Miller

 =head1 DESCRIPTION

-Provides abstraction to the configuration information obtainable from 
+Provides abstraction to the configuration information obtainable from
 Juniper (Trapeze) Wireless Controllers through SNMP.

 This class emulates bridge functionality for the wireless switch. This enables
@@ -817,7 +818,7 @@ 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. 
+after determining a more specific class using the method above.

 my $trapeze = new SNMP::Info::Layer2::Trapeze(...);

@@ -911,7 +912,7 @@ See documentation in L<SNMP::Info::Bridge/"GLOBALS"> for details.
 These are methods that return tables of information in the form of a reference
 to a hash.

-=over 
+=over

 =item $trapeze->i_ssidlist()

@@ -1142,7 +1143,7 @@ These emulate the F<CISCO-DOT11-MIB>

 (C<trpzClSessClientSessStatsUniPktOut>)

-=back 
+=back

 =head2 Table Methods imported from SNMP::Info

@@ -1158,14 +1159,14 @@ See documentation in L<SNMP::Info::Bridge/"TABLE METHODS"> for details.

 =item $trapeze->i_index()

-Returns reference to map of IIDs to Interface index. 
+Returns reference to map of IIDs to Interface index.

 Extends C<ifIndex> to support thin APs and WLAN virtual interfaces as device
 interfaces.

 =item $trapeze->interfaces()

-Returns reference to map of IIDs to ports.  Thin APs are implemented as device 
+Returns reference to map of IIDs to ports.  Thin APs are implemented as device
 interfaces.  The thin AP MAC address and Slot ID trapeze_apif_slot() are
 used as the port identifier.

@@ -1210,7 +1211,7 @@ the interface iid.
 =item $trapeze->fw_port()

 Returns reference to a hash, value being mac and
-trapeze_sta_slot() combined to match the interface iid.  
+trapeze_sta_slot() combined to match the interface iid.

 =item $trapeze->fw_mac()

--- a/lib/SNMP/Info/Layer2/Ubiquiti.pm
+++ b/lib/SNMP/Info/Layer2/Ubiquiti.pm
@@ -0,0 +1,399 @@
+# SNMP::Info::Layer2::Ubiquiti - SNMP Interface to Ubiquiti Devices
+#
+# Copyright (c) 2019 by The Netdisco Developer Team.
+#
+# 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::Ubiquiti;
+
+use strict;
+use Exporter;
+use SNMP::Info::IEEE802dot11;
+use SNMP::Info::Layer2;
+use SNMP::Info::Layer3;  # only used in sub mac()
+
+
+
+@SNMP::Info::Layer2::Ubiquiti::ISA
+    = qw/SNMP::Info::IEEE802dot11 SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Ubiquiti::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+
+$VERSION = '3.66';
+
+%MIBS = (
+    %SNMP::Info::Layer2::MIBS,
+    %SNMP::Info::IEEE802dot11::MIBS,
+
+);
+
+%GLOBALS
+    = ( %SNMP::Info::Layer2::GLOBALS, %SNMP::Info::IEEE802dot11::GLOBALS, );
+
+%FUNCS = (
+    %SNMP::Info::Layer2::FUNCS,
+    %SNMP::Info::IEEE802dot11::FUNCS,
+
+);
+
+%MUNGE = ( %SNMP::Info::Layer2::MUNGE, %SNMP::Info::IEEE802dot11::MUNGE, );
+
+sub os {
+    my $ubnt = shift;
+
+    my $names = $ubnt->dot11_prod_name();
+
+    foreach my $iid ( keys %$names ) {
+        my $prod = $names->{$iid};
+        next unless defined $prod;
+        # Product names that match AirOS products
+                if((lc $prod) =~ /station/ or (lc $prod) =~ /beam/ or (lc $prod) =~ /grid/){
+                        return 'AirOS';
+                # Product names that match UAP
+                }elsif((lc $prod) =~ /uap/){
+                        return 'UniFi';
+                }else{
+                    # Continue below to find OS name
+                }
+    }
+
+    ## EdgeMAX OS (EdgeSwitch and EdgeRouter) name is first field split by space
+    my $ver = $ubnt->description() || '';
+
+    my @myver = split(/ /, $ver);
+
+    return $myver[0];
+}
+
+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;
+        return $ver;
+        ## Not sure what this function does, it seems to be extraneous being in the same code block after a return statement?
+        if ( $ver =~ /([\d\.]+)/ ) {
+            return $1;
+        }
+    }
+    my $ver = $dot11->description() || '';
+    if($ver =~ /^edgeswitch/){
+        ## EdgeSwitch OS version is second field split by comma
+        my @myver = split(/, /, $ver);
+
+        return $myver[1];
+    }
+
+    ## EdgeRouter OS version is second field split by space
+    my @myver = split(/ /, $ver);
+
+    return $myver[1];
+}
+
+sub vendor {
+    return 'Ubiquiti Networks, Inc.';
+}
+
+sub model {
+    my $ubnt = shift;
+
+    my $names = $ubnt->dot11_prod_name();
+
+    foreach my $iid ( keys %$names ) {
+        my $prod = $names->{$iid};
+        next unless defined $prod;
+        return $prod;
+    }
+
+    my $desc = $ubnt->description() || '';
+
+    ## Pull Model from beginning of description, separated by comma (EdgeSwitch)
+    if((lc $desc) =~ /^edgeswitch/){
+        my @mydesc = split(/, /, $desc);
+        return $mydesc[0];
+    }
+
+    if(!((lc $desc) =~ /edgeos/)){
+        # Not sure what type of device this is to get Model
+        # Wireless devices report dot11_prod_name
+        # EdgeSwitch includes mode directly and edgeos logic is in else statement
+        return ;
+    }else{
+        ## do some logic to determine ER model based on tech specs from ubnt:
+        ## https://help.ubnt.com/hc/en-us/articles/219652227--EdgeRouter-Which-EdgeRouter-Should-I-Use-#tech%20specs
+        ## Would be nice if UBNT simply adds the model string to their SNMP daemon directly
+        my $ethCount = 0;
+        my $switchCount = 0;
+        #my $sfpCount = 0;
+        #my $poeCount = 0;
+        my $memTotalReal = $ubnt->memTotalReal;
+        my $cpuLoad = $ubnt->hrProcessorLoad;
+        my $cpuCount = 0;
+        ## My perl is lacking. Not sure if there's a more efficient way to find the cpu count
+        foreach my $iid ( keys %$cpuLoad ) {
+            $cpuCount++;
+        }
+
+        my $ifDescs = $ubnt->ifDescr;
+        foreach my $iid ( keys %$ifDescs ) {
+            my $ifDesc = $ifDescs->{$iid};
+            next unless defined $ifDesc;
+
+            if((lc $ifDesc) =~ /^eth\d+$/){ # exclude vlan interfaces. Ex: eth1.5
+                $ethCount++;
+            }elsif((lc $ifDesc) =~ /^switch/){
+                $switchCount++;
+            }
+        }
+
+        ## If people have other models to further fine-tune this logic that would be great.
+        if($ethCount eq 9){
+            ## Should be ER Infinity
+            return "EdgeRouter Infinity"
+        }if($ethCount eq 8){
+            ## Could be ER-8 Pro, ER-8, or EP-R8
+            return "EdgeRouter 8-Port"
+        }elsif($ethCount eq 5 and $cpuCount eq 4){
+            ## Could be ER-X or ER-X-SFP
+            return "EdgeRouter X 5-Port"
+        }elsif($ethCount eq 5){
+            return "EdgeRouter PoE 5-Port"
+        }elsif($ethCount eq 3 and $cpuCount eq 2){
+            return "EdgeRouter LITE 3-Port"
+        }else{
+            ## failback string
+            return "EdgeRouter eth-$ethCount switch-$switchCount mem-$memTotalReal cpuNum-$cpuCount";
+        }
+
+    }
+}
+
+## simply take the MAC and clean it up
+sub serial {
+    my $ubnt = shift;
+
+    my $serial = $ubnt->mac();
+    if($serial){
+        $serial =~ s/://g;
+        return uc $serial;
+    }
+    return ;
+}
+
+## UBNT doesn't put the primary-mac interface at index 1
+sub mac {
+    my $ubnt = shift;
+    my $ifDescs = $ubnt->ifDescr;
+
+    foreach my $iid ( keys %$ifDescs ) {
+        my $ifDesc = $ifDescs->{$iid};
+        next unless defined $ifDesc;
+        ## CPU Interface will have the primary MAC for EdgeSwitch
+        ## eth0 will have primary MAC for linux-based UBNT devices
+        if($ifDesc =~ /CPU/ or $ifDesc eq 'eth0'){
+            my $mac = $ubnt->ifPhysAddress->{$iid};
+
+            # syntax stolen from sub munge_mac in SNMP::Info
+            $mac = lc join( ':', map { sprintf "%02x", $_ } unpack( 'C*', $mac ) );
+            return $mac if $mac =~ /^([0-9A-F][0-9A-F]:){5}[0-9A-F][0-9A-F]$/i;
+        }
+    }
+
+    # MAC malformed or missing
+    return;
+}
+
+sub interfaces {
+    my $netgear = shift;
+    my $partial = shift;
+
+    my $interfaces = $netgear->i_index($partial)       || {};
+    my $i_descr    = $netgear->i_description($partial) || {};
+    my $return = {};
+
+    foreach my $iid ( keys %$i_descr ) {
+        # Slot: 0 Port: 4 Gigabit - Level
+        if ($i_descr->{$iid} =~ m/([0-9]+)[^0-9]+([0-9]+)/) {
+            $return->{$iid} = $1 .'/'. $2;
+            next;
+        }
+        # Link Aggregate 4
+        if ($i_descr->{$iid} =~ m/Link Aggregate (\d+)/) {
+            $return->{$iid} = '3/'. $1;
+            next;
+        }
+        # else
+        $return->{$iid} = $i_descr->{$iid};
+    }
+
+    return $return;
+}
+
+sub i_ignore {
+    my $l2      = shift;
+    my $partial = shift;
+
+    my $interfaces = $l2->interfaces($partial) || {};
+    my $i_descr    = $l2->i_description($partial) || {};
+
+    my %i_ignore;
+    foreach my $if ( keys %$interfaces ) {
+
+        # CPU Interface
+        if ( $i_descr->{$if} =~ /CPU Interface/i ) {
+            $i_ignore{$if}++;
+        }
+    }
+    return \%i_ignore;
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Ubiquiti - SNMP Interface to Ubiquiti Access Points
+
+=head1 AUTHOR
+
+Max Kosmach
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you.
+ my $ubnt = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myswitch',
+                          Community   => 'public',
+                          Version     => 2
+                        )
+    or die "Can't connect to DestHost.\n";
+
+ my $class = $ubnt->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Provides abstraction to the configuration information obtainable from
+Ubiquiti Access Point 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 $ubnt = new SNMP::Info::Layer2::Ubiquiti(...);
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer2
+
+=item SNMP::Info::IEEE802dot11
+
+=back
+
+=head2 Required MIBs
+
+None.
+
+=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 $ubnt->vendor()
+
+Returns 'Ubiquiti Networks, Inc.'
+
+=item $ubnt->model()
+
+Returns the model extracted from C<dot11manufacturerProductName>, with failback to some complex logic for EdgeMax devices
+
+=item $ubnt->serial()
+
+Serial Number.
+
+=item $ubnt->mac()
+
+Bridge MAC address.
+
+=item $ubnt->os()
+
+Returns 'Ubiquiti Networks, Inc.'
+
+=item $ubnt->os_ver()
+
+Returns the software version extracted from C<dot11manufacturerProductVersion>, with failback to description splitting for EdgeMax devices
+
+=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 $ubiquiti->interfaces()
+
+Uses the i_name() field.
+
+=item $ubiquiti->i_ignore()
+
+Ignores interfaces with "CPU Interface" in them.
+
+=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
--- a/lib/SNMP/Info/Layer2/ZyXEL_DSLAM.pm
+++ b/lib/SNMP/Info/Layer2/ZyXEL_DSLAM.pm
@@ -39,14 +39,14 @@ use SNMP::Info::Layer2;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );

 %FUNCS = (
    %SNMP::Info::Layer2::FUNCS,
-    'ip_adresses'   => 'ipAdEntAddr',
+    'ip_addresses'  => 'ipAdEntAddr',
    'i_name'        => 'ifDescr',
    'i_description' => 'adslLineConfProfile',
 );
@@ -58,7 +58,7 @@ $VERSION = '3.10';

 sub layers {
    my $zyxel  = shift;
-    my $layers = $zyxel->layers();
+    my $layers = $zyxel->SUPER::layers();
    return $layers if defined $layers;

    # If these don't claim to have any layers, so we'll give them 1+2
@@ -102,7 +102,9 @@ sub ip {
    my $ip_hash = $zyxel->ip_addresses();
    my $found_ip;

-    foreach my $ip ( keys %{$ip_hash} ) {
+    # Since hashes are random add sort so we get the same address each time
+    # if there happens to be more than one. Will return highest numbered address
+    foreach my $ip ( sort keys %{$ip_hash} ) {
        $found_ip = $ip
            if ( defined $ip
            and $ip =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/ );
@@ -122,14 +124,14 @@ Dmitry Sergienko (C<dmitry@trifle.net>)

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $zyxel = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myhub',
                          Community   => 'public',
                          Version     => 1
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $l2->class();
@@ -137,8 +139,8 @@ Dmitry Sergienko (C<dmitry@trifle.net>)

 =head1 DESCRIPTION

-Provides abstraction to the configuration information obtainable from a 
-ZyXEL device through SNMP. See inherited classes' documentation for 
+Provides abstraction to the configuration information obtainable from a
+ZyXEL device through SNMP. See inherited classes' documentation for
 inherited methods.

 =head2 Inherited Classes
@@ -176,7 +178,7 @@ Returns 'ZyXEL' :)

 =item $zyxel->os()

-Returns 'ZyXEL' 
+Returns 'ZyXEL'

 =item $zyxel->os_ver()

--- a/lib/SNMP/Info/Layer3.pm
+++ b/lib/SNMP/Info/Layer3.pm
@@ -41,17 +41,19 @@ use SNMP::Info::Entity;
 use SNMP::Info::PowerEthernet;
 use SNMP::Info::IPv6;
 use SNMP::Info::AdslLine;
+use SNMP::Info::LLDP;

@SNMP::Info::Layer3::ISA = qw/
    SNMP::Info::PowerEthernet SNMP::Info::IPv6
    SNMP::Info::Entity SNMP::Info::EtherLike
    SNMP::Info::Bridge SNMP::Info::AdslLine
+    SNMP::Info::LLDP
    SNMP::Info Exporter/;
@SNMP::Info::Layer3::EXPORT_OK = qw//;

 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::MIBS,
@@ -61,8 +63,10 @@ $VERSION = '3.10';
    %SNMP::Info::Entity::MIBS,
    %SNMP::Info::PowerEthernet::MIBS,
    %SNMP::Info::IPv6::MIBS,
+    %SNMP::Info::LLDP::MIBS,
    'IP-MIB'   => 'ipNetToMediaIfIndex',
    'OSPF-MIB' => 'ospfRouterId',
+    'ISIS-MIB' => 'isisSysID',
    'BGP4-MIB' => 'bgpIdentifier',
 );

@@ -76,6 +80,7 @@ $VERSION = '3.10';
    %SNMP::Info::Entity::GLOBALS,
    %SNMP::Info::PowerEthernet::GLOBALS,
    %SNMP::Info::IPv6::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
    'mac' => 'ifPhysAddress.1',
    'serial1' =>
        '.1.3.6.1.4.1.9.3.6.3.0',    # OLD-CISCO-CHASSIS-MIB::chassisId.0
@@ -92,6 +97,7 @@ $VERSION = '3.10';
    %SNMP::Info::Entity::FUNCS,
    %SNMP::Info::PowerEthernet::FUNCS,
    %SNMP::Info::IPv6::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,

    # Obsolete Address Translation Table (ARP Cache)
    'old_at_index'   => 'atIfIndex',
@@ -118,6 +124,20 @@ $VERSION = '3.10';
    'ospf_peer_id'    => 'ospfNbrRtrId',
    'ospf_peer_state' => 'ospfNbrState',

+    # ISIS-MIB::isisCircTable
+    'isis_circ_if_idx'      => 'isisCircIfIndex' ,
+    'isis_circ_admin'       => 'isisCircAdminState',
+    'isis_circ_type'        => 'isisCircType',
+    'isis_circ_level_type'  => 'isisCircLevelType',
+
+    # ISIS-MIB::isisISAdjTable
+    'isis_adj_state'   => 'isisISAdjState',
+    'isis_adj_type'    => 'isisISAdjNeighSysType',
+    'isis_adj_usage'   => 'isisISAdjUsage',
+    'isis_adj_id'      => 'isisISAdjNeighSysID',
+    'isis_adj_ip_type' => 'isisISAdjIPAddrType',
+    'isis_adj'         => 'isisISAdjIPAddrAddress',
+
    # BGP4-MIB::bgpPeerTable
    'bgp_peers'               => 'bgpPeerLocalAddr',
    'bgp_peer_id'             => 'bgpPeerIdentifier',
@@ -150,11 +170,38 @@ $VERSION = '3.10';
    %SNMP::Info::Entity::MUNGE,
    %SNMP::Info::PowerEthernet::MUNGE,
    %SNMP::Info::IPv6::MUNGE,
+    %SNMP::Info::LLDP::MUNGE,
    'old_at_paddr' => \&SNMP::Info::munge_mac,
    'at_paddr'     => \&SNMP::Info::munge_mac,
    'n2p_paddr'    => \&SNMP::Info::munge_mac,
 );

+sub isis_peers {
+    my $l3 = shift;
+
+    my $isis_peers = {};
+
+    # Returns hexstrings. Need to convert to IPv4 dotted or IPv6 hex notation
+    my $adjacencies = $l3->isis_adj();
+    foreach my $key (keys %$adjacencies) {
+        my $hexstr = $adjacencies->{$key};
+        my $l = length $hexstr;
+        my $ip;
+        # 4 bytes = IPv4
+        if ($l == 4) {
+            $ip = join(".", unpack("C*", $hexstr));
+            $isis_peers->{$key} = $ip;
+        }
+        # 16 bytes = IPv6
+        elsif ($l == 16) {
+            $ip = unpack("H*", $hexstr);
+            $ip =~ s/....(?=.)\K/:/sg ;
+            $isis_peers->{$key} = $ip;
+        }
+    }
+    return $isis_peers;
+}
+
 # Method OverRides

 sub root_ip {
@@ -185,49 +232,21 @@ sub root_ip {
    return;
 }

-sub i_ignore {
-    my $l3      = shift;
-    my $partial = shift;
-
-    my $interfaces = $l3->interfaces($partial) || {};
-
-    my %i_ignore;
-    foreach my $if ( keys %$interfaces ) {
-
-        # lo -> cisco aironet 350 loopback
-        if ( $interfaces->{$if} =~ /(tunnel|loopback|\blo\b|null)/i ) {
-            $i_ignore{$if}++;
-        }
-    }
-    return \%i_ignore;
-}
-
 sub serial {
    my $l3 = shift;

-    my $serial1 = $l3->serial1();
-    my $e_parent = $l3->e_parent() || {};
-
-    foreach my $iid ( keys %$e_parent ) {
-        my $parent = $e_parent->{$iid};
-        if ( $parent eq '0' ) {
-            my $serial = $l3->e_serial($iid);
-            if ( $serial ) {
-                return $serial->{$iid};
-            }
-            else {
-                my $descr = $l3->e_descr($iid);
-                if ( $descr and $descr =~ /serial#?:\s*([a-z0-9]+)/i )
-                {
-                    return $1;
-                }
-            }
-        }
+    my $entity_serial = $l3->entity_derived_serial();
+    if ( defined $entity_serial and $entity_serial !~ /^\s*$/ ){
+        return $entity_serial;
    }

-    return $serial1 if ( defined $serial1 and $serial1 !~ /^\s*$/ );
+    my $serial1 = $l3->serial1();
+    if ( defined $serial1 and $serial1 !~ /^\s*$/ ) {
+        return $serial1;
+    }

    return;
+
 }

 # $l3->model() - the sysObjectID returns an IID to an entry in
@@ -373,14 +392,14 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $l3 = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class = $l3->class();
@@ -403,11 +422,11 @@ 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. 
+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. 
+after determining a more specific class using the method above.

 my $l3 = new SNMP::Info::Layer3(...);

@@ -427,6 +446,8 @@ after determining a more specific class using the method above.

 =item SNMP::Info::IPv6

+=item SNMP::Info::LLDP
+
 =back

 =head2 Required MIBs
@@ -435,6 +456,8 @@ after determining a more specific class using the method above.

 =item F<IP-MIB>

+=item F<ISIS-MIB>
+
 =item F<OSPF-MIB>

 =item F<BGP4-MIB>
@@ -455,6 +478,8 @@ See L<SNMP::Info::PowerEthernet/"Required MIBs"> for its MIB requirements.

 See L<SNMP::Info::IPv6/"Required MIBs"> for its MIB requirements.

+See L<SNMP::Info::LLDP/"Required MIBs"> for its MIB requirements.
+
 =head1 GLOBALS

 These are methods that return scalar value from SNMP
@@ -479,7 +504,7 @@ Returns the BGP identifier of the local system

 =item $l3->bgp_local_as()

-Returns the local autonomous system number 
+Returns the local autonomous system number

 (C<bgpLocalAs.0>)

@@ -497,8 +522,7 @@ Removes 'cisco'  from cisco devices for readability.

 =item $l3->serial()

-Tries to cull a serial number from F<ENTITY-MIB>, description, and
-F<OLD-CISCO->... MIB.
+Returns a serial number if found from F<ENTITY-MIB> and F<OLD-CISCO->... MIB.

 =item $l3->vendor()

@@ -528,6 +552,18 @@ See L<SNMP::Info::EtherLike/"GLOBALS"> for details.

 See L<SNMP::Info::Entity/"GLOBALS"> for details.

+=head2 Global Methods imported from SNMP::Info:PowerEthernet
+
+See L<SNMP::Info::PowerEthernet/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::IPv6
+
+See L<SNMP::Info::IPv6/"GLOBALS"> for details.
+
+=head2 Global Methods imported from SNMP::Info::LLDP
+
+See L<SNMP::Info::LLDP/"GLOBALS"> for details.
+
 =head1 TABLE METHODS

 These are methods that return tables of information in the form of a reference
@@ -540,19 +576,13 @@ to a hash.
 =item $l3->interfaces()

 Returns the map between SNMP Interface Identifier (iid) and physical port
-name. 
+name.

 Only returns those iids that have a description listed in $l3->i_description()

-=item $l3->i_ignore()
-
-Returns reference to hash.  Creates a key for each IID that should be ignored.
-
-Currently looks for tunnel,loopback,lo,null from $l3->interfaces()
-
 =item $l3->i_name()

-Returns reference to hash of iid to human set name. 
+Returns reference to hash of iid to human set name.

 Defaults to C<ifName>, but checks for an C<ifAlias>

@@ -560,8 +590,8 @@ Defaults to C<ifName>, but checks for an C<ifAlias>

 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. 
+Maps $l3->el_index() to $l3->el_duplex, then culls out
+full,half, or auto and sets the map to that value.

 See L<SNMP::Info::Etherlike> for the el_index() and el_duplex() methods.

@@ -573,7 +603,7 @@ See L<SNMP::Info::Etherlike> for the el_index() and el_duplex() methods.

 =item $l3->at_index()

-Returns reference to hash.  Maps ARP table entries to Interface IIDs 
+Returns reference to hash.  Maps ARP table entries to Interface IIDs

 (C<ipNetToMediaIfIndex>)

@@ -582,7 +612,7 @@ the deprecated C<atIfIndex>.

 =item $l3->at_paddr()

-Returns reference to hash.  Maps ARP table entries to MAC addresses. 
+Returns reference to hash.  Maps ARP table entries to MAC addresses.

 (C<ipNetToMediaPhysAddress>)

@@ -591,7 +621,7 @@ the deprecated C<atPhysAddress>.

 =item $l3->at_netaddr()

-Returns reference to hash.  Maps ARP table entries to IP addresses. 
+Returns reference to hash.  Maps ARP table entries to IP addresses.

 (C<ipNetToMediaNetAddress>)

@@ -779,6 +809,82 @@ routers

 =back

+=head2 IS-IS Circuit Table
+
+=over
+
+=item $l3->isis_circ_if_idx()
+
+Returns reference to hash of the interface index associated with the IS-IS
+circuit
+(C<isisCircIfIndex>)
+
+=item $l3->isis_circ_admin()
+
+Returns reference to hash of the IS-IS circuit's admin status
+
+(C<isisCircAdminState>)
+
+=item $l3->isis_circ_type()
+
+Returns reference to hash of the IS-IS circuit's type
+
+(C<isisCircType>)
+
+=item $l3->isis_circ_level_type()
+
+Returns reference to hash of the IS-IS circuit's level
+
+(C<isisCircLevelType>)
+
+=back
+
+=head2 IS-IS Adjacency Table
+
+=over
+
+=item $l3->isis_adj_id()
+
+Returns reference to hash of the peer id of adjacencies.
+
+(C<isisISAdjNeighSysID>)
+
+=item $l3->isis_adj_type()
+
+Returns reference to hash of the type of adjacencies (Level 1
+Intermediate System, Level 2 Intermediate System, Level 1+2
+Intermediate System, unknown)
+
+(C<isisISAdjNeighSysType>)
+
+=item $l3->isis_adj_usage()
+
+Returns reference to hash of the type of adjacencies in use
+(undefined, Level 1, Level 2, Level1+2)
+
+(C<isisISAdjNeighUsage>)
+
+=item $l3->isis_adj_ip_type()
+
+Returns reference to hash of type of address (IPv4, IPv6, etc) on adjacencies.
+
+(C<isisISAdjIPAddrType>)
+
+=item $l3->isis_adj()
+
+Returns reference to hash of addresses (IPv4, IPv6, etc) on adjacencies.
+Note this returns hash-strings, for IPs, use $l3->isis_peers()
+
+(C<isisISAdjIPAddrAddress>)
+
+=item $l3->isis_peers()
+
+Returns reference to hash of addresses (IPv4, IPv6) on adjacencies.
+Convers hash strings from isis_adj to proper
+IP (v4 and v6) formatting.
+
+=back
+
 =head2 Table Methods imported from SNMP::Info

 See L<SNMP::Info/"TABLE METHODS"> for details.
@@ -803,4 +909,8 @@ See L<SNMP::Info::PowerEthernet/"TABLE METHODS"> for details.

 See L<SNMP::Info::IPv6/"TABLE METHODS"> for details.

+=head2 Table Methods imported from SNMP::Info::LLDP
+
+See L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
+
 =cut
--- a/lib/SNMP/Info/Layer3/Aironet.pm
+++ b/lib/SNMP/Info/Layer3/Aironet.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer3;

 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
@@ -69,8 +69,8 @@ $VERSION = '3.10';
    'bp_index2' => 'dot1dBasePortIfIndex',

    # AWC Interface Table (awcIfTable)
-    'awc_default_mac' => 'awcIfDefaultPhyAddress',
-    'awc_mac'         => 'awcIfPhyAddress',
+    'awc_default_mac' => 'awcIfDefaultPhysAddress',
+    'awc_mac'         => 'awcIfPhysAddress',
    'awc_ip'          => 'awcIfIpAddress',
    'awc_netmask'     => 'awcIfIpNetMask',
    'awc_msdu'        => 'awcIfMSDUMaxLength',
@@ -224,14 +224,14 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $aironet = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $aironet->class();
@@ -257,7 +257,7 @@ This class is for devices running Cisco IOS software (newer)
 =back

 For speed or debugging purposes you can call the subclass directly, but not
-after determining a more specific class using the method above. 
+after determining a more specific class using the method above.

 my $aironet = new SNMP::Info::Layer3::Aironet(...);

@@ -280,7 +280,7 @@ after determining a more specific class using the method above.
 =back

 These MIBs are now included in the v2.tar.gz archive available from
-ftp.cisco.com.  Make sure you have a current version. 
+ftp.cisco.com.  Make sure you have a current version.

 =head1 GLOBALS

@@ -296,7 +296,7 @@ C<awcEtherDuplex.0>

 =item $aironet->mac()

-Gives the MAC Address of the wireless side 
+Gives the MAC Address of the wireless side

 C<dot11StationID.2>

@@ -364,13 +364,13 @@ Ignores ports that are of type ``rptr'' and ``lo''.

 Gives the default MAC address of each interface.

-C<awcIfDefaultPhyAddress>
+C<awcIfDefaultPhysAddress>

 =item $aironet->awc_mac()

 Gives the actual MAC address of each interface.

-C<awcIfPhyAddress>
+C<awcIfPhysAddress>

 =item $aironet->awc_ip()

--- a/lib/SNMP/Info/Layer3/AlcatelLucent.pm
+++ b/lib/SNMP/Info/Layer3/AlcatelLucent.pm
@@ -49,7 +49,7 @@ use SNMP::Info::LLDP;

 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
@@ -112,15 +112,13 @@ sub vendor {
 }

 sub os_ver {
-    my $alu = shift;
+   my $alu = shift;

-    my $descr = $alu->description();
-    if ( $descr =~ m/^(\S+)/ ) {
-        return $1;
-    }
+   my $descr = $alu->description();
+   return $1 if $descr =~ m/\b(\d[\.\d]+R\d+) (?:GA|Service Release), /;

-    # No clue what this will try but hey
-    return $alu->SUPER::os_ver();
+   # No clue what this will try but hey
+   return $alu->SUPER::os_ver();
 }

 # ps1_type, ps1_status, ps2_type, ps2_status:
@@ -198,21 +196,6 @@ sub interfaces {
    return $alu->orig_i_name($partial);
 }

-# Use Q-BRIDGE-MIB
-sub fw_mac {
-    my $alu     = shift;
-    my $partial = shift;
-
-    return $alu->qb_fw_mac($partial);
-}
-
-sub fw_port {
-    my $alu     = shift;
-    my $partial = shift;
-
-    return $alu->qb_fw_port($partial);
-}
-
 # Work around buggy bp_index in 6.3.1.871.R01 and 6.3.1.975.R01
 sub bp_index {
    my $alu     = shift;
@@ -323,7 +306,7 @@ Bill Fenner

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $alu = new SNMP::Info(
                        AutoSpecify => 1,
                        Debug       => 1,
@@ -331,7 +314,7 @@ Bill Fenner
                        DestHost    => 'myswitch',
                        Community   => 'public',
                        Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $alu->class();
@@ -445,14 +428,6 @@ to a hash.
 Returns interface name from C<ifName>, since the default return value
 of C<ifDescr> includes the OS version.

-=item $alu->fw_mac()
-
-Use the F<Q-BRIDGE-MIB> instead of F<BRIDGE-MIB>
-
-=item $alu->fw_port()
-
-Use the F<Q-BRIDGE-MIB> instead of F<BRIDGE-MIB>
-
 =item $alu->bp_index()

 Work around various bugs in the F<BRIDGE-MIB> and
--- a/lib/SNMP/Info/Layer3/AlteonAD.pm
+++ b/lib/SNMP/Info/Layer3/AlteonAD.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;

 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
@@ -163,14 +163,14 @@ sub ps1_status {
    my $alteon = shift;
    my $old_ps = $alteon->old_ps1_stat();
    my $new_ps = $alteon->new_ps_stat();
-    
+
    return $old_ps if $old_ps;
-    
+
    if ($new_ps) {
        return 'ok' if ($new_ps eq 'singlePowerSupplyOk');
        return 'failed' if ($new_ps eq 'firstPowerSupplyFailed');
    }
-    
+
    return;
 }

@@ -178,9 +178,9 @@ sub ps2_status {
    my $alteon = shift;
    my $old_ps = $alteon->old_ps2_stat();
    my $new_ps = $alteon->new_ps_stat();
-    
+
    return $old_ps if $old_ps;
-    
+
    if ($new_ps) {
        return 'ok' if ($new_ps eq 'doublePowerSupplyOk');
        return 'failed' if ($new_ps eq 'secondPowerSupplyFailed');
@@ -242,19 +242,19 @@ sub i_duplex {
 sub i_duplex_admin {
    my $alteon = shift;

-    my $ag_pref 
+    my $ag_pref
        = $alteon->new_ag_p_cfg_pref()
        || $alteon->old_ag_p_cfg_pref()
        || {};
-    my $ag_fe_auto 
+    my $ag_fe_auto
        = $alteon->new_ag_p_cfg_fe_auto()
        || $alteon->old_ag_p_cfg_fe_auto()
        || {};
-    my $ag_fe_mode 
+    my $ag_fe_mode
        = $alteon->new_ag_p_cfg_fe_mode()
        || $alteon->old_ag_p_cfg_fe_mode()
        || {};
-    my $ag_ge_auto 
+    my $ag_ge_auto
        = $alteon->new_ag_p_cfg_ge_auto()
        || $alteon->old_ag_p_cfg_ge_auto()
        || {};
@@ -385,6 +385,20 @@ sub i_vlan_membership {
    return $i_vlan_membership;
 }

+sub i_vlan_membership_untagged {
+    my $alteon  = shift;
+    my $partial = shift;
+
+    my $vlans = $alteon->i_vlan($partial);
+    my $i_vlan_membership = {};
+    foreach my $port (keys %$vlans) {
+        my $vlan = $vlans->{$port};
+        push( @{ $i_vlan_membership->{$port} }, $vlan );
+    }
+
+    return $i_vlan_membership;
+}
+
 # Bridge MIB does not map Bridge Port to ifIndex correctly on some code
 # versions
 sub bp_index {
@@ -418,14 +432,14 @@ Eric Miller

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $alteon = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $alteon->class();
@@ -437,7 +451,7 @@ Abstraction subclass for Radware Alteon Series ADC switches and
 Nortel BladeCenter Layer2-3 GbE Switch Modules.

 For speed or debugging purposes you can call the subclass directly, but not
-after determining a more specific class using the method above. 
+after determining a more specific class using the method above.

 my $alteon = new SNMP::Info::Layer3::AlteonAD(...);

@@ -567,13 +581,19 @@ IDs.  These are the VLANs which are members of the egress list for the port.
  Example:
  my $interfaces = $alteon->interfaces();
  my $vlans      = $alteon->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 $alteon->i_vlan_membership_untagged()
+
+Returns reference to hash of arrays: key = C<ifIndex>, value = array of VLAN
+IDs.  These are the VLANs which are members of the untagged egress list for
+the port.
+
 =item $alteon->v_index()

 Returns VLAN IDs
--- a/lib/SNMP/Info/Layer3/Altiga.pm
+++ b/lib/SNMP/Info/Layer3/Altiga.pm
@@ -4,20 +4,20 @@
 # Copyright (c) 2008 Jeroen van Ingen Schenau
 # 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  
+#
+# 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
@@ -37,16 +37,16 @@ use SNMP::Info::Layer3;
@SNMP::Info::Layer3::Altiga::ISA = qw/SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::Altiga::EXPORT_OK = qw//;

-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE 
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE
            $int_include_vpn $fake_idx $type_class/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
            %SNMP::Info::Layer3::MIBS,
            'ALTIGA-VERSION-STATS-MIB'  => 'alVersionString',
            'ALTIGA-SESSION-STATS-MIB'  => 'alActiveSessionCount',
-            'ALTIGA-HARDWARE-STATS-MIB' => 'alHardwarePs1Type',  
+            'ALTIGA-HARDWARE-STATS-MIB' => 'alHardwarePs1Type',
    );

 %GLOBALS = (
@@ -70,7 +70,7 @@ $VERSION = '3.10';
            'fan1_alarm'      => 'alHardwareFan1RpmAlarm',
            'fan2_alarm'      => 'alHardwareFan2RpmAlarm',
            'fan3_alarm'      => 'alHardwareFan3RpmAlarm',
-            
+
       );

 %FUNCS = (
@@ -189,7 +189,7 @@ sub interfaces {
    if ($int_include_vpn) {
        my $tun_type = $altiga->vpn_sess_protocol();
        my $peer = $altiga->vpn_sess_peer_ip();
-        my $remote = $altiga->vpn_sess_rem_ip(); 
+        my $remote = $altiga->vpn_sess_rem_ip();
        my $group = $altiga->vpn_sess_gid();
        foreach my $tunnel (keys %$tun_type) {
            if ($type_class->{$tun_type->{$tunnel}} eq 1) {
@@ -197,7 +197,7 @@ sub interfaces {
            }
        }
    }
-            
+
    return \%interfaces;
 }

@@ -275,14 +275,14 @@ Jeroen van Ingen Schenau

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $altiga = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'my_vpn_host',
                          Community   => 'public',
                          Version     => 1
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $altiga->class();
@@ -366,7 +366,7 @@ to a hash.
 =item $altiga->interfaces()

 This method overrides the interfaces() method inherited from SNMP::Info.
-It provides a mapping between the Interface Table Index (iid) and the physical 
+It provides a mapping between the Interface Table Index (iid) and the physical
 port name, adding a port number to the port name to prevent duplicate names.

 =item $altiga->i_lastchange()
--- a/lib/SNMP/Info/Layer3/Arista.pm
+++ b/lib/SNMP/Info/Layer3/Arista.pm
@@ -36,20 +36,26 @@ use Exporter;
 use SNMP::Info::Layer3;
 use SNMP::Info::MAU;
 use SNMP::Info::LLDP;
+use SNMP::Info::Aggregate 'agg_ports_ifstack';

-@SNMP::Info::Layer3::Arista::ISA = qw/SNMP::Info::LLDP SNMP::Info::MAU
-    SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Arista::ISA = qw/
+    SNMP::Info::Aggregate
+    SNMP::Info::LLDP
+    SNMP::Info::MAU
+    SNMP::Info::Layer3 Exporter
+/;
@SNMP::Info::Layer3::Arista::EXPORT_OK = qw//;

 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
    %SNMP::Info::MAU::MIBS,
    %SNMP::Info::LLDP::MIBS,
-    'ARISTA-PRODUCTS-MIB' => 'aristaProducts',
+    %SNMP::Info::Aggregate::MIBS,
+    'ARISTA-PRODUCTS-MIB' => 'aristaDCS7124S',
 );

 %GLOBALS = (
@@ -104,22 +110,6 @@ sub model {
    return $model;
 }

-# Use Q-BRIDGE-MIB
-
-sub fw_mac {
-    my $arista  = shift;
-    my $partial = shift;
-
-    return $arista->qb_fw_mac($partial);
-}
-
-sub fw_port {
-    my $arista  = shift;
-    my $partial = shift;
-
-    return $arista->qb_fw_port($partial);
-}
-
 # The LLDP MIB leaves it up in the air what the index means.
 # On EOS, it's a dot1d port.
 sub lldp_if {
@@ -141,6 +131,8 @@ sub lldp_if {
    return $lldp_if;
 }

+sub agg_ports { return agg_ports_ifstack(@_) }
+
 1;
 __END__

@@ -154,7 +146,7 @@ Bill Fenner

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $arista = new SNMP::Info(
                        AutoSpecify => 1,
                        Debug       => 1,
@@ -162,7 +154,7 @@ Bill Fenner
                        DestHost    => 'myswitch',
                        Community   => 'public',
                        Version     => 2
-                        ) 
+		 	)
    or die "Can't connect to DestHost.\n";

 my $class      = $arista->class();
@@ -176,6 +168,8 @@ Subclass for Arista Networks EOS-based devices

 =over

+=item SNMP::Info::Aggregate
+
 =item SNMP::Info::Layer3

 =item SNMP::Info::MAU
@@ -194,6 +188,8 @@ Subclass for Arista Networks EOS-based devices

 See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.

+See L<SNMP::Info::Aggregate/"Required MIBs"> for its own MIB requirements.
+
 See L<SNMP::Info::MAU/"Required MIBs"> for its own MIB requirements.

 See L<SNMP::Info::LLDP/"Required MIBs"> for its own MIB requirements.
@@ -245,14 +241,6 @@ to a hash.

 =over

-=item $arista->fw_mac()
-
-Use the F<Q-BRIDGE-MIB> instead of F<BRIDGE-MIB>
-
-=item $arista->fw_port()
-
-Use the F<Q-BRIDGE-MIB> instead of F<BRIDGE-MIB>
-
 =item $arista->i_duplex_admin()

 Returns info from F<MAU-MIB>
@@ -265,6 +253,12 @@ Returns info from F<MAU-MIB>

 Returns the mapping to the SNMP Interface Table.

+=item C<agg_ports>
+
+Returns a HASH reference mapping from slave to master port for each member of
+a port bundle on the device. Keys are ifIndex of the slave ports, Values are
+ifIndex of the corresponding master ports.
+
 =back

 =head2 Table Methods imported from SNMP::Info::Layer3
--- a/lib/SNMP/Info/Layer3/Aruba.pm
+++ b/lib/SNMP/Info/Layer3/Aruba.pm
@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;

 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
@@ -124,6 +124,8 @@ $VERSION = '3.10';
    'aruba_ap_model'  => 'wlanAPModelName',
    'aruba_ap_name'   => 'wlanAPName',
    'aruba_ap_ip'     => 'wlanAPIpAddress',
+    'aruba_ap_hw_ver' => 'wlanAPHwVersion',
+    'aruba_ap_sw_ver' => 'wlanAPSwVersion',

    # WLSX-WLAN-MIB::wlsxWlanESSIDVlanPoolTable
    'aruba_ssid_vlan' => 'wlanESSIDVlanPoolStatus',
@@ -484,6 +486,7 @@ sub i_vlan {
 	return $aruba->SUPER::i_vlan($partial)
 		if keys %{ $aruba->SUPER::i_vlan($partial) };

+	# If we don't have Q-BRIDGE-MIB, we're a wireless controller
 	my $index = $aruba->aruba_if_idx();

 	if ($partial) {
@@ -512,6 +515,7 @@ sub i_vlan_membership {
 	return $aruba->SUPER::i_vlan_membership($partial)
 		if keys %{ $aruba->SUPER::i_vlan_membership($partial) };

+	# If we don't have Q-BRIDGE-MIB, we're a wireless controller
 	my $essid_ssid = $aruba->aruba_ap_bssid_ssid();
 	my $ssid_vlans = $aruba->aruba_ssid_vlan();
 	my $if_vlans   = $aruba->aruba_if_vlan_member();
@@ -555,6 +559,32 @@ sub i_vlan_membership {
 	return $i_vlan_membership;
 }

+sub i_vlan_membership_untagged {
+	my $aruba   = shift;
+	my $partial = shift;
+
+	return $aruba->SUPER::i_vlan_membership_untagged($partial)
+		if keys %{ $aruba->SUPER::i_vlan_membership_untagged($partial) };
+
+	# If we don't have Q-BRIDGE-MIB, we're a wireless controller
+	# It is unclear if native VLAN is transmitted untagged
+	# This assumes Cisco-like behavior on trunks that native VLAN is
+	# transmitted untagged, if this needs to be changed we will need to
+	# consider ifExtMode rather than just using i_vlan
+	my $if_membership = $aruba->i_vlan_membership();
+	my $if_ = $aruba->i_vlan();
+	my $if_mode   = $aruba->aruba_if_mode();
+
+    my $vlans = $aruba->i_vlan($partial);
+    my $i_vlan_membership = {};
+    foreach my $port (keys %$vlans) {
+        my $vlan = $vlans->{$port};
+        push( @{ $i_vlan_membership->{$port} }, $vlan );
+    }
+
+    return $i_vlan_membership;
+}
+
 sub i_80211channel {
    my $aruba   = shift;
    my $partial = shift;
@@ -995,8 +1025,9 @@ sub e_type {
 sub e_hwver {
    my $aruba = shift;

-    my $ap_hw   = $aruba->aruba_card_hw()   || {};
-    my $ap_fpga = $aruba->aruba_card_fpga() || {};
+    my $ap_hw     = $aruba->aruba_card_hw()   || {};
+    my $ap_fpga   = $aruba->aruba_card_fpga() || {};
+    my $ap_hw_ver = $aruba->aruba_ap_hw_ver() || {};

    my %e_hwver;

@@ -1008,9 +1039,36 @@ sub e_hwver {

 	$e_hwver{$iid} = "$hw $fpga";
    }
+
+    # APs
+    foreach my $idx ( keys %$ap_hw_ver ) {
+	my $hw_ver = $ap_hw_ver->{$idx};
+	next unless defined $hw_ver;
+
+	$e_hwver{$idx} = "$hw_ver";
+    }
+
    return \%e_hwver;
 }

+sub e_swver {
+    my $aruba = shift;
+
+    my $ap_sw_ver = $aruba->aruba_ap_hw_ver() || {};
+
+    my %e_swver;
+
+    # APs
+    foreach my $idx ( keys %$ap_sw_ver ) {
+	my $sw_ver = $ap_sw_ver->{$idx};
+	next unless defined $sw_ver;
+
+	$e_swver{$idx} = "$sw_ver";
+    }
+
+    return \%e_swver;
+}
+
 sub e_vendor {
    my $aruba = shift;

@@ -1345,7 +1403,7 @@ Eric Miller
 			  DestHost    => 'myswitch',
 			  Community   => 'public',
 			  Version     => 2
-			) 
+			)

    or die "Can't connect to DestHost.\n";

@@ -1364,7 +1422,7 @@ 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. 
+after determining a more specific class using the method above.

 my $aruba = new SNMP::Info::Layer3::Aruba(...);

@@ -1408,7 +1466,7 @@ These are methods that return scalar value from SNMP

 =item $aruba->model()

-Returns model type.  Cross references $aruba->id() with product IDs in the 
+Returns model type.  Cross references $aruba->id() with product IDs in the
 Aruba MIB.

 =item $aruba->vendor()
@@ -1482,7 +1540,7 @@ false.
 =item $aruba->i_ssidmac()

 With the same keys as i_ssidlist, returns the Basic service set
-identification (BSSID), MAC address, the AP is using for the SSID. 
+identification (BSSID), MAC address, the AP is using for the SSID.

 =item $aruba->cd11_mac()

@@ -1520,7 +1578,7 @@ Total packets transmitted by the wireless client.

 =item $aruba->i_index()

-Returns reference to map of IIDs to Interface index. 
+Returns reference to map of IIDs to Interface index.

 Extends C<ifIndex> to support APs as device interfaces.

@@ -1556,7 +1614,7 @@ interfaces.
 =item $aruba->i_up_admin()

 Returns reference to map of IIDs to administrative status of the interface.
-Returns C<ifAdminStatus> for Ethernet interfaces and C<wlanAPStatus> 
+Returns C<ifAdminStatus> for Ethernet interfaces and C<wlanAPStatus>
 for AP interfaces.

 =item $aruba->i_mac()
@@ -1586,6 +1644,12 @@ Returns reference to map of IIDs to VLAN ID of the interface.
 Returns reference to hash of arrays: key = C<ifIndex>, value = array of VLAN
 IDs.  These are the VLANs for which the port is a member.

+=item $aruba->i_vlan_membership_untagged()
+
+Returns reference to hash of arrays: key = C<ifIndex>, value = array of VLAN
+IDs.  These are the VLANs which are members of the untagged egress list for
+the port.
+
 =item $aruba->bp_index()

 Augments the bridge MIB by returning reference to a hash containing the
@@ -1648,6 +1712,10 @@ Returns reference to hash.  Key: IID, Value: Type of component.

 Returns reference to hash.  Key: IID, Value: Hardware revision.

+=item $aruba->e_swver()
+
+Returns reference to hash.  Key: IID, Value: Software revision.
+
 =item $aruba->e_vendor()

 Returns reference to hash.  Key: IID, Value: aruba.
--- a/lib/SNMP/Info/Layer3/BayRS.pm
+++ b/lib/SNMP/Info/Layer3/BayRS.pm
@@ -43,7 +43,7 @@ use SNMP::Info::Bridge;
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE %MODEL_MAP
    %MODID_MAP %PROCID_MAP/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::MIBS,
@@ -732,6 +732,8 @@ sub i_vlan {
    return \%i_vlan;
 }

+sub i_pvid { goto &i_vlan }
+
 sub root_ip {
    my $bayrs = shift;

@@ -1387,14 +1389,14 @@ Eric Miller

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $bayrs = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
                          Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $bayrs->class();
@@ -1402,10 +1404,10 @@ Eric Miller

 =head1 DESCRIPTION

-Abstraction subclass for routers running Avaya/Nortel BayRS.  
+Abstraction subclass for routers running Avaya/Nortel BayRS.

 For speed or debugging purposes you can call the subclass directly, but not
-after determining a more specific class using the method above. 
+after determining a more specific class using the method above.

 my $bayrs = new SNMP::Info::Layer3::BayRS(...);

@@ -1456,7 +1458,7 @@ These are methods that return scalar value from SNMP
 Returns the model of the BayRS router.  Will translate between the MIB model
 and the common model with this map :

-    C<%MODEL_MAP = ( 
+    C<%MODEL_MAP = (
        'acefn'     => 'FN',
        'aceln'     => 'LN',
        'acecn'     => 'CN',
@@ -1527,8 +1529,8 @@ passed but the entire table will be returned.
 Returns reference to the map between IID and physical Port.

 The physical port name is stripped to letter and numbers to signify
-port type and slot port (S11) if the default platform naming was 
-maintained.  Otherwise the port is the interface description. 
+port type and slot port (S11) if the default platform naming was
+maintained.  Otherwise the port is the interface description.

 =item $bayrs->i_name()

@@ -1538,7 +1540,7 @@ interfaces.
 =item $bayrs->i_duplex()

 Returns reference to hash.  Maps port operational duplexes to IIDs for
-Ethernet interfaces. 
+Ethernet interfaces.

 =item $bayrs->i_duplex_admin()

@@ -1549,6 +1551,10 @@ interfaces.

 Returns reference to hash.  Maps port VLAN ID to IIDs.

+=item $bayrs->i_pvid()
+
+Returns reference to hash.  Maps port VLAN ID to IIDs.
+
 =back

 =head2 Pseudo F<ENTITY-MIB> information
--- a/lib/SNMP/Info/Layer3/BlueCoatSG.pm
+++ b/lib/SNMP/Info/Layer3/BlueCoatSG.pm
@@ -36,7 +36,7 @@ use SNMP::Info::Layer3;

 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS, %SNMP::Info::Layer3::MIBS,
@@ -154,12 +154,6 @@ See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 These are methods that return tables of information in the form of a reference
 to a hash.

-=head2 Overrides
-
-=over
-
-=back
-
 =head2 Table Methods imported from SNMP::Info::Layer3

 See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
--- a/lib/SNMP/Info/Layer3/C3550.pm
+++ b/lib/SNMP/Info/Layer3/C3550.pm
@@ -32,39 +32,22 @@
 package SNMP::Info::Layer3::C3550;

 use strict;
+use warnings;
 use Exporter;
-use SNMP::Info::CiscoVTP;
 use SNMP::Info::CiscoStack;
-use SNMP::Info::LLDP;
-use SNMP::Info::CDP;
-use SNMP::Info::CiscoConfig;
-use SNMP::Info::CiscoStats;
-use SNMP::Info::CiscoImage;
-use SNMP::Info::CiscoPortSecurity;
-use SNMP::Info::CiscoPower;
-use SNMP::Info::Layer3;
-use SNMP::Info::CiscoStpExtensions;
+use SNMP::Info::Layer3::CiscoSwitch;

 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;

 # NOTE : Top-most items gets precedence for @ISA
@SNMP::Info::Layer3::C3550::ISA = qw/
-    SNMP::Info::CiscoVTP
-    SNMP::Info::CiscoStpExtensions
    SNMP::Info::CiscoStack
-    SNMP::Info::LLDP
-    SNMP::Info::CDP
-    SNMP::Info::CiscoStats
-    SNMP::Info::CiscoImage
-    SNMP::Info::CiscoPortSecurity
-    SNMP::Info::CiscoConfig
-    SNMP::Info::CiscoPower
-    SNMP::Info::Layer3
+    SNMP::Info::Layer3::CiscoSwitch
    Exporter/;

@SNMP::Info::Layer3::C3550::EXPORT_OK = qw//;

-$VERSION = '3.10';
+$VERSION = '3.66';

 # NOTE: Order creates precedence
 #       Example: v_name exists in Bridge.pm and CiscoVTP.pm
@@ -72,46 +55,23 @@ $VERSION = '3.10';
 #       So we want CiscoVTP to come last to get the right one.
 # The @ISA order should match these orders.

-%MIBS = (
-    %SNMP::Info::Layer3::MIBS,             %SNMP::Info::CiscoPower::MIBS,
-    %SNMP::Info::CiscoConfig::MIBS,        %SNMP::Info::CiscoPortSecurity::MIBS,
-    %SNMP::Info::CiscoImage::MIBS,         %SNMP::Info::CiscoStats::MIBS,
-    %SNMP::Info::LLDP::MIBS,               %SNMP::Info::CDP::MIBS,
-    %SNMP::Info::CiscoStack::MIBS,         %SNMP::Info::CiscoStpExtensions::MIBS, 
-    %SNMP::Info::CiscoVTP::MIBS,
-);
-
+%MIBS
+    = ( %SNMP::Info::Layer3::CiscoSwitch::MIBS, %SNMP::Info::CiscoStack::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::LLDP::GLOBALS,
-    %SNMP::Info::CDP::GLOBALS,
+    %SNMP::Info::Layer3::CiscoSwitch::GLOBALS,
    %SNMP::Info::CiscoStack::GLOBALS,
-    %SNMP::Info::CiscoStpExtensions::GLOBALS,
-    %SNMP::Info::CiscoVTP::GLOBALS,
 );

 %FUNCS = (
-    %SNMP::Info::Layer3::FUNCS,             %SNMP::Info::CiscoPower::FUNCS,
-    %SNMP::Info::CiscoConfig::FUNCS,        %SNMP::Info::CiscoPortSecurity::FUNCS,
-    %SNMP::Info::CiscoImage::FUNCS,         %SNMP::Info::CiscoStats::FUNCS,
-    %SNMP::Info::LLDP::FUNCS,               %SNMP::Info::CDP::FUNCS,
-    %SNMP::Info::CiscoStack::FUNCS,         %SNMP::Info::CiscoStpExtensions::FUNCS, 
-    %SNMP::Info::CiscoVTP::FUNCS,    
+    %SNMP::Info::Layer3::CiscoSwitch::FUNCS,
+    %SNMP::Info::CiscoStack::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::LLDP::MUNGE,               %SNMP::Info::CDP::MUNGE,
-    %SNMP::Info::CiscoStack::MUNGE,         %SNMP::Info::CiscoStpExtensions::MUNGE, 
-    %SNMP::Info::CiscoVTP::MUNGE,
+    %SNMP::Info::Layer3::CiscoSwitch::MUNGE,
+    %SNMP::Info::CiscoStack::MUNGE,
 );

 sub vendor {
@@ -136,8 +96,8 @@ sub ports {
    my $c3550 = shift;

    my $id    = $c3550->id();
-    my $model = &SNMP::translateObj($id);
-    if ( $model =~ /(12|24|48)(C|T|TS|G|TS-E|TS-S|T-E)?$/ ) {
+    my $model = SNMP::translateObj($id);
+    if ( defined $model && $model =~ /(12|24|48)(C|T|TS|G|TS-E|TS-S|T-E)?$/ ) {
        return $1;
    }

@@ -232,10 +192,6 @@ sub set_i_duplex_admin {
    }
 }

-sub cisco_comm_indexing {
-    return 1;
-}
-
 1;
 __END__

@@ -250,7 +206,7 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $c3550 = new SNMP::Info(
                        AutoSpecify => 1,
                        Debug       => 1,
@@ -258,7 +214,7 @@ Max Baker
                        DestHost    => 'myswitch',
                        Community   => 'public',
                        Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $c3550->class();
@@ -266,14 +222,14 @@ Max Baker

 =head1 DESCRIPTION

-Abstraction subclass for Cisco Catalyst 3550 Layer 2/3 Switches.  
+Abstraction subclass for Cisco Catalyst 3550 Layer 2/3 Switches.

 These devices run IOS but have some of the same characteristics as the
 Catalyst WS-C family (5xxx,6xxx).  For example, forwarding tables are held in
 VLANs, and extended interface information is gleaned from F<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. 
+after determining a more specific class using the method above.

 my $c3550 = new SNMP::Info::Layer3::C3550(...);

@@ -281,25 +237,9 @@ after determining a more specific class using the method above.

 =over

-=item SNMP::Info::Layer3
-
-=item SNMP::Info::CiscoSTPExtensions
-
-=item SNMP::Info::CiscoPower
-
-=item SNMP::Info::CiscoPortSecurity
-
-=item SNMP::Info::CiscoVTP
-
 =item SNMP::Info::CiscoStack

-=item SNMP::Info::CDP
-
-=item SNMP::Info::LLDP
-
-=item SNMP::Info::CiscoStats
-
-=item SNMP::Info::CiscoImage
+=item SNMP::Info::Layer3::CiscoSwitch

 =back

@@ -309,26 +249,10 @@ after determining a more specific class using the method above.

 =item Inherited Classes' MIBs

-See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
-
-See L<SNMP::Info::CiscoStpExtensions/"Required MIBs"> for its own MIB requirements.
-
-See L<SNMP::Info::CiscoPower/"Required MIBs"> for its own MIB requirements.
-
-See L<SNMP::Info::CiscoPortSecurity/"Required MIBs"> for its own MIB
-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.
-
-See L<SNMP::Info::LLDP/"Required MIBs"> for its own MIB requirements.
+See L<SNMP::Info::Layer3::CiscoSwitch/"Required MIBs"> for its own MIB
+requirements.

 =back

@@ -353,51 +277,15 @@ Will take the translated model number and try to format it better.

 Tries to cull the number of ports from the model number.

-=item $c3550->cisco_comm_indexing()
-
-Returns 1.  Use vlan indexing.
-
 =back

-=head2 Globals imported from SNMP::Info::Layer3
-
-See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
-
-=head2 Globals imported from SNMP::Info::CiscoStpExtensions
-
-See documentation in L<SNMP::Info::CiscoStpExtensions/"GLOBALS"> for details.
-
-=head2 Globals imported from SNMP::Info::CiscoPower
-
-See documentation in L<SNMP::Info::CiscoPower/"GLOBALS"> for details.
-
-=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
+=head2 Globals imported from SNMP::Info::CiscoStack

 See documentation in L<SNMP::Info::CiscoStack/"GLOBALS"> for details.

-=head2 Globals imported from SNMP::Info::CDP
+=head2 Globals imported from SNMP::Info::Layer3::CiscoSwitch

-See documentation in L<SNMP::Info::CDP/"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::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.
+See documentation in L<SNMP::Info::Layer3::CiscoSwitch/"GLOBALS"> for details.

 =head1 TABLE METHODS

@@ -439,50 +327,18 @@ Crosses $c3550->p_port() with $c3550->p_duplex() to utilize port C<ifIndex>.

    Example:
    my %if_map = reverse %{$c3550->interfaces()};
-    $c3550->set_i_duplex_admin('auto', $if_map{'FastEthernet0/1'}) 
+    $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 L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
-
-=head2 Table Methods imported from SNMP::Info::CiscoStpExtensions
-
-See documentation in L<SNMP::Info::CiscoStpExtensions/"TABLE METHODS"> for details.
-
-=head2 Table Methods imported from SNMP::Info::CiscoPower
-
-See documentation in L<SNMP::Info::CiscoPower/"TABLE METHODS"> for details.
-
-=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
+=head2 Table Methods imported from SNMP::Info::Layer3::CiscoSwitch

-See documentation in L<SNMP::Info::CDP/"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::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.
+See documentation in L<SNMP::Info::Layer3::CiscoSwitch/"TABLE METHODS"> for
+details.

 =cut
--- a/lib/SNMP/Info/Layer3/C4000.pm
+++ b/lib/SNMP/Info/Layer3/C4000.pm
@@ -31,48 +31,30 @@
 package SNMP::Info::Layer3::C4000;

 use strict;
+use warnings;
 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::Layer3::CiscoSwitch;
 use SNMP::Info::MAU;
-use SNMP::Info::Layer3;

-@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::ISA = qw/
+    SNMP::Info::Layer3::CiscoSwitch
+    SNMP::Info::MAU
+    Exporter/;
@SNMP::Info::Layer3::C4000::EXPORT_OK = qw//;

 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %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,
+    %SNMP::Info::Layer3::CiscoSwitch::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,
+    %SNMP::Info::Layer3::CiscoSwitch::GLOBALS,
    'ps1_type'   => 'ciscoEnvMonSupplyStatusDescr.1',
    'ps1_status' => 'ciscoEnvMonSupplyState.1',
    'ps2_type'   => 'ciscoEnvMonSupplyStatusDescr.2',
@@ -80,24 +62,14 @@ $VERSION = '3.10';
 );

 %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,
+    %SNMP::Info::Layer3::CiscoSwitch::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,
-);
+%MUNGE
+    = ( %SNMP::Info::MAU::MUNGE, %SNMP::Info::Layer3::CiscoSwitch::MUNGE, );

 # Override Inheritance for these specific methods
 # use MAU-MIB for admin. duplex and admin. speed
@@ -111,7 +83,6 @@ $VERSION = '3.10';
 *SNMP::Info::Layer3::C4000::set_i_speed_admin
    = \&SNMP::Info::MAU::mau_set_i_speed_admin;

-
 sub fan {
    my $c4000     = shift;
    my $fan_state = $c4000->fan_state();
@@ -126,8 +97,6 @@ sub fan {
    return $ret;
 }

-sub cisco_comm_indexing { return 1; }
-
 1;
 __END__

@@ -142,7 +111,7 @@ Bill Fenner

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $c4000 = new SNMP::Info(
                        AutoSpecify => 1,
                        Debug       => 1,
@@ -150,7 +119,7 @@ Bill Fenner
                        DestHost    => 'myswitch',
                        Community   => 'public',
                        Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $c4000->class();
@@ -158,10 +127,10 @@ Bill Fenner

 =head1 DESCRIPTION

-Abstraction subclass for Cisco Catalyst 4000 Layer 2/3 Switches.  
+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. 
+after determining a more specific class using the method above.

 my $c4000 = new SNMP::Info::Layer3::C4000(...);

@@ -169,22 +138,10 @@ after determining a more specific class using the method above.

 =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::Layer3::CiscoSwitch

 =item SNMP::Info::MAU

-=item SNMP::Info::Layer3
-
 =back

 =head2 Required MIBs
@@ -193,23 +150,11 @@ after determining a more specific class using the method above.

 =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
+See L<SNMP::Info::Layer3::CiscoSwitch/"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
@@ -220,48 +165,20 @@ These are methods that return scalar value from SNMP

 =over

-=item $c4000->cisco_comm_indexing()
-
-Returns 1.  Use vlan indexing.
-
 =item $c4000->fan()

 Returns fan status

 =back

-=head2 Global Methods imported from SNMP::Info::CiscoVTP
+=head2 Globals imported from SNMP::Info::Layer3::CiscoSwitch

-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.
+See documentation in L<SNMP::Info::Layer3::CiscoSwitch/"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
@@ -301,37 +218,13 @@ Duplex choices are 'auto', 'half', 'full'.

 =back

-=head2 Table Methods imported from SNMP::Info::CiscoVTP
+=head2 Table Methods imported from SNMP::Info::Layer3::CiscoSwitch

-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
+See documentation in L<SNMP::Info::Layer3::CiscoSwitch/"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
--- a/lib/SNMP/Info/Layer3/C6500.pm
+++ b/lib/SNMP/Info/Layer3/C6500.pm
@@ -31,35 +31,18 @@
 package SNMP::Info::Layer3::C6500;

 use strict;
+use warnings;
 use Exporter;
 use SNMP::Info::CiscoStack;
-use SNMP::Info::LLDP;
-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 SNMP::Info::CiscoStpExtensions;
-use SNMP::Info::CiscoVTP;
+use SNMP::Info::Layer3::CiscoSwitch;
 use SNMP::Info::MAU;

 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;

 # NOTE : Top-most items gets precedence for @ISA
@SNMP::Info::Layer3::C6500::ISA = qw/
-    SNMP::Info::CiscoVTP 
-    SNMP::Info::CiscoStpExtensions
    SNMP::Info::CiscoStack
-    SNMP::Info::LLDP
-    SNMP::Info::CDP 
-    SNMP::Info::CiscoImage
-    SNMP::Info::CiscoStats
-    SNMP::Info::CiscoPortSecurity
-    SNMP::Info::CiscoConfig
-    SNMP::Info::CiscoPower
-    SNMP::Info::Layer3
+    SNMP::Info::Layer3::CiscoSwitch
    SNMP::Info::MAU
    Exporter
 /;
@@ -68,7 +51,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;

 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 # NOTE: Order creates precedence
 #       Example: v_name exists in Bridge.pm and CiscoVTP.pm
@@ -78,58 +61,49 @@ $VERSION = '3.10';

 %MIBS = (
    %SNMP::Info::MAU::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::LLDP::MIBS,
+    %SNMP::Info::Layer3::CiscoSwitch::MIBS,
    %SNMP::Info::CiscoStack::MIBS,
-    %SNMP::Info::CiscoStpExtensions::MIBS,
-    %SNMP::Info::CiscoVTP::MIBS,
    'CISCO-VIRTUAL-SWITCH-MIB' => 'cvsSwitchMode',
 );

 %GLOBALS = (
    %SNMP::Info::MAU::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::LLDP::GLOBALS,
+    %SNMP::Info::Layer3::CiscoSwitch::GLOBALS,
    %SNMP::Info::CiscoStack::GLOBALS,
-    %SNMP::Info::CiscoStpExtensions::GLOBALS,
-    %SNMP::Info::CiscoVTP::GLOBALS,
 );

 %FUNCS = (
-    %SNMP::Info::MAU::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::LLDP::FUNCS,               %SNMP::Info::CiscoStack::FUNCS,
-    %SNMP::Info::CiscoStpExtensions::FUNCS, %SNMP::Info::CiscoVTP::FUNCS,
+    %SNMP::Info::MAU::FUNCS,
+    %SNMP::Info::Layer3::CiscoSwitch::FUNCS,
+    %SNMP::Info::CiscoStack::FUNCS,
 );

 %MUNGE = (
-    %SNMP::Info::MAU::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::LLDP::MUNGE,               %SNMP::Info::CiscoStack::MUNGE,
-    %SNMP::Info::CiscoStpExtensions::MUNGE, %SNMP::Info::CiscoVTP::MUNGE,
+    %SNMP::Info::MAU::MUNGE,
+    %SNMP::Info::Layer3::CiscoSwitch::MUNGE,
+    %SNMP::Info::CiscoStack::MUNGE,
 );

 sub vendor {
    return 'cisco';
 }

-sub cisco_comm_indexing { return 1; }
+sub serial {
+    my $c6500 = shift;
+
+    my $serial = $c6500->SUPER::serial();
+    return $serial if defined $serial and $serial;
+
+    # now grab the table only if SUPER cannot find it
+    my $e_serial = $c6500->e_serial();
+
+    # Find entity table entry for this unit
+    foreach my $e ( sort keys %$e_serial ) {
+        if (defined $e_serial->{$e} and $e_serial->{$e} !~ /^\s*$/) {
+            return $e_serial->{$e};
+        }
+    }
+}

 #  Newer versions use the ETHERLIKE-MIB to report operational duplex.

@@ -205,7 +179,7 @@ sub set_i_duplex_admin {

    my $c6500 = shift;
    my ( $duplex, $iid ) = @_;
- 
+
    if ( $c6500->is_virtual_switch() ) {

        # VSS -> MAU
@@ -278,7 +252,7 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $c6500 = new SNMP::Info(
                        AutoSpecify => 1,
                        Debug       => 1,
@@ -286,7 +260,7 @@ Max Baker
                        DestHost    => 'myswitch',
                        Community   => 'public',
                        Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $c6500->class();
@@ -294,14 +268,14 @@ Max Baker

 =head1 DESCRIPTION

-Abstraction subclass for Cisco Catalyst 6500 Layer 2/3 Switches.  
+Abstraction subclass for Cisco Catalyst 6500 Layer 2/3 Switches.

 These devices run IOS but have some of the same characteristics as the
 Catalyst WS-C family (5xxx). For example, forwarding tables are held in
 VLANs, and extended interface information is gleaned from F<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. 
+after determining a more specific class using the method above.

 my $c6500 = new SNMP::Info::Layer3::C6500(...);

@@ -309,25 +283,11 @@ after determining a more specific class using the method above.

 =over

-=item SNMP::Info::CiscoVTP
-
 =item SNMP::Info::CiscoStack

-=item SNMP::Info::CDP
+=item SNMP::Info::Layer3::CiscoSwitch

-=item SNMP::Info::CiscoStats
-
-=item SNMP::Info::CiscoImage
-
-=item SNMP::Info::CiscoPortSecurity
-
-=item SNMP::Info::CiscoConfig
-
-=item SNMP::Info::CiscoPower
-
-=item SNMP::Info::Layer3
-
-=item SNMP::Info::CiscoStpExtensions
+=item SNMP::Info::MAU

 =back

@@ -337,26 +297,12 @@ after determining a more specific class using the method above.

 =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
+See L<SNMP::Info::Layer3::CiscoSwitch/"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.
-
-See L<SNMP::Info::CiscoStpExtensions/"Required MIBs"> for its own MIB requirements.
+See L<SNMP::Info::MAU/"Required MIBs"> for its own MIB requirements.

 =back

@@ -370,10 +316,6 @@ These are methods that return scalar value from SNMP

    Returns 'cisco'

-=item $c6500->cisco_comm_indexing()
-
-Returns 1.  Use vlan indexing.
-
 =item $c6500->cvsSwitchMode()

 Returns the Switch status: multiNode or standalone.
@@ -382,47 +324,23 @@ Returns the Switch status: multiNode or standalone.

 Return 1 if the switch (C<cvsSwitchMode>) is in multimode (VSS).

+=item $c6500->serial()
+
+Returns serial number of unit (falls back to C<entPhysicalSerialNum>).
+
 =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
+=head2 Globals imported from SNMP::Info::CiscoStack

 See documentation in L<SNMP::Info::CiscoStack/"GLOBALS"> for details.

-=head2 Globals imported from SNMP::Info::CDP
+=head2 Globals imported from SNMP::Info::Layer3::CiscoSwitch

-See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.
+See documentation in L<SNMP::Info::Layer3::CiscoSwitch/"GLOBALS"> for details.

-=head2 Globals imported from SNMP::Info::CiscoStats
+=head2 Globals imported from SNMP::Info::MAU

-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.
-
-=head2 Globals imported from SNMP::Info::CiscoStpExtensions
-
-See documentation in L<SNMP::Info::CiscoStpExtensions/"GLOBALS"> for details.
+See documentation in L<SNMP::Info::MAU/"GLOBALS"> for details.

 =head1 TABLE METHODS

@@ -464,7 +382,7 @@ Crosses $c6500->p_port() with $c6500->p_duplex() to utilize port C<ifIndex>.

    Example:
    my %if_map = reverse %{$c6500->interfaces()};
-    $c6500->set_i_duplex_admin('auto', $if_map{'FastEthernet0/1'}) 
+    $c6500->set_i_duplex_admin('auto', $if_map{'FastEthernet0/1'})
        or die "Couldn't change port duplex. ",$c6500->error(1);

 =item $c6500->set_i_speed_admin(speed, ifIndex)
@@ -477,47 +395,19 @@ Crosses $c6500->p_port() with $c6500->p_speed() to utilize port C<ifIndex>.

 =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::Layer3::CiscoSwitch

-=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
+See documentation in L<SNMP::Info::Layer3::CiscoSwitch/"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

-=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::CiscoStpExtensions
-
-See documentation in L<SNMP::Info::CiscoStpExtensions/"TABLE METHODS"> for
-details.
-
-=head2 Table Methods imported from SNMP::Info::Layer3
-
-See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
+See documentation in L<SNMP::Info::MAU/"TABLE METHODS"> for details.

 =cut
-
--- a/lib/SNMP/Info/Layer3/CheckPoint.pm
+++ b/lib/SNMP/Info/Layer3/CheckPoint.pm
@@ -0,0 +1,330 @@
+# SNMP::Info::Layer3::CheckPoint
+# $Id$
+#
+# Copyright (c) 2008 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 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::CheckPoint;
+
+use strict;
+use Exporter;
+use SNMP::Info::Layer3;
+use SNMP::Info::LLDP;
+
+@SNMP::Info::Layer3::CheckPoint::ISA       = qw/SNMP::Info::LLDP SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::CheckPoint::EXPORT_OK = qw//;
+
+use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+
+$VERSION = '3.66';
+
+%MIBS = (
+    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::LLDP::MIBS,
+    'CHECKPOINT-MIB'      => 'fwProduct',
+    'UCD-SNMP-MIB'        => 'versionTag',
+    'NET-SNMP-TC'         => 'netSnmpAliasDomain',
+    'NET-SNMP-EXTEND-MIB' => 'nsExtendNumEntries',
+    'HOST-RESOURCES-MIB'  => 'hrSystem',
+);
+
+%GLOBALS = (
+    %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
+    'netsnmp_vers'   => 'versionTag',
+    'hrSystemUptime' => 'hrSystemUptime',
+
+);
+
+%FUNCS = (
+    %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,
+
+    # Net-SNMP Extend table that could but customize to add a the CheckPoint version
+    'extend_output_table' => 'nsExtendOutputFull',
+);
+
+%MUNGE = (
+    %SNMP::Info::Layer3::MUNGE,
+    %SNMP::Info::LLDP::MUNGE,
+);
+
+sub vendor {
+    return 'checkpoint';
+}
+
+sub model {
+    my $ckp = shift;
+    my $id = $ckp->id;
+
+    my $model = &SNMP::translateObj($id);
+
+    if (defined $model) {
+        $model =~ s/^checkPoint//;
+        return $model;
+    } else {
+        return $id;
+    }
+}
+
+sub os {
+    return 'checkpoint';
+}
+
+sub os_ver {
+    my $ckp = shift;
+    my $extend_table = $ckp->extend_output_table() || {};
+
+    my $descr   = $ckp->description();
+    my $vers    = $ckp->netsnmp_vers();
+    my $os_ver  = undef;
+
+    foreach my $ex (keys %$extend_table) {
+        (my $name = pack('C*',split(/\./,$ex))) =~ s/[^[:print:]]//g;
+        if ($name eq 'ckpVersion') {
+            return $1 if ($extend_table->{$ex} =~ /^This is Check Point's software version (.*)$/);
+            last;
+        }
+    }
+
+    $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 {
+    my $ckp = shift;
+    my $extend_table = $ckp->extend_output_table() || {};
+
+    foreach my $ex (keys %$extend_table) {
+        (my $name = pack('C*',split(/\./,$ex))) =~ s/[^[:print:]]//g;
+        if ($name eq 'ckpAsset') {
+            return $1 if ($extend_table->{$ex} =~ /Serial Number: (\S+)/);
+            last;
+        }
+    }
+
+    return '';
+}
+
+sub layers {
+    return '01001100';
+}
+
+# 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 $ckp = shift;
+    my $uptime;
+
+    $uptime = $ckp->hrSystemUptime();
+    return $uptime if defined $uptime;
+
+    return $ckp->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::CheckPoint - SNMP Interface to CheckPoint Devices
+
+=head1 AUTHORS
+
+Ambroise Rosset
+
+=head1 SYNOPSIS
+
+ # Let SNMP::Info determine the correct subclass for you.
+ my $ckp = new SNMP::Info(
+                          AutoSpecify => 1,
+                          Debug       => 1,
+                          DestHost    => 'myrouter',
+                          Community   => 'public',
+                          Version     => 2
+                        )
+    or die "Can't connect to DestHost.\n";
+
+ my $class      = $ckp->class();
+ print "SNMP::Info determined this device to fall under subclass : $class\n";
+
+=head1 DESCRIPTION
+
+Subclass for Generic Net-SNMP devices
+
+=head2 WARNING
+
+To correctly and completelly work, you should add the following line in the file C</etc/snmp/snmpd.local.conf> on each of your CheckPoint devices:
+
+ # Netdisco SNMP configuration
+ extend  ckpVersion /opt/CPsuite-R77/fw1/bin/fw ver
+ extend  ckpAsset /bin/clish -c 'show asset all'
+
+=head2 Inherited Classes
+
+=over
+
+=item SNMP::Info::Layer3
+
+=back
+
+=head2 Required MIBs
+
+=over
+
+=item F<UCD-SNMP-MIB>
+
+=item F<NET-SNMP-TC>
+
+=item F<HOST-RESOURCES-MIB>
+
+=item Inherited Classes' MIBs
+
+See L<SNMP::Info::Layer3> for its own MIB requirements.
+
+See L<SNMP::Info::LLDP> for its own MIB requirements.
+
+=back
+
+=head1 GLOBALS
+
+These are methods that return scalar value from SNMP
+
+=over
+
+=item $ckp->vendor()
+
+Returns 'checkpoint'.
+
+=item $ckp->model()
+
+Return the model type of the CheckPoint device (Based on the sysObjectOID translation).
+
+=item $ckp->os()
+
+Returns the OS extracted from C<sysDescr>.
+
+=item $ckp->os_ver()
+
+Returns the software version extracted from C<sysDescr>, along
+with the Net-SNMP version.
+
+=item $ckp->uptime()
+
+Returns the system uptime instead of the agent uptime.
+NOTE: discontinuity timers and other Time Stamp based objects
+are based on agent uptime, so use orig_uptime().
+
+=item $ckp->serial()
+
+Return the serial number of the device if the SNMP server is configured as indicated previously.
+Return '' in other case.
+
+=item $ckp->layers()
+
+Return '01001100'.
+
+=back
+
+=head2 Globals imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3> for details.
+
+=head2 Globals imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP> for details.
+
+=head1 TABLE ENTRIES
+
+These are methods that return tables of information in the form of a reference
+to a hash.
+
+=head2 Overrides
+
+=over
+
+=item $ckp->i_ignore()
+
+Returns reference to hash.  Increments value of IID if port is to be ignored.
+
+Ignores loopback
+
+=back
+
+=head2 Table Methods imported from SNMP::Info::Layer3
+
+See documentation in L<SNMP::Info::Layer3> for details.
+
+=head2 Table Methods imported from SNMP::Info::LLDP
+
+See documentation in L<SNMP::Info::LLDP> 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 C<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
--- a/lib/SNMP/Info/Layer3/Cisco.pm
+++ b/lib/SNMP/Info/Layer3/Cisco.pm
@@ -31,94 +31,146 @@
 package SNMP::Info::Layer3::Cisco;

 use strict;
+use warnings;
 use Exporter;
 use SNMP::Info::CiscoVTP;
+use SNMP::Info::LLDP;
 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::CiscoStpExtensions;
 use SNMP::Info::Layer3;

-@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::Cisco::ISA = qw/SNMP::Info::CiscoVTP
+    SNMP::Info::LLDP SNMP::Info::CDP
+    SNMP::Info::CiscoStats SNMP::Info::CiscoRTT
+    SNMP::Info::CiscoQOS SNMP::Info::CiscoConfig
+    SNMP::Info::CiscoPower SNMP::Info::CiscoStpExtensions
    SNMP::Info::Layer3
    Exporter/;
@SNMP::Info::Layer3::Cisco::EXPORT_OK = qw//;

 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;

-$VERSION = '3.10';
+$VERSION = '3.66';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
+    %SNMP::Info::CiscoStpExtensions::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::LLDP::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',
+    %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::CiscoStpExtensions::GLOBALS,
+    %SNMP::Info::CiscoPower::GLOBALS,
+    %SNMP::Info::CiscoConfig::GLOBALS,
+    %SNMP::Info::CiscoQOS::GLOBALS,
+    %SNMP::Info::CiscoRTT::GLOBALS,
+    %SNMP::Info::CiscoStats::GLOBALS,
+    %SNMP::Info::CDP::GLOBALS,
+    %SNMP::Info::LLDP::GLOBALS,
+    %SNMP::Info::CiscoVTP::GLOBALS,
+    'eigrp_id' => 'cEigrpAsRouterId',
 );

 %FUNCS = (
    %SNMP::Info::Layer3::FUNCS,
+    %SNMP::Info::CiscoStpExtensions::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::LLDP::FUNCS,
    %SNMP::Info::CiscoVTP::FUNCS,

-    # EIGRP
-    'eigrp_peers' => 'cEigrpPeerAddr',
+    # CISCO-EIGRP-MIB::cEigrpPeerTable
+    'c_eigrp_peer_types' => 'cEigrpPeerAddrType',
+    'c_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,
+    %SNMP::Info::Layer3::MUNGE,     %SNMP::Info::CiscoStpExtensions::MUNGE,
+    %SNMP::Info::CiscoPower::MUNGE, %SNMP::Info::CiscoConfig::MUNGE,
+    %SNMP::Info::CiscoQOS::MUNGE,   %SNMP::Info::CiscoRTT::MUNGE,
+    %SNMP::Info::CiscoStats::MUNGE, %SNMP::Info::CDP::MUNGE,
+    %SNMP::Info::LLDP::MUNGE,       %SNMP::Info::CiscoVTP::MUNGE,
 );

 sub i_vlan {
-    my ($cisco)   = shift;
-    my ($partial) = shift;
+    my $cisco   = shift;
+    my $partial = shift;

-    my ($i_type)  = $cisco->i_type($partial);
-    my ($i_descr) = $cisco->i_description($partial);
-    my %i_vlan;
+    my $i_type  = $cisco->i_type($partial);
+    my $i_descr = $cisco->i_description($partial);
+    my $i_vlan  = $cisco->SUPER::i_vlan($partial);

    foreach my $idx ( keys %$i_descr ) {
-        if ( $i_type->{$idx} eq 'l2vlan' || $i_type->{$idx} eq 135 ) {
+        next unless $i_type->{$idx};
+        if (   $i_type->{$idx} eq 'l2vlan'
+            || $i_type->{$idx} eq '135' && !defined $i_vlan->{$idx} )
+        {
+            # Not sure where this regex came from, anchored at end?
            if ( $i_descr->{$idx} =~ /\.(\d+)$/ ) {
-                $i_vlan{$idx} = $1;
+                $i_vlan->{$idx} = $1;
+            }
+
+            # This matches 101 in 'Ethernet0.101-802.1Q vLAN subif'
+            elsif ( $i_descr->{$idx} =~ /\.(\d+)-/ ) {
+                $i_vlan->{$idx} = $1;
            }
        }
    }
-    return \%i_vlan;
+    return $i_vlan;
+}
+
+sub cisco_comm_indexing {
+    my $cisco = shift;
+
+    # If we get a VTP version, it's *extremely* likely that the device needs
+    # community based indexing
+    my $vtp = $cisco->vtp_version() || '0';
+    return $vtp ? 1 : 0;
+}
+
+sub eigrp_peers {
+    my $cisco = shift;
+
+    my $peers = $cisco->c_eigrp_peers()      || {};
+    my $types = $cisco->c_eigrp_peer_types() || {};
+
+    my %eigrp_peers;
+    foreach my $idx ( keys %$peers ) {
+        my $type = $types->{$idx};
+        next unless $type;
+        my $peer = $peers->{$idx};
+        next unless $peer;
+
+        my $ip = NetAddr::IP::Lite->new($peer);
+
+        if ($ip) {
+            $eigrp_peers{$idx} = $ip->addr;
+        }
+        elsif ( $type eq 'ipv4' ) {
+            $eigrp_peers{$idx} = SNMP::Info::munge_ip($peer);
+        }
+        next;
+    }
+    return \%eigrp_peers;
 }

 1;
@@ -127,7 +179,9 @@ __END__
 =head1 NAME

 SNMP::Info::Layer3::Cisco - SNMP Interface to L3 and L2+L3 IOS Cisco Device
-that are not covered in other classes.
+that are not covered in other classes and the base L3 Cisco class for other
+device specific L3 Cisco classes.
+

 =head1 AUTHOR

@@ -135,7 +189,7 @@ Max Baker

 =head1 SYNOPSIS

- # Let SNMP::Info determine the correct subclass for you. 
+ # Let SNMP::Info determine the correct subclass for you.
 my $cisco = new SNMP::Info(
                        AutoSpecify => 1,
                        Debug       => 1,
@@ -143,7 +197,7 @@ Max Baker
                        DestHost    => 'myswitch',
                        Community   => 'public',
                        Version     => 2
-                        ) 
+                        )
    or die "Can't connect to DestHost.\n";

 my $class      = $cisco->class();
@@ -151,7 +205,8 @@ Max Baker

 =head1 DESCRIPTION

-Subclass for Generic Cisco Routers running IOS
+Subclass for Generic Cisco Routers running IOS and the base L3 Cisco class
+for other device specific L3 Cisco classes.

 =head2 Inherited Classes

@@ -159,12 +214,12 @@ Subclass for Generic Cisco Routers running IOS

 =item SNMP::Info::CiscoVTP

+=item SNMP::Info::LLDP
+
 =item SNMP::Info::CDP

 =item SNMP::Info::CiscoStats

-=item SNMP::Info::CiscoImage
-
 =item SNMP::Info::CiscoRTT

 =item SNMP::Info::CiscoQOS
@@ -173,6 +228,8 @@ Subclass for Generic Cisco Routers running IOS

 =item SNMP::Info::Power

+=item SNMP::Info::CiscoStpExtensions
+
 =item SNMP::Info::Layer3

 =back
@@ -187,12 +244,12 @@ Subclass for Generic Cisco Routers running IOS

 See L<SNMP::Info::CiscoVTP/"Required MIBs"> for its own MIB requirements.

+See L<SNMP::Info::LLDP/"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.
@@ -201,6 +258,8 @@ 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::CiscoStpExtensions/"Required MIBs"> for its own MIB requirements.
+
 See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.

 =back
@@ -211,20 +270,25 @@ These are methods that return scalar value from SNMP

 =over

-=item $cisco->vendor()
-
-    Returns 'cisco'
-
 =item $cisco->eigrp_id()

 (C<cEigrpAsRouterId>)

+=item $switch->cisco_comm_indexing()
+
+Returns 1 when the device is likely to need vlan indexing.
+Determined by checking C<vtpVersion>.
+
 =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::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.
@@ -233,10 +297,6 @@ See documentation in L<SNMP::Info::CDP/"GLOBALS"> for details.

 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.
@@ -253,6 +313,10 @@ See documentation in L<SNMP::Info::CiscoConfig/"GLOBALS"> for details.

 See documentation in L<SNMP::Info::CiscoPower/"GLOBALS"> for details.

+=head2 Globals imported from SNMP::Info::CiscoStpExtensions
+
+See documentation in L<SNMP::Info::CiscoStpExtensions/"GLOBALS"> for details.
+
 =head2 Globals imported from SNMP::Info::Layer3

 See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
@@ -280,6 +344,10 @@ Returns a mapping between C<ifIndex> and the PVID or default VLAN.

 See documentation in L<SNMP::Info::CiscoVTP/"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.
@@ -288,10 +356,6 @@ See documentation in L<SNMP::Info::CDP/"TABLE METHODS"> for details.

 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.
@@ -308,6 +372,10 @@ See documentation in L<SNMP::Info::CiscoConfig/"TABLE METHODS"> for details.

 See documentation in L<SNMP::Info::CiscoPower/"TABLE METHODS"> for details.

+=head2 Table Methods imported from SNMP::Info::CiscoStpExtensions
+
+See documentation in L<SNMP::Info::CiscoStpExtensions/"TABLE METHODS"> for details.
+
 =head2 Table Methods imported from SNMP::Info::Layer3

 See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
--- a/Show More
+++ b/Show More