Raisecom. cosmetic

Raisecom RC. more wide regexp HW
Raisecom. HW regexp bugfix
2020-05-20 22:47:37 +03:00 · 2020-05-20 22:23:27 +03:00 · 2020-05-20 22:18:57 +03:00 · 2020-05-20 22:01:40 +03:00 · 2020-05-20 21:08:14 +03:00 · 2020-05-20 17:49:53 +03:00
232 changed files with 11467 additions and 3360 deletions
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,5 +1,20 @@
-<!--- Provide a general summary of the issue in the Title above -->
+<!---
-<!--- https://guides.github.com/features/mastering-markdown/#examples -->
+
 READ THIS FIRST!
 ----------------
 the more info you can provide, the easier it is for us the help you, so please
 fill out as many of the items below as possible.
 Provide a general summary of the issue in the Title above
 when including netdisco config snippets, whitespace matters since it's a yaml file
 for github issues it really helps if you include the relevant config parts in a codeblock (code fencing)
 see the "code" subject on https://guides.github.com/features/mastering-markdown/ for that)
 this should preserve spaces in the issue tracker and make troubleshooting quicker
 -->
 ## Expected Behavior
 <!--- If you're describing a bug, tell us what should happen -->
@@ -25,6 +40,16 @@
 <!--- 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: 
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ Build
 _build
 blib
 cover_db
 .idea
--- a/.perltidyrc
+++ b/.perltidyrc
@@ -0,0 +1,18 @@
 # .perltidyrc - PBP perltidy configuration file for SNMP::Info
 # $Id$
 -l=78   # Max line width is 78 cols
 -i=4    # Indent level is 4 cols
 -ci=4   # Continuation indent is 4 cols
 -nst    # Output to STDOUT
 -se     # Errors to STDERR
 -vt=2   # Maximal vertical tightness
 -cti=0  # No extra indentation for closing brackets
 -pt=1   # Medium parenthesis tightness
 -bt=1   # Medium brace tightness
 -sbt=1  # Medium square bracket tightness
 -bbt=1  # Medium block brace tightness
 -nsfs   # No space before semicolons
 -nolq   # Don't outdent long quoted strings
 -wbb="% + - * / x != == >= <= =~ !~ < > | & >= < = **= += *= &= <<= && += -= /= |= >>= ||= .= %= ^= x=" # Break before all operators
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,9 @@
 language: perl
 perl:
  - "5.30"
  - "5.10"
 os: linux
 dist: trusty
 addons:
  apt:
    packages:
@@ -12,8 +17,8 @@ before_install:
  - mkdir ~/netdisco-mibs
  - cd ~/netdisco-mibs
 install:
-  - curl -sL https://github.com/netdisco/netdisco-mibs/releases/download/4.009/netdisco-mibs.tar.gz | tar --strip-components=1 -zxf -
+  - curl -sL https://api.github.com/repos/netdisco/netdisco-mibs/releases/latest | jq -r '.tarball_url' | xargs -n1 curl -sL | tar --strip-components=1 -zxf -
-  - cpanm --quiet --notest PkgConfig Test::CChecker Alien::zlib::Static Alien::OpenSSL::Static Alien::SNMP::MAXTC
+  - cpanm --quiet --notest PkgConfig Test::CChecker Alien::zlib::Static Alien::OpenSSL::Static Alien::SNMP
 before_script:
  - 'cd ${TRAVIS_BUILD_DIR}'
 script:
@@ -24,6 +29,11 @@ script:
 notifications:
  irc:
    on_success: change
-    on_failure: always
+    on_failure: change
    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
@@ -16,6 +16,7 @@ Module::Build->new(
  requires => {
    'SNMP' => '0',
    'Math::BigInt' => '0',
    'NetAddr::IP' => '4.068',
  },
  recommends => {
    'PPI' => '0',
@@ -34,6 +35,9 @@ Module::Build->new(
    'File::Slurper' => '0',
    'Test::Exception' => '0.43',
    'Class::Inspector' => '0',
    'NetSNMP::default_store' => '0',
    'Module::Find' => '0',
    'Hook::LexWrap' => '0',
  },
  # script_files => [
  # ],
--- a/197
+++ b/197
@@ -1,3 +1,196 @@
 Version 3.70 (2019-10-15)
  [NEW FEATURES]
  * #361 Siemens Scalance switch support
  * #365 Ciena Layer3 support
  * #368 DOCSIS cable modem support
  [ENHANCEMENTS]
  * #350 ubiquiti version string cleanup (LBegnaud)
  * #352 duplex support for ciscosb
  * #353 report all vendor names in lowercase
  * #353 sprinkle "use warnings" and "use strict" around
  * #358 prefer checkpoint mib over net-snmp mib (earendilfr) 
  * #359 detect newer ios-xe using codenames (Christoph Neuhaus)
  * #367 test using latest MIBs version dynamically
  * #370 smarter Q-BRIDGE handling
  * poe power usage & mac address for ciscosb
  [BUG FIXES]
  * #353 doc fixes: report all required mibs for each module as based on code
  * #353 include fixes: don't include modules already imported from parent classes
  * #355 fix #252, don't think 6char devices names are mac addresses
  * #363 clean return calls in code
  * #364 strip newline from neoteris os_ver, fixes netdisco #647
 Version 3.68 (2019-04-28)
  [NEW FEATURES]
  * initial support for redlion cellular routers (inphobia)
  [ENHANCEMENTS]
  * use pulsesecure mib in layer7::neoteris instead of juniper-ive
 Version 3.67 (2019-04-20)
  [NEW FEATURES]
  * #323 initial Lenovo / cnos support (inphobia)
  * #317 #326 DOCSIS Head End support (Pyro3d)
  [ENHANCEMENTS]
  * add v3 Context update() tests for net-snmp 5.8+
  * support INFO_TRACE and SNMP_TRACE environment variables for Debug
  * #324 clean up exinda and add regression test
  [BUG FIXES]
  * #294 snmp::info should show full class used
  * #297 perl 5.28 removal of "use vars"
  * #306 fix incorrect interfaces for d-link
  * #319 make fortinet return a useful interface name (inphobia)
  * #320 improve duplicate interfaces() fixup
  * #321 clean interface descriptions of null and trailing space
  * #322 #327 full fix for aerohive tests
  * #325 lazy load legacy RFC1213-MIB only if needed
  * #496 fix for aerohive wireless clients support (inphobia)
 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 and 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]
@@ -182,13 +375,13 @@ version 3.41 (2018-02-01)
  [BUG FIXES]
-  * Fixes to distriution metadata
+  * Fixes to distribution metadata
 version 3.40 (2018-01-28)
  [ENHANCEMENTS]
-  * #240 Support for CheckPoint devies through SNMP
+  * #240 Support for CheckPoint devices through SNMP
  * #240 Cisco SB switches fixup
  * #244 Add Adtran support
  * #241 Vyatta/VyOS support
--- a/22
+++ b/22
@@ -1,3 +1,4 @@
 .perltidyrc
 Build.PL
 Changes
 contrib/DEVELOP
@@ -25,6 +26,8 @@ lib/SNMP/Info/CiscoStack.pm
 lib/SNMP/Info/CiscoStats.pm
 lib/SNMP/Info/CiscoStpExtensions.pm
 lib/SNMP/Info/CiscoVTP.pm
 lib/SNMP/Info/DocsisCM.pm
 lib/SNMP/Info/DocsisHE.pm
 lib/SNMP/Info/EDP.pm
 lib/SNMP/Info/Entity.pm
 lib/SNMP/Info/EtherLike.pm
@@ -41,9 +44,11 @@ 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
@@ -51,6 +56,7 @@ 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
@@ -78,6 +84,7 @@ 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/Ciena.pm
 lib/SNMP/Info/Layer3/Cisco.pm
 lib/SNMP/Info/Layer3/CiscoASA.pm
 lib/SNMP/Info/Layer3/CiscoFWSM.pm
@@ -93,12 +100,14 @@ 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/Lenovo.pm
 lib/SNMP/Info/Layer3/Microsoft.pm
 lib/SNMP/Info/Layer3/Mikrotik.pm
 lib/SNMP/Info/Layer3/N1600.pm
@@ -111,6 +120,8 @@ 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/Redlion.pm
 lib/SNMP/Info/Layer3/Scalance.pm
 lib/SNMP/Info/Layer3/SonicWALL.pm
 lib/SNMP/Info/Layer3/Steelhead.pm
 lib/SNMP/Info/Layer3/Sun.pm
@@ -123,6 +134,7 @@ 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
@@ -148,7 +160,7 @@ xt/00_local_prereq.t
 xt/00_local_spelling.t
 xt/00_local_versionsync.t
 xt/10_remote_snmplabs.t
-xt/20_run.t
+xt/21_run.t
 xt/lib/My/Test/Class.pm
 xt/lib/Test/SNMP/Info.pm
 xt/lib/Test/SNMP/Info/AdslLine.pm
@@ -181,9 +193,11 @@ 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
@@ -191,6 +205,7 @@ 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/Exinda.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
@@ -233,12 +248,14 @@ 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/Lenovo.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
@@ -251,6 +268,8 @@ 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/Redlion.pm
 xt/lib/Test/SNMP/Info/Layer3/Scalance.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
@@ -263,6 +282,7 @@ 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
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -68,3 +68,6 @@ README.md
 # Avoid Komodo project file
 \.komodoproject$
 # ignore intellij
 \B\.idea
--- a/META.json
+++ b/META.json
@@ -29,6 +29,7 @@
         },
         "requires" : {
            "Math::BigInt" : "0",
            "NetAddr::IP" : "4.068",
            "SNMP" : "0"
         }
      },
@@ -37,6 +38,9 @@
            "Class::Inspector" : "0",
            "File::Find" : "0",
            "File::Slurper" : "0",
            "Hook::LexWrap" : "0",
            "Module::Find" : "0",
            "NetSNMP::default_store" : "0",
            "Path::Class" : "0",
            "Test::Class::Most" : "0",
            "Test::Distribution" : "0",
@@ -49,499 +53,543 @@
   "provides" : {
      "SNMP::Info" : {
         "file" : "lib/SNMP/Info.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::AMAP" : {
         "file" : "lib/SNMP/Info/AMAP.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::AdslLine" : {
         "file" : "lib/SNMP/Info/AdslLine.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Aggregate" : {
         "file" : "lib/SNMP/Info/Aggregate.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Airespace" : {
         "file" : "lib/SNMP/Info/Airespace.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Bridge" : {
         "file" : "lib/SNMP/Info/Bridge.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::CDP" : {
         "file" : "lib/SNMP/Info/CDP.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoAgg" : {
         "file" : "lib/SNMP/Info/CiscoAgg.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoConfig" : {
         "file" : "lib/SNMP/Info/CiscoConfig.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoPortSecurity" : {
         "file" : "lib/SNMP/Info/CiscoPortSecurity.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoPower" : {
         "file" : "lib/SNMP/Info/CiscoPower.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoQOS" : {
         "file" : "lib/SNMP/Info/CiscoQOS.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoRTT" : {
         "file" : "lib/SNMP/Info/CiscoRTT.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoStack" : {
         "file" : "lib/SNMP/Info/CiscoStack.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoStats" : {
         "file" : "lib/SNMP/Info/CiscoStats.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoStpExtensions" : {
         "file" : "lib/SNMP/Info/CiscoStpExtensions.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoVTP" : {
         "file" : "lib/SNMP/Info/CiscoVTP.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::DocsisCM" : {
         "file" : "lib/SNMP/Info/DocsisCM.pm",
         "version" : "3.70"
      },
      "SNMP::Info::DocsisHE" : {
         "file" : "lib/SNMP/Info/DocsisHE.pm",
         "version" : "3.70"
      },
      "SNMP::Info::EDP" : {
         "file" : "lib/SNMP/Info/EDP.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Entity" : {
         "file" : "lib/SNMP/Info/Entity.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::EtherLike" : {
         "file" : "lib/SNMP/Info/EtherLike.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::FDP" : {
         "file" : "lib/SNMP/Info/FDP.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::IEEE802dot11" : {
         "file" : "lib/SNMP/Info/IEEE802dot11.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::IEEE802dot3ad" : {
         "file" : "lib/SNMP/Info/IEEE802dot3ad.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::IPv6" : {
         "file" : "lib/SNMP/Info/IPv6.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::LLDP" : {
         "file" : "lib/SNMP/Info/LLDP.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer1" : {
         "file" : "lib/SNMP/Info/Layer1.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer1::Allied" : {
         "file" : "lib/SNMP/Info/Layer1/Allied.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer1::Asante" : {
         "file" : "lib/SNMP/Info/Layer1/Asante.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer1::Bayhub" : {
         "file" : "lib/SNMP/Info/Layer1/Bayhub.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer1::Cyclades" : {
         "file" : "lib/SNMP/Info/Layer1/Cyclades.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer1::S3000" : {
         "file" : "lib/SNMP/Info/Layer1/S3000.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2" : {
         "file" : "lib/SNMP/Info/Layer2.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::3Com" : {
         "file" : "lib/SNMP/Info/Layer2/3Com.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Adtran" : {
         "file" : "lib/SNMP/Info/Layer2/Adtran.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Aerohive" : {
         "file" : "lib/SNMP/Info/Layer2/Aerohive.pm",
         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Airespace" : {
         "file" : "lib/SNMP/Info/Layer2/Airespace.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Aironet" : {
         "file" : "lib/SNMP/Info/Layer2/Aironet.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Allied" : {
         "file" : "lib/SNMP/Info/Layer2/Allied.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Atmedia" : {
         "file" : "lib/SNMP/Info/Layer2/Atmedia.pm",
         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Baystack" : {
         "file" : "lib/SNMP/Info/Layer2/Baystack.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::C1900" : {
         "file" : "lib/SNMP/Info/Layer2/C1900.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::C2900" : {
         "file" : "lib/SNMP/Info/Layer2/C2900.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Catalyst" : {
         "file" : "lib/SNMP/Info/Layer2/Catalyst.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Centillion" : {
         "file" : "lib/SNMP/Info/Layer2/Centillion.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Cisco" : {
         "file" : "lib/SNMP/Info/Layer2/Cisco.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::CiscoSB" : {
         "file" : "lib/SNMP/Info/Layer2/CiscoSB.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Exinda" : {
         "file" : "lib/SNMP/Info/Layer2/Exinda.pm",
         "version" : "3.70"
      },
      "SNMP::Info::Layer2::HP" : {
         "file" : "lib/SNMP/Info/Layer2/HP.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::HP4000" : {
         "file" : "lib/SNMP/Info/Layer2/HP4000.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::HPVC" : {
         "file" : "lib/SNMP/Info/Layer2/HPVC.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Kentrox" : {
         "file" : "lib/SNMP/Info/Layer2/Kentrox.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::N2270" : {
         "file" : "lib/SNMP/Info/Layer2/N2270.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::NAP222x" : {
         "file" : "lib/SNMP/Info/Layer2/NAP222x.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::NWSS2300" : {
         "file" : "lib/SNMP/Info/Layer2/NWSS2300.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Netgear" : {
         "file" : "lib/SNMP/Info/Layer2/Netgear.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Nexans" : {
         "file" : "lib/SNMP/Info/Layer2/Nexans.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Orinoco" : {
         "file" : "lib/SNMP/Info/Layer2/Orinoco.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Sixnet" : {
         "file" : "lib/SNMP/Info/Layer2/Sixnet.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Trapeze" : {
         "file" : "lib/SNMP/Info/Layer2/Trapeze.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Ubiquiti" : {
         "file" : "lib/SNMP/Info/Layer2/Ubiquiti.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::ZyXEL_DSLAM" : {
         "file" : "lib/SNMP/Info/Layer2/ZyXEL_DSLAM.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3" : {
         "file" : "lib/SNMP/Info/Layer3.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Aironet" : {
         "file" : "lib/SNMP/Info/Layer3/Aironet.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::AlcatelLucent" : {
         "file" : "lib/SNMP/Info/Layer3/AlcatelLucent.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::AlteonAD" : {
         "file" : "lib/SNMP/Info/Layer3/AlteonAD.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Altiga" : {
         "file" : "lib/SNMP/Info/Layer3/Altiga.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Arista" : {
         "file" : "lib/SNMP/Info/Layer3/Arista.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Aruba" : {
         "file" : "lib/SNMP/Info/Layer3/Aruba.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::BayRS" : {
         "file" : "lib/SNMP/Info/Layer3/BayRS.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::BlueCoatSG" : {
         "file" : "lib/SNMP/Info/Layer3/BlueCoatSG.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::C3550" : {
         "file" : "lib/SNMP/Info/Layer3/C3550.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::C4000" : {
         "file" : "lib/SNMP/Info/Layer3/C4000.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::C6500" : {
         "file" : "lib/SNMP/Info/Layer3/C6500.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::CheckPoint" : {
         "file" : "lib/SNMP/Info/Layer3/CheckPoint.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Ciena" : {
         "file" : "lib/SNMP/Info/Layer3/Ciena.pm",
         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Cisco" : {
         "file" : "lib/SNMP/Info/Layer3/Cisco.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::CiscoASA" : {
         "file" : "lib/SNMP/Info/Layer3/CiscoASA.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::CiscoFWSM" : {
         "file" : "lib/SNMP/Info/Layer3/CiscoFWSM.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::CiscoSwitch" : {
         "file" : "lib/SNMP/Info/Layer3/CiscoSwitch.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Contivity" : {
         "file" : "lib/SNMP/Info/Layer3/Contivity.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Cumulus" : {
         "file" : "lib/SNMP/Info/Layer3/Cumulus.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::DLink" : {
         "file" : "lib/SNMP/Info/Layer3/DLink.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Dell" : {
         "file" : "lib/SNMP/Info/Layer3/Dell.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::ERX" : {
         "file" : "lib/SNMP/Info/Layer3/ERX.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Enterasys" : {
         "file" : "lib/SNMP/Info/Layer3/Enterasys.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Extreme" : {
         "file" : "lib/SNMP/Info/Layer3/Extreme.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::F5" : {
         "file" : "lib/SNMP/Info/Layer3/F5.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Force10" : {
         "file" : "lib/SNMP/Info/Layer3/Force10.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Fortinet" : {
         "file" : "lib/SNMP/Info/Layer3/Fortinet.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Foundry" : {
         "file" : "lib/SNMP/Info/Layer3/Foundry.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Genua" : {
         "file" : "lib/SNMP/Info/Layer3/Genua.pm",
         "version" : "3.70"
      },
      "SNMP::Info::Layer3::H3C" : {
         "file" : "lib/SNMP/Info/Layer3/H3C.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::HP9300" : {
         "file" : "lib/SNMP/Info/Layer3/HP9300.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Huawei" : {
         "file" : "lib/SNMP/Info/Layer3/Huawei.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::IBMGbTor" : {
         "file" : "lib/SNMP/Info/Layer3/IBMGbTor.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Juniper" : {
         "file" : "lib/SNMP/Info/Layer3/Juniper.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Lantronix" : {
         "file" : "lib/SNMP/Info/Layer3/Lantronix.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Lenovo" : {
         "file" : "lib/SNMP/Info/Layer3/Lenovo.pm",
         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Microsoft" : {
         "file" : "lib/SNMP/Info/Layer3/Microsoft.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Mikrotik" : {
         "file" : "lib/SNMP/Info/Layer3/Mikrotik.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::N1600" : {
         "file" : "lib/SNMP/Info/Layer3/N1600.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::NetSNMP" : {
         "file" : "lib/SNMP/Info/Layer3/NetSNMP.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Netscreen" : {
         "file" : "lib/SNMP/Info/Layer3/Netscreen.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Nexus" : {
         "file" : "lib/SNMP/Info/Layer3/Nexus.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::OneAccess" : {
         "file" : "lib/SNMP/Info/Layer3/OneAccess.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::PacketFront" : {
         "file" : "lib/SNMP/Info/Layer3/PacketFront.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::PaloAlto" : {
         "file" : "lib/SNMP/Info/Layer3/PaloAlto.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Passport" : {
         "file" : "lib/SNMP/Info/Layer3/Passport.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Pf" : {
         "file" : "lib/SNMP/Info/Layer3/Pf.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Pica8" : {
         "file" : "lib/SNMP/Info/Layer3/Pica8.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Redlion" : {
         "file" : "lib/SNMP/Info/Layer3/Redlion.pm",
         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Scalance" : {
         "file" : "lib/SNMP/Info/Layer3/Scalance.pm",
         "version" : "3.70"
      },
      "SNMP::Info::Layer3::SonicWALL" : {
         "file" : "lib/SNMP/Info/Layer3/SonicWALL.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Steelhead" : {
         "file" : "lib/SNMP/Info/Layer3/Steelhead.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Sun" : {
         "file" : "lib/SNMP/Info/Layer3/Sun.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Tasman" : {
         "file" : "lib/SNMP/Info/Layer3/Tasman.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Timetra" : {
         "file" : "lib/SNMP/Info/Layer3/Timetra.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::VMware" : {
         "file" : "lib/SNMP/Info/Layer3/VMware.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::VyOS" : {
         "file" : "lib/SNMP/Info/Layer3/VyOS.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer7" : {
         "file" : "lib/SNMP/Info/Layer7.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer7::APC" : {
         "file" : "lib/SNMP/Info/Layer7/APC.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer7::Arbor" : {
         "file" : "lib/SNMP/Info/Layer7/Arbor.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer7::CiscoIPS" : {
         "file" : "lib/SNMP/Info/Layer7/CiscoIPS.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer7::Gigamon" : {
         "file" : "lib/SNMP/Info/Layer7/Gigamon.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer7::Liebert" : {
         "file" : "lib/SNMP/Info/Layer7/Liebert.pm",
         "version" : "3.70"
      },
      "SNMP::Info::Layer7::Neoteris" : {
         "file" : "lib/SNMP/Info/Layer7/Neoteris.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer7::Netscaler" : {
         "file" : "lib/SNMP/Info/Layer7/Netscaler.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::MAU" : {
         "file" : "lib/SNMP/Info/MAU.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::MRO" : {
         "file" : "lib/SNMP/Info/MRO.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::NortelStack" : {
         "file" : "lib/SNMP/Info/NortelStack.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::PowerEthernet" : {
         "file" : "lib/SNMP/Info/PowerEthernet.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::RapidCity" : {
         "file" : "lib/SNMP/Info/RapidCity.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      },
      "SNMP::Info::SONMP" : {
         "file" : "lib/SNMP/Info/SONMP.pm",
-         "version" : "3.57"
+         "version" : "3.70"
      }
   },
   "release_status" : "stable",
@@ -559,6 +607,6 @@
      "x_IRC" : "irc://irc.freenode.org/#netdisco",
      "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/snmp-info-users"
   },
-   "version" : "3.57",
+   "version" : "3.70",
   "x_serialization_backend" : "JSON::PP version 2.97001"
 }
--- a/META.yml
+++ b/META.yml
@@ -6,6 +6,9 @@ build_requires:
  Class::Inspector: '0'
  File::Find: '0'
  File::Slurper: '0'
  Hook::LexWrap: '0'
  Module::Find: '0'
  NetSNMP::default_store: '0'
  Path::Class: '0'
  Test::Class::Most: '0'
  Test::Distribution: '0'
@@ -24,376 +27,409 @@ name: SNMP-Info
 provides:
  SNMP::Info:
    file: lib/SNMP/Info.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::AMAP:
    file: lib/SNMP/Info/AMAP.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::AdslLine:
    file: lib/SNMP/Info/AdslLine.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Aggregate:
    file: lib/SNMP/Info/Aggregate.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Airespace:
    file: lib/SNMP/Info/Airespace.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Bridge:
    file: lib/SNMP/Info/Bridge.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::CDP:
    file: lib/SNMP/Info/CDP.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::CiscoAgg:
    file: lib/SNMP/Info/CiscoAgg.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::CiscoConfig:
    file: lib/SNMP/Info/CiscoConfig.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::CiscoPortSecurity:
    file: lib/SNMP/Info/CiscoPortSecurity.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::CiscoPower:
    file: lib/SNMP/Info/CiscoPower.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::CiscoQOS:
    file: lib/SNMP/Info/CiscoQOS.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::CiscoRTT:
    file: lib/SNMP/Info/CiscoRTT.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::CiscoStack:
    file: lib/SNMP/Info/CiscoStack.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::CiscoStats:
    file: lib/SNMP/Info/CiscoStats.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::CiscoStpExtensions:
    file: lib/SNMP/Info/CiscoStpExtensions.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::CiscoVTP:
    file: lib/SNMP/Info/CiscoVTP.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::DocsisCM:
    file: lib/SNMP/Info/DocsisCM.pm
    version: '3.70'
  SNMP::Info::DocsisHE:
    file: lib/SNMP/Info/DocsisHE.pm
    version: '3.70'
  SNMP::Info::EDP:
    file: lib/SNMP/Info/EDP.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Entity:
    file: lib/SNMP/Info/Entity.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::EtherLike:
    file: lib/SNMP/Info/EtherLike.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::FDP:
    file: lib/SNMP/Info/FDP.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::IEEE802dot11:
    file: lib/SNMP/Info/IEEE802dot11.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::IEEE802dot3ad:
    file: lib/SNMP/Info/IEEE802dot3ad.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::IPv6:
    file: lib/SNMP/Info/IPv6.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::LLDP:
    file: lib/SNMP/Info/LLDP.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer1:
    file: lib/SNMP/Info/Layer1.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer1::Allied:
    file: lib/SNMP/Info/Layer1/Allied.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer1::Asante:
    file: lib/SNMP/Info/Layer1/Asante.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer1::Bayhub:
    file: lib/SNMP/Info/Layer1/Bayhub.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer1::Cyclades:
    file: lib/SNMP/Info/Layer1/Cyclades.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer1::S3000:
    file: lib/SNMP/Info/Layer1/S3000.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2:
    file: lib/SNMP/Info/Layer2.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::3Com:
    file: lib/SNMP/Info/Layer2/3Com.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::Adtran:
    file: lib/SNMP/Info/Layer2/Adtran.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::Aerohive:
    file: lib/SNMP/Info/Layer2/Aerohive.pm
    version: '3.70'
  SNMP::Info::Layer2::Airespace:
    file: lib/SNMP/Info/Layer2/Airespace.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::Aironet:
    file: lib/SNMP/Info/Layer2/Aironet.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::Allied:
    file: lib/SNMP/Info/Layer2/Allied.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::Atmedia:
    file: lib/SNMP/Info/Layer2/Atmedia.pm
    version: '3.70'
  SNMP::Info::Layer2::Baystack:
    file: lib/SNMP/Info/Layer2/Baystack.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::C1900:
    file: lib/SNMP/Info/Layer2/C1900.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::C2900:
    file: lib/SNMP/Info/Layer2/C2900.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::Catalyst:
    file: lib/SNMP/Info/Layer2/Catalyst.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::Centillion:
    file: lib/SNMP/Info/Layer2/Centillion.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::Cisco:
    file: lib/SNMP/Info/Layer2/Cisco.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::CiscoSB:
    file: lib/SNMP/Info/Layer2/CiscoSB.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::Exinda:
    file: lib/SNMP/Info/Layer2/Exinda.pm
    version: '3.70'
  SNMP::Info::Layer2::HP:
    file: lib/SNMP/Info/Layer2/HP.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::HP4000:
    file: lib/SNMP/Info/Layer2/HP4000.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::HPVC:
    file: lib/SNMP/Info/Layer2/HPVC.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::Kentrox:
    file: lib/SNMP/Info/Layer2/Kentrox.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::N2270:
    file: lib/SNMP/Info/Layer2/N2270.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::NAP222x:
    file: lib/SNMP/Info/Layer2/NAP222x.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::NWSS2300:
    file: lib/SNMP/Info/Layer2/NWSS2300.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::Netgear:
    file: lib/SNMP/Info/Layer2/Netgear.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::Nexans:
    file: lib/SNMP/Info/Layer2/Nexans.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::Orinoco:
    file: lib/SNMP/Info/Layer2/Orinoco.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::Sixnet:
    file: lib/SNMP/Info/Layer2/Sixnet.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::Trapeze:
    file: lib/SNMP/Info/Layer2/Trapeze.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::Ubiquiti:
    file: lib/SNMP/Info/Layer2/Ubiquiti.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer2::ZyXEL_DSLAM:
    file: lib/SNMP/Info/Layer2/ZyXEL_DSLAM.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3:
    file: lib/SNMP/Info/Layer3.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Aironet:
    file: lib/SNMP/Info/Layer3/Aironet.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::AlcatelLucent:
    file: lib/SNMP/Info/Layer3/AlcatelLucent.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::AlteonAD:
    file: lib/SNMP/Info/Layer3/AlteonAD.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Altiga:
    file: lib/SNMP/Info/Layer3/Altiga.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Arista:
    file: lib/SNMP/Info/Layer3/Arista.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Aruba:
    file: lib/SNMP/Info/Layer3/Aruba.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::BayRS:
    file: lib/SNMP/Info/Layer3/BayRS.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::BlueCoatSG:
    file: lib/SNMP/Info/Layer3/BlueCoatSG.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::C3550:
    file: lib/SNMP/Info/Layer3/C3550.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::C4000:
    file: lib/SNMP/Info/Layer3/C4000.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::C6500:
    file: lib/SNMP/Info/Layer3/C6500.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::CheckPoint:
    file: lib/SNMP/Info/Layer3/CheckPoint.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Ciena:
    file: lib/SNMP/Info/Layer3/Ciena.pm
    version: '3.70'
  SNMP::Info::Layer3::Cisco:
    file: lib/SNMP/Info/Layer3/Cisco.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::CiscoASA:
    file: lib/SNMP/Info/Layer3/CiscoASA.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::CiscoFWSM:
    file: lib/SNMP/Info/Layer3/CiscoFWSM.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::CiscoSwitch:
    file: lib/SNMP/Info/Layer3/CiscoSwitch.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Contivity:
    file: lib/SNMP/Info/Layer3/Contivity.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Cumulus:
    file: lib/SNMP/Info/Layer3/Cumulus.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::DLink:
    file: lib/SNMP/Info/Layer3/DLink.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Dell:
    file: lib/SNMP/Info/Layer3/Dell.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::ERX:
    file: lib/SNMP/Info/Layer3/ERX.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Enterasys:
    file: lib/SNMP/Info/Layer3/Enterasys.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Extreme:
    file: lib/SNMP/Info/Layer3/Extreme.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::F5:
    file: lib/SNMP/Info/Layer3/F5.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Force10:
    file: lib/SNMP/Info/Layer3/Force10.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Fortinet:
    file: lib/SNMP/Info/Layer3/Fortinet.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Foundry:
    file: lib/SNMP/Info/Layer3/Foundry.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Genua:
    file: lib/SNMP/Info/Layer3/Genua.pm
    version: '3.70'
  SNMP::Info::Layer3::H3C:
    file: lib/SNMP/Info/Layer3/H3C.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::HP9300:
    file: lib/SNMP/Info/Layer3/HP9300.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Huawei:
    file: lib/SNMP/Info/Layer3/Huawei.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::IBMGbTor:
    file: lib/SNMP/Info/Layer3/IBMGbTor.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Juniper:
    file: lib/SNMP/Info/Layer3/Juniper.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Lantronix:
    file: lib/SNMP/Info/Layer3/Lantronix.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Lenovo:
    file: lib/SNMP/Info/Layer3/Lenovo.pm
    version: '3.70'
  SNMP::Info::Layer3::Microsoft:
    file: lib/SNMP/Info/Layer3/Microsoft.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Mikrotik:
    file: lib/SNMP/Info/Layer3/Mikrotik.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::N1600:
    file: lib/SNMP/Info/Layer3/N1600.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::NetSNMP:
    file: lib/SNMP/Info/Layer3/NetSNMP.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Netscreen:
    file: lib/SNMP/Info/Layer3/Netscreen.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Nexus:
    file: lib/SNMP/Info/Layer3/Nexus.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::OneAccess:
    file: lib/SNMP/Info/Layer3/OneAccess.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::PacketFront:
    file: lib/SNMP/Info/Layer3/PacketFront.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::PaloAlto:
    file: lib/SNMP/Info/Layer3/PaloAlto.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Passport:
    file: lib/SNMP/Info/Layer3/Passport.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Pf:
    file: lib/SNMP/Info/Layer3/Pf.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Pica8:
    file: lib/SNMP/Info/Layer3/Pica8.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Redlion:
    file: lib/SNMP/Info/Layer3/Redlion.pm
    version: '3.70'
  SNMP::Info::Layer3::Scalance:
    file: lib/SNMP/Info/Layer3/Scalance.pm
    version: '3.70'
  SNMP::Info::Layer3::SonicWALL:
    file: lib/SNMP/Info/Layer3/SonicWALL.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Steelhead:
    file: lib/SNMP/Info/Layer3/Steelhead.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Sun:
    file: lib/SNMP/Info/Layer3/Sun.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Tasman:
    file: lib/SNMP/Info/Layer3/Tasman.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::Timetra:
    file: lib/SNMP/Info/Layer3/Timetra.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::VMware:
    file: lib/SNMP/Info/Layer3/VMware.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer3::VyOS:
    file: lib/SNMP/Info/Layer3/VyOS.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer7:
    file: lib/SNMP/Info/Layer7.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer7::APC:
    file: lib/SNMP/Info/Layer7/APC.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer7::Arbor:
    file: lib/SNMP/Info/Layer7/Arbor.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer7::CiscoIPS:
    file: lib/SNMP/Info/Layer7/CiscoIPS.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer7::Gigamon:
    file: lib/SNMP/Info/Layer7/Gigamon.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer7::Liebert:
    file: lib/SNMP/Info/Layer7/Liebert.pm
    version: '3.70'
  SNMP::Info::Layer7::Neoteris:
    file: lib/SNMP/Info/Layer7/Neoteris.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::Layer7::Netscaler:
    file: lib/SNMP/Info/Layer7/Netscaler.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::MAU:
    file: lib/SNMP/Info/MAU.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::MRO:
    file: lib/SNMP/Info/MRO.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::NortelStack:
    file: lib/SNMP/Info/NortelStack.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::PowerEthernet:
    file: lib/SNMP/Info/PowerEthernet.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::RapidCity:
    file: lib/SNMP/Info/RapidCity.pm
-    version: '3.57'
+    version: '3.70'
  SNMP::Info::SONMP:
    file: lib/SNMP/Info/SONMP.pm
-    version: '3.57'
+    version: '3.70'
 recommends:
  Class::ISA: '0'
  File::Slurp: '0'
@@ -402,6 +438,7 @@ recommends:
  PPI: '0'
 requires:
  Math::BigInt: '0'
  NetAddr::IP: '4.068'
  SNMP: '0'
 resources:
  IRC: irc://irc.freenode.org/#netdisco
@@ -410,5 +447,5 @@ resources:
  homepage: http://netdisco.org/
  license: http://opensource.org/licenses/bsd-license.php
  repository: https://github.com/netdisco/snmp-info
-version: '3.57'
+version: '3.70'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
--- a/271
+++ b/271
@@ -2,13 +2,13 @@ NAME
    SNMP::Info - OO Interface to Network devices and MIBs through SNMP
 VERSION
-    SNMP::Info - Version 3.57
+    SNMP::Info - Version 3.70
 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
@@ -36,8 +36,8 @@ SYNOPSIS
     my $err = $info->error();
     die "SNMP Community or Version probably wrong connecting to device. $err\n" if defined $err;
-     $name  = $info->name();
+     my $name  = $info->name();
-     $class = $info->class();
+     my $class = $info->class();
     print "SNMP::Info is using this device class : $class\n";
     # Find out the Duplex status for the ports
@@ -137,8 +137,7 @@ REQUIREMENTS
        If you are using SNMP::Info separate from Netdisco, download the
        Netdisco MIB package at
-        <http://sourceforge.net/projects/netdisco/files/netdisco-mibs/latest
+        <https://github.com/netdisco/netdisco-mibs/releases/latest/>
        -snapshot/>
        Make sure that your snmp.conf is updated to point to your MIB
        directory and that the MIBs are world-readable.
@@ -169,8 +168,8 @@ 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
+        back to the developers (via a github pull request or the mailing
-        inclusion in the next version.
+        list) for inclusion in the next version.
 SUBCLASSES
    These are the subclasses that implement MIBs and support devices:
@@ -209,7 +208,7 @@ 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.
@@ -276,6 +275,16 @@ SUBCLASSES
        See documentation in SNMP::Info::CiscoVTP for details.
    SNMP::Info::DocsisHE
        SNMP Interface for DOCSIS CMTS
        See documentation in SNMP::Info::DocsisHE for details.
    SNMP::Info::DocsisCM
        SNMP Interface for DOCSIS Cable Modems
        See documentation in SNMP::Info::DocsisCM for details.
    SNMP::Info::EDP
        Extreme Discovery Protocol. EXTREME-EDP-MIB
@@ -297,13 +306,6 @@ SUBCLASSES
        See documentation in SNMP::Info::FDP for details.
    SNMP::Info::IPv6
        SNMP Interface for obtaining configured IPv6 addresses and mapping
        IPv6 addresses to MAC addresses and interfaces, using information
        from IP-MIB, IPV6-MIB and/or CISCO-IETF-IP-MIB.
        See documentation in SNMP::Info::IPv6 for details.
    SNMP::Info::IEEE802dot11
        IEEE802dot11-MIB. A collection of OIDs providing information about
        standards based 802.11 wireless devices.
@@ -315,6 +317,13 @@ SUBCLASSES
        See documentation in SNMP::Info::IEEE802dot3ad for details.
    SNMP::Info::IPv6
        SNMP Interface for obtaining configured IPv6 addresses and mapping
        IPv6 addresses to MAC addresses and interfaces, using information
        from IP-MIB, IPV6-MIB and/or CISCO-IETF-IP-MIB.
        See documentation in SNMP::Info::IPv6 for details.
    SNMP::Info::LLDP
        LLDP-MIB, LLDP-EXT-DOT1-MIB, and LLDP-EXT-DOT3-MIB. Link Layer
        Discovery Protocol (LLDP) Support.
@@ -323,7 +332,7 @@ 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.
@@ -404,7 +413,7 @@ SUBCLASSES
        See documentation in SNMP::Info::Layer2 for details.
        SNMP::Info::Layer2::3Com
-            SNMP::Info::Layer2::3Com - SNMP Interface to L2 3Com Switches
+            Subclass for L2 3Com Switches.
            See documentation in SNMP::Info::Layer2::3Com for details.
@@ -413,6 +422,11 @@ SUBCLASSES
            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.
@@ -420,7 +434,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.
@@ -429,6 +444,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
@@ -438,10 +458,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.
@@ -469,7 +485,7 @@ SUBCLASSES
        SNMP::Info::Layer2::Cisco
            Generic Cisco subclass for layer 2 devices that are not yet
-            supported in more specific subclassesand the base layer 2 Cisco
+            supported in more specific subclasses and the base layer 2 Cisco
            class for other device specific layer 2 Cisco classes.
            See documentation in SNMP::Info::Layer2::Cisco for details.
@@ -481,8 +497,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.
@@ -500,6 +521,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.
@@ -518,7 +544,7 @@ SUBCLASSES
        SNMP::Info::Layer2::Nexans
            Subclass for Nexans switches
-            See documetion in SNMP::Info::Layer2::Nexans for details.
+            See documentation in SNMP::Info::Layer2::Nexans for details.
        SNMP::Info::Layer2::NWSS2300
            SNMP Interface to Avaya (Trapeze) Wireless Controllers
@@ -560,10 +586,7 @@ SUBCLASSES
            Subclass for Cisco Aironet wireless access points (AP) not
            running IOS. These are usually older devices.
-            MIBs for these devices now included in v2.tar.gz available from
+            Note SNMP::Info::Layer2::Aironet
            ftp.cisco.com.
            Note Layer2::Aironet
            See documentation in SNMP::Info::Layer3::Aironet for details.
@@ -613,16 +636,22 @@ SUBCLASSES
            See documentation in SNMP::Info::Layer3::C4000 for details.
        SNMP::Info::Layer3::C6500
-            This class covers Catalyst 6500s in native mode, hybrid mode.
+            This class covers Catalyst 6500 series running CatOS or IOS, as
-            Catalyst 3750's, 2970's and probably others.
+            well as Catalyst 2960, 2970, 3750 and 3850 series, including
            blade switches CBS30x0 and CBS31x0 series, all running IOS.
            See documentation in SNMP::Info::Layer3::C6500 for details.
        SNMP::Info::Layer3::CheckPoint
-            Subclass for CheckPoint devices
+            Subclass for CheckPoint devices.
            See documentation in SNMP::Info::Layer3::CheckPoint for details.
        SNMP::Info::Layer3::Ciena
            Subclass for Ciena devices.
            See documentation in SNMP::Info::Layer3::Ciena for details.
        SNMP::Info::Layer3::Cisco
            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
@@ -701,6 +730,11 @@ SUBCLASSES
            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.
@@ -720,20 +754,26 @@ SUBCLASSES
        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.
        SNMP::Info::Layer3::Lenovo
            Subclass for Lenovo switches running CNOS.
            See documentation in SNMP::Info::Layer3::Lenovo for details.
        SNMP::Info::Layer3::Microsoft
            Subclass for Generic Microsoft Routers running Microsoft Windows
            OS.
@@ -761,12 +801,12 @@ 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 Quidway switches
+            Subclass for OneAccess routers.
            See documentation in SNMP::Info::Layer3::OneAccess for details.
@@ -797,13 +837,25 @@ SUBCLASSES
            See documentation in SNMP::Info::Layer3::Pica8 for details.
        SNMP::Info::Layer3::Redlion
            Subclass for redlion routers.
            See documentation in SNMP::Info::Layer3::Redlion for details.
        SNMP::Info::Layer3::Scalance
            Subclass for Siemens Scalance devices.
            See documentation in SNMP::Info::Layer3::Scalance for details.
        SNMP::Info::Layer3::SonicWALL
-            Subclass for generic SonicWALL devices. See documentation in
+            Subclass for generic SonicWALL devices.
-            SNMP::Info::Layer3::SonicWALL for details.
+
            See documentation in SNMP::Info::Layer3::SonicWALL for details.
        SNMP::Info::Layer3::Steelhead
-            Subclass for Riverbed Steelhead WAN optimization appliances. See
+            Subclass for Riverbed Steelhead WAN optimization appliances.
-            documentation in SNMP::Info::Layer3::Steelhead for details.
+
            See documentation in SNMP::Info::Layer3::Steelhead for details.
        SNMP::Info::Layer3::Sun
            Subclass for Generic Sun Routers running SunOS.
@@ -836,36 +888,40 @@ SUBCLASSES
        See documentation in SNMP::Info::Layer7 for details.
        SNMP::Info::Layer7::APC
-            Subclass for APC UPS devices
+            Subclass for APC UPS devices.
            See documentation in SNMP::Info::Layer7::APC for details.
        SNMP::Info::Layer7::Arbor
-            Subclass for Arbor appliances
+            Subclass for Arbor appliances.
            See documentation in SNMP::Info::Layer7::Arbor for details.
        SNMP::Info::Layer7::CiscoIPS
-            Subclass for Cisco IPS devices
+            Subclass for Cisco IPS devices.
-            See documentation in "SNMP::Info::Layer7::Cisco IPS" for
+            See documentation in SNMP::Info::Layer7::CiscoIPS for details.
            details.
        SNMP::Info::Layer7::Gigamon
-            Subclass for Gigamon devices
+            Subclass for Gigamon devices.
            See documentation in SNMP::Info::Layer7::Gigamon for details.
-        SNMP::Info::Layer7::Netscaler
+        SNMP::Info::Layer7::Liebert
-            Subclass for Citrix Netscaler appliances
+            Subclass for Liebert devices.
-            See documentation in SNMP::Info::Layer7::Netscaler for details.
+            See documentation in SNMP::Info::Layer7::Liebert for details.
        SNMP::Info::Layer7::Neoteris
-            Subclass for Juniper SSL VPN appliances
+            Subclass for Pulse Secure / Juniper SSL VPN appliances.
            See documentation in SNMP::Info::Layer7::Neoteris for details.
        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
@@ -873,8 +929,8 @@ Thanks
    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
+    Hunter, Nicolai Petri, Ralf Gross, Robert Kerr, Nick Nauwelaerts and
-    Netdisco README!
+    people listed on the Netdisco README!
 USAGE
  Constructor
@@ -1008,7 +1064,7 @@ USAGE
        anything when a connection under Version 2 is attempted.
        Some newer devices will support Version 1, but will not return all
-        the data they might have if you had connected under Version 1
+        the data they might have if you had connected under Version 1.
        When trying to get info from a new device, you may have to try
        version 2 and then fallback to version 1.
@@ -1108,7 +1164,7 @@ USAGE
         my $info = new SNMP::Info(...);
         # Returns more specific object type
-         $info = $info->specific();
+         my $specific = $info->specify();
        Usually this method is called internally from new(AutoSpecify => 1)
@@ -1122,7 +1178,7 @@ USAGE
        <ftp://ftp.cisco.com/pub/mibs/supportlists/wsc5000/wsc5000-community
        Indexing.html>
-  Globals (Scalar Methods)
+  GLOBALS (Scalar Methods)
    These are methods to return scalar data from RFC1213.
    Some subset of these is probably available for any network device that
@@ -1382,29 +1438,39 @@ USAGE
        ("ifSpecific")
-  IP Address Table
+  IPv4 Address Table
-    Each entry in this table is an IP address in use on this device. Usually
+    Each entry in this table is an IPv4 address in use on this device.
-    this is implemented in Layer3 Devices.
+    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.
    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()
@@ -1661,8 +1727,8 @@ 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.
+    The preference is to open a pull request in the github project. This
-    This allows all developers to have visibility into the request. Please
+    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
@@ -1680,10 +1746,9 @@ 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
+    output, zip the file, and attach it to the github pull request. However,
-    tracker. However, if you do not feel comfortable uploading the output to
+    if you do not feel comfortable uploading the output to the tracker you
-    the tracker you could e-mail it to the developer that has claimed the
+    could e-mail it to the developer that has claimed the ticket.
    ticket.
  Data Structures required in new Subclass
    A class inheriting this class must implement these data structures :
@@ -1754,6 +1819,7 @@ EXTENDING SNMP::INFO
     $VERSION = 0.1;
     use strict;
     use warnings;
     use Exporter;
     use SNMP::Info::Layer2;
@@ -1763,18 +1829,18 @@ EXTENDING SNMP::INFO
                                           SNMP::Info::CiscoVTP Exporter/;
     @SNMP::Info::Layer2::Sample::EXPORT_OK = qw//;
-     use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+     our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE, $AUTOLOAD, $INIT, $DEBUG);
     %MIBS    = (%SNMP::Info::Layer2::MIBS,
                 %SNMP::Info::CiscoVTP::MIBS,
-                 'SUPER-DOOPER-MIB'  => 'supermibobject'
+                 'SUPER-DOOPER-MIB'  => 'supermibobject',
                );
     %GLOBALS = (%SNMP::Info::Layer2::GLOBALS,
                 %SNMP::Info::CiscoVTP::GLOBALS,
                 'name'              => 'supermib_supername',
                 'favorite_color'    => 'supermib_fav_color_object',
-                 'favorite_movie'    => 'supermib_fav_movie_val'
+                 'favorite_movie'    => 'supermib_fav_movie_val',
                 );
     %FUNCS   = (%SNMP::Info::Layer2::FUNCS,
@@ -1782,16 +1848,16 @@ EXTENDING SNMP::INFO
                 # Super Dooper MIB - Super Hero Table
                 'super_hero_index'  => 'SuperHeroIfIndex',
                 'super_hero_name'   => 'SuperHeroIfName',
-                 'super_hero_powers' => 'SuperHeroIfPowers'
+                 'super_hero_powers' => 'SuperHeroIfPowers',
                );
     %MUNGE   = (%SNMP::Info::Layer2::MUNGE,
                 %SNMP::Info::CiscoVTP::MUNGE,
-                 'super_hero_powers' => \&munge_powers
+                 'super_hero_powers' => \&munge_powers,
                );
-     # OverRide uptime() method from %SNMP::Info::GLOBALS
+     # Override uptime() method from %SNMP::Info::GLOBALS
     sub uptime {
         my $sample = shift;
@@ -1829,10 +1895,6 @@ 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}
@@ -1862,11 +1924,11 @@ SNMP::INFO INTERNALS
    $REPEATERS
        Default 20. MaxRepeaters for BULKWALK operations. See "perldoc SNMP"
-        for more info. Can change by passing BulkRepeaters option in new()
+        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',
@@ -1915,45 +1977,45 @@ 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
        ASCII hex string.
    munge_prio_mac()
        Takes an 2-byte octet stream (HEX-STRING) and returns a colon
        separated ASCII hex string.
    munge_prio_port()
        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
+    munge_bits()
-        Takes a SNMP2 'BITS' field and returns the ASCII bit string
+        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.
        TODO: Get the precedence of MIBs and overriding of MIB data in
-        Net-SNMP figured out. Heirarchy/precendence of MIBS in SNMP::Info.
+        Net-SNMP figured out. Hierarchy/precedence 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.
@@ -1962,12 +2024,19 @@ 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 underlying "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.
--- a/contrib/DEVELOP
+++ b/contrib/DEVELOP
@@ -7,9 +7,14 @@ Coding Guidelines:
    - check-in required mibs to netdisco-mibs and release new package if needed
 Release and Testing Instructions:
-    - Please see misc/RELEASE in Netdisco
+    - for netdisco see:
-      ( http://netdisco.cvs.sourceforge.net/viewvc/netdisco/misc/RELEASE?view=markup )
+        -> https://github.com/netdisco/netdisco/wiki/Developing
-      and follow all testing and release guidelines
+        -> 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?
--- a/lib/SNMP/Info.pm
+++ b/lib/SNMP/Info.pm
--- a/lib/SNMP/Info/AMAP.pm
+++ b/lib/SNMP/Info/AMAP.pm
@@ -30,26 +30,27 @@
 package SNMP::Info::AMAP;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::AMAP::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::AMAP::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
-%MIBS
+%MIBS = (
-    = ( 'ALCATEL-IND1-INTERSWITCH-PROTOCOL-MIB' => 'aipAMAPRemDeviceType', );
+  'ALCATEL-IND1-INTERSWITCH-PROTOCOL-MIB' => 'aipAMAPRemDeviceType',
 );
 %GLOBALS = (
 );
 %FUNCS = (
-
+    # ALCATEL-IND1-INTERSWITCH-PROTOCOL-MIB::aipAMAPRemHostname
    # EXTREME-EDP-MIB::extremeEdpTable
    'amap_rem_sysname' => 'aipAMAPRemHostname',
 );
@@ -91,7 +92,7 @@ sub _conn_table_mac {
 # address since they should all originate from the same device, but we don't
 # know if they would all be reachable from the network management application.
 #
-# We don't inplement partials since this is private index function
+# We don't implement partials since this is private index function
 sub _amap_index {
    my $amap = shift;
@@ -253,7 +254,7 @@ Eric Miller
 $hasamap   = $amap->hasAMAP() ? 'yes' : 'no';
- # Print out a map of device ports with LLDP neighbors:
+ # Print out a map of device ports with AMAP neighbors:
 my $interfaces    = $amap->interfaces();
 my $amap_if       = $amap->amap_if();
 my $amap_ip       = $amap->amap_ip();
@@ -291,7 +292,7 @@ None.
 =back
-=head1 GLOBAL METHODS
+=head1 GLOBALS
 These are methods that return scalar values from SNMP
--- a/lib/SNMP/Info/AdslLine.pm
+++ b/lib/SNMP/Info/AdslLine.pm
@@ -30,15 +30,16 @@
 package SNMP::Info::AdslLine;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::AdslLine::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::AdslLine::EXPORT_OK = qw//;
-use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = ( 'ADSL-LINE-MIB' => 'adslLineType' );
@@ -105,8 +106,6 @@ none.
 =back
 MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
 =head1 GLOBALS
 =over
--- a/lib/SNMP/Info/Aggregate.pm
+++ b/lib/SNMP/Info/Aggregate.pm
@@ -30,15 +30,16 @@
 package SNMP::Info::Aggregate;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@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/;
+our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 # Load MIB for leafs referenced within class
 %MIBS = ('IF-MIB' => 'ifIndex',);
--- a/lib/SNMP/Info/Airespace.pm
+++ b/lib/SNMP/Info/Airespace.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Airespace
 # $Id$
 #
 # Copyright (c) 2008 Eric Miller
 # All rights reserved.
@@ -31,15 +30,16 @@
 package SNMP::Info::Airespace;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::Airespace::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::Airespace::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::MIBS,
@@ -508,8 +508,8 @@ sub ip_index {
    my $airespace = shift;
    my $partial   = shift;
-    my $ip_index = $airespace->orig_ip_index($partial) || {};
+    my $ip_index = $airespace->SUPER::ip_index($partial) || {};
-    my $if_ip    = $airespace->airespace_if_ip()       || {};
+    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 $ip_mask = $airespace->SUPER::ip_netmask($partial) || {};
-    my $if_ip   = $airespace->airespace_if_ip()         || {};
+    my $if_ip   = $airespace->airespace_if_ip()           || {};
-    my $if_mask = $airespace->airespace_if_mask()       || {};
+    my $if_mask = $airespace->airespace_if_mask()         || {};
    my %ip_netmask;
    foreach my $ip ( keys %$ip_mask ) {
--- a/lib/SNMP/Info/Bridge.pm
+++ b/lib/SNMP/Info/Bridge.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Bridge
 # $Id$
 #
 # Changes since Version 0.7 Copyright (c) 2004 Max Baker
 # All rights reserved.
@@ -34,15 +33,16 @@
 package SNMP::Info::Bridge;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::Bridge::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::Bridge::EXPORT_OK = qw//;
-use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
+our ($VERSION, $DEBUG, %MIBS, %FUNCS, %GLOBALS, %MUNGE, $INIT);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    'BRIDGE-MIB'   => 'dot1dBaseBridgeAddress',
@@ -242,8 +242,10 @@ sub qb_fdb_index {
 sub fw_mac {
    my $bridge = shift;
-    my $qb = $bridge->qb_fw_mac();
+    unless ($bridge->can('cisco_comm_indexing') && $bridge->cisco_comm_indexing()){
-    return $qb if (ref {} eq ref $qb and scalar keys %$qb);
+        my $qb = $bridge->qb_fw_mac();
        return $qb if (ref {} eq ref $qb and scalar keys %$qb);
    }
    return $bridge->SUPER::fw_mac();
 }
@@ -251,8 +253,10 @@ sub fw_mac {
 sub fw_port {
    my $bridge = shift;
-    my $qb = $bridge->qb_fw_port();
+    unless ($bridge->can('cisco_comm_indexing') && $bridge->cisco_comm_indexing()){
-    return $qb if (ref {} eq ref $qb and scalar keys %$qb);
+        my $qb = $bridge->qb_fw_port();
        return $qb if (ref {} eq ref $qb and scalar keys %$qb);
    }
    return $bridge->SUPER::fw_port();
 }
@@ -260,8 +264,10 @@ sub fw_port {
 sub fw_status {
    my $bridge = shift;
-    my $qb = $bridge->qb_fw_status();
+    unless ($bridge->can('cisco_comm_indexing') && $bridge->cisco_comm_indexing()){
-    return $qb if (ref {} eq ref $qb and scalar keys %$qb);
+        my $qb = $bridge->qb_fw_status();
        return $qb if (ref {} eq ref $qb and scalar keys %$qb);
    }
    return $bridge->SUPER::fw_status();
 }
@@ -296,11 +302,11 @@ sub i_stp_port {
    my %i_stp_port;
    foreach my $index ( keys %$stp_p_port ) {
-        my $bridge = $stp_p_port->{$index};
+        my $bport  = $stp_p_port->{$index};
        my $iid    = $bp_index->{$index};
        next unless defined $iid;
-        next unless defined $bridge;
+        next unless defined $bport;
-        $i_stp_port{$iid} = $bridge;
+        $i_stp_port{$iid} = $bport;
    }
    return \%i_stp_port;
 }
@@ -315,11 +321,11 @@ sub i_stp_id {
    my %i_stp_id;
    foreach my $index ( keys %$stp_p_id ) {
-        my $bridge = $stp_p_id->{$index};
+        my $bport  = $stp_p_id->{$index};
        my $iid    = $bp_index->{$index};
        next unless defined $iid;
-        next unless defined $bridge;
+        next unless defined $bport;
-        $i_stp_id{$iid} = $bridge;
+        $i_stp_id{$iid} = $bport;
    }
    return \%i_stp_id;
 }
@@ -334,11 +340,11 @@ sub i_stp_bridge {
    my %i_stp_bridge;
    foreach my $index ( keys %$stp_p_bridge ) {
-        my $bridge = $stp_p_bridge->{$index};
+        my $bport  = $stp_p_bridge->{$index};
        my $iid    = $bp_index->{$index};
        next unless defined $iid;
-        next unless defined $bridge;
+        next unless defined $bport;
-        $i_stp_bridge{$iid} = $bridge;
+        $i_stp_bridge{$iid} = $bport;
    }
    return \%i_stp_bridge;
 }
@@ -609,12 +615,11 @@ None.
 =item F<Q-BRIDGE-MIB>
 =item F<RSTP-MIB>
 =back
-F<BRIDGE-MIB> needs to be extracted from
+=head1 GLOBALS
 ftp://ftp.cisco.com/pub/mibs/v1/v1.tar.gz
 =head1 GLOBAL METHODS
 These are methods that return scalar values from SNMP
--- a/lib/SNMP/Info/CDP.pm
+++ b/lib/SNMP/Info/CDP.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::CDP
 # $Id$
 #
 # Changes since Version 0.7 Copyright (c) 2004 Max Baker
 # All rights reserved.
@@ -34,16 +33,17 @@
 package SNMP::Info::CDP;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::CDP::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::CDP::EXPORT_OK = qw//;
-use vars
+our
-    qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT %CDP_CAPABILITIES/;
+    ($VERSION, $DEBUG, %FUNCS, %GLOBALS, %MIBS, %MUNGE, $INIT, %CDP_CAPABILITIES);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 # Five data structures required by SNMP::Info
 %MIBS = ( 'CISCO-CDP-MIB' => 'cdpGlobalRun' );
@@ -54,7 +54,7 @@ $VERSION = '3.57';
    'cdp_run'      => 'cdpGlobalRun',
    'cdp_interval' => 'cdpGlobalMessageInterval',
    'cdp_holdtime' => 'cdpGlobalHoldTime',
-    'cdp_gid'       => 'cdpGlobalDeviceId',
+    'cdp_gid'      => 'cdpGlobalDeviceId',
 );
 %FUNCS = (
@@ -62,7 +62,7 @@ $VERSION = '3.57';
    'cdp_addr'         => 'cdpCacheAddress',
    'cdp_ver'          => 'cdpCacheVersion',
    'cdp_dev_id'       => 'cdpCacheDeviceId',
-    'cdp_port'         => 'cdpCacheDevicePort',
+    'cdp_dev_port'     => 'cdpCacheDevicePort',
    'cdp_platform'     => 'cdpCachePlatform',
    'cdp_capabilities' => 'cdpCacheCapabilities',
    'cdp_domain'       => 'cdpCacheVTPMgmtDomain',
@@ -79,11 +79,9 @@ $VERSION = '3.57';
    '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_ver'          => \&SNMP::Info::munge_null,
    'cdp_ip'           => \&SNMP::Info::munge_ip,
    'cdp_power'        => \&munge_power,
 );
 %CDP_CAPABILITIES = (
@@ -110,18 +108,16 @@ 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
+    # SNMP v1 clients don't have the globals, fallback
-    if ( defined $ver and $ver == 1 ) {
+    # by checking if it would report neighbors
-        my $cdp_ip = $cdp->cdp_ip();
+    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;
        return 1 if ( defined $cdp_ip and scalar( keys %$cdp_ip ) );
        return;
    }
    return $cdp->cdp_run();
 }
 sub cdp_if {
@@ -219,6 +215,28 @@ sub cdp_id {
    return \%cdp_id;
 }
 sub cdp_port {
    my $cdp    = shift;
    my $partial = shift;
    my $ch = $cdp->cdp_dev_port($partial) || {};
    # most devices return a string with the interface name here (Port-ID TLV)
    # see https://www.cisco.com/c/en/us/td/docs/ios-xml/ios/cdp/command/cdp-cr-book/cdp-cr-a1.html
    # it seems however that some devices report hex encoded mac addresses for this, see
    # https://github.com/netdisco/snmp-info/issues/252
    # once these bad devices get known we can figure out workarounds for them
    my %cdp_port;
    foreach my $key ( sort keys %$ch ) {
        my $port = $ch->{$key};
        next unless $port;
        $port = SNMP::Info::munge_null($port);
        $cdp_port{$key} = $port;
    }
    return \%cdp_port;
 }
 1;
 __END__
@@ -246,7 +264,7 @@ Max Baker
 $hascdp   = $cdp->hasCDP() ? 'yes' : 'no';
 # Print out a map of device ports with CDP neighbors:
- my $interfaces = $cdp->interfaces();
+ my $interfaces   = $cdp->interfaces();
 my $cdp_if       = $cdp->cdp_if();
 my $cdp_ip       = $cdp->cdp_ip();
 my $cdp_port     = $cdp->cdp_port();
@@ -265,8 +283,8 @@ 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
-also speak CDP, mostly switches and routers.  CDP is implemented in Cisco and
+also speak CDP, mostly switches and routers.  CDP is implemented by Cisco and
-some HP devices.
+several other vendors.
 Create or use a device subclass that inherits this class.  Do not use
 directly.
@@ -286,9 +304,7 @@ None.
 =back
-MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
+=head1 GLOBALS
 =head1 GLOBAL METHODS
 These are methods that return scalar values from SNMP
@@ -466,9 +482,10 @@ Returns remote platform id
 =item $cdp->cdp_port()
-Returns remote port ID
+Returns remote Port-ID. Most of the time this is a string with the port name, but this
 is not guaranteed to be so.
-(C<cdpDevicePort>)
+(C<cdpCacheDevicePort>)
 =item  $cdp->cdp_proto()
--- a/lib/SNMP/Info/CiscoAgg.pm
+++ b/lib/SNMP/Info/CiscoAgg.pm
@@ -1,6 +1,6 @@
 # SNMP::Info::CiscoAgg
 #
-# Copyright (c) 2018 SNMP::Info Developers
+# Copyright (c) 2019 SNMP::Info Developers
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -30,36 +30,72 @@
 package SNMP::Info::CiscoAgg;
 use strict;
 use warnings;
 use Exporter;
-use SNMP::Info::IEEE802dot3ad 'agg_ports_lag';
+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/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+our ($DEBUG, $VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
  %SNMP::Info::IEEE802dot3ad::MIBS,
-  'CISCO-PAGP-MIB'   => 'pagpGroupIfIndex',
+  '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;
@@ -80,9 +116,28 @@ sub agg_ports_pagp {
  return $mapping;
 }
-# until we have PAgP data and need to combine with LAG data
+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(@_)}};
+  my $ret = {%{agg_ports_pagp(@_)}, %{agg_ports_lag(@_)}, %{agg_ports_cisco(@_)}};
  return $ret;
 }
@@ -116,7 +171,7 @@ SNMP::Info Developers
 =head1 DESCRIPTION
 This class provides access to Aggregated Links configuration on Cisco devices.
-It combines Cisco PAgP and IEEE 802.3ad information.
+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.
@@ -130,11 +185,13 @@ L<SNMP::Info::IEEE802dot3ad>
 =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 TABLE METHODS
 =head1 METHODS
 =over 4
@@ -144,15 +201,52 @@ 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
@@ -1,5 +1,4 @@
 # SNMP::Info::CiscoConfig
 # $Id$
 #
 # Copyright (c) 2008 Eric Miller
 # All rights reserved.
@@ -31,15 +30,16 @@
 package SNMP::Info::CiscoConfig;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::CiscoConfig::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::CiscoConfig::EXPORT_OK = qw//;
-use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    'CISCO-CONFIG-COPY-MIB' => 'ccCopyTable',
@@ -336,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
--- a/lib/SNMP/Info/CiscoPortSecurity.pm
+++ b/lib/SNMP/Info/CiscoPortSecurity.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::CiscoPortSecurity
 # $Id$
 #
 # Copyright (c) 2008 Eric Miller
 # All rights reserved.
@@ -31,15 +30,16 @@
 package SNMP::Info::CiscoPortSecurity;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::CiscoPortSecurity::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::CiscoPortSecurity::EXPORT_OK = qw//;
-use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PAECAPABILITIES/;
+our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE, %PAECAPABILITIES);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    'CISCO-PORT-SECURITY-MIB' => 'ciscoPortSecurityMIB',
@@ -110,7 +110,7 @@ $VERSION = '3.57';
 %PAECAPABILITIES = (
    0 => 'dot1xPaePortAuthCapable',
-    1 => 'dot1xPaePortSuppCapable'
+    1 => 'dot1xPaePortSuppCapable',
 );
 sub munge_pae_capabilities {
@@ -196,10 +196,6 @@ None.
 These are methods that return scalar values from SNMP
 =over
 =back
 =head2 F<CISCO-PORT-SECURITY-MIB> globals
 =over
--- a/lib/SNMP/Info/CiscoPower.pm
+++ b/lib/SNMP/Info/CiscoPower.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::CiscoPower
 # $Id$
 #
 # Copyright (c) 2008 Bill Fenner
 # All rights reserved.
@@ -31,18 +30,20 @@
 package SNMP::Info::CiscoPower;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::CiscoPower::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::CiscoPower::EXPORT_OK = qw//;
-use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = ( 'CISCO-POWER-ETHERNET-EXT-MIB' => 'cpeExtPsePortEntPhyIndex',
-          'CISCO-CDP-MIB' => 'cdpCachePowerConsumption' );
+          'CISCO-CDP-MIB' => 'cdpCachePowerConsumption',
 );
 %GLOBALS = ();
@@ -153,6 +154,8 @@ Note that it requires that the device inherits from Info::Entity.
 =item F<CISCO-POWER-ETHERNET-EXT-MIB>
 =item F<CISCO-CDP-MIB>
 =back
 =head1 GLOBALS
--- a/lib/SNMP/Info/CiscoQOS.pm
+++ b/lib/SNMP/Info/CiscoQOS.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::CiscoQOS
 # $Id$
 #
 # Copyright (c) 2005 Alexander Hartmaier
 # All rights reserved.
@@ -31,15 +30,16 @@
 package SNMP::Info::CiscoQOS;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::CiscoQOS::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::CiscoQOS::EXPORT_OK = qw//;
-use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = ( 'CISCO-CLASS-BASED-QOS-MIB' => 'cbQosIfIndex', );
@@ -118,8 +118,6 @@ none.
 =back
 MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
 =head1 GLOBALS
 =over
--- a/lib/SNMP/Info/CiscoRTT.pm
+++ b/lib/SNMP/Info/CiscoRTT.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::CiscoRTT
 # $Id$
 #
 # Copyright (c) 2005 Alexander Hartmaier
 # All rights reserved.
@@ -31,15 +30,16 @@
 package SNMP::Info::CiscoRTT;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::CiscoRTT::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::CiscoRTT::EXPORT_OK = qw//;
-use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = ( 'CISCO-RTTMON-MIB' => 'rttMonCtrlAdminOwner', );
@@ -99,8 +99,6 @@ none.
 =back
 MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
 =head1 GLOBALS
 =over
@@ -113,7 +111,7 @@ None
 =head2 Overall Control Group Table
-This table is from C<CISCO-RTTMAN-MIB::rttMonCtrlAdminTable>
+This table is from C<CISCO-RTTMON-MIB::rttMonCtrlAdminTable>
 =over
--- a/lib/SNMP/Info/CiscoStack.pm
+++ b/lib/SNMP/Info/CiscoStack.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::CiscoStack
 # $Id$
 #
 # Copyright (c) 2008 Max Baker
 # All rights reserved.
@@ -31,14 +30,15 @@
 package SNMP::Info::CiscoStack;
 use strict;
 use warnings;
 use Exporter;
@SNMP::Info::CiscoStack::ISA       = qw/Exporter/;
@SNMP::Info::CiscoStack::EXPORT_OK = qw//;
-use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT/;
+our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE, %PORTSTAT);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = ( 'CISCO-STACK-MIB' => 'ciscoStackMIB', );
@@ -106,7 +106,7 @@ $VERSION = '3.57';
    1 => 'other',
    2 => 'ok',
    3 => 'minorFault',
-    4 => 'majorFault'
+    4 => 'majorFault',
 );
 # Changes binary byte describing each port into ascii, and returns
@@ -286,8 +286,7 @@ __END__
 =head1 NAME
-SNMP::Info::CiscoStack - SNMP Interface to data from F<CISCO-STACK-MIB> and
+SNMP::Info::CiscoStack - SNMP Interface to data from F<CISCO-STACK-MIB>
 F<CISCO-PORT-SECURITY-MIB>
 =head1 AUTHOR
@@ -296,7 +295,7 @@ Max Baker
 =head1 SYNOPSIS
 # Let SNMP::Info determine the correct subclass for you.
- my $ciscostats = new SNMP::Info(
+ my $ciscostack = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myswitch',
@@ -305,7 +304,7 @@ Max Baker
                        )
    or die "Can't connect to DestHost.\n";
- my $class = $ciscostats->class();
+ my $class = $ciscostack->class();
 print "SNMP::Info determined this device to fall under subclass : $class\n";
 =head1 DESCRIPTION
--- a/lib/SNMP/Info/CiscoStats.pm
+++ b/lib/SNMP/Info/CiscoStats.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::CiscoStats
 # $Id$
 #
 # Changes since Version 0.7 Copyright (c) 2008-2009 Max Baker and SNMP::Info Developers
 # All rights reserved.
@@ -34,15 +33,16 @@
 package SNMP::Info::CiscoStats;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::CiscoStats::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::CiscoStats::EXPORT_OK = qw//;
-use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    'SNMPv2-MIB'            => 'sysDescr',
@@ -105,6 +105,10 @@ sub os {
    # order here matters - there are Catalysts that run IOS and have catalyst
    # in their description field, as well as Catalysts that run IOS-XE.
    return 'ios-xe'   if ( $descr =~ /Denali/ );
    return 'ios-xe'   if ( $descr =~ /Fuji/ );
    return 'ios-xe'   if ( $descr =~ /Everest/ );
    return 'ios-xe'   if ( $descr =~ /Gibraltar/ );
    return 'ios-xe'   if ( $descr =~ /IOS-XE/ );
    return 'ios-xr'   if ( $descr =~ /IOS XR/ );
    return 'ios'      if ( $descr =~ /IOS/ );
@@ -385,8 +389,6 @@ None.
 =back
 MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
 =head1 GLOBALS
 =over
--- a/lib/SNMP/Info/CiscoStpExtensions.pm
+++ b/lib/SNMP/Info/CiscoStpExtensions.pm
@@ -29,14 +29,14 @@
 package SNMP::Info::CiscoStpExtensions;
 use strict;
-
+use warnings;
 use Exporter;
 use SNMP::Info;
 use SNMP::Info::Bridge;
-use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT $INIT/;
+our ($VERSION, $DEBUG, %MIBS, %FUNCS, %GLOBALS, %MUNGE, %PORTSTAT, $INIT);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
@SNMP::Info::CiscoStpExtensions::ISA = qw/SNMP::Info::Bridge SNMP::Info Exporter/;
@SNMP::Info::CiscoStpExtensions::EXPORT_OK = qw//;
@@ -277,6 +277,19 @@ 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
@@ -296,9 +309,15 @@ For debugging you can call new() directly as you would in SNMP::Info
 =back
-MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
+=head2 Required MIBs
-=head1 GLOBAL METHODS
+=over
 =item F<CISCO-STP-EXTENSIONS-MIB>
 =back
 =head1 GLOBALS
 These are methods that return scalar values from SNMP
--- a/lib/SNMP/Info/CiscoVTP.pm
+++ b/lib/SNMP/Info/CiscoVTP.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::CiscoVTP
 # $Id$
 #
 # Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
 #
@@ -33,15 +32,16 @@
 package SNMP::Info::CiscoVTP;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::CiscoVTP::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::CiscoVTP::EXPORT_OK = qw//;
-use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    'CISCO-VTP-MIB'                       => 'vtpVlanName',
@@ -565,8 +565,6 @@ None.
 =back
 MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
 =head1 GLOBALS
 =over
--- a/lib/SNMP/Info/DocsisCM.pm
+++ b/lib/SNMP/Info/DocsisCM.pm
@@ -0,0 +1,126 @@
 # SNMP::Info::DocsisCM - SNMP Interface to DOCSIS Cable Modems
 #
 # 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::DocsisCM;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer2;
@SNMP::Info::DocsisCM::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::DocsisCM::EXPORT_OK = qw//;
 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);
 $VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer2::MIBS
 );
 %GLOBALS = (
    %SNMP::Info::Layer2::GLOBALS
 );
 %FUNCS  = (
    %SNMP::Info::Layer2::FUNCS
 );
 %MUNGE = (
    %SNMP::Info::Layer2::MUNGE
 );
 sub vendor {
    my $cm = shift;
    my $descr = $cm->description();
    return $1 if $descr =~ /VENDOR: (.*?);/;
 }
 sub model {
    my $cm = shift;
    my $descr = $cm->description();
    return $1 if $descr =~ /MODEL: (.*?)>>/;
 }
 sub os {
    return "CM";
 }
 sub os_ver {
    my $cm = shift;
    my $descr = $cm->description();
    return $1 if $descr =~ /SW_REV: (.*?);/;
 }
 1;
 __END__
 =head1 NAME
 SNMP::Info::DocsisCM - SNMP Interface for DOCSIS Cable Modems
 =head1 DESCRIPTION
 SNMP::Info::DocsisCM is a subclass of SNMP::Info that provides info
 about a given cable modem. Extracts data from the sysDescr, which is 
 mandated in the DOCSIS specification to match
 "HW_REV: <value>; VENDOR: <value>; BOOTR: <value>; SW_REV: <value>; MODEL: <value>"
 =head2 Inherited Classes
 None.
 =head2 Required MIBs
 None.
 =head1 GLOBALS
 These are methods that return scalar value from SNMP
 =over
 =item $cm->vendor()
 Returns the vendor of the cable modem.
 =item $cm->model()
 Returns the model of the cable modem.
 =item $cm->os()
 Returns 'cm', as the actual os is vendor and model dependent.
 =item $cm->os_ver()
 Returns the version of the software, extracted from the SW_REV field.
 =back
--- a/lib/SNMP/Info/DocsisHE.pm
+++ b/lib/SNMP/Info/DocsisHE.pm
@@ -0,0 +1,124 @@
 package SNMP::Info::DocsisHE;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::DocsisHE::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::DocsisHE::EXPORT_OK = qw//;
 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);
 $VERSION = '3.70-135';
 %MIBS = (
    'DOCS-IF3-MIB' => 'docsIf3Mib',
    'DOCS-IF-MIB'  => 'docsIfMib',
 );
 %GLOBALS = ();
 %FUNCS  = (
    # DOCSIS 3.0 (DOCS-IF3-MIB) from CableLabs
    'docs_if3_cmts_cm_status_md_if_index'=> 'docsIf3CmtsCmRegStatusMdIfIndex',
    # DOCSIS (1.1, etc) from IETF
    'docs_if_cmts_cm_status_inet_address_type' => 'docsIfCmtsCmStatusInetAddressType',
    'docs_if_cmts_cm_status_inet_address'      => 'docsIfCmtsCmStatusInetAddress',
    'docs_cmts_cm_down_channel_if_index'       => 'docsIfCmtsCmStatusDownChannelIfIndex',
    'docs_cmts_cm_up_channel_if_index'         => 'docsIfCmtsCmStatusUpChannelIfIndex',
 );
 %MUNGE = ();
 1;
 __END__
 =head1 NAME
 SNMP::Info::DocsisHE - SNMP Interface for F<DOCS-IF-MIB> and F<DOCS-IF3-MIB>
 =head1 AUTHOR
 Ryan Gasik
 =head1 SYNOPSIS
 my $cmts = new SNMP::Info(
                             AutoSpecify => 1,
                             Debug       => 1,
                             DestHost    => 'cmts',
                             Community   => 'public',
                             Version     => 2
                          );
 # Get a list of modems off the DOCSIS CMTS
 my $modems = $cmts->docs_if_cmts_cm_status_inet_address()
 =head1 DESCRIPTION
 SNMP::Info::DocsisHE is a subclass of SNMP::Info that provides information
 about the cable modems of a DOCSIS CMTS.
 =head2 Inherited Classes
 None.
 =head2 Required MIBs
 =over
 =item F<DOCS-IF-MIB>
 Standard IETF MIBs for DOCSIS 1.1
 =item F<DOCS-IF3-MIB>
 CableLabs MIBs for DOCSIS 3
 =back
 =head1 GLOBALS
 None.
 =head1 TABLE METHODS
 =over
 =item $info->docs_if3_cmts_cm_status_md_if_index()
 Returns reference to hash of the IfIndex associated with each cable modem.
 (C<docsIf3CmtsCmRegStatusMdIfIndex>)
 =item $info->docs_if_cmts_cm_status_inet_address_type()
 Returns reference to hash of the type of IP address (ie, IPv4, IPv6)
 associated with each cable modem
 (C<docsIfCmtsCmStatusInetAddressType>)
 =item $info->docs_if_cmts_cm_status_inet_address()
 Returns reference to hash of the IP address associated with each
 cable modem.
 (C<docsIfCmtsCmStatusInetAddress>)
 =item $info->docs_cmts_cm_down_channel_if_index()
 Returns reference to hash of the IfIndex of the down channel
 (for DOCSIS 1.1) or a down channel (DOCSIS 3+) associated with each
 cable modem.
 (C<docsIfCmtsCmStatusDownChannelIfIndex>)
 =item $info->docs_cmts_cm_up_channel_if_index()
 Returns reference to hash of the IfIndex of the up channel
 (for DOCSIS 1.1) or a up channel (DOCSIS 3+) associated with each
 cable modem.
 (C<docsIfCmtsCmStatusUpChannelIfIndex>)
 =back
 =cut
--- a/lib/SNMP/Info/EDP.pm
+++ b/lib/SNMP/Info/EDP.pm
@@ -31,15 +31,16 @@
 package SNMP::Info::EDP;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::EDP::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::EDP::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    'EXTREME-EDP-MIB'   => 'extremeEdpPortIfIndex',
@@ -75,7 +76,7 @@ sub hasEDP {
 # address since they should all originate from the same device, but we don't
 # know if they would all be reachable from the network management application.
 #
-# We don't inplement partials since this is private index function
+# We don't implement partials since this is private index function
 sub _edp_index {
    my $edp = shift;
@@ -204,10 +205,10 @@ Eric Miller
 my $class = $edp->class();
 print " Using device sub class : $class\n";
- $haslldp   = $edp->hasLLDP() ? 'yes' : 'no';
+ $hasedp   = $edp->hasEDP() ? 'yes' : 'no';
- # Print out a map of device ports with LLDP neighbors:
+ # Print out a map of device ports with EDP neighbors:
- my $interfaces    = $edp->interfaces();
+ my $interfaces   = $edp->interfaces();
 my $edp_if       = $edp->edp_if();
 my $edp_ip       = $edp->edp_ip();
 my $edp_port     = $edp->edp_port();
@@ -243,7 +244,7 @@ None.
 =back
-=head1 GLOBAL METHODS
+=head1 GLOBALS
 These are methods that return scalar values from SNMP
@@ -251,7 +252,7 @@ These are methods that return scalar values from SNMP
 =item $edp->hasEDP()
-Is EDP is active in this device?  
+Is EDP active on this device?
 =back
--- a/lib/SNMP/Info/Entity.pm
+++ b/lib/SNMP/Info/Entity.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Entity
 # $Id$
 #
 # Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
 #
@@ -33,15 +32,16 @@
 package SNMP::Info::Entity;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::Entity::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::Entity::EXPORT_OK = qw//;
-use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = ( 'ENTITY-MIB' => 'entPhysicalSerialNum' );
@@ -75,7 +75,7 @@ sub e_index {
    my $entity  = shift;
    my $partial = shift;
-    # Force use of MIB leaf to avoid inheritance issues in psuedo classes
+    # Force use of MIB leaf to avoid inheritance issues in pseudo classes
    my $e_descr = $entity->entPhysicalDescr($partial);
    return unless ($e_descr);
@@ -213,8 +213,6 @@ none.
 =back
 MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
 =head1 GLOBALS
 none.
--- a/lib/SNMP/Info/EtherLike.pm
+++ b/lib/SNMP/Info/EtherLike.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::EtherLike
 # $Id$
 #
 # Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
 #
@@ -33,15 +32,16 @@
 package SNMP::Info::EtherLike;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::EtherLike::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::EtherLike::EXPORT_OK = qw//;
-use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = ( 'EtherLike-MIB' => 'etherMIB' );
@@ -68,7 +68,7 @@ $VERSION = '3.57';
    'el_xmit_defer'      => 'dot3StatsDeferredTransmissions',
    # Ethernet-like Collision Statistics Group
-    'el_coll_freq'  => 'dot3CollFrequencies'
+    'el_coll_freq'  => 'dot3CollFrequencies',
 );
 %MUNGE = ( %SNMP::Info::MUNGE, 'el_duplex' => \&munge_el_duplex, );
@@ -103,7 +103,7 @@ Max Baker
                             Version     => 2
                           );
- my $class = $cdp->class();
+ my $class = $el->class();
 print " Using device sub class : $class\n";
 # Find the duplex setting for a port on a device that implements
@@ -143,8 +143,6 @@ None.
 =back
 MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
 =head1 GLOBALS
 These are methods that return scalar values from SNMP
--- a/lib/SNMP/Info/FDP.pm
+++ b/lib/SNMP/Info/FDP.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::FDP
 # $Id$
 #
 # Copyright (c) 2008 Bruce Rodger, Max Baker
 # All rights reserved.
@@ -34,15 +33,16 @@
 package SNMP::Info::FDP;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::FDP::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::FDP::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = ( 'FOUNDRY-SN-SWITCH-GROUP-MIB' => 'snFdpGlobalRun' );
@@ -65,7 +65,7 @@ $VERSION = '3.57';
 %MUNGE = (
    'fdp_capabilities' => \&SNMP::Info::munge_bits,
-    'fdp_ip'           => \&SNMP::Info::munge_ip
+    'fdp_ip'           => \&SNMP::Info::munge_ip,
 );
 sub fdp_run {
@@ -146,7 +146,7 @@ Bruce Rodger, Max Baker
 $hasfdp   = $fdp->hasFDP() ? 'yes' : 'no';
 # Print out a map of device ports with FDP neighbors:
- my $interfaces = $fdp->interfaces();
+ my $interfaces   = $fdp->interfaces();
 my $fdp_if       = $fdp->fdp_if();
 my $fdp_ip       = $fdp->fdp_ip();
 my $fdp_port     = $fdp->fdp_port();
@@ -190,7 +190,7 @@ work with B2R07600C.
 =back
-=head1 GLOBAL METHODS
+=head1 GLOBALS
 These are methods that return scalar values from SNMP
--- a/lib/SNMP/Info/IEEE802dot11.pm
+++ b/lib/SNMP/Info/IEEE802dot11.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::IEEE802dot11
 # $Id$
 #
 # Copyright (c) 2008 Eric Miller
 # All rights reserved.
@@ -31,15 +30,16 @@
 package SNMP::Info::IEEE802dot11;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::IEEE802dot11::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::IEEE802dot11::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = ( 'IEEE802dot11-MIB' => 'dot11DesiredSSID', );
--- a/lib/SNMP/Info/IEEE802dot3ad.pm
+++ b/lib/SNMP/Info/IEEE802dot3ad.pm
@@ -30,6 +30,7 @@
 package SNMP::Info::IEEE802dot3ad;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Aggregate;
@@ -41,9 +42,9 @@ use SNMP::Info::Aggregate;
  agg_ports_lag
 /;
-use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
  %SNMP::Info::Aggregate::MIBS,
--- a/lib/SNMP/Info/IPv6.pm
+++ b/lib/SNMP/Info/IPv6.pm
@@ -30,13 +30,14 @@
 package SNMP::Info::IPv6;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::IPv6::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::IPv6::EXPORT_OK = qw//;
-use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE $METHOD/;
+our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE, $METHOD);
 use constant {
    IPMIB   => 1,
@@ -44,7 +45,7 @@ use constant {
    IPV6MIB => 3,
 };
-$VERSION = '3.57';
+$VERSION = '3.70-135';
@@ -479,7 +480,9 @@ none.
 =over
 =item F<IP-MIB>
 =item F<IPV6-MIB>
 =item F<CISCO-IETF-IP-MIB>
 =back
--- a/lib/SNMP/Info/LLDP.pm
+++ b/lib/SNMP/Info/LLDP.pm
@@ -1,7 +1,6 @@
 # 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
@@ -31,15 +30,16 @@
 package SNMP::Info::LLDP;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::LLDP::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::LLDP::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    'LLDP-MIB'          => 'lldpLocSysCapEnabled',
@@ -116,7 +116,8 @@ sub hasLLDP {
    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
+    # 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;
@@ -138,13 +139,18 @@ sub lldp_if {
        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,
+        # Local LLDP port may not equate to ifIndex, see LldpPortNumber
-        # prefer ifDescr over ifAlias because using cross ref with description is correct behavior 
+        # TEXTUAL-CONVENTION in LLDP-MIB. Cross reference lldpLocPortDesc
-        # according to the LLDP-MIB. Some devices (eg H3C gear) seem to use ifAlias though.
+        # 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 cross reference is successful use it, otherwise stick with
        # lldpRemLocalPortNum
        if ( $desc && exists $r_i_descr{$desc} ) {
            $port = $r_i_descr{$desc};
        }
@@ -165,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;
@@ -181,7 +187,7 @@ sub lldp_ipv6 {
    my %lldp_ipv6;
    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 == 2;
        $lldp_ipv6{$index} = $addr;
@@ -197,7 +203,7 @@ sub lldp_mac {
    my %lldp_ipv6;
    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 == 6;
        $lldp_ipv6{$index} = $addr;
@@ -213,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;
    }
@@ -233,7 +239,10 @@ sub 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.
@@ -246,8 +255,7 @@ sub lldp_port {
          # May need to format other types in the future, i.e. Network address
            if ( $type =~ /mac/ ) {
-                $port = join( ':',
+                $port = SNMP::Info::munge_mac($port)
                    map { sprintf "%02x", $_ } unpack( 'C*', $port ) );
            }
        }
@@ -282,12 +290,13 @@ 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)
+                # IP address - first octet is IANA Address Family Number, need
                # walk with IPv6
                my @octets
                    = ( map { sprintf "%02x", $_ } unpack( 'C*', $id ) )
                    [ 1 .. 4 ];
@@ -323,7 +332,8 @@ sub lldp_cap {
    # 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 $oid
        = SNMP::translateObj( 'LLDP-MIB::lldpRemSysCapEnabled', 0, 1 ) || '';
    my $enums = (
        ( ref {} eq ref $SNMP::MIB{$oid}{'enums'} )
        ? $SNMP::MIB{$oid}{'enums'}
@@ -401,11 +411,13 @@ sub lldp_media_cap {
 # Break up the lldpRemManAddrTable INDEX into common index, protocol,
 # and address.
 sub _lldp_addr_index {
-    my $idx    = shift;
+    my $lldp = shift;
-    my @oids   = split( /\./, $idx );
+    my $idx  = shift;
-    my $index  = join( '.', splice( @oids, 0, 3 ) );
+
-    my $proto  = shift(@oids);
+    my @oids = split( /\./, $idx );
-    shift(@oids) if scalar @oids > 4; # $length
+    my $index = join( '.', splice( @oids, 0, 3 ) );
    my $proto = shift(@oids);
    shift(@oids) if scalar @oids > 4;    # $length
    # IPv4
    if ( $proto == 1 ) {
@@ -415,7 +427,7 @@ sub _lldp_addr_index {
    # IPv6
    elsif ( $proto == 2 ) {
        return ( $index, $proto,
-            join(':', unpack('(H4)*', pack('C*', @oids)) ) );
+            join( ':', unpack( '(H4)*', pack( 'C*', @oids ) ) ) );
    }
    # MAC
@@ -500,7 +512,7 @@ None.
 =back
-=head1 GLOBAL METHODS
+=head1 GLOBALS
 These are methods that return scalar values from SNMP
--- a/lib/SNMP/Info/Layer1.pm
+++ b/lib/SNMP/Info/Layer1.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer1 - SNMP Interface to Layer1 Devices
 # $Id$
 #
 # Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
 #
@@ -33,15 +32,16 @@
 package SNMP::Info::Layer1;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
@SNMP::Info::Layer1::ISA       = qw/SNMP::Info Exporter/;
@SNMP::Info::Layer1::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %PORTSTAT, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = ( %SNMP::Info::MIBS, 'SNMP-REPEATER-MIB' => 'rptrPortGroupIndex' );
@@ -49,7 +49,7 @@ $VERSION = '3.57';
    %SNMP::Info::GLOBALS,
    'ports_managed' => 'ifNumber',
    'rptr_slots'    => 'rptrGroupCapacity',
-    'slots'         => 'rptrGroupCapacity'
+    'slots'         => 'rptrGroupCapacity',
 );
 %FUNCS = (
@@ -86,7 +86,7 @@ sub ports {
 }
 # $l1->model() - Looks at sysObjectID which gives the oid of the system
-#       name, contained in a propriatry MIB.
+#       name, contained in a proprietary MIB.
 sub model {
    my $l1    = shift;
    my $id    = $l1->id();
@@ -178,7 +178,7 @@ Max Baker
                          Debug       => 1,
                          DestHost    => 'myswitch',
                          Community   => 'public',
-                          Version     => 1
+                          Version     => 2
                        )
    or die "Can't connect to DestHost.\n";
@@ -227,12 +227,9 @@ after determining a more specific class using the method above.
 =back
-MIBs required for L<SNMP::Info/"Required MIBs">
+MIBs required for L<SNMP::Info/"REQUIREMENTS">
-See L<SNMP::Info/"Required MIBs"> for its MIB requirements.
+See L<SNMP::Info/"REQUIREMENTS"> for its MIB requirements.
 F<SNMP-REPEATER-MIB> needs to be extracted from
 ftp://ftp.cisco.com/pub/mibs/v1/v1.tar.gz
 =head1 GLOBALS
@@ -278,7 +275,7 @@ Number of 'groups' in the Repeater MIB
 =head2 Global Methods imported from SNMP::Info
-See documentation in L<SNMP::Info/"GLOBALS"> for details.
+See documentation in L<SNMP::Info/"USAGE"> for details.
 =head1 TABLE METHODS
@@ -341,6 +338,6 @@ Group (slot) Number for given port.
 =head2 Table Methods imported from SNMP::Info
-See documentation in L<SNMP::Info/"TABLE METHODS"> for details.
+See documentation in L<SNMP::Info/"USAGE"> for details.
 =cut
--- a/lib/SNMP/Info/Layer1/Allied.pm
+++ b/lib/SNMP/Info/Layer1/Allied.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer1::Allied
 # $Id$
 #
 # Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
 #
@@ -33,15 +32,16 @@
 package SNMP::Info::Layer1::Allied;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer1;
@SNMP::Info::Layer1::Allied::ISA       = qw/SNMP::Info::Layer1 Exporter/;
@SNMP::Info::Layer1::Allied::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, 'root_ip' => 'actualIPAddr', );
@@ -52,9 +52,14 @@ $VERSION = '3.57';
    'ati_up'     => 'linkTestLED',
 );
-%MIBS = ( %SNMP::Info::Layer1::MIBS, 'ATI-MIB' => 'atiPortGroupIndex' );
+%MIBS = (
    %SNMP::Info::Layer1::MIBS,
    'ATI-MIB' => 'atiPortGroupIndex',
 );
-%MUNGE = ( %SNMP::Info::Layer1::MUNGE, );
+%MUNGE = (
    %SNMP::Info::Layer1::MUNGE,
 );
 sub vendor {
    return 'allied';
@@ -68,7 +73,7 @@ sub os_ver {
    my $allied = shift;
    my $descr  = $allied->description();
-    if ( $descr =~ m/version (\d+\.\d+)/ ) {
+    if ( defined ($descr) && $descr =~ m/version (\d+\.\d+)/ ) {
        return $1;
    }
    return;
@@ -79,7 +84,7 @@ sub model {
    my $desc = $allied->description();
-    if ( $desc =~ /(AT-\d{4}\S{1})/ ) {
+    if ( defined ($desc) && $desc =~ /(AT-\d{4}\S{1})/ ) {
        return $1;
    }
    return;
--- a/lib/SNMP/Info/Layer1/Asante.pm
+++ b/lib/SNMP/Info/Layer1/Asante.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer1::Asante
 # $Id$
 #
 # Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
 #
@@ -33,15 +32,16 @@
 package SNMP::Info::Layer1::Asante;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer1;
@SNMP::Info::Layer1::Asante::ISA       = qw/SNMP::Info::Layer1 Exporter/;
@SNMP::Info::Layer1::Asante::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, );
@@ -81,7 +81,7 @@ sub os_ver {
    my $asante = shift;
    my $descr  = $asante->description();
-    if ( $descr =~ /software v(\d+\.\d+)/ ) {
+    if ( defined ($descr) && $descr =~ /software v(\d+\.\d+)/ ) {
        return $1;
    }
    return;
@@ -188,7 +188,7 @@ Max Baker
 =head1 DESCRIPTION
-Provides abstraction to the configuration information obtainable from a 
+Provides abstraction to the configuration information obtainable from an
 Asante device through SNMP.
 =head2 Inherited Classes
@@ -227,7 +227,7 @@ Culls software version from description()
 =item $asante->vendor()
-Returns 'asante' :)
+Returns 'asante'
 =item $asante->model()
--- a/lib/SNMP/Info/Layer1/Bayhub.pm
+++ b/lib/SNMP/Info/Layer1/Bayhub.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer1::Bayhub
 # $Id$
 #
 # Copyright (c) 2008 Eric Miller, Max Baker
 # All rights reserved.
@@ -31,18 +30,19 @@
 package SNMP::Info::Layer1::Bayhub;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::SONMP;
 use SNMP::Info::NortelStack;
 use SNMP::Info::Layer2;
@SNMP::Info::Layer1::Bayhub::ISA
-    = qw/SNMP::Info::SONMP SNMP::Info::NortelStack  SNMP::Info::Layer2 Exporter/;
+    = qw/SNMP::Info::SONMP SNMP::Info::NortelStack SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer1::Bayhub::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
@@ -505,11 +505,6 @@ 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. 
 my $bayhub = new SNMP::Info::Layer1::Bayhub(...);
 =head2 Inherited Classes
 =over
--- a/lib/SNMP/Info/Layer1/Cyclades.pm
+++ b/lib/SNMP/Info/Layer1/Cyclades.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer1::Cyclades
 # $Id$
 #
 # Copyright (c) 2018 Eric Miller
 # All rights reserved.
@@ -31,15 +30,16 @@
 package SNMP::Info::Layer1::Cyclades;
 use strict;
 use warnings;
 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/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE, $AUTOLOAD);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer1::MIBS,
@@ -498,11 +498,6 @@ Eric Miller
 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
@@ -515,6 +510,10 @@ my $cyclades = new SNMP::Info::Layer1::Cyclades(...);
 =over
 =item F<ACS-MIB>
 =item F<ACS6000-MIB>
 =item F<CYCLADES-ACS-SYS-MIB>
 =item F<CYCLADES-ACS-CONF-MIB>
@@ -527,8 +526,6 @@ my $cyclades = new SNMP::Info::Layer1::Cyclades(...);
 =item F<CYCLADES-ACS5K-INFO-MIB>
 =item F<ACS6000-MIB>
 =back
 =head2 Inherited MIBs
--- a/lib/SNMP/Info/Layer1/S3000.pm
+++ b/lib/SNMP/Info/Layer1/S3000.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer1::S3000
 # $Id$
 #
 # Copyright (c) 2008 Eric Miller
 # All rights reserved.
@@ -31,15 +30,16 @@
 package SNMP::Info::Layer1::S3000;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer2;
@SNMP::Info::Layer1::S3000::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer1::S3000::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
@@ -386,11 +386,6 @@ 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. 
 my $s3000 = new SNMP::Info::Layer1::S3000(...);
 =head2 Inherited Classes
 =over
--- a/lib/SNMP/Info/Layer2.pm
+++ b/lib/SNMP/Info/Layer2.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer2 - SNMP Interface to Layer2 Devices
 # $Id$
 #
 # Copyright (c) 2008 Max Baker -- All changes from Version 0.7 on
 #
@@ -33,30 +32,33 @@
 package SNMP::Info::Layer2;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
 use SNMP::Info::Bridge;
 use SNMP::Info::Entity;
 use SNMP::Info::PowerEthernet;
 use SNMP::Info::LLDP;
 use SNMP::Info::DocsisHE;
@SNMP::Info::Layer2::ISA
-    = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::Entity SNMP::Info::PowerEthernet SNMP::Info::LLDP Exporter/;
+    = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::Entity SNMP::Info::PowerEthernet SNMP::Info::LLDP SNMP::Info::DocsisHE Exporter/;
@SNMP::Info::Layer2::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %PORTSTAT, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::MIBS,         %SNMP::Info::Bridge::MIBS,
    %SNMP::Info::Entity::MIBS, %SNMP::Info::PowerEthernet::MIBS,
-    %SNMP::Info::LLDP::MIBS,
+    %SNMP::Info::LLDP::MIBS,   %SNMP::Info::DocsisHE::MIBS,
 );
 %GLOBALS = (
    %SNMP::Info::GLOBALS,
    %SNMP::Info::Bridge::GLOBALS,
    %SNMP::Info::DocsisHE::GLOBALS,
    %SNMP::Info::Entity::GLOBALS,
    %SNMP::Info::PowerEthernet::GLOBALS,
    %SNMP::Info::LLDP::GLOBALS,
@@ -67,7 +69,7 @@ $VERSION = '3.57';
 %FUNCS = (
    %SNMP::Info::FUNCS,         %SNMP::Info::Bridge::FUNCS,
    %SNMP::Info::Entity::FUNCS, %SNMP::Info::PowerEthernet::FUNCS,
-    %SNMP::Info::LLDP::FUNCS,
+    %SNMP::Info::LLDP::FUNCS,   %SNMP::Info::DocsisHE::FUNCS,
 );
 %MUNGE = (
@@ -75,6 +77,7 @@ $VERSION = '3.57';
    # Inherit all the built in munging
    %SNMP::Info::MUNGE,
    %SNMP::Info::Bridge::MUNGE,
    %SNMP::Info::DocsisHE::MUNGE,
    %SNMP::Info::Entity::MUNGE,
    %SNMP::Info::PowerEthernet::MUNGE,
    %SNMP::Info::LLDP::MUNGE,
@@ -83,7 +86,7 @@ $VERSION = '3.57';
 # Method OverRides
 # $l2->model() - Looks at sysObjectID which gives the oid of the system
-#       name, contained in a propriatry MIB.
+#       name, contained in a proprietary MIB.
 sub model {
    my $l2    = shift;
    my $id    = $l2->id();
@@ -142,15 +145,25 @@ sub interfaces {
    # Replace the Index with the ifDescr field.
    # Check for duplicates in ifDescr, if so uniquely identify by adding
    # ifIndex to repeated values
-    my %seen;
+    my (%seen, %first_seen_as);
-    foreach my $iid ( keys %$i_descr ) {
+    foreach my $iid ( sort keys %$i_descr ) {
        my $port = $i_descr->{$iid};
        next unless defined $port;
        $port = SNMP::Info::munge_null($port);
        $port =~ s/^\s+//; $port =~ s/\s+$//;
        next unless length $port;
        if ( $seen{$port}++ ) {
            # (#320) also fixup the port this is a duplicate of
            $interfaces->{ $first_seen_as{$port} }
              = sprintf( "%s (%d)", $port, $first_seen_as{$port} );
            $interfaces->{$iid} = sprintf( "%s (%d)", $port, $iid );
        }
        else {
            $interfaces->{$iid} = $port;
            $first_seen_as{$port} = $iid;
        }
    }
    return $interfaces;
@@ -215,10 +228,14 @@ after determining a more specific class using the method above.
 =item SNMP::Info::Bridge
 =item SNMP::Info::DocsisHE
 =item SNMP::Info::Entity
 =item SNMP::Info::LLDP
 =item SNMP::Info::PowerEthernet
 =back
 =head2 Required MIBs
@@ -262,7 +279,7 @@ Returns a serial number if found from F<ENTITY-MIB> and F<OLD-CISCO->... MIB.
 =head2 Globals imported from SNMP::Info
-See documentation in L<SNMP::Info/"GLOBALS"> for details.
+See documentation in L<SNMP::Info/"USAGE"> for details.
 =head2 Globals imported from SNMP::Info::Bridge
@@ -296,7 +313,7 @@ Defaults to C<ifDescr> but checks and overrides with C<ifName>
 =head2 Table Methods imported from SNMP::Info
-See documentation in L<SNMP::Info/"TABLE METHODS"> for details.
+See documentation in L<SNMP::Info/"USAGE"> for details.
 =head2 Table Methods imported from SNMP::Info::Bridge
--- a/lib/SNMP/Info/Layer2/3Com.pm
+++ b/lib/SNMP/Info/Layer2/3Com.pm
@@ -1,40 +1,63 @@
 # 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 warnings;
 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::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::3Com::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE, $AUTOLOAD);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %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';
 }
@@ -66,17 +89,19 @@ sub os_ver {
 }
 sub vendor {
-    return '3Com';
+    return '3com';
 }
 sub model {
    my $dsmodel = shift;
    my $descr = $dsmodel->description();
-    if ( $descr =~ /^([\S ]+) Software.*/){
+
    if (defined ($descr)) {
      if ($descr =~ /^([\S ]+) Software.*/) {
        return $1;
-    } else {
+      } else {
        return $descr;
      }
    }
    return;
 }
@@ -100,7 +125,7 @@ Max Kosmach
                          Debug       => 1,
                          DestHost    => 'myrouter',
                          Community   => 'public',
-                          Version     => 1
+                          Version     => 2
                        )
    or die "Can't connect to DestHost.\n";
@@ -141,7 +166,7 @@ These are methods that return scalar value from SNMP
 =item $device->vendor()
-Returns '3Com'
+Returns '3com'
 =item $device->os()
--- a/lib/SNMP/Info/Layer2/Adtran.pm
+++ b/lib/SNMP/Info/Layer2/Adtran.pm
@@ -1,17 +1,45 @@
 # 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 warnings;
 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::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Adtran::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 # This will be filled in with the device's index into the EntPhysicalEntry
 # table by the serial() function.
@@ -20,24 +48,22 @@ our $index = undef;
 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
    %SNMP::Info::Layer3::MIBS,
-    'ADTRAN-GENEVC-MIB'     => 'adGenEVCMIB',
+#    'ADTRAN-GENEVC-MIB'     => 'adGenEVCMIB',
-    'ADTRAN-GENMEF-MIB'     => 'adGenMEFMIB',
+#    'ADTRAN-GENMEF-MIB'     => 'adGenMEFMIB',
-    'ADTRAN-GENPORT-MIB'    => 'adGenPort',
+#    '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',
@@ -47,7 +73,7 @@ our $index = undef;
           'ad_genportcustuse' => 'adGenPortCustomerUse',
 );
-%MUNGE = ( %SNMP::Info::Layer2::MUNGE, %SNMP::Info::LLDP::MUNGE, %SNMP::Info::Layer3::MUNGE );
+%MUNGE = ( %SNMP::Info::Layer2::MUNGE, %SNMP::Info::Layer3::MUNGE );
 sub vendor {
    return 'adtran';
@@ -102,8 +128,8 @@ sub i_name {
    my $adname = $adtran->ad_genportcustuse() || undef;
    if (defined $adname) {
        foreach my $port (keys %$adname) {
-            my @split = split(/\./,$port);
+            my @splitout = split(/\./,$port);
-            $i_name->{@split[1]} = $adname->{$port};
+            $i_name->{$splitout[1]} = $adname->{$port};
        }
    }
    return $i_name;
@@ -142,9 +168,9 @@ sub i_vlan_membership {
        }
        my $if_vlans = {};
        foreach my $entry (keys %$i_vlan) {
-            my @split = split(/(\.0)+\./,$entry);
+            my @splitout = split(/(\.0)+\./,$entry);
-            my $name = pack("C*", split(/\./,@split[0]));
+            my $name = pack("C*", split(/\./,$splitout[0]));
-            push @{$if_vlans->{@split[2]}}, $vlans->{$name};
+            push @{$if_vlans->{$splitout[2]}}, $vlans->{$name};
        }
        my $mgmtevcports = $adtran->ad_mgmtevcports();
        my $mgmtevcid = $adtran->ad_mgmtevcvid();
@@ -195,17 +221,17 @@ Subclass for adtran Devices running JUNOS
 =over
-=item SNMP::Info::Layer3
+=item SNMP::Info::Layer2
-=item SNMP::Info::LLDP
+=item SNMP::Info::Layer3
 =back
 =head2 Inherited Classes' MIBs
-See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
+See L<SNMP::Info::Layer2/"Required MIBs"> for its own MIB requirements.
-See L<SNMP::Info::LLDP/"Required MIBs"> for its own MIB requirements.
+See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
 =head1 GLOBALS
@@ -245,10 +271,6 @@ Returns serial number.
 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
@@ -275,12 +297,12 @@ IDs.  These are the VLANs which are members of the egress list for the port.
 =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::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,511 @@
 # 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 warnings;
 use Exporter;
 use SNMP::Info::Layer2;
@SNMP::Info::Layer2::Aerohive::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Aerohive::EXPORT_OK = qw//;
 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
 $VERSION = '3.70-135';
 %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, );
 # hiveos does not have sysServices
 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 ( defined ($descr) && $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 ( defined ($descr) && $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;
    # somewhere caching is doing something strange, without load_
    # netdisco can't find bp_index mappings & will not registerer
    # any clients. netdisco/netdisco#496
    my $i_index = $aerohive->load_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.
 =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
@@ -29,8 +29,8 @@
 package SNMP::Info::Layer2::Airespace;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Bridge;
 use SNMP::Info::CDP;
 use SNMP::Info::Airespace;
@@ -38,9 +38,9 @@ use SNMP::Info::Airespace;
    = qw/SNMP::Info::Airespace SNMP::Info::CDP SNMP::Info::Bridge Exporter/;
@SNMP::Info::Layer2::Airespace::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::MIBS,      %SNMP::Info::Bridge::MIBS,
@@ -272,11 +272,6 @@ Eric Miller
 Provides abstraction to the configuration information obtainable from
 Cisco (Airespace) Wireless Controllers through SNMP.
 For speed or debugging purposes you can call the subclass directly, but not
 after determining a more specific class using the method above. 
 my $airespace = new SNMP::Info::Layer2::Airespace(...);
 =head2 Inherited Classes
 =over
--- a/lib/SNMP/Info/Layer2/Aironet.pm
+++ b/lib/SNMP/Info/Layer2/Aironet.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer2::Aironet
 # $Id$
 #
 # Copyright (c) 2008-2009 Max Baker changes from version 0.8 and beyond.
 #
@@ -33,9 +32,9 @@
 package SNMP::Info::Layer2::Aironet;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer2;
 use SNMP::Info::Entity;
 use SNMP::Info::EtherLike;
 use SNMP::Info::CiscoStats;
 use SNMP::Info::CiscoConfig;
@@ -43,30 +42,28 @@ use SNMP::Info::CDP;
 use SNMP::Info::IEEE802dot11;
@SNMP::Info::Layer2::Aironet::ISA
-    = qw/SNMP::Info::Layer2 SNMP::Info::Entity SNMP::Info::EtherLike
+    = qw/SNMP::Info::Layer2 SNMP::Info::EtherLike
    SNMP::Info::CiscoStats SNMP::Info::CiscoConfig SNMP::Info::CDP Exporter/;
@SNMP::Info::Layer2::Aironet::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %GLOBALS = (
    %SNMP::Info::IEEE802dot11::GLOBALS,
    %SNMP::Info::Layer2::GLOBALS,
    %SNMP::Info::Entity::GLOBALS,
    %SNMP::Info::EtherLike::GLOBALS,
    %SNMP::Info::CiscoStats::GLOBALS,
    %SNMP::Info::CiscoConfig::GLOBALS,
    %SNMP::Info::CDP::GLOBALS,
    'serial' => 'entPhysicalSerialNum.1',
-    'ps1_type' => 'cpoePdCurrentPowerSource'
+    'ps1_type' => 'cpoePdCurrentPowerSource',
 );
 %FUNCS = (
    %SNMP::Info::IEEE802dot11::FUNCS,
    %SNMP::Info::Layer2::FUNCS,
    %SNMP::Info::Entity::FUNCS,
    %SNMP::Info::EtherLike::FUNCS,
    %SNMP::Info::CiscoStats::FUNCS,
    %SNMP::Info::CiscoConfig::FUNCS,
@@ -88,7 +85,6 @@ $VERSION = '3.57';
 %MIBS = (
    %SNMP::Info::IEEE802dot11::MIBS,
    %SNMP::Info::Layer2::MIBS,
    %SNMP::Info::Entity::MIBS,
    %SNMP::Info::EtherLike::MIBS,
    %SNMP::Info::CiscoStats::MIBS,
    %SNMP::Info::CiscoConfig::MIBS,
@@ -103,7 +99,6 @@ $VERSION = '3.57';
 %MUNGE = (
    %SNMP::Info::IEEE802dot11::MUNGE,
    %SNMP::Info::Layer2::MUNGE,
    %SNMP::Info::Entity::MUNGE,
    %SNMP::Info::EtherLike::MUNGE,
    %SNMP::Info::CiscoStats::MUNGE,
    %SNMP::Info::CiscoConfig::MUNGE,
@@ -118,7 +113,6 @@ $VERSION = '3.57';
    = \&SNMP::Info::IEEE802dot11::dot11_cur_tx_pwr_mw;
 sub vendor {
    # Sorry, but it's true.
    return 'cisco';
 }
@@ -138,8 +132,13 @@ sub description {
    my $descr   = $aironet->SUPER::description();
    my $e_descr = $aironet->e_descr();
-    $descr = "$e_descr->{1}  $descr" if defined $e_descr->{1};
+    if (defined $e_descr->{1}) {
-
+      if (defined $descr) {
        $descr = "$e_descr->{1}  $descr"
      } else {
        $descr = "$e_descr->{1}"
      }
    }
    return $descr;
 }
@@ -527,8 +526,6 @@ my $aironet = new SNMP::Info::Layer2::Aironet(...);
 =item SNMP::Info::Layer2
 =item SNMP::Info::Entity
 =item SNMP::Info::EtherLike
 =item SNMP::Info::CiscoStats
@@ -541,6 +538,16 @@ my $aironet = new SNMP::Info::Layer2::Aironet(...);
 =over
 =item F<CISCO-DOT11-ASSOCIATION-MIB>
 =item F<CISCO-DOT11-IF-MIB>
 =item F<CISCO-DOT11-SSID-SECURITY-MIB>
 =item F<CISCO-POE-PD-MIB>
 =item F<CISCO-VLAN-IFTABLE-RELATIONSHIP-MIB>
 =item Inherited Classes
 MIBs required by the inherited classes listed above.
@@ -567,10 +574,6 @@ System description. Adds info from method e_descr() from SNMP::Info::Entity
 See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
 =head2 Globals imported from SNMP::Info::Entity
 See documentation in L<SNMP::Info::Entity/"GLOBALS"> for details.
 =head2 Globals imported from SNMP::Info::EtherLike
 See documentation in L<SNMP::Info::EtherLike/"GLOBALS"> for details.
@@ -668,10 +671,6 @@ C<cpoePdSupportedPowerMode>.
 See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::Entity
 See documentation in L<SNMP::Info::Entity/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::EtherLike
 See documentation in L<SNMP::Info::EtherLike/"TABLE METHODS"> for details.
--- a/lib/SNMP/Info/Layer2/Allied.pm
+++ b/lib/SNMP/Info/Layer2/Allied.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer2::Allied
 # $Id$
 #
 # Copyright (c) 2008 Max Baker
 # All rights reserved.
@@ -31,6 +30,7 @@
 package SNMP::Info::Layer2::Allied;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer2;
 use SNMP::Info::Layer1;
@@ -38,9 +38,9 @@ use SNMP::Info::Layer1;
@SNMP::Info::Layer2::Allied::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Allied::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );
@@ -70,7 +70,7 @@ sub os_ver {
    my $allied = shift;
    my $descr  = $allied->description();
-    if ( $descr =~ m/version (\d+\.\d+)/ ) {
+    if ( defined ($descr) && $descr =~ m/version (\d+\.\d+)/ ) {
        return $1;
    }
    return;
@@ -78,10 +78,9 @@ sub os_ver {
 sub model {
    my $allied = shift;
    my $desc = $allied->description();
-    if ( $desc =~ /(AT-80\d{2}\S*)/ ) {
+    if ( defined ($desc) &&  $desc =~ /(AT-80\d{2}\S*)/ ) {
        return $1;
    }
    return;
@@ -191,7 +190,7 @@ These are methods that return scalar value from SNMP
 =item $allied->vendor()
-Returns 'allied' :)
+Returns 'allied'
 =item $allied->os()
--- a/lib/SNMP/Info/Layer2/Atmedia.pm
+++ b/lib/SNMP/Info/Layer2/Atmedia.pm
@@ -0,0 +1,168 @@
 # 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 warnings;
 use Exporter;
 use SNMP::Info::Layer2;
@SNMP::Info::Layer2::Atmedia::ISA       = qw/SNMP::Info::Layer2/;
@SNMP::Info::Layer2::Atmedia::EXPORT_OK = qw//;
 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
 $VERSION = '3.70-135';
 %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();
    if (defined $atmedia_model) {
      $atmedia_model =~ s/\<|\>//g;
      $atmedia_model =~ s/\//_/g;
      return $atmedia_model;
    }
    return;
 }
 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
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer2::Baystack
 # $Id$
 #
 # Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
 # All rights reserved.
@@ -31,38 +30,38 @@
 package SNMP::Info::Layer2::Baystack;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::SONMP;
 use SNMP::Info::NortelStack;
 use SNMP::Info::RapidCity;
 use SNMP::Info::LLDP;
 use SNMP::Info::Layer3;
@SNMP::Info::Layer2::Baystack::ISA
    = qw/SNMP::Info::SONMP SNMP::Info::NortelStack
-    SNMP::Info::RapidCity SNMP::Info::LLDP
+    SNMP::Info::RapidCity
    SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer2::Baystack::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
-    %SNMP::Info::Layer3::MIBS,    %SNMP::Info::LLDP::MIBS,
+    %SNMP::Info::Layer3::MIBS,
    %SNMP::Info::RapidCity::MIBS, %SNMP::Info::NortelStack::MIBS,
    %SNMP::Info::SONMP::MIBS,
    'BAY-STACK-PETH-EXT-MIB' => 'bspePethPsePortExtMeasuredPower',
 );
 %GLOBALS = (
-    %SNMP::Info::Layer3::GLOBALS,    %SNMP::Info::LLDP::GLOBALS,
+    %SNMP::Info::Layer3::GLOBALS,
    %SNMP::Info::RapidCity::GLOBALS, %SNMP::Info::NortelStack::GLOBALS,
    %SNMP::Info::SONMP::GLOBALS,
 );
 %FUNCS = (
-    %SNMP::Info::Layer3::FUNCS,    %SNMP::Info::LLDP::FUNCS,
+    %SNMP::Info::Layer3::FUNCS,
    %SNMP::Info::RapidCity::FUNCS, %SNMP::Info::NortelStack::FUNCS,
    %SNMP::Info::SONMP::FUNCS,
    'peth_port_power' => 'bspePethPsePortExtMeasuredPower',
@@ -74,7 +73,7 @@ $SNMP::Info::SPEED_MAP{200_000_000}   = '100 Mbps';
 $SNMP::Info::SPEED_MAP{2_000_000_000} = '1.0 Gbps';
 %MUNGE = (
-    %SNMP::Info::Layer3::MUNGE,    %SNMP::Info::LLDP::MUNGE,
+    %SNMP::Info::Layer3::MUNGE,
    %SNMP::Info::RapidCity::MUNGE, %SNMP::Info::NortelStack::MUNGE,
    %SNMP::Info::SONMP::MUNGE,
 );
@@ -429,11 +428,6 @@ Provides abstraction to the configuration information obtainable from an
 Avaya Ethernet Switch (formerly Nortel/Bay Baystack) and VSP 7000 series
 through SNMP.
 For speed or debugging purposes you can call the subclass directly, but not
 after determining a more specific class using the method above. 
 my $baystack = new SNMP::Info::Layer2::Baystack(...);
 =head2 Inherited Classes
 =over
@@ -444,8 +438,6 @@ my $baystack = new SNMP::Info::Layer2::Baystack(...);
 =item SNMP::Info::RapidCity
 =item SNMP::Info::LLDP
 =item SNMP::Info::Layer3
 =back
@@ -454,7 +446,7 @@ my $baystack = new SNMP::Info::Layer2::Baystack(...);
 =over
-=item F<BAY-STACK-PETH-EXT-MIBB>
+=item F<BAY-STACK-PETH-EXT-MIB>
 =back
@@ -466,8 +458,6 @@ See L<SNMP::Info::NortelStack/"Required MIBs"> for its MIB requirements.
 See L<SNMP::Info::RapidCity/"Required MIBs"> for its MIB requirements.
 See L<SNMP::Info::LLDP/"Required MIBs"> for its MIB requirements.
 See L<SNMP::Info::Layer3/"Required MIBs"> for its MIB requirements.
 =head1 GLOBALS
@@ -537,10 +527,6 @@ See L<SNMP::Info::NortelStack/"GLOBALS"> for details.
 See L<SNMP::Info::RapidCity/"GLOBALS"> for details.
 =head2 Globals imported from SNMP::Info::LLDP
 See documentation in L<SNMP::Info::LLDP/"GLOBALS"> for details.
 =head2 Globals imported from SNMP::Info::Layer3
 See L<SNMP::Info::Layer3/"GLOBALS"> for details.
@@ -700,10 +686,6 @@ See L<SNMP::Info::NortelStack/"TABLE METHODS"> for details.
 See L<SNMP::Info::RapidCity/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::LLDP
 See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::Layer3
 See L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
--- a/lib/SNMP/Info/Layer2/C1900.pm
+++ b/lib/SNMP/Info/Layer2/C1900.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer2::C1900
 # $Id$
 #
 # Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
 #
@@ -33,6 +32,7 @@
 package SNMP::Info::Layer2::C1900;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::CDP;
 use SNMP::Info::CiscoStats;
@@ -46,9 +46,9 @@ use SNMP::Info::Layer2;
    Exporter/;
@SNMP::Info::Layer2::C1900::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %GLOBALS = (
    %SNMP::Info::Layer2::GLOBALS,
@@ -311,11 +311,6 @@ 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. 
 my $c1900 = new SNMP::Info::Layer2::C1900(...);
 =head2 Inherited classes
 =over
@@ -342,8 +337,6 @@ after determining a more specific class using the method above.
 F<ESSWITCH-MIB> is included in the Version 1 MIBs from Cisco.
 They can be found at ftp://ftp.cisco.com/pub/mibs/v1/v1.tar.gz
 =back
 =head2 Inherited MIBs
@@ -386,7 +379,7 @@ the version from there.
 =item $c1900->vendor()
-Returns 'cisco' :)
+Returns 'cisco'
 =back
@@ -420,10 +413,6 @@ See L<SNMP::Info::CiscoConfig/"GLOBALS"> for details.
 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.
--- a/lib/SNMP/Info/Layer2/C2900.pm
+++ b/lib/SNMP/Info/Layer2/C2900.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer2::C2900
 # $Id$
 #
 # Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
 #
@@ -33,15 +32,16 @@
 package SNMP::Info::Layer2::C2900;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer2::Cisco;
@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/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %GLOBALS = (
    %SNMP::Info::Layer2::Cisco::GLOBALS,
@@ -244,11 +244,6 @@ Max Baker
 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. 
 my $c2900 = new SNMP::Info::Layer2::C2900(...);
 =head2 Inherited Classes
 =over
@@ -281,7 +276,7 @@ These are methods that return scalar value from SNMP
 =item $c2900->vendor()
-Returns 'cisco' :)
+Returns 'cisco'
 =item $c2900->cisco_comm_indexing()
--- a/lib/SNMP/Info/Layer2/Carelink.pm
+++ b/lib/SNMP/Info/Layer2/Carelink.pm
@@ -0,0 +1,133 @@
 # SNMP::Info::Layer2::Carelink - SNMP Interface to Carelink Devices
 #
 # Copyright (c) 2020 by 135.
 package SNMP::Info::Layer2::Carelink;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer2;
 use SNMP::Info::Layer3;
@SNMP::Info::Layer2::Carelink::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Carelink::EXPORT_OK = qw//;
 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
 $VERSION = '3.70-135';
 # 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,
 );
 %GLOBALS = (
    %SNMP::Info::Layer2::GLOBALS,
    'serial_oid'    => 'mib-2.47.1.1.1.1.11.1',
    'os_ver_oid' => 'mib-2.47.1.1.1.1.9.1',
    'hw_oid'     => 'mib-2.47.1.1.1.1.2.1',
    'fw_mac_oid'    => 'mib-2.47.1.1.1.1.11.1',
 );
 %FUNCS = ( %SNMP::Info::Layer2::FUNCS, );
 %MUNGE = ( %SNMP::Info::Layer2::MUNGE, );
 sub vendor {
    return 'carelink';
 }
 sub os {
    return 'caos';
 }
 sub os_ver {
    my $carelink = shift;
    my $ver = $carelink->os_ver_oid() || undef;
    return $ver if (defined $ver);
    return 'Unknown';
 }
 sub model {
    my $carelink = shift;
    my $id = $carelink->id();
    my $mod = $carelink->hw_oid() || undef;
    return $mod if (defined $mod);
    return 'Unknown';
 }
 1;
 __END__
 =head1 NAME
 SNMP::Info::Layer2::Carelink - SNMP Interface to Carelink Devices
 =head1 SYNOPSIS
 # Let SNMP::Info determine the correct subclass for you.
 my $carelink = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myrouter',
                          Community   => 'public',
                          Version     => 2
                        )
    or die "Can't connect to DestHost.\n";
 my $class      = $carelink->class();
 print "SNMP::Info determined this device to fall under subclass : $class\n";
 =head1 DESCRIPTION
 Subclass for carelink Devices running IOS-like software
 =head2 Inherited Classes
 =over
 =item SNMP::Info::Layer2
 =item SNMP::Info::Layer3
 =back
 =head2 Inherited Classes' MIBs
 See L<SNMP::Info::Layer2/"Required MIBs"> for its own MIB requirements.
 See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
 =head1 GLOBALS
 These are methods that return scalar value from SNMP
 =over
 =item $carelink->vendor()
 Returns 'adtran'
 =item $carelink->os()
 Returns 'caos'
 =item $carelink->layers()
 Ensures that layer two is reported, at least.
 =item $carelink->os_ver()
 Returns the software version.
 =item $carelink->model()
 Returns the model extracted.
 =item $carelink->serial()
 Returns serial number.
 =cut
--- a/lib/SNMP/Info/Layer2/Catalyst.pm
+++ b/lib/SNMP/Info/Layer2/Catalyst.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer2::Catalyst
 # $Id$
 #
 # Copyright (c) 2002,2003 Regents of the University of California
 # Copyright (c) 2008 Max Baker changes from version 0.8 and beyond
@@ -32,6 +31,7 @@
 package SNMP::Info::Layer2::Catalyst;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::CiscoStack;
 use SNMP::Info::Layer2::Cisco;
@@ -40,9 +40,9 @@ use SNMP::Info::Layer2::Cisco;
    = qw/SNMP::Info::CiscoStack SNMP::Info::Layer2::Cisco Exporter/;
@SNMP::Info::Layer2::Catalyst::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer2::Cisco::MIBS,
@@ -64,7 +64,7 @@ $VERSION = '3.57';
    %SNMP::Info::CiscoStack::MUNGE,
 );
-# Overidden Methods
+# Overridden Methods
 # i_physical sets a hash entry as true if the iid is a physical port
 sub i_physical {
--- a/lib/SNMP/Info/Layer2/Centillion.pm
+++ b/lib/SNMP/Info/Layer2/Centillion.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer2::Centillion
 # $Id$
 #
 # Copyright (c) 2008 Eric Miller
 # All rights reserved.
@@ -31,9 +30,9 @@
 package SNMP::Info::Layer2::Centillion;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
 use SNMP::Info::Bridge;
 use SNMP::Info::NortelStack;
 use SNMP::Info::SONMP;
@@ -41,9 +40,9 @@ use SNMP::Info::SONMP;
    = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::NortelStack SNMP::Info::SONMP Exporter/;
@SNMP::Info::Layer2::Centillion::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::MIBS,
@@ -292,11 +291,6 @@ Eric Miller
 Provides abstraction to the configuration information obtainable from a
 Centillion device through SNMP.
 For speed or debugging purposes you can call the subclass directly, but not
 after determining a more specific class using the method above. 
 my $centillion = new SNMP::Info::Layer2::centillion(...);
 Note:  This class supports version 4.X and 5.X which are VLAN based rather
 than bridge group based.
@@ -328,7 +322,7 @@ than bridge group based.
 =item Inherited Classes' MIBs
-See L<SNMP::Info/"Required MIBs"> for its own MIB requirements.
+See L<SNMP::Info/"REQUIREMENTS"> for its own MIB requirements.
 See L<SNMP::Info::Bridge/"Required MIBs"> for its own MIB requirements.
@@ -346,7 +340,7 @@ These are methods that return scalar value from SNMP
 =item $centillion->vendor()
-Returns 'Nortel'
+Returns 'nortel'
 =item $centillion->model()
@@ -357,7 +351,7 @@ Removes C<sreg-> from the model name
 =item $centillion->os()
-Returns 'Centillion'
+Returns 'centillion'
 =item $centillion->tftp_action()
@@ -399,7 +393,7 @@ start at 0.  Returns 0.
 =head2 Globals imported from SNMP::Info
-See documentation in L<SNMP::Info/"GLOBALS"> for details.
+See documentation in L<SNMP::Info/"USAGE"> for details.
 =head2 Globals imported from SNMP::Info::Bridge
@@ -513,7 +507,7 @@ Returns reference to hash.  Key: Table entry, Value: VLAN Type
 =head2 Table Methods imported from SNMP::Info
-See documentation in L<SNMP::Info/"TABLE METHODS"> for details.
+See documentation in L<SNMP::Info/"USAGE"> for details.
 =head2 Table Methods imported from SNMP::Info::Bridge
--- a/lib/SNMP/Info/Layer2/Cisco.pm
+++ b/lib/SNMP/Info/Layer2/Cisco.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer2::Cisco
 # $Id$
 #
 # Copyright (c) 2008 Max Baker
 # All rights reserved.
@@ -31,6 +30,7 @@
 package SNMP::Info::Layer2::Cisco;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::CiscoVTP;
 use SNMP::Info::CDP;
@@ -50,9 +50,9 @@ use SNMP::Info::Layer2;
    Exporter/;
@SNMP::Info::Layer2::Cisco::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
@@ -194,7 +194,7 @@ These are methods that return scalar value from SNMP
 =item $cisco->vendor()
-    Returns 'cisco'
+Returns 'cisco'
 =back
@@ -226,10 +226,6 @@ See documentation in L<SNMP::Info::CiscoPortSecurity/"GLOBALS"> for details.
 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.
--- 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
 #
@@ -35,61 +34,60 @@
 package SNMP::Info::Layer2::CiscoSB;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer2;
 use SNMP::Info::Entity;
 use SNMP::Info::EtherLike;
 use SNMP::Info::CiscoStats;
 use SNMP::Info::CiscoConfig;
 use SNMP::Info::CDP;
@SNMP::Info::Layer2::CiscoSB::ISA
-    = qw/SNMP::Info::Layer2 SNMP::Info::Entity SNMP::Info::EtherLike
+    = qw/SNMP::Info::Layer2 SNMP::Info::EtherLike
    SNMP::Info::CiscoStats SNMP::Info::CiscoConfig SNMP::Info::CDP Exporter/;
@SNMP::Info::Layer2::CiscoSB::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %GLOBALS = (
    %SNMP::Info::Layer2::GLOBALS,
    %SNMP::Info::Entity::GLOBALS,
    %SNMP::Info::EtherLike::GLOBALS,
    %SNMP::Info::CiscoStats::GLOBALS,
    %SNMP::Info::CiscoConfig::GLOBALS,
    %SNMP::Info::CDP::GLOBALS,
-    'descr'  => 'sysDescr'
+    'descr'  => 'sysDescr',
    'mac'    => 'rndBasePhysicalAddress',
 );
 %FUNCS = (
    %SNMP::Info::Layer2::FUNCS,
    %SNMP::Info::Entity::FUNCS,
    %SNMP::Info::EtherLike::FUNCS,
    %SNMP::Info::CiscoStats::FUNCS,
    %SNMP::Info::CiscoConfig::FUNCS,
    %SNMP::Info::CDP::FUNCS,
    'peth_port_power' => 'rlPethPsePortOutputPower',
 );
 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
    %SNMP::Info::Entity::MIBS,
    %SNMP::Info::EtherLike::MIBS,
    %SNMP::Info::CiscoStats::MIBS,
    %SNMP::Info::CiscoConfig::MIBS,
    %SNMP::Info::CDP::MIBS,
    'CISCOSB-POE-MIB'          => 'rlPethPsePortOutputPower',
    'CISCOSB-DEVICEPARAMS-MIB' => 'rndBasePhysicalAddress',
 );
 %MUNGE = (
    %SNMP::Info::Layer2::MUNGE,
    %SNMP::Info::Entity::MUNGE,
    %SNMP::Info::EtherLike::MUNGE,
    %SNMP::Info::CiscoStats::MUNGE,
    %SNMP::Info::CiscoConfig::MUNGE,
    %SNMP::Info::CDP::MUNGE,
 );
 sub vendor {
    return 'cisco';
 }
@@ -138,6 +136,26 @@ sub model {
    return $ciscosb->description();
 }
 # CISCOSBinterfaces.mib also contains duplex info if needed
 sub i_duplex {
    my $ciscosb = shift;
    my $partial = shift;
    my $el_duplex = $ciscosb->el_duplex($partial);
    if ( defined $el_duplex and scalar( keys %$el_duplex ) ) {
        my %i_duplex;
        foreach my $el_port ( keys %$el_duplex ) {
            my $duplex = $el_duplex->{$el_port};
            next unless defined $duplex;
            $i_duplex{$el_port} = 'half' if $duplex =~ /half/i;
            $i_duplex{$el_port} = 'full' if $duplex =~ /full/i;
        }
        return \%i_duplex;
    }
 }
 # ifDescr is the same for all interfaces in a class, but the ifName is
 # unique, so let's use that for port name.
 sub interfaces {
@@ -149,7 +167,6 @@ sub interfaces {
    return $interfaces;
 }
 1;
 __END__
@@ -185,15 +202,15 @@ managed switches. [i.e. those matching enterprises(1).cisco(9).otherEnterprises(
 =over
-=item SNMP::Info::Layer2
+=item SNMP::Info::CDP
-=item SNMP::Info::Entity
+=item SNMP::Info::CiscoConfig
 =item SNMP::Info::EtherLike
 =item SNMP::Info::CiscoStats
-=item SNMP::Info::CiscoConfig
+=item SNMP::Info::EtherLike
 =item SNMP::Info::Layer2
 =back
@@ -201,6 +218,10 @@ managed switches. [i.e. those matching enterprises(1).cisco(9).otherEnterprises(
 =over
 =item F<CISCOSB-DEVICEPARAMS-MIB>
 =item F<CISCOSB-POE-MIB>
 =item Inherited Classes
 MIBs required by the inherited classes listed above.
@@ -209,17 +230,13 @@ 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()
+=item $ciscosb->mac()
-Returns 'cisco'
+Returns mac from (C<rndBasePhysicalAddress>)
 =item $ciscosb->os()
 Returns 'ros'
 =item $ciscosb->os_ver()
@@ -236,20 +253,43 @@ 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.
 =head2 Globals imported from SNMP::Info::Entity
 See documentation in L<SNMP::Info::Entity/"GLOBALS"> for details.
 =head2 Globals imported from SNMP::Info::EtherLike
 See documentation in L<SNMP::Info::EtherLike/"GLOBALS"> for details.
 =head1 TABLE METHODS
 =over
 =item $ciscosb->peth_port_power()
 Power supplied by PoE ports, in milliwatts.
 (C<rlPethPsePortOutputPower>)
 =item $ciscosb->i_duplex()
 Return duplex based upon the result of EtherLike->el_duplex().
 =back
 =head2 Overrides
 =over
@@ -264,10 +304,6 @@ Uses the i_name() field.
 See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::Entity
 See documentation in L<SNMP::Info::Entity/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::EtherLike
 See documentation in L<SNMP::Info::EtherLike/"TABLE METHODS"> for details.
--- a/lib/SNMP/Info/Layer2/ECI.pm
+++ b/lib/SNMP/Info/Layer2/ECI.pm
@@ -0,0 +1,113 @@
 # SNMP::Info::Layer2::ECI - SNMP Interface to ECI Devices
 #
 # Copyright (c) 2020 by 135.
 package SNMP::Info::Layer2::ECI;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer2;
@SNMP::Info::Layer2::ECI::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::ECI::EXPORT_OK = qw//;
 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
 $VERSION = '3.70-135';
 %MIBS = ( %SNMP::Info::Layer2::MIBS, );
 %GLOBALS = (
    %SNMP::Info::Layer2::GLOBALS,
 );
 %FUNCS = ( %SNMP::Info::Layer2::FUNCS, );
 %MUNGE = ( %SNMP::Info::Layer2::MUNGE, );
 sub vendor {
    return 'eci';
 }
 sub os {
    return 'eci-os';
 }
 sub os_ver {
    return 'unknown';
 }
 sub model {
    my $obj = shift;
    return $obj->description;
 }
 1;
 __END__
 =head1 NAME
 SNMP::Info::Layer2::ECI - SNMP Interface to ECI Devices
 =head1 SYNOPSIS
 # Let SNMP::Info determine the correct subclass for you.
 my $obj = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myrouter',
                          Community   => 'public',
                          Version     => 2
                        )
    or die "Can't connect to DestHost.\n";
 my $class      = $obj->class();
 print "SNMP::Info determined this device to fall under subclass : $class\n";
 =head1 DESCRIPTION
 Subclass for ECI Devices running IOS-like software
 =head2 Inherited Classes
 =over
 =item SNMP::Info::Layer2
 =back
 =head1 GLOBALS
 These are methods that return scalar value from SNMP
 =over
 =item $obj->vendor()
 Returns 'eci'
 =item $obj->os()
 Returns 'eci-os'
 =item $obj->layers()
 Ensures that layer two is reported, at least.
 =item $obj->os_ver()
 Returns the software version.
 =item $obj->model
 Returns the model extracted.
 =item $obj->serial()
 Returns serial number.
 =cut
 =back
--- a/lib/SNMP/Info/Layer2/Exinda.pm
+++ b/lib/SNMP/Info/Layer2/Exinda.pm
@@ -0,0 +1,201 @@
 # 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 warnings;
 use Exporter;
 use SNMP::Info::Layer2;
@SNMP::Info::Layer2::Exinda::ISA = qw/
    SNMP::Info::Layer2
    Exporter
 /;
@SNMP::Info::Layer2::Exinda::EXPORT_OK = qw//;
 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
 $VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
    'EXINDA-MIB' => 'systemVersion',
 );
 %GLOBALS = (
    %SNMP::Info::Layer2::GLOBALS,
    # EXINDA-MIB
    'exinda_model' => 'hardwareSeries',
    'serial1'      => 'systemHostId',
    'uptime'       => 'systemUptime',
    'os_ver'       => 'systemVersion',
 );
 %FUNCS = (
    %SNMP::Info::Layer2::FUNCS,
 );
 %MUNGE = (
    %SNMP::Info::Layer2::MUNGE,
 );
 # layer 2: bridged shaping and failopen interfaces
 # layer 3/4: ip and layer 4 protocol fiddling and accell
 # layer 7: wccp support
 sub layers {
    return '01001110';
 }
 sub vendor {
    return 'exinda';
 }
 # overwrite l2->model, hardwareSeries returns a plain string
 sub model {
    my $exinda = shift;
    return $exinda->exinda_model;
 }
 # systemHostId (and thus serial1) is actually also a mac address
 sub mac {
    my $exinda = shift;
    my $exinda_mac = $exinda->serial1;
    return unless (defined $exinda_mac && (length $exinda_mac) == 12);
    return join(":", $exinda_mac =~ m/\w{2}/g);
 }
 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 C<hardwareSeries>.
 =item $exinda->os()
 Returns 'exos'.
 =item $exinda->os_ver()
 Returns C<systemVersion>.
 =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
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer2::HP - SNMP Interface to HP ProCurve Switches
 # $Id$
 #
 # Copyright (c) 2008-2009 Max Baker changes from version 0.8 and beyond.
 #
@@ -33,6 +32,7 @@
 package SNMP::Info::Layer2::HP;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer3;
 use SNMP::Info::MAU;
@@ -48,9 +48,9 @@ use SNMP::Info::Aggregate 'agg_ports_ifstack';
 /;
@SNMP::Info::Layer2::HP::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %PORTSTAT, %MODEL_MAP, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
@@ -158,6 +158,12 @@ $VERSION = '3.57';
    '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',
@@ -177,6 +183,23 @@ $VERSION = '3.57';
    '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',
@@ -216,6 +239,11 @@ $VERSION = '3.57';
    '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',
@@ -305,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;
 }
--- a/lib/SNMP/Info/Layer2/HP4000.pm
+++ b/lib/SNMP/Info/Layer2/HP4000.pm
@@ -32,6 +32,7 @@
 package SNMP::Info::Layer2::HP4000;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer3;
 use SNMP::Info::MAU;
@@ -42,14 +43,13 @@ use SNMP::Info::CDP;
    SNMP::Info::CDP Exporter/;
@SNMP::Info::Layer2::HP4000::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %PORTSTAT, %MODEL_MAP, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
    %SNMP::Info::MAU::MIBS,
    %SNMP::Info::LLDP::MIBS,
    %SNMP::Info::CDP::MIBS,
    'RFC1271-MIB'    => 'logDescription',
    'HP-ICF-OID'     => 'hpSwitch4000',
@@ -427,7 +427,7 @@ sub set_i_vlan {
                    $hp->error_throw("Error removing previous untagged vlan from port, should never happen...\n") unless defined $rv;
                }
            } else {
-                # If vlan change was not succesful, try to revert to the old situation.
+                # If vlan change was not successful, try to revert to the old situation.
                if (defined $old_untagged) {
                    $rv = $hp->set_hp_v_if_tag(2, $old_untagged) if defined $old_untagged;
                    if (defined $rv) {
@@ -504,11 +504,6 @@ 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. 
 my $hp = new SNMP::Info::Layer2::HP4000(...);
 =head2 Inherited Classes
 =over
--- a/lib/SNMP/Info/Layer2/HPVC.pm
+++ b/lib/SNMP/Info/Layer2/HPVC.pm
@@ -31,21 +31,20 @@
 package SNMP::Info::Layer2::HPVC;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer2;
 use SNMP::Info::LLDP;
@SNMP::Info::Layer2::HPVC::ISA
-    = qw/SNMP::Info::Layer2 SNMP::Info::LLDP Exporter/;
+    = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::HPVC::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
    %SNMP::Info::LLDP::MIBS,
    'HPVC-MIB'       => 'vcDomainName',
    'CPQSINFO-MIB'   => 'cpqSiSysSerialNum',
    'HPVCMODULE-MIB' => 'vcModuleDomainName',
@@ -53,7 +52,6 @@ $VERSION = '3.57';
 %GLOBALS = (
    %SNMP::Info::Layer2::GLOBALS,
    %SNMP::Info::LLDP::GLOBALS,
    'serial1'      => 'cpqSiSysSerialNum.0',
    'os_ver'       => 'cpqHoSWRunningVersion.1',
    'os_bin'       => 'cpqHoFwVerVersion.1',
@@ -62,17 +60,13 @@ $VERSION = '3.57';
 %FUNCS = (
    %SNMP::Info::Layer2::FUNCS,
    %SNMP::Info::LLDP::FUNCS,
 );
 %MUNGE = (
    # Inherit all the built in munging
    %SNMP::Info::Layer2::MUNGE,
    %SNMP::Info::LLDP::MUNGE,
 );
 # Method Overrides
 sub os {
@@ -120,11 +114,6 @@ Jeroen van Ingen
 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. 
 my $hp = new SNMP::Info::Layer2::HPVC(...);
 =head2 Inherited Classes
 =over
@@ -188,22 +177,10 @@ 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
--- a/lib/SNMP/Info/Layer2/Kentrox.pm
+++ b/lib/SNMP/Info/Layer2/Kentrox.pm
@@ -28,15 +28,16 @@ package SNMP::Info::Layer2::Kentrox;
 # POSSIBILITY OF SUCH DAMAGE.
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer2;
@SNMP::Info::Layer2::Kentrox::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Kentrox::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE, $AUTOLOAD);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
@@ -57,13 +58,13 @@ $VERSION = '3.57';
 %MUNGE = ( %SNMP::Info::Layer2::MUNGE, );
 sub os {
-    return 'Kentrox';
+    return 'kentrox';
 }
 sub os_ver {
    my $dsver = shift;
    my $descr = $dsver->description();
-    if ( $descr =~ /^\S+\s\S+\s\S+\s(\S+)/){
+    if ( defined ($descr) && $descr =~ /^\S+\s\S+\s\S+\s(\S+)/){
        return $1;
    }
    return;
@@ -72,20 +73,20 @@ sub os_ver {
 sub serial {
    my $dsserial = shift;
    my $serial = $dsserial->ds_sysinfo();
-    if ( $serial =~ /SERIAL\s(\S+)/){
+    if ( defined ($serial) && $serial =~ /SERIAL\s(\S+)/){
        my $str = substr($1,8,10);
        return $str;
    }
    return;
 }
 sub vendor {
-    return 'Kentrox';
+    return 'kentrox';
 }
 sub model {
    my $dsmodel = shift;
    my $descr = $dsmodel->description();
-    if ( $descr =~ /^(\S+\s\S+)/){
+    if ( defined ($descr) && $descr =~ /^(\S+\s\S+)/){
        return $1;
    }
    return;
@@ -110,7 +111,7 @@ phishphreek@gmail.com
                          Debug       => 1,
                          DestHost    => 'myrouter',
                          Community   => 'public',
-                          Version     => 1
+                          Version     => 2
                        )
    or die "Can't connect to DestHost.\n";
@@ -168,12 +169,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
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer2::N2270
 # $Id$
 #
 # Copyright (c) 2008 Eric Miller
 # All rights reserved.
@@ -31,38 +30,42 @@
 package SNMP::Info::Layer2::N2270;
 use strict;
 use warnings;
 use Exporter;
-use SNMP::Info;
+use SNMP::Info::Layer2;
 use SNMP::Info::Bridge;
 use SNMP::Info::SONMP;
 use SNMP::Info::Airespace;
@SNMP::Info::Layer2::N2270::ISA
-    = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::SONMP SNMP::Info::Airespace Exporter/;
+    = qw/SNMP::Info::Layer2 SNMP::Info::SONMP SNMP::Info::Airespace Exporter/;
@SNMP::Info::Layer2::N2270::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE, $AUTOLOAD, $INIT, $DEBUG);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
-    %SNMP::Info::MIBS,        %SNMP::Info::Bridge::MIBS,
+    %SNMP::Info::Layer2::MIBS,
-    %SNMP::Info::SONMP::MIBS, %SNMP::Info::Airespace::MIBS,
+    %SNMP::Info::SONMP::MIBS,
    %SNMP::Info::Airespace::MIBS,
 );
 %GLOBALS = (
-    %SNMP::Info::GLOBALS,        %SNMP::Info::Bridge::GLOBALS,
+    %SNMP::Info::Layer2::GLOBALS,
-    %SNMP::Info::SONMP::GLOBALS, %SNMP::Info::Airespace::GLOBALS,
+    %SNMP::Info::SONMP::GLOBALS,
    %SNMP::Info::Airespace::GLOBALS,
 );
 %FUNCS = (
-    %SNMP::Info::FUNCS,        %SNMP::Info::Bridge::FUNCS,
+    %SNMP::Info::Layer2::FUNCS,
-    %SNMP::Info::SONMP::FUNCS, %SNMP::Info::Airespace::FUNCS,
+    %SNMP::Info::SONMP::FUNCS,
    %SNMP::Info::Airespace::FUNCS,
 );
 %MUNGE = (
-    %SNMP::Info::MUNGE,        %SNMP::Info::Bridge::MUNGE,
+    %SNMP::Info::Layer2::MUNGE,
-    %SNMP::Info::SONMP::MUNGE, %SNMP::Info::Airespace::MUNGE,
+    %SNMP::Info::SONMP::MUNGE,
    %SNMP::Info::Airespace::MUNGE,
 );
 sub os {
@@ -126,18 +129,11 @@ Eric Miller
 Provides abstraction to the configuration information obtainable from a
 Nortel 2270 Series Wireless Switch through SNMP.
 For speed or debugging purposes you can call the subclass directly, but not
 after determining a more specific class using the method above. 
 my $n2270 = new SNMP::Info::Layer2::N2270(...);
 =head2 Inherited Classes
 =over
-=item SNMP::Info
+=item SNMP::Info::Layer2
 =item SNMP::Info::Bridge
 =item SNMP::Info::SONMP
@@ -151,9 +147,7 @@ my $n2270 = new SNMP::Info::Layer2::N2270(...);
 =item Inherited Classes' MIBs
-See L<SNMP::Info/"Required MIBs"> for its own MIB requirements.
+See L<SNMP::Info::Layer2/"Required MIBs"> for its own MIB requirements.
 See L<SNMP::Info::Bridge/"Required MIBs"> for its own MIB requirements.
 See L<SNMP::Info::SONMP/"Required MIBs"> for its own MIB requirements.
@@ -200,13 +194,9 @@ start at 0.  Returns 0.
 =back
-=head2 Globals imported from SNMP::Info
+=head2 Globals imported from SNMP::Info::Layer2
-See documentation in L<SNMP::Info/"GLOBALS"> for details.
+See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
 =head2 Globals imported from SNMP::Info::Bridge
 See documentation in L<SNMP::Info::Bridge/"GLOBALS"> for details.
 =head2 Global Methods imported from SNMP::Info::SONMP
@@ -229,13 +219,9 @@ to a hash.
 =back
-=head2 Table Methods imported from SNMP::Info
+=head2 Table Methods imported from SNMP::Info::Layer2
-See documentation in L<SNMP::Info/"TABLE METHODS"> for details.
+See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::Bridge
 See documentation in L<SNMP::Info::Bridge/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::SONMP
--- a/lib/SNMP/Info/Layer2/NAP222x.pm
+++ b/lib/SNMP/Info/Layer2/NAP222x.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer2::NAP222x
 # $Id$
 #
 # Copyright (c) 2008 Eric Miller
 # All rights reserved.
@@ -31,6 +30,7 @@
 package SNMP::Info::Layer2::NAP222x;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::SONMP;
 use SNMP::Info::IEEE802dot11;
@@ -40,9 +40,9 @@ use SNMP::Info::Layer2;
    = qw/SNMP::Info::SONMP SNMP::Info::IEEE802dot11 SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::NAP222x::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer2::MIBS, %SNMP::Info::IEEE802dot11::MIBS,
@@ -393,11 +393,6 @@ Eric Miller
 Provides abstraction to the configuration information obtainable from a Nortel
 2220 series wireless Access Points through SNMP.
 For speed or debugging purposes you can call the subclass directly, but not
 after determining a more specific class using the method above. 
 my $nap222x = new SNMP::Info::Layer2::NAP222x(...);
 =head2 Inherited Classes
 =over
--- a/lib/SNMP/Info/Layer2/NWSS2300.pm
+++ b/lib/SNMP/Info/Layer2/NWSS2300.pm
@@ -29,21 +29,20 @@
 package SNMP::Info::Layer2::NWSS2300;
 use strict;
 use warnings;
 use Exporter;
-use SNMP::Info;
+use SNMP::Info::Layer2;
 use SNMP::Info::Bridge;
@SNMP::Info::Layer2::NWSS2300::ISA
-    = qw/SNMP::Info SNMP::Info::Bridge Exporter/;
+    = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::NWSS2300::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
-    %SNMP::Info::MIBS,
+    %SNMP::Info::Layer2::MIBS,
    %SNMP::Info::Bridge::MIBS,
    'NTWS-REGISTRATION-DEVICES-MIB' => 'ntwsSwitch2380',
    'NTWS-AP-STATUS-MIB'            => 'ntwsApStatNumAps',
    'NTWS-CLIENT-SESSION-MIB'       => 'ntwsClSessTotalSessions',
@@ -53,16 +52,14 @@ $VERSION = '3.57';
 );
 %GLOBALS = (
-    %SNMP::Info::GLOBALS,
+    %SNMP::Info::Layer2::GLOBALS,
    %SNMP::Info::Bridge::GLOBALS,
    'os_ver' => 'ntwsVersionString',
    'serial' => 'ntwsSerialNumber',
    'mac'    => 'dot1dBaseBridgeAddress',
 );
 %FUNCS = (
-    %SNMP::Info::FUNCS,
+    %SNMP::Info::Layer2::FUNCS,
    %SNMP::Info::Bridge::FUNCS,
    # NTWS-AP-STATUS-MIB::ntwsApStatApStatusTable
    'nwss2300_ap_mac'      => 'ntwsApStatApStatusBaseMac',
@@ -125,8 +122,7 @@ $VERSION = '3.57';
 );
 %MUNGE = (
-    %SNMP::Info::MUNGE,
+    %SNMP::Info::Layer2::MUNGE,
    %SNMP::Info::Bridge::MUNGE,
    'nwss2300_apif_mac'      => \&SNMP::Info::munge_mac,
    'nwss2300_apif_bssid'    => \&SNMP::Info::munge_mac,
 );
@@ -813,18 +809,11 @@ This class emulates bridge functionality for the wireless switch. This enables
 end station MAC addresses collection and correlation to the thin access point
 the end station is using for communication.
 For speed or debugging purposes you can call the subclass directly, but not
 after determining a more specific class using the method above. 
 my $nwss2300 = new SNMP::Info::Layer2::NWSS2300(...);
 =head2 Inherited Classes
 =over
-=item SNMP::Info
+=item SNMP::Info::Layer2
 =item SNMP::Info::Bridge
 =back
@@ -846,9 +835,7 @@ my $nwss2300 = new SNMP::Info::Layer2::NWSS2300(...);
 =head2 Inherited Classes' MIBs
-See L<SNMP::Info/"Required MIBs"> for its own MIB requirements.
+See L<SNMP::Info::Layer2/"Required MIBs"> for its own MIB requirements.
 See L<SNMP::Info::Bridge/"Required MIBs"> for its own MIB requirements.
 =head1 GLOBALS
@@ -895,13 +882,9 @@ proprietary MIBs.
 =back
-=head2 Global Methods imported from SNMP::Info
+=head2 Global Methods imported from SNMP::Info::Layer2
-See documentation in L<SNMP::Info/"GLOBALS"> for details.
+See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
 =head2 Globals imported from SNMP::Info::Bridge
 See documentation in L<SNMP::Info::Bridge/"GLOBALS"> for details.
 =head1 TABLE METHODS
@@ -1141,13 +1124,9 @@ These emulate the F<CISCO-DOT11-MIB>
 =back
-=head2 Table Methods imported from SNMP::Info
+=head2 Table Methods imported from SNMP::Info::Layer2
-See documentation in L<SNMP::Info/"TABLE METHODS"> for details.
+See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::Bridge
 See documentation in L<SNMP::Info::Bridge/"TABLE METHODS"> for details.
 =head2 Overrides
--- a/lib/SNMP/Info/Layer2/Netgear.pm
+++ b/lib/SNMP/Info/Layer2/Netgear.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer2::Netgear
 # $Id$
 #
 # Copyright (c) 2008 Bill Fenner
 # All rights reserved.
@@ -31,33 +30,33 @@
 package SNMP::Info::Layer2::Netgear;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer2;
 use SNMP::Info::LLDP;
-@SNMP::Info::Layer2::Netgear::ISA       = qw/SNMP::Info::LLDP SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Netgear::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Netgear::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 # 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::LLDP::MIBS, );
+%MIBS = ( %SNMP::Info::Layer2::MIBS, );
 %GLOBALS = (
-    %SNMP::Info::Layer2::GLOBALS, %SNMP::Info::LLDP::GLOBALS,
+    %SNMP::Info::Layer2::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::LLDP::FUNCS, );
+%FUNCS = ( %SNMP::Info::Layer2::FUNCS, );
-%MUNGE = ( %SNMP::Info::Layer2::MUNGE, %SNMP::Info::LLDP::MUNGE, );
+%MUNGE = ( %SNMP::Info::Layer2::MUNGE, );
 sub vendor {
    return 'netgear';
@@ -87,7 +86,7 @@ sub serial {
        return $e_serial->{$index} if defined $index;
    }
-    # Without Enitity-MIB, we've got to work our way through a bunch of
+    # Without Entity-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/[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,
-# concatentate ifDesc and ifIndex.
+# concatenate ifDesc and ifIndex.
 sub interfaces {
    my $netgear = shift;
    my $partial = shift;
@@ -192,8 +191,6 @@ inherited methods.
 =over
 =item SNMP::Info::Layer2
 =item SNMP::Info::Entity
 =item SNMP::Info::LLDP
 =back
@@ -206,10 +203,6 @@ inherited methods.
 MIBs listed in L<SNMP::Info::Layer2/"Required MIBs"> and its inherited
 classes.
 See L<SNMP::Info::Entity/"Required MIBs"> for its MIB requirements.
 See L<SNMP::Info::LLDP/"Required MIBs"> for its MIB requirements.
 =back
 =head1 GLOBALS
@@ -248,14 +241,6 @@ serial number).
 See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
 =head2 Globals imported from SNMP::Info::Entity
 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
@@ -275,12 +260,4 @@ Uses the i_name() field.
 See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::Entity
 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/Nexans.pm
+++ b/lib/SNMP/Info/Layer2/Nexans.pm
@@ -30,15 +30,16 @@
 package SNMP::Info::Layer2::Nexans;
 use strict;
 use warnings;
 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/;
+our ($VERSION, %GLOBALS, %FUNCS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
@@ -157,11 +158,6 @@ tested devices:
    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
--- a/lib/SNMP/Info/Layer2/Orinoco.pm
+++ b/lib/SNMP/Info/Layer2/Orinoco.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer2::Orinoco
 # $Id$
 #
 # Copyright (c) 2008 Eric Miller
 # All rights reserved.
@@ -31,6 +30,7 @@
 package SNMP::Info::Layer2::Orinoco;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::IEEE802dot11;
 use SNMP::Info::Layer2;
@@ -39,9 +39,9 @@ use SNMP::Info::Layer2;
    = qw/SNMP::Info::IEEE802dot11 SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Orinoco::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
@@ -189,11 +189,6 @@ Provides abstraction to the configuration information obtainable from
 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. 
 my $orinoco = new SNMP::Info::Layer2::Orinoco(...);
 =head2 Inherited Classes
 =over
@@ -234,7 +229,7 @@ Returns the model extracted from C<sysDescr>.
 =item $orinoco->os()
-Returns 'Orinoco'
+Returns 'orinoco'
 =item $orinoco->os_ver()
--- a/lib/SNMP/Info/Layer2/Proscend.pm
+++ b/lib/SNMP/Info/Layer2/Proscend.pm
@@ -0,0 +1,108 @@
 # SNMP::Info::Layer2::Proscend - SNMP Interface to Proscend Devices
 #
 # Copyright (c) 2020 by 135.
 package SNMP::Info::Layer2::Proscend;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer2;
@SNMP::Info::Layer2::Proscend::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Proscend::EXPORT_OK = qw//;
 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
 $VERSION = '3.70-135';
 %MIBS = ( %SNMP::Info::Layer2::MIBS, );
 %GLOBALS = (
    %SNMP::Info::Layer2::GLOBALS,
 );
 %FUNCS = ( %SNMP::Info::Layer2::FUNCS, );
 %MUNGE = ( %SNMP::Info::Layer2::MUNGE, );
 sub vendor {
    return 'proscend';
 }
 sub os {
    return 'proscend';
 }
 sub model {
    my $obj = shift;
    return $obj->SUPER::model();
 }
 1;
 __END__
 =head1 NAME
 SNMP::Info::Layer2::Proscend - SNMP Interface to Proscend Devices
 =head1 SYNOPSIS
 # Let SNMP::Info determine the correct subclass for you.
 my $obj = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myrouter',
                          Community   => 'public',
                          Version     => 2
                        )
    or die "Can't connect to DestHost.\n";
 my $class      = $obj->class();
 print "SNMP::Info determined this device to fall under subclass : $class\n";
 =head1 DESCRIPTION
 Subclass for Proscend Devices
 =head2 Inherited Classes
 =over
 =item SNMP::Info::Layer2
 =back
 =head2 Inherited Classes' MIBs
 See L<SNMP::Info::Layer2/"Required MIBs"> for its own MIB requirements.
 =head1 GLOBALS
 These are methods that return scalar value from SNMP
 =over
 =item $obj->vendor()
 Returns 'proscend'
 =item $obj->os()
 Returns 'proscend'
 =item $obj->os_ver()
 Returns the software version.
 =item $obj->model()
 Returns the model extracted.
 =item $obj->serial()
 Returns serial number.
 =cut
 =back
--- a/lib/SNMP/Info/Layer2/Sixnet.pm
+++ b/lib/SNMP/Info/Layer2/Sixnet.pm
@@ -30,15 +30,16 @@
 package SNMP::Info::Layer2::Sixnet;
 use strict;
 use warnings;
 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/;
+our ($VERSION, %GLOBALS, %FUNCS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (%SNMP::Info::Layer2::MIBS, 'SIXNET-MIB' => 'sxid',);
@@ -108,11 +109,6 @@ Eric Miller
 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
--- a/lib/SNMP/Info/Layer2/Telindus.pm
+++ b/lib/SNMP/Info/Layer2/Telindus.pm
@@ -0,0 +1,124 @@
 # SNMP::Info::Layer2::Telindus - SNMP Interface to Telindus Devices
 #
 # Copyright (c) 2020 by 135.
 package SNMP::Info::Layer2::Telindus;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer2;
@SNMP::Info::Layer2::Telindus::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Telindus::EXPORT_OK = qw//;
 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
 $VERSION = '3.70-135';
 # 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, );
 %GLOBALS = (
    %SNMP::Info::Layer2::GLOBALS,
 );
 %FUNCS = ( %SNMP::Info::Layer2::FUNCS, );
 %MUNGE = ( %SNMP::Info::Layer2::MUNGE, );
 sub vendor {
    return 'telindus';
 }
 sub os {
    return 'telind-os';
 }
 sub os_ver {
    my $obj = shift;
    $obj->description =~ /\$Telindus\s(\d+)(\$\s(.*)|\s(.*)\$)\s(T\d+\/\d+)/;
    return $5
        if defined $5;
    return $obj->SUPER::os_ver();
 }
 sub model {
    my $obj = shift;
    $obj->description =~ /\$Telindus\s(\d+)(\$\s(.*)|\s(.*)\$)\s(T\d+\/\d+)/;
    if (defined $1 and defined $3) {
        return $1 . ' ' . $3;
    }
    elsif (defined $1 and defined $4) {
        return $1 . ' ' . $4;
    }
    return $obj->SUPER::model();
 }
 1;
 __END__
 =head1 NAME
 SNMP::Info::Layer2::Telindus - SNMP Interface to Telindus Devices
 =head1 SYNOPSIS
 # Let SNMP::Info determine the correct subclass for you.
 my $obj = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myrouter',
                          Community   => 'public',
                          Version     => 2
                        )
    or die "Can't connect to DestHost.\n";
 my $class      = $obj->class();
 print "SNMP::Info determined this device to fall under subclass : $class\n";
 =head1 DESCRIPTION
 Subclass for Telindus Devices
 =head2 Inherited Classes
 =over
 =item SNMP::Info::Layer2
 =back
 =head1 GLOBALS
 These are methods that return scalar value from SNMP
 =over
 =item $obj->vendor()
 Returns 'zyxel'
 =item $obj->os()
 Returns 'zynos'
 =item $obj->layers()
 Ensures that layer two is reported, at least.
 =item $obj->os_ver()
 Returns the software version.
 =item $obj->model
 Returns the model extracted.
 =cut
 =back
--- a/lib/SNMP/Info/Layer2/Trapeze.pm
+++ b/lib/SNMP/Info/Layer2/Trapeze.pm
@@ -29,23 +29,20 @@
 package SNMP::Info::Layer2::Trapeze;
 use strict;
 use warnings;
 use Exporter;
-use SNMP::Info;
+use SNMP::Info::Layer2;
 use SNMP::Info::Bridge;
 use SNMP::Info::LLDP;
@SNMP::Info::Layer2::Trapeze::ISA
-    = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::LLDP Exporter/;
+    = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Trapeze::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
-    %SNMP::Info::MIBS,
+    %SNMP::Info::Layer2::MIBS,
    %SNMP::Info::Bridge::MIBS,
    %SNMP::Info::LLDP::MIBS,
    'TRAPEZE-NETWORKS-REGISTRATION-DEVICES-MIB' => 'wirelessLANController',
    'TRAPEZE-NETWORKS-AP-STATUS-MIB'            => 'trpzApStatNumAps',
    'TRAPEZE-NETWORKS-CLIENT-SESSION-MIB'       => 'trpzClSessTotalSessions',
@@ -55,18 +52,14 @@ $VERSION = '3.57';
 );
 %GLOBALS = (
-    %SNMP::Info::GLOBALS,
+    %SNMP::Info::Layer2::GLOBALS,
    %SNMP::Info::Bridge::GLOBALS,
    %SNMP::Info::LLDP::GLOBALS,
    'os_ver' => 'trpzVersionString',
    'serial' => 'trpzSerialNumber',
    'mac'    => 'dot1dBaseBridgeAddress',
 );
 %FUNCS = (
-    %SNMP::Info::FUNCS,
+    %SNMP::Info::Layer2::FUNCS,
    %SNMP::Info::Bridge::FUNCS,
    %SNMP::Info::LLDP::FUNCS,
    # TRAPEZE-NETWORKS-AP-STATUS-MIB::trpzApStatApStatusTable
    'trapeze_ap_mac'      => 'trpzApStatApStatusBaseMac',
    'trapeze_ap_name'     => 'trpzApStatApStatusApName',
@@ -128,9 +121,7 @@ $VERSION = '3.57';
 );
 %MUNGE = (
-    %SNMP::Info::MUNGE,
+    %SNMP::Info::Layer2::MUNGE,
    %SNMP::Info::Bridge::MUNGE,
    %SNMP::Info::LLDP::MUNGE,
    'trapeze_apif_mac'      => \&SNMP::Info::munge_mac,
    'trapeze_apif_bssid'    => \&SNMP::Info::munge_mac,
 );
@@ -817,18 +808,11 @@ This class emulates bridge functionality for the wireless switch. This enables
 end station MAC addresses collection and correlation to the thin access point
 the end station is using for communication.
 For speed or debugging purposes you can call the subclass directly, but not
 after determining a more specific class using the method above. 
 my $trapeze = new SNMP::Info::Layer2::Trapeze(...);
 =head2 Inherited Classes
 =over
-=item SNMP::Info
+=item SNMP::Info::Layer2
 =item SNMP::Info::Bridge
 =back
@@ -850,9 +834,7 @@ my $trapeze = new SNMP::Info::Layer2::Trapeze(...);
 =head2 Inherited Classes' MIBs
-See L<SNMP::Info/"Required MIBs"> for its own MIB requirements.
+See L<SNMP::Info::Layer2/"Required MIBs"> for its own MIB requirements.
 See L<SNMP::Info::Bridge/"Required MIBs"> for its own MIB requirements.
 =head1 GLOBALS
@@ -899,13 +881,9 @@ proprietary MIBs.
 =back
-=head2 Global Methods imported from SNMP::Info
+=head2 Global Methods imported from SNMP::Info::Layer2
-See documentation in L<SNMP::Info/"GLOBALS"> for details.
+See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
 =head2 Globals imported from SNMP::Info::Bridge
 See documentation in L<SNMP::Info::Bridge/"GLOBALS"> for details.
 =head1 TABLE METHODS
@@ -1147,11 +1125,7 @@ These emulate the F<CISCO-DOT11-MIB>
 =head2 Table Methods imported from SNMP::Info
-See documentation in L<SNMP::Info/"TABLE METHODS"> for details.
+See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::Bridge
 See documentation in L<SNMP::Info::Bridge/"TABLE METHODS"> for details.
 =head2 Overrides
--- a/lib/SNMP/Info/Layer2/Ubiquiti.pm
+++ b/lib/SNMP/Info/Layer2/Ubiquiti.pm
@@ -1,10 +1,35 @@
-# SNMP::Info::Layer2::Ubiquiti
+# SNMP::Info::Layer2::Ubiquiti - SNMP Interface to Ubiquiti Devices
 # $Id$
 #
 # 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 warnings;
 use Exporter;
 use SNMP::Info::IEEE802dot11;
 use SNMP::Info::Layer2;
@@ -16,23 +41,23 @@ use SNMP::Info::Layer3;  # only used in sub mac()
    = qw/SNMP::Info::IEEE802dot11 SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Ubiquiti::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
    %SNMP::Info::IEEE802dot11::MIBS,
 );
-%GLOBALS
+%GLOBALS = (
-    = ( %SNMP::Info::Layer2::GLOBALS, %SNMP::Info::IEEE802dot11::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, );
@@ -46,14 +71,14 @@ sub os {
        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/){
+        if((lc $prod) =~ /station/ or (lc $prod) =~ /beam/ or (lc $prod) =~ /grid/){
-                        return 'AirOS';
+                return 'AirOS';
-                # Product names that match UAP
+        # Product names that match UAP
-                }elsif((lc $prod) =~ /uap/){
+        }elsif((lc $prod) =~ /uap/){
-                        return 'UniFi';
+                return 'UniFi';
-                }else{
+        }else{
-                    # Continue below to find OS name
+            # Continue below to find OS name
-                }
+        }
    }
    ## EdgeMAX OS (EdgeSwitch and EdgeRouter) name is first field split by space
@@ -65,35 +90,54 @@ sub os {
 }
 sub os_ver {
-    my $dot11 = shift;
+    my $ubnt = shift;
-    my $versions = $dot11->dot11_prod_ver();
+    my $versions = $ubnt->dot11_prod_ver();
    foreach my $iid ( keys %$versions ) {
        my $ver = $versions->{$iid};
        next unless defined $ver;
        my $os = $ubnt->os;
        if($os == 'AirOS'){
            ## pretty up the version reporting for AirOS to include hardware (XW, XM, etc) and three major groups of firmware
            my @firmware =  split(/v/, $ver);
            my @firmwareSplit = split(/\./, $firmware[1]);
            my @prefix = split(/\./, $ver);
            $ver = $prefix[0] . '-v' . join('.', @firmwareSplit[0,1,2]);
        }
        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\.]+)/ ) {
+        #if ( $ver =~ /([\d\.]+)/ ) {
-            return $1;
+        #    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];
+    my $ver = $ubnt->description() || '';
    if((lc $ver) =~ /^edgeswitch/){
        ## EdgeSwitch OS version is second field split by comma and bootcode version is last
        my @myver = split(/, /, $ver);
        my @firmware = split(/\./, $myver[1]);
        my @bootcode = split(/\./, $myver[-1]);
        ## Return only three major version groupings and include bootcode version
        return join('.', @firmware[0,1,2]) . '.-b' . join('.', @bootcode[0,1,2]);
    }
    ## EdgeRouter OS version is second field split by space
    my @myver = split(/ /, $ver);
    my @firmware = split(/\./, $myver[1]);
-    return $myver[1];
+    if($firmware[2] =~ /hotfix$/){
        # edge case where EdgeOS has hotfix versions in format "EdgeOS v1.9.7+hotfix.4.5024004.171005.0403"
        $firmware[2] = $firmware[2] . '.' . $firmware[3]
    }
    ## Return only three major version groupings
    return join('.', @firmware[0,1,2]);
 }
 sub vendor {
-    return 'Ubiquiti Networks, Inc.';
+    return 'ubiquiti';
 }
 sub model {
@@ -118,7 +162,7 @@ sub model {
    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
+        # EdgeSwitch includes model directly and edgeos logic is in else statement
        return ;
    }else{
        ## do some logic to determine ER model based on tech specs from ubnt:
@@ -198,13 +242,11 @@ sub mac {
            # 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 {
@@ -282,11 +324,6 @@ Max Kosmach
 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
@@ -315,11 +352,11 @@ These are methods that return scalar value from SNMP
 =item $ubnt->vendor()
-Returns 'Ubiquiti Networks, Inc.'
+Returns 'ubiquiti'
 =item $ubnt->model()
-Returns the model extracted from C<dot11manufacturerProductName>, with failback to some complex logic for EdgeMax devices
+Returns the model extracted from C<dot11manufacturerProductName>, with fallback to some complex logic for EdgeMax devices
 =item $ubnt->serial()
--- a/lib/SNMP/Info/Layer2/ZyXEL_DSLAM.pm
+++ b/lib/SNMP/Info/Layer2/ZyXEL_DSLAM.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer2::ZyXEL_DSLAM
 # $Id$
 #
 # Copyright (c) 2008 Max Baker
 # All rights reserved.
@@ -31,15 +30,16 @@
 package SNMP::Info::Layer2::ZyXEL_DSLAM;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer2;
@SNMP::Info::Layer2::ZyXEL_DSLAM::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::ZyXEL_DSLAM::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );
@@ -77,7 +77,7 @@ sub os_ver {
    my $zyxel = shift;
    my $descr = $zyxel->description();
-    if ( $descr =~ m/version (\S+) / ) {
+    if ( defined ($descr) && $descr =~ m/version (\S+) / ) {
        return $1;
    }
    return;
@@ -88,11 +88,13 @@ sub model {
    my $desc = $zyxel->description();
-    if ( $desc =~ /8-port ADSL Module\(Annex A\)/ ) {
+    if (defined $desc) {
      if ($desc =~ /8-port ADSL Module\(Annex A\)/) {
        return "AAM1008-61";
-    }
+      }
-    elsif ( $desc =~ /8-port ADSL Module\(Annex B\)/ ) {
+      elsif ($desc =~ /8-port ADSL Module\(Annex B\)/) {
        return "AAM1008-63";
      }
    }
    return;
 }
@@ -130,11 +132,11 @@ Dmitry Sergienko (C<dmitry@trifle.net>)
                          Debug       => 1,
                          DestHost    => 'myhub',
                          Community   => 'public',
-                          Version     => 1
+                          Version     => 2
                        )
    or die "Can't connect to DestHost.\n";
- my $class      = $l2->class();
+ my $class      = $zyxel->class();
 print "SNMP::Info determined this device to fall under subclass : $class\n";
 =head1 DESCRIPTION
@@ -174,11 +176,11 @@ These are methods that return scalar value from SNMP
 =item $zyxel->vendor()
-Returns 'ZyXEL' :)
+Returns 'zyxel'
 =item $zyxel->os()
-Returns 'ZyXEL' 
+Returns 'zyxel'
 =item $zyxel->os_ver()
--- a/lib/SNMP/Info/Layer2/Zyxel.pm
+++ b/lib/SNMP/Info/Layer2/Zyxel.pm
@@ -0,0 +1,126 @@
 # SNMP::Info::Layer2::Zyxel - SNMP Interface to Zyxel Devices
 #
 # Copyright (c) 2020 by 135.
 package SNMP::Info::Layer2::Zyxel;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer2;
@SNMP::Info::Layer2::Zyxel::ISA       = qw/SNMP::Info::Layer2 Exporter/;
@SNMP::Info::Layer2::Zyxel::EXPORT_OK = qw//;
 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
 $VERSION = '3.70-135';
 # 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, );
 %GLOBALS = (
    %SNMP::Info::Layer2::GLOBALS,
    'serial_oid' => 'transmission.94.1.1.2.1.1.1',
 );
 %FUNCS = ( %SNMP::Info::Layer2::FUNCS, );
 %MUNGE = ( %SNMP::Info::Layer2::MUNGE, );
 sub vendor {
    return 'zyxel';
 }
 sub os {
    return 'zynos';
 }
 sub os_ver {
    my $obj = shift;
    return 'unknown';
 }
 sub model {
    my $obj = shift;
    my $id = $obj->id;
    if ($id =~ /890\.1\.5\.11\.11$/) {
        return 'IES-1000 AAM1212-51';
    }
    return 'unknown';
 }
 sub serial {
    my $obj = shift;
    return $obj->serial_oid;
 }
 1;
 __END__
 =head1 NAME
 SNMP::Info::Layer2::Zyxel - SNMP Interface to Zyxel Devices
 =head1 SYNOPSIS
 # Let SNMP::Info determine the correct subclass for you.
 my $obj = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myrouter',
                          Community   => 'public',
                          Version     => 2
                        )
    or die "Can't connect to DestHost.\n";
 my $class      = $obj->class();
 print "SNMP::Info determined this device to fall under subclass : $class\n";
 =head1 DESCRIPTION
 Subclass for Zyxel Devices running IOS-like software
 =head2 Inherited Classes
 =over
 =item SNMP::Info::Layer2
 =back
 =head1 GLOBALS
 These are methods that return scalar value from SNMP
 =over
 =item $obj->vendor()
 Returns 'zyxel'
 =item $obj->os()
 Returns 'zynos'
 =item $obj->layers()
 Ensures that layer two is reported, at least.
 =item $obj->os_ver()
 Returns the software version.
 =item $obj->model
 Returns the model extracted.
 =item $obj->serial()
 Returns serial number.
 =cut
 =back
--- a/lib/SNMP/Info/Layer3.pm
+++ b/lib/SNMP/Info/Layer3.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer3 - SNMP Interface to Layer3 devices
 # $Id$
 #
 # Copyright (c) 2008 Max Baker -- All changes from Version 0.7 on
 #
@@ -33,6 +32,7 @@
 package SNMP::Info::Layer3;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
 use SNMP::Info::Bridge;
@@ -42,23 +42,25 @@ use SNMP::Info::PowerEthernet;
 use SNMP::Info::IPv6;
 use SNMP::Info::AdslLine;
 use SNMP::Info::LLDP;
 use SNMP::Info::DocsisHE;
@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::LLDP SNMP::Info::DocsisHE
    SNMP::Info Exporter/;
@SNMP::Info::Layer3::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
+our ($VERSION, %GLOBALS, %FUNCS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::MIBS,
    %SNMP::Info::AdslLine::MIBS,
    %SNMP::Info::Bridge::MIBS,
    %SNMP::Info::DocsisHE::MIBS,
    %SNMP::Info::EtherLike::MIBS,
    %SNMP::Info::Entity::MIBS,
    %SNMP::Info::PowerEthernet::MIBS,
@@ -66,6 +68,7 @@ $VERSION = '3.57';
    %SNMP::Info::LLDP::MIBS,
    'IP-MIB'   => 'ipNetToMediaIfIndex',
    'OSPF-MIB' => 'ospfRouterId',
    'ISIS-MIB' => 'isisSysID',
    'BGP4-MIB' => 'bgpIdentifier',
 );
@@ -75,6 +78,7 @@ $VERSION = '3.57';
    %SNMP::Info::GLOBALS,
    %SNMP::Info::AdslLine::GLOBALS,
    %SNMP::Info::Bridge::GLOBALS,
    %SNMP::Info::DocsisHE::GLOBALS,
    %SNMP::Info::EtherLike::GLOBALS,
    %SNMP::Info::Entity::GLOBALS,
    %SNMP::Info::PowerEthernet::GLOBALS,
@@ -92,6 +96,7 @@ $VERSION = '3.57';
    %SNMP::Info::FUNCS,
    %SNMP::Info::AdslLine::FUNCS,
    %SNMP::Info::Bridge::FUNCS,
    %SNMP::Info::DocsisHE::FUNCS,
    %SNMP::Info::EtherLike::FUNCS,
    %SNMP::Info::Entity::FUNCS,
    %SNMP::Info::PowerEthernet::FUNCS,
@@ -123,6 +128,20 @@ $VERSION = '3.57';
    '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',
@@ -152,6 +171,7 @@ $VERSION = '3.57';
    %SNMP::Info::AdslLine::MUNGE,
    %SNMP::Info::Bridge::MUNGE,
    %SNMP::Info::EtherLike::MUNGE,
    %SNMP::Info::DocsisHE::MUNGE,
    %SNMP::Info::Entity::MUNGE,
    %SNMP::Info::PowerEthernet::MUNGE,
    %SNMP::Info::IPv6::MUNGE,
@@ -161,6 +181,32 @@ $VERSION = '3.57';
    '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 {
@@ -284,15 +330,25 @@ sub interfaces {
    # Check for duplicates in ifDescr, if so uniquely identify by adding
    # ifIndex to repeated values
-    my %seen;
+    my (%seen, %first_seen_as);
-    foreach my $iid ( keys %$i_descr ) {
+    foreach my $iid ( sort keys %$i_descr ) {
        my $port = $i_descr->{$iid};
        next unless defined $port;
        $port = SNMP::Info::munge_null($port);
        $port =~ s/^\s+//; $port =~ s/\s+$//;
        next unless length $port;
        if ( $seen{$port}++ ) {
            # (#320) also fixup the port this is a duplicate of
            $interfaces->{ $first_seen_as{$port} }
              = sprintf( "%s (%d)", $port, $first_seen_as{$port} );
            $interfaces->{$iid} = sprintf( "%s (%d)", $port, $iid );
        }
        else {
            $interfaces->{$iid} = $port;
            $first_seen_as{$port} = $iid;
        }
    }
    return $interfaces;
@@ -407,6 +463,10 @@ after determining a more specific class using the method above.
 =item SNMP::Info::LLDP
 =item SNMP::Info::DocsisHE
 =item SNMP::Info::AdslLine
 =back
 =head2 Required MIBs
@@ -415,6 +475,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>
@@ -423,7 +485,7 @@ after determining a more specific class using the method above.
 =head2 Inherited MIBs
-See L<SNMP::Info/"Required MIBs"> for its MIB requirements.
+See L<SNMP::Info/"REQUIREMENTS"> for its MIB requirements.
 See L<SNMP::Info::Bridge/"Required MIBs"> for its MIB requirements.
@@ -437,6 +499,10 @@ See L<SNMP::Info::IPv6/"Required MIBs"> for its MIB requirements.
 See L<SNMP::Info::LLDP/"Required MIBs"> for its MIB requirements.
 See L<SNMP::Info::DocsisHE/"Required MIBs"> for its MIB requirements.
 See L<SNMP::Info::AdslLine/"Required MIBs"> for its MIB requirements.
 =head1 GLOBALS
 These are methods that return scalar value from SNMP
@@ -495,7 +561,7 @@ found:  OSPF Router ID (C<ospfRouterId>) or any OSPF Host IP Address
 =head2 Globals imported from SNMP::Info
-See L<SNMP::Info/"GLOBALS"> for details.
+See L<SNMP::Info/"USAGE"> for details.
 =head2 Global Methods imported from SNMP::Info::Bridge
@@ -521,6 +587,14 @@ See L<SNMP::Info::IPv6/"GLOBALS"> for details.
 See L<SNMP::Info::LLDP/"GLOBALS"> for details.
 =head2 Global Methods imported from SNMP::Info::DocsisHE
 See L<SNMP::Info::DocsisHE/"GLOBALS"> for details.
 =head2 Global Methods imported from SNMP::Info::AdslLine
 See L<SNMP::Info::AdslLine/"GLOBALS"> for details.
 =head1 TABLE METHODS
 These are methods that return tables of information in the form of a reference
@@ -550,7 +624,7 @@ Returns reference to hash of iid to current link duplex setting.
 Maps $l3->el_index() to $l3->el_duplex, then culls out
 full,half, or auto and sets the map to that value.
-See L<SNMP::Info::Etherlike> for the el_index() and el_duplex() methods.
+See L<SNMP::Info::EtherLike> for the el_index() and el_duplex() methods.
 =back
@@ -766,9 +840,85 @@ 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.
 Convert 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.
+See L<SNMP::Info/"USAGE"> for details.
 =head2 Table Methods imported from SNMP::Info::Bridge
@@ -794,4 +944,12 @@ See L<SNMP::Info::IPv6/"TABLE METHODS"> for details.
 See L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::DocsisHE
 See L<SNMP::Info::DocsisHE/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::AdslLine
 See L<SNMP::Info::AdslLine/"TABLE METHODS"> for details.
 =cut
--- a/lib/SNMP/Info/Layer3/Accton.pm
+++ b/lib/SNMP/Info/Layer3/Accton.pm
@@ -0,0 +1,155 @@
 # SNMP::Info::Layer3::Accton - SNMP Interface to Accton Devices
 #
 # Copyright (c) 2020 by 135.
 package SNMP::Info::Layer3::Accton;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer3;
@SNMP::Info::Layer3::Accton::ISA       = qw/SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::Accton::EXPORT_OK = qw//;
 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
 $VERSION = '3.70-135';
 %MIBS = ( %SNMP::Info::Layer3::MIBS, );
 %GLOBALS = (
    %SNMP::Info::Layer3::GLOBALS,
    'os_ver_oid_259_6_10_94' => 'enterprises.259.6.10.94.1.1.5.4.0',
    'os_ver_oid_259_8_1_5'   => 'enterprises.259.8.1.5.1.1.5.4.0',
 );
 %FUNCS = (
    %SNMP::Info::Layer3::FUNCS,
 );
 %MUNGE = ( %SNMP::Info::Layer3::MUNGE, );
 sub vendor {
    return 'accton';
 }
 sub os {
    return 'accton-os';
 }
 sub model {
    my $obj = shift;
    my $hw = $obj->c_hw_ver() || undef;
    return $obj->SUPER::description() . ' HW:' . $hw if (defined $hw);
    return $obj->SUPER::description()
    #return $obj->SUPER::model();
 }
 sub serial {
    my $obj = shift;
    my $sess = $obj->session();
    my $serial = $sess->get($obj->id() . '.1.1.3.1.10.1') || undef;
    return $serial;
 }
 sub hwver {
    my $obj = shift;
    my $sess = $obj->session();
    my $hw = $sess->get($obj->id() . '.1.1.3.1.2.1') || undef;
    return $hw;
 }
 sub os_ver {
    my $obj = shift;
    my $sess = $obj->session();
    my $os_ver = $sess->get($obj->id() . '.1.1.5.4.0') || undef;
    my $brom = $sess->get($obj->id() . '.1.1.3.1.5.1') || undef;
    my $loader = $sess->get($obj->id() . '.1.1.3.1.4.1') || undef;
    my $full_os_ver = $os_ver if defined($os_ver) || return;
    $full_os_ver .= ' bootrom:' . $brom if defined($brom);
    $full_os_ver .= ' loader:' . $loader if defined($loader);
    return $full_os_ver;
 }
 sub description {
    my $obj = shift;
    my $descr = undef;
    my $sess = $obj->session();
    $descr .= $obj->SUPER::description() . "\n";
    $descr .= "Serial Number: " . $sess->get($obj->id() . '.1.1.3.1.10.1') . "\n";
    $descr .= "Hardware Version: " . $sess->get($obj->id() . '.1.1.3.1.2.1') . "\n";
    $descr .= "EPLD Version: " . $sess->get($obj->id() . '.1.1.3.1.15.1') . "\n";
    $descr .= "Loader Version: " . $sess->get($obj->id() . '.1.1.3.1.4.1') . "\n";
    $descr .= "Boot ROM Version: " . $sess->get($obj->id() . '.1.1.3.1.5.1') . "\n";
    $descr .= "Operation Code Version: " . $sess->get($obj->id() . '.1.1.5.4.0') . "\n";
    return $descr;
    #$sess->get($obj->id() . '.1.1.5.4.0')
 }
 1;
 __END__
 =head1 NAME
 SNMP::Info::Layer3::Accton - SNMP Interface to Accton Devices
 =head1 SYNOPSIS
 # Let SNMP::Info determine the correct subclass for you.
 my $obj = new SNMP::Info(
                          AutoSpecify => 1,
                          Debug       => 1,
                          DestHost    => 'myrouter',
                          Community   => 'public',
                          Version     => 2
                        )
    or die "Can't connect to DestHost.\n";
 my $class      = $obj->class();
 print "SNMP::Info determined this device to fall under subclass : $class\n";
 =head1 DESCRIPTION
 Subclass for Accton Devices
 =head2 Inherited Classes
 =over
 =item SNMP::Info::Layer3
 =back
 =head2 Inherited Classes' MIBs
 See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
 =head1 GLOBALS
 These are methods that return scalar value from SNMP
 =over
 =item $obj->vendor()
 Returns 'accton'
 =item $obj->os()
 Returns 'accton-os'
 =item $obj->os_ver()
 Returns the software version.
 =item $obj->model()
 Returns the model extracted.
 =item $obj->serial()
 Returns serial number.
 =cut
 =back
--- a/lib/SNMP/Info/Layer3/Aironet.pm
+++ b/lib/SNMP/Info/Layer3/Aironet.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer3::Aironet
 # $Id$
 #
 # Copyright (c) 2008 Max Baker changes from version 0.8 and beyond.
 #
@@ -33,15 +32,16 @@
 package SNMP::Info::Layer3::Aironet;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer3;
@SNMP::Info::Layer3::Aironet::ISA       = qw/SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::Aironet::EXPORT_OK = qw//;
-use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
+our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
@@ -279,9 +279,6 @@ 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. 
 =head1 GLOBALS
 These are methods that return scalar value from SNMP
--- a/lib/SNMP/Info/Layer3/AlcatelLucent.pm
+++ b/lib/SNMP/Info/Layer3/AlcatelLucent.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer3::AlcatelLucent
 # $Id$
 #
 # Copyright (c) 2008 Bill Fenner
 #
@@ -30,6 +29,7 @@
 package SNMP::Info::Layer3::AlcatelLucent;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer3;
@@ -47,9 +47,9 @@ use SNMP::Info::LLDP;
    SNMP::Info::MAU SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::AlcatelLucent::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
@@ -96,6 +96,8 @@ sub model {
    my $id    = $alu->id();
    my $model = &SNMP::translateObj($id);
    return 'ASAM 73xx' if $id =~ /637\.61\.1$/;
    return $id unless defined $model;
    $model =~ s/^device//;
@@ -112,15 +114,15 @@ sub vendor {
 }
 sub os_ver {
-    my $alu = shift;
+   my $alu = shift;
-    my $descr = $alu->description();
+   my $descr = $alu->description();
-    if ( $descr =~ m/^(\S+)/ ) {
+   if (defined ($descr)) {
-        return $1;
+     return $1 if $descr =~ m/\b(\d[\.\d]+R\d+) (?:GA|Service Release), /;
-    }
+   }
-    # No clue what this will try but hey
+   # No clue what this will try but hey
-    return $alu->SUPER::os_ver();
+   return $alu->SUPER::os_ver();
 }
 # ps1_type, ps1_status, ps2_type, ps2_status:
@@ -372,7 +374,7 @@ These are methods that return scalar value from SNMP
 =item $alu->vendor()
-    Returns 'alcatel-lucent'
+Returns 'alcatel-lucent'
 =item $alu->model()
--- a/lib/SNMP/Info/Layer3/AlteonAD.pm
+++ b/lib/SNMP/Info/Layer3/AlteonAD.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer3::AlteonAD
 # $Id$
 #
 # Copyright (c) 2008 Eric Miller
 # All Rights Reserved
@@ -31,15 +30,16 @@
 package SNMP::Info::Layer3::AlteonAD;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer3;
@SNMP::Info::Layer3::AlteonAD::ISA       = qw/SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::AlteonAD::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
+our ($VERSION, %GLOBALS, %FUNCS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
@@ -450,11 +450,6 @@ Eric Miller
 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. 
 my $alteon = new SNMP::Info::Layer3::AlteonAD(...);
 =head2 Inherited Classes
 =over
--- a/lib/SNMP/Info/Layer3/Altiga.pm
+++ b/lib/SNMP/Info/Layer3/Altiga.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer3::Altiga
 # $Id$
 #
 # Copyright (c) 2008 Jeroen van Ingen Schenau
 # All rights reserved.
@@ -31,16 +30,17 @@
 package SNMP::Info::Layer3::Altiga;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer3;
@SNMP::Info::Layer3::Altiga::ISA = qw/SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::Altiga::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE 
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE,
-            $int_include_vpn $fake_idx $type_class/;
+            $int_include_vpn, $fake_idx, $type_class);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
            %SNMP::Info::Layer3::MIBS,
@@ -281,7 +281,7 @@ Jeroen van Ingen Schenau
                          Debug       => 1,
                          DestHost    => 'my_vpn_host',
                          Community   => 'public',
-                          Version     => 1
+                          Version     => 2
                        )
    or die "Can't connect to DestHost.\n";
@@ -304,6 +304,12 @@ Subclass for Cisco (formerly Altiga) VPN concentrators
 =over
 =item F<ALTIGA-VERSION-STATS-MIB>
 =item F<ALTIGA-SESSION-STATS-MIB>
 =item F<ALTIGA-HARDWARE-STATS-MIB>
 =item Inherited Classes' MIBs
 See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
--- a/lib/SNMP/Info/Layer3/Arista.pm
+++ b/lib/SNMP/Info/Layer3/Arista.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer3::Arista
 # $Id$
 #
 # Copyright (c) 2008 Arista Networks, Inc.
 # All rights reserved.
@@ -31,29 +30,27 @@
 package SNMP::Info::Layer3::Arista;
 use strict;
 use warnings;
 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::Aggregate
    SNMP::Info::LLDP
    SNMP::Info::MAU
-    SNMP::Info::Layer3 Exporter
+    SNMP::Info::Layer3
    Exporter
 /;
@SNMP::Info::Layer3::Arista::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
    %SNMP::Info::MAU::MIBS,
    %SNMP::Info::LLDP::MIBS,
    %SNMP::Info::Aggregate::MIBS,
    'ARISTA-PRODUCTS-MIB' => 'aristaDCS7124S',
 );
@@ -61,19 +58,16 @@ $VERSION = '3.57';
 %GLOBALS = (
    %SNMP::Info::Layer3::GLOBALS,
    %SNMP::Info::MAU::GLOBALS,
    %SNMP::Info::LLDP::GLOBALS,
 );
 %FUNCS = (
    %SNMP::Info::Layer3::FUNCS,
    %SNMP::Info::MAU::FUNCS,
    %SNMP::Info::LLDP::FUNCS,
 );
 %MUNGE = (
    %SNMP::Info::Layer3::MUNGE,
    %SNMP::Info::MAU::MUNGE,
    %SNMP::Info::LLDP::MUNGE,
 );
 # use MAU-MIB for admin. duplex and admin. speed
@@ -92,11 +86,14 @@ sub os {
 sub os_ver {
    my $arista = shift;
-    my $descr   = $arista->description();
+    my $descr  = $arista->description();
    my $os_ver  = undef;
-    $os_ver = $1 if ( $descr =~ /\s+EOS\s+version\s+(\S+)\s+/ );
+    if (defined ($descr)) {
-    return $os_ver;
+      my $os_ver = undef;
      $os_ver = $1 if ($descr =~ /\s+EOS\s+version\s+(\S+)\s+/);
      return $os_ver;
    }
    return;
 }
 sub model {
@@ -154,7 +151,7 @@ Bill Fenner
                        DestHost    => 'myswitch',
                        Community   => 'public',
                        Version     => 2
-                        ) 
+		 	)
    or die "Can't connect to DestHost.\n";
 my $class      = $arista->class();
@@ -174,8 +171,6 @@ Subclass for Arista Networks EOS-based devices
 =item SNMP::Info::MAU
 =item SNMP::Info::LLDP
 =back
 =head2 Required MIBs
@@ -192,8 +187,6 @@ 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.
 =back
 =head1 GLOBALS
@@ -204,7 +197,7 @@ These are methods that return scalar values from SNMP
 =item $arista->vendor()
-    Returns 'Arista Networks, Inc.'
+Returns 'arista'
 =item $arista->model()
@@ -230,10 +223,6 @@ See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 See documentation in L<SNMP::Info::MAU/"GLOBALS"> for details.
 =head2 Global Methods imported from SNMP::Info::Layer3
 See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 =head1 TABLE METHODS
 These are methods that return tables of information in the form of a reference
@@ -269,8 +258,4 @@ See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
 See documentation in L<SNMP::Info::MAU/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::LLDP
 See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
 =cut
--- a/lib/SNMP/Info/Layer3/Aruba.pm
+++ b/lib/SNMP/Info/Layer3/Aruba.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer3::Aruba
 # $Id$
 #
 # Copyright (c) 2013 Eric Miller
 # All rights reserved.
@@ -31,20 +30,19 @@
 package SNMP::Info::Layer3::Aruba;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer3;
 use SNMP::Info::LLDP;
-@SNMP::Info::Layer3::Aruba::ISA       = qw/SNMP::Info::LLDP SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Aruba::ISA       = qw/SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::Aruba::EXPORT_OK = qw//;
-use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
+our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
    %SNMP::Info::LLDP::MIBS,
    'WLSR-AP-MIB'        => 'wlsrHideSSID',
    'WLSX-IFEXT-MIB'     => 'ifExtVlanName',
    'WLSX-POE-MIB'       => 'wlsxPseSlotPowerAvailable',
@@ -58,7 +56,6 @@ $VERSION = '3.57';
 %GLOBALS = (
    %SNMP::Info::Layer3::GLOBALS,
    %SNMP::Info::LLDP::GLOBALS,
    'aruba_serial_old' => 'wlsxSwitchLicenseSerialNumber',
    'aruba_serial_new' => 'wlsxSysExtLicenseSerialNumber',
    'aruba_model'      => 'wlsxModelName',
@@ -67,7 +64,6 @@ $VERSION = '3.57';
 %FUNCS = (
    %SNMP::Info::Layer3::FUNCS,
    %SNMP::Info::LLDP::FUNCS,
    # WLSR-AP-MIB::wlsrConfigTable
    'aruba_ap_ssidbcast' => 'wlsrHideSSID',
@@ -143,7 +139,6 @@ $VERSION = '3.57';
 %MUNGE = (
    %SNMP::Info::Layer3::MUNGE,
    %SNMP::Info::LLDP::MUNGE,
    'aruba_ap_fqln'       => \&munge_aruba_fqln,
    'aruba_ap_type'       => \&SNMP::Info::munge_e_type,
    'aruba_card_type'     => \&SNMP::Info::munge_e_type,
@@ -170,10 +165,9 @@ sub vendor {
    $id = $1 if ( defined($id) && $id =~ /^\.1\.3\.6\.1\.4\.1\.(\d+)/ );
    if ( defined($id) and exists( $oidmap{$id} ) ) {
-	return $oidmap{$id};
+      return $oidmap{$id};
-    }
+    } else {
-    else {
+      return 'aruba';
 	return 'aruba';
    }
 }
@@ -183,7 +177,7 @@ sub os_ver {
    return unless defined $descr;
    if ( $descr =~ m/Version\s+(\d+\.\d+\.\d+\.\d+)/ ) {
-	return $1;
+      return $1;
    }
    return;
@@ -1421,11 +1415,6 @@ This class emulates bridge functionality for the wireless switch. This enables
 end station MAC addresses collection and correlation to the thin access point
 the end station is using for communication.
 For speed or debugging purposes you can call the subclass directly, but not
 after determining a more specific class using the method above. 
 my $aruba = new SNMP::Info::Layer3::Aruba(...);
 =head2 Inherited Classes
 =over
--- a/lib/SNMP/Info/Layer3/BayRS.pm
+++ b/lib/SNMP/Info/Layer3/BayRS.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer3::BayRS
 # $Id$
 #
 # Copyright (c) 2008 Eric Miller
 # All rights reserved.
@@ -31,24 +30,21 @@
 package SNMP::Info::Layer3::BayRS;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
 use SNMP::Info::Layer3;
 use SNMP::Info::Bridge;
-@SNMP::Info::Layer3::BayRS::ISA = qw/SNMP::Info SNMP::Info::Layer3
+@SNMP::Info::Layer3::BayRS::ISA = qw/SNMP::Info::Layer3
-    SNMP::Info::Bridge Exporter/;
+    Exporter/;
@SNMP::Info::Layer3::BayRS::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE %MODEL_MAP
+our ($VERSION, %GLOBALS, %FUNCS, %MIBS, %MUNGE, %MODEL_MAP,
-    %MODID_MAP %PROCID_MAP/;
+    %MODID_MAP, %PROCID_MAP);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::MIBS,
    %SNMP::Info::Layer3::MIBS,
    %SNMP::Info::Bridge::MIBS,
    'Wellfleet-HARDWARE-MIB'        => 'wfHwBpIdOpt',
    'Wellfleet-OSPF-MIB'            => 'wfOspfRouterId',
    'Wellfleet-DOT1QTAG-CONFIG-MIB' => 'wfDot1qTagCfgVlanName',
@@ -57,18 +53,14 @@ $VERSION = '3.57';
 );
 %GLOBALS = (
    %SNMP::Info::GLOBALS,
    %SNMP::Info::Layer3::GLOBALS,
    %SNMP::Info::Bridge::GLOBALS,
    'bp_id'       => 'wfHwBpIdOpt',
    'bp_serial'   => 'wfHwBpSerialNumber',
    'ospf_rtr_id' => 'wfOspfRouterId',
 );
 %FUNCS = (
    %SNMP::Info::FUNCS,
    %SNMP::Info::Layer3::FUNCS,
    %SNMP::Info::Bridge::FUNCS,
    # From Wellfleet-CSMACD-MIB::wfCSMACDTable
    'wf_csmacd_cct'  => 'wfCSMACDCct',
@@ -107,9 +99,7 @@ $VERSION = '3.57';
 );
 %MUNGE = (
    %SNMP::Info::MUNGE,
    %SNMP::Info::Layer3::MUNGE,
    %SNMP::Info::Bridge::MUNGE,
    'wf_hw_boot'     => \&munge_hw_rev,
    'wf_hw_diag'     => \&munge_hw_rev,
    'wf_hw_mobo_ser' => \&munge_wf_serial,
@@ -541,7 +531,10 @@ sub model {
    my $bayrs = shift;
    my $bp_id = $bayrs->bp_id();
-    return defined $MODEL_MAP{$bp_id} ? $MODEL_MAP{$bp_id} : $bp_id;
+    if (defined $bp_id) {
      return defined $MODEL_MAP{$bp_id} ? $MODEL_MAP{$bp_id} : $bp_id;
    }
    return;
 }
 sub vendor {
@@ -776,7 +769,7 @@ sub e_index {
    my $bp_id = $bayrs->bp_id();
    # Don't like polling all these columns to build the index, can't think of
-    # a better way right now.  Luckly all this data will be cached for the
+    # a better way right now.  Luckily all this data will be cached for the
    # rest of the e_* methods
    # Using mib leafs so we don't have to define everything in FUNCS
@@ -805,7 +798,7 @@ sub e_index {
    my @slots = ( $wf_mb, $wf_db, $wf_bb, $wf_mod, $wf_mod1, $wf_mod2 );
    my @mods = ( $wf_mm, $wf_dm );
-    # We're going to hack an index: Slot/Module/Postion
+    # We're going to hack an index: Slot/Module/Position
    my %wf_e_index;
    # Chassis on BN types
@@ -1406,19 +1399,10 @@ Eric Miller
 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. 
 my $bayrs = new SNMP::Info::Layer3::BayRS(...);
 =head2 Inherited Classes
 =over
 =item SNMP::Info
 =item SNMP::Info::Bridge
 =item SNMP::Info::Layer3
 =back
@@ -1441,10 +1425,6 @@ after determining a more specific class using the method above.
 =head2 Inherited MIBs
 See L<SNMP::Info/"Required MIBs"> for its own MIB requirements.
 See L<SNMP::Info::Bridge/"Required MIBs"> for its own MIB requirements.
 See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
 =head1 GLOBALS
@@ -1500,14 +1480,6 @@ undefined.
 =back
 =head2 Globals imported from SNMP::Info
 See documentation in L<SNMP::Info/"GLOBALS"> for details.
 =head2 Globals imported from SNMP::Info::Bridge
 See documentation in L<SNMP::Info::Bridge/"GLOBALS"> for details.
 =head2 Globals imported from SNMP::Info::Layer3
 See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
@@ -1625,14 +1597,6 @@ is not contained in any other entity.
 =back
 =head2 Table Methods imported from SNMP::Info
 See documentation in L<SNMP::Info/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::Bridge
 See documentation in L<SNMP::Info::Bridge/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::Layer3
 See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
--- a/lib/SNMP/Info/Layer3/BlueCoatSG.pm
+++ b/lib/SNMP/Info/Layer3/BlueCoatSG.pm
@@ -28,15 +28,16 @@ package SNMP::Info::Layer3::BlueCoatSG;
 # POSSIBILITY OF SUCH DAMAGE.
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer3;
@SNMP::Info::Layer3::BlueCoatSG::ISA       = qw/SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::BlueCoatSG::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer2::MIBS, %SNMP::Info::Layer3::MIBS,
@@ -55,7 +56,7 @@ $VERSION = '3.57';
 %MUNGE = ( %SNMP::Info::Layer2::MUNGE, %SNMP::Info::Layer3::MUNGE, );
 sub vendor {
-    return 'Blue Coat';
+    return 'bluecoat';
 }
 sub os {
@@ -65,7 +66,7 @@ sub os {
 sub os_ver {
    my $sg = shift;
    my $os_string = $sg->sw_ver();
-    if ($os_string =~ /^Version:\s(\w+)\s([\d\.]+)/) {
+    if (defined ($os_string) && $os_string =~ /^Version:\s(\w+)\s([\d\.]+)/) {
        return $2;
    } else {
        return ''; # perhaps we can try sysDescr or some other object...
@@ -92,7 +93,7 @@ Jeroen van Ingen
                          Debug       => 1,
                          DestHost    => 'myrouter',
                          Community   => 'public',
-                          Version     => 1
+                          Version     => 2
                        )
    or die "Can't connect to DestHost.\n";
@@ -113,10 +114,10 @@ Subclass for Blue Coat SG Series proxy devices
 =head2 Required MIBs
 BLUECOAT-SG-PROXY-MIB
 =over
 =item F<BLUECOAT-SG-PROXY-MIB>
 =item Inherited Classes' MIBs
 See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
@@ -133,7 +134,7 @@ These are methods that return scalar value from SNMP
 =item $router->vendor()
-Returns C<'Blue Coat'>
+Returns C<'bluecoat'>
 =item $router->os()
@@ -154,12 +155,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
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer3::C3550
 # $Id$
 #
 # Copyright (c) 2008-2009 Max Baker changes from version 0.8 and beyond.
 # Copyright (c) 2004 Regents of the University of California
@@ -37,7 +36,7 @@ use Exporter;
 use SNMP::Info::CiscoStack;
 use SNMP::Info::Layer3::CiscoSwitch;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
 # NOTE : Top-most items gets precedence for @ISA
@SNMP::Info::Layer3::C3550::ISA = qw/
@@ -47,7 +46,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
@SNMP::Info::Layer3::C3550::EXPORT_OK = qw//;
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 # NOTE: Order creates precedence
 #       Example: v_name exists in Bridge.pm and CiscoVTP.pm
@@ -105,7 +104,7 @@ sub ports {
    return $ports;
 }
-#  Verions prior to 12.1(22)EA1a use the older CiscoStack method
+#  Versions prior to 12.1(22)EA1a use the older CiscoStack method
 #  Newer versions use the ETHERLIKE-MIB to report operational duplex.
 #  See http://www.ciscosystems.com/en/US/products/hw/switches/ps646/prod_release_note09186a00802a08ee.html
@@ -228,11 +227,6 @@ 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. 
 my $c3550 = new SNMP::Info::Layer3::C3550(...);
 =head2 Inherited Classes
 =over
@@ -304,7 +298,7 @@ Software version 12.1(22)EA1a or greater returns duplex based upon the
 result of $c3550->el_duplex().  Otherwise it uses the result of
 the call to CiscoStack::i_duplex().
-See L<SNMP::Info::Etherlike> for el_duplex() method and
+See L<SNMP::Info::EtherLike> for el_duplex() method and
 L<SNMP::Info::CiscoStack> for its i_duplex() method.
 =item $c3550->i_duplex_admin()
--- a/lib/SNMP/Info/Layer3/C4000.pm
+++ b/lib/SNMP/Info/Layer3/C4000.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer3::C4000
 # $Id$
 #
 # Copyright (c) 2008 Bill Fenner
 # All rights reserved.
@@ -42,9 +41,9 @@ use SNMP::Info::MAU;
    Exporter/;
@SNMP::Info::Layer3::C4000::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::MAU::MIBS,
@@ -129,11 +128,6 @@ Bill Fenner
 Abstraction subclass for Cisco Catalyst 4000 Layer 2/3 Switches.
 For speed or debugging purposes you can call the subclass directly, but not
 after determining a more specific class using the method above. 
 my $c4000 = new SNMP::Info::Layer3::C4000(...);
 =head2 Inherited Classes
 =over
--- a/lib/SNMP/Info/Layer3/C6500.pm
+++ b/lib/SNMP/Info/Layer3/C6500.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer3::C6500
 # $Id$
 #
 # Copyright (c) 2008-2009 Max Baker
 # All rights reserved.
@@ -37,7 +36,7 @@ use SNMP::Info::CiscoStack;
 use SNMP::Info::Layer3::CiscoSwitch;
 use SNMP::Info::MAU;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
 # NOTE : Top-most items gets precedence for @ISA
@SNMP::Info::Layer3::C6500::ISA = qw/
@@ -49,9 +48,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
@SNMP::Info::Layer3::C6500::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+$VERSION = '3.70-135';
 $VERSION = '3.57';
 # NOTE: Order creates precedence
 #       Example: v_name exists in Bridge.pm and CiscoVTP.pm
@@ -188,7 +185,7 @@ sub set_i_duplex_admin {
        # 2. Disable ifMauAutoNegAdminStatus
        # If the second set is not done, this is not going to be
        # working... Cisco Bug id CSCty97033.
-        # SXI is not working (up to at least relase SXI9).
+        # SXI is not working (up to at least release SXI9).
        # SXJ is working at SXJ3 (not before).
        return $c6500->mau_set_i_duplex_admin( $duplex, $iid );
@@ -226,7 +223,7 @@ sub set_i_speed_admin {
        # 2. Disable ifMauAutoNegAdminStatus
        # If the second set is not done, this is not going to be working...
        # Cisco Bug id CSCty97033.
-        # SXI is not working (at least up to relase SXI9).
+        # SXI is not working (at least up to release SXI9).
        # SXJ is working at SXJ3 (not before).
        return $c6500->mau_set_i_speed_admin( $speed, $iid );
@@ -244,7 +241,8 @@ __END__
 =head1 NAME
 SNMP::Info::Layer3::C6500 - SNMP Interface to Cisco Catalyst 6500 Layer 2/3
-Switches running IOS and/or CatOS
+Switches running IOS and/or CatOS. Also Cisco Catalyst 2960, 2970, 3750 and
 3850 series and blade switch CBS30x0 and CBS31x0 series running IOS.
 =head1 AUTHOR
@@ -274,10 +272,9 @@ 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
+It also supports the following IOS only series switches: Cisco Catalyst 2960,
-after determining a more specific class using the method above. 
+2970, 3750 and 3850 series. Also blade switches from the CBS30x0 and CBS31x0
-
+series.
 my $c6500 = new SNMP::Info::Layer3::C6500(...);
 =head2 Inherited Classes
@@ -295,6 +292,8 @@ after determining a more specific class using the method above.
 =over
 =item F<CISCO-VIRTUAL-SWITCH-MIB>
 =item Inherited Classes' MIBs
 See L<SNMP::Info::CiscoStack/"Required MIBs"> for its own MIB requirements.
@@ -314,7 +313,7 @@ These are methods that return scalar value from SNMP
 =item $c6500->vendor()
-    Returns 'cisco'
+Returns 'cisco'
 =item $c6500->cvsSwitchMode()
@@ -359,7 +358,7 @@ Newer software versions return duplex based upon the result of
 $c6500->el_duplex().  Otherwise it uses the result of the call to
 CiscoStack::i_duplex().
-See L<SNMP::Info::Etherlike> for el_duplex() method and
+See L<SNMP::Info::EtherLike> for el_duplex() method and
 L<SNMP::Info::CiscoStack> for its i_duplex() method.
 =item $c6500->i_duplex_admin()
@@ -399,13 +398,11 @@ Crosses $c6500->p_port() with $c6500->p_speed() to utilize port C<ifIndex>.
 See documentation in L<SNMP::Info::CiscoStack/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::Layer3::CiscoSwitch
 See documentation in L<SNMP::Info::Layer3::CiscoSwitch/"TABLE METHODS"> for
 details.
 =head2 Table Methods imported from SNMP::Info::MAU
 See documentation in L<SNMP::Info::MAU/"TABLE METHODS"> for details.
--- a/lib/SNMP/Info/Layer3/CheckPoint.pm
+++ b/lib/SNMP/Info/Layer3/CheckPoint.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer3::CheckPoint
 # $Id$
 #
 # Copyright (c) 2008 Bill Fenner
 # All rights reserved.
@@ -31,20 +30,19 @@
 package SNMP::Info::Layer3::CheckPoint;
 use strict;
 use warnings;
 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::ISA       = qw/SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::CheckPoint::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
    %SNMP::Info::LLDP::MIBS,
    'CHECKPOINT-MIB'      => 'fwProduct',
    'UCD-SNMP-MIB'        => 'versionTag',
    'NET-SNMP-TC'         => 'netSnmpAliasDomain',
@@ -54,15 +52,16 @@ $VERSION = '3.57';
 %GLOBALS = (
    %SNMP::Info::Layer3::GLOBALS,
    %SNMP::Info::LLDP::GLOBALS,
    'netsnmp_vers'   => 'versionTag',
    'hrSystemUptime' => 'hrSystemUptime',
-    
+    'serial_number'  => 'svnApplianceSerialNumber',
    'product_name'   => 'svnApplianceProductName',
    'manufacturer'   => 'svnApplianceManufacturer',
    'version'        => 'svnVersion',
 );
 %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',
@@ -70,11 +69,16 @@ $VERSION = '3.57';
 %MUNGE = (
    %SNMP::Info::Layer3::MUNGE,
    %SNMP::Info::LLDP::MUNGE,
 );
 sub vendor {
-    return 'checkpoint';
+    my $ckp = shift;
    if (defined $ckp->manufacturer) {
        return lc $ckp->manufacturer;
    } else {
        return 'checkpoint';
    }
 }
 sub model {
@@ -83,7 +87,9 @@ sub model {
    my $model = &SNMP::translateObj($id);
-    if (defined $model) {
+    if (defined $ckp->product_name) {
        return $ckp->product_name;
    } elsif (defined $model) {
        $model =~ s/^checkPoint//;
        return $model;
    } else {
@@ -97,41 +103,48 @@ sub os {
 sub os_ver {
    my $ckp = shift;
-    my $extend_table = $ckp->extend_output_table() || {};
+    if (defined $ckp->version) {
        return $ckp->version;
    } else {
        my $extend_table = $ckp->extend_output_table() || {};
-    my $descr   = $ckp->description();
+        my $descr   = $ckp->description();
-    my $vers    = $ckp->netsnmp_vers();
+        my $vers    = $ckp->netsnmp_vers();
-    my $os_ver  = undef;
+        my $os_ver  = undef;
-    foreach my $ex (keys %$extend_table) {
+        foreach my $ex (keys %$extend_table) {
-        (my $name = pack('C*',split(/\./,$ex))) =~ s/[^[:print:]]//g;
+            (my $name = pack('C*',split(/\./,$ex))) =~ s/[^[:print:]]//g;
-        if ($name eq 'ckpVersion') {
+            if ($name eq 'ckpVersion') {
-            return $1 if ($extend_table->{$ex} =~ /^This is Check Point's software version (.*)$/);
+                return $1 if ($extend_table->{$ex} =~ /^This is Check Point's software version (.*)$/);
-            last;
+                last;
            }
        }
    } 
-    $os_ver = $1 if ( $descr =~ /^\S+\s+\S+\s+(\S+)\s+/ );
+        $os_ver = $1 if ( $descr =~ /^\S+\s+\S+\s+(\S+)\s+/ );
-    if ($vers) {
+        if ($vers) {
-        $os_ver = "???" unless defined($os_ver);
+            $os_ver = "???" unless defined($os_ver);
-        $os_ver .= " / Net-SNMP " . $vers;
+            $os_ver .= " / Net-SNMP " . $vers;
        }
        return $os_ver;
    }
    return $os_ver;
 }
 sub serial {
    my $ckp = shift;
    my $extend_table = $ckp->extend_output_table() || {};
-    foreach my $ex (keys %$extend_table) {
+    if (defined $ckp->serial_number) {
-        (my $name = pack('C*',split(/\./,$ex))) =~ s/[^[:print:]]//g;
+        return $ckp->serial_number;
-        if ($name eq 'ckpAsset') {
+    } else {
-            return $1 if ($extend_table->{$ex} =~ /Serial Number: (\S+)/);
+        my $extend_table = $ckp->extend_output_table() || {};
-            last;
+
        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 '';
 }
@@ -199,11 +212,13 @@ Ambroise Rosset
 =head1 DESCRIPTION
-Subclass for Generic Net-SNMP devices
+Subclass for CheckPoint 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:
+To correctly and completely work on IPSO based devices, 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
@@ -221,8 +236,12 @@ To correctly and completelly work, you should add the following line in the file
 =over
 =item F<CHECKPOINT-MIB>
 =item F<UCD-SNMP-MIB>
 =item F<NET-SNMP-EXTEND-MIB>
 =item F<NET-SNMP-TC>
 =item F<HOST-RESOURCES-MIB>
@@ -231,8 +250,6 @@ To correctly and completelly work, you should add the following line in the file
 See L<SNMP::Info::Layer3> for its own MIB requirements.
 See L<SNMP::Info::LLDP> for its own MIB requirements.
 =back
 =head1 GLOBALS
@@ -243,11 +260,12 @@ These are methods that return scalar value from SNMP
 =item $ckp->vendor()
-Returns 'checkpoint'.
+Returns C<svnApplianceManufacturer> in lowercase, else 'checkpoint'.
 =item $ckp->model()
-Return the model type of the CheckPoint device (Based on the sysObjectOID translation).
+Returns C<svnApplianceProductName>, else the model type based on the
 sysObjectOID translation.
 =item $ckp->os()
@@ -255,8 +273,8 @@ Returns the OS extracted from C<sysDescr>.
 =item $ckp->os_ver()
-Returns the software version extracted from C<sysDescr>, along
+Returns C<svnVersion>, else the software version is extracted from
-with the Net-SNMP version.
+C<sysDescr>, along with the Net-SNMP version.
 =item $ckp->uptime()
@@ -266,8 +284,9 @@ 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.
+Returns <svnApplianceSerialNumber>, else the serial number of the
-Return '' in other case.
+device if the SNMP server is configured as indicated previously.
 Returns '' in other case.
 =item $ckp->layers()
@@ -279,10 +298,6 @@ Return '01001100'.
 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
@@ -304,12 +319,12 @@ Ignores loopback
 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
 If your device is not recognized by SNMP::Info as being in the class
 L<SNMP::Info::Layer3::CheckPoint> you might need additional snmp
 configuration on the CheckPoint device.
 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
--- a/lib/SNMP/Info/Layer3/Ciena.pm
+++ b/lib/SNMP/Info/Layer3/Ciena.pm
@@ -0,0 +1,325 @@
 # SNMP::Info::Layer3::Ciena - SNMP Interface to Ciena 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::Layer3::Ciena;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info::Layer3;
@SNMP::Info::Layer3::Ciena::ISA       = qw/SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::Ciena::EXPORT_OK = qw//;
 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
 $VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
    'WWP-LEOS-SW-XGRADE-MIB' => 'wwpLeosBladeRunPackageVer',
    'WWP-LEOS-BLADE-MIB'     => 'wwpLeosBladeId',
    'WWP-LEOS-CHASSIS-MIB'   => 'wwpLeosChassisDeviceId',
    'WWP-LEOS-FLOW-MIB'      => 'wwpLeosFlowLearnType',
    'WWP-LEOS-PORT-MIB'      => 'wwpLeosEtherIngressPvid',
    'WWP-LEOS-VLAN-TAG-MIB'  => 'wwpLeosNumVlans',
    'WWP-PRODUCTS-MIB'       => 'wwpProductsMIB'
 );
 %GLOBALS = (
    %SNMP::Info::Layer3::GLOBALS,
    'ciena_serial' => 'wwpLeosSystemSerialNumber',
    'mac'          => 'dot1dBaseBridgeAddress'
 );
 %FUNCS = (
    %SNMP::Info::Layer3::FUNCS,
    'v_name'     => 'wwpLeosVlanName',
    'ps_type'    => 'wwpLeosChassisPowerSupplyType',
    'ps_status'  => 'wwpLeosChassisPowerSupplyState',
    'ps_name'    => 'wwpLeosChassisPowerSupplyModuleLabel',
    'fan_type'   => 'wwpLeosChassisFanModuleType',
    'fan_status' => 'wwpLeosChassisFanModuleStatus',
    'fan_name'   => 'wwpLeosChassisFanModuleNum'
 );
 %MUNGE = (
    %SNMP::Info::Layer3::MUNGE
 );
 sub vendor {
    return 'ciena';
 }
 sub os {
    return 'saos';
 }
 sub os_ver {
    my $ciena = shift;
    my $version = $ciena->wwpLeosBladeRunPackageVer || {};
    return values(%$version);
 }
 sub serial {
    my $ciena = shift;
    return $ciena->ciena_serial();
 }
 # Override lldp_if function to translate the port with bp_index
 sub lldp_if {
    my $ciena = shift;
    my $lldp = $ciena->SUPER::lldp_if;
    my $bp_index = $ciena->bp_index;
    foreach my $iface (keys %$lldp) {
        my $orig_iface = $lldp->{$iface};
        $lldp->{$iface} = $bp_index->{$orig_iface};
    }
    return $lldp;
 }
 sub i_vlan {
    my $ciena = shift;
    my $i_vlan = {};
    my $pvid = $ciena->wwpLeosEtherIngressPvid() || undef;
    # bp_index needed to resolve correct port id
    my $bp_index = $ciena->bp_index;
    if (defined $pvid) {
        foreach my $i (keys %$pvid) {
            $i_vlan->{$bp_index->{$i}} = $pvid->{$i};
        }
    }
    return $i_vlan;
 }
 sub i_vlan_membership {
    my $ciena = shift;
    my $i_vlan_membership = {};
    my $vlans = $ciena->wwpLeosVlanMemberPortId();
    # bp_index needed to resolve correct port id
    my $bp_index = $ciena->bp_index;
    foreach my $vlan (keys %$vlans) {
        push @{$i_vlan_membership->{$bp_index->{$vlans->{$vlan}}}} , (split(/\./,$vlan))[0];
    }
    return $i_vlan_membership;
 }
 sub qb_fw_vlan {
    my $ciena = shift;
    my $qb_fw_vlan = {};
    my $learn_entries = $ciena->wwpLeosFlowLearnType();
    foreach my $entry (keys %$learn_entries) {
        my @params = (split(/\./, $entry));
        $qb_fw_vlan->{join('.', @params[1..6])} = $params[8];
    }
    return $qb_fw_vlan;
 }
 sub fan {
    my $ciena = shift;
    my $fan_status = $ciena->fan_status || {};
    my $fan_type = $ciena->fan_type;
    my $fan_name = $ciena->fan_name;
    my @messages;
    foreach my $fan (keys %$fan_status) {
        if ($fan_status->{$fan} ne "ok") {
            push @messages, sprintf("%s fan %s failed.", $fan_type->{$fan}, $fan_name->{$fan});
        }
    }
    return sprintf("%s fans OK", scalar keys %$fan_status) if scalar @messages  == 0;
    return join(", ", @messages);
 }
 sub ps1_type {
    my $ciena = shift;
    my $ps_type = $ciena->ps_type;
    return $ps_type->{'1'} if defined $ps_type->{'1'};
 }
 sub ps1_status {
    my $ciena = shift;
    my $ps_status = $ciena->ps_status;
    return $ps_status->{'1'} if defined $ps_status->{'1'};
 }
 sub ps2_type {
    my $ciena = shift;
    my $ps_type = $ciena->ps_type;
    return $ps_type->{'2'} if defined $ps_type->{'2'};
 }
 sub ps2_status {
    my $ciena = shift;
    my $ps_status = $ciena->ps_status;
    return $ps_status->{'2'} if defined $ps_status->{'2'};
 }
 =head1 DESCRIPTION
 Subclass for Ciena Devices running SAOS
 =head2 Inherited Classes
 =over
 =item SNMP::Info::Layer3
 =back
 =head2 Required MIBs
 =over
 =item F<WWP-LEOS-SW-XGRADE-MIB>
 =item F<WWP-LEOS-BLADE-MIB>
 =item F<WWP-LEOS-CHASSIS-MIB>
 =item F<WWP-LEOS-FLOW-MIB>
 =item F<WWP-LEOS-PORT-MIB>
 =item F<WWP-LEOS-VLAN-TAG-MIB>
 =item F<WWP-PRODUCTS-MIB>
 =back
 =head2 Inherited Classes' MIBs
 See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
 =head1 GLOBALS
 These are methods that return scalar value from SNMP
 =over
 =item $ciena->vendor()
 Returns 'ciena'
 =item $ciena->os()
 Returns 'saos'
 =item $ciena->os_ver()
 Returns the running software package extracted with C<wwpLeosBladeRunPackageVer>
 =item $ciena->serial()
 Returns serial number
 (C<wwpLeosSystemSerialNumber>)
 =item $ciena->mac()
 Returns the MAC address used by this bridge when it must be referred
 to in a unique fashion.
 (C<dot1dBaseBridgeAddress>)
 =item $huawei->fan()
 Return the status of all fans. Returns a string indicating the number of fans 'OK'  or
 identification of any fan without a 'normal' operating status.
 =item $ciena->ps1_status()
 Return the status of the first power supply
 =item $ciena->ps1_type()
 Return the type of the first power supply
 =item $ciena->ps2_status()
 Return the status of the second power supply
 =item $ciena->ps2_type()
 Return the type of the second power supply
 =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 $ciena->lldp_if()
 Returns the mapping to the SNMP Interface Table. Overridden to translate to correct ethernet port with bp_index
 =item $ciena->i_vlan()
 Returns a mapping between C<ifIndex> and the PVID or default VLAN.
 =item $ciena->i_vlan_membership()
 Returns reference to hash of arrays: key = C<ifIndex>, value = array of VLAN
 IDs.
 =item $ciena->qb_fw_vlan()
 Returns reference to hash of forwarding table entries VLAN ID, using C<wwpLeosFlowLearnType>
 =item $ciena->ps_name()
 Returns reference to hash of the power supplies and their names.
 =item $ciena->ps_type()
 Returns reference to hash of the power supplies and their type (ex. AC, DC, etc.)
 =item $ciena->ps_status()
 Returns reference to hash of the power supplies and their status.
 =item $ciena->fan_name()
 Returns reference to hash of fans and their names. In this case, it is simply a number.
 =item $ciena->fan_type()
 Returns reference to hash of fans and their types (ex. fixed, modular, etc.)
 =item $ciena->fan_status)
 Returns reference to hash of fans and their status
 =back
--- a/lib/SNMP/Info/Layer3/Cisco.pm
+++ b/lib/SNMP/Info/Layer3/Cisco.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer3::Cisco
 # $Id$
 #
 # Copyright (c) 2008 Max Baker
 # All rights reserved.
@@ -34,7 +33,6 @@ 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::CiscoRTT;
@@ -45,7 +43,7 @@ use SNMP::Info::CiscoStpExtensions;
 use SNMP::Info::Layer3;
@SNMP::Info::Layer3::Cisco::ISA = qw/SNMP::Info::CiscoVTP
-    SNMP::Info::LLDP SNMP::Info::CDP
+    SNMP::Info::CDP
    SNMP::Info::CiscoStats SNMP::Info::CiscoRTT
    SNMP::Info::CiscoQOS SNMP::Info::CiscoConfig
    SNMP::Info::CiscoPower SNMP::Info::CiscoStpExtensions
@@ -53,9 +51,9 @@ use SNMP::Info::Layer3;
    Exporter/;
@SNMP::Info::Layer3::Cisco::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
@@ -66,7 +64,6 @@ $VERSION = '3.57';
    %SNMP::Info::CiscoRTT::MIBS,
    %SNMP::Info::CiscoStats::MIBS,
    %SNMP::Info::CDP::MIBS,
    %SNMP::Info::LLDP::MIBS,
    %SNMP::Info::CiscoVTP::MIBS,
    'CISCO-EIGRP-MIB' => 'cEigrpAsRouterId',
 );
@@ -80,7 +77,6 @@ $VERSION = '3.57';
    %SNMP::Info::CiscoRTT::GLOBALS,
    %SNMP::Info::CiscoStats::GLOBALS,
    %SNMP::Info::CDP::GLOBALS,
    %SNMP::Info::LLDP::GLOBALS,
    %SNMP::Info::CiscoVTP::GLOBALS,
    'eigrp_id' => 'cEigrpAsRouterId',
 );
@@ -94,25 +90,19 @@ $VERSION = '3.57';
    %SNMP::Info::CiscoRTT::FUNCS,
    %SNMP::Info::CiscoStats::FUNCS,
    %SNMP::Info::CDP::FUNCS,
    %SNMP::Info::LLDP::FUNCS,
    %SNMP::Info::CiscoVTP::FUNCS,
-    # EIGRP
+    # CISCO-EIGRP-MIB::cEigrpPeerTable
-    'eigrp_peers' => 'cEigrpPeerAddr',
+    'c_eigrp_peer_types' => 'cEigrpPeerAddrType',
    'c_eigrp_peers'      => 'cEigrpPeerAddr',
 );
 %MUNGE = (
-    %SNMP::Info::Layer3::MUNGE,
+    %SNMP::Info::Layer3::MUNGE,     %SNMP::Info::CiscoStpExtensions::MUNGE,
-    %SNMP::Info::CiscoStpExtensions::MUNGE,
+    %SNMP::Info::CiscoPower::MUNGE, %SNMP::Info::CiscoConfig::MUNGE,
-    %SNMP::Info::CiscoPower::MUNGE,
+    %SNMP::Info::CiscoQOS::MUNGE,   %SNMP::Info::CiscoRTT::MUNGE,
-    %SNMP::Info::CiscoConfig::MUNGE,
+    %SNMP::Info::CiscoStats::MUNGE, %SNMP::Info::CDP::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,
    'eigrp_peers' => \&SNMP::Info::munge_ip,
 );
 sub i_vlan {
@@ -132,6 +122,7 @@ sub i_vlan {
            if ( $i_descr->{$idx} =~ /\.(\d+)$/ ) {
                $i_vlan->{$idx} = $1;
            }
            # This matches 101 in 'Ethernet0.101-802.1Q vLAN subif'
            elsif ( $i_descr->{$idx} =~ /\.(\d+)-/ ) {
                $i_vlan->{$idx} = $1;
@@ -143,12 +134,39 @@ sub 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;
 __END__
@@ -190,8 +208,6 @@ for other device specific L3 Cisco classes.
 =item SNMP::Info::CiscoVTP
 =item SNMP::Info::LLDP
 =item SNMP::Info::CDP
 =item SNMP::Info::CiscoStats
@@ -220,8 +236,6 @@ for other device specific L3 Cisco classes.
 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.
@@ -261,10 +275,6 @@ Determined by checking C<vtpVersion>.
 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.
@@ -320,10 +330,6 @@ 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.
--- a/lib/SNMP/Info/Layer3/CiscoASA.pm
+++ b/lib/SNMP/Info/Layer3/CiscoASA.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer3::CiscoASA
 # $Id$
 #
 # Copyright (c) 2013 Moe Kraus
 # All rights reserved.
@@ -43,9 +42,9 @@ use SNMP::Info::Layer3;
    Exporter/;
@SNMP::Info::Layer3::CiscoASA::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CiscoStats::MIBS, );
@@ -113,7 +112,7 @@ Moe Kraus
 =head1 SYNOPSIS
 # Let SNMP::Info determine the correct subclass for you.
- my $cisco = new SNMP::Info(
+ my $asa = new SNMP::Info(
                        AutoSpecify => 1,
                        Debug       => 1,
                        # These arguments are passed directly to SNMP::Session
--- a/lib/SNMP/Info/Layer3/CiscoFWSM.pm
+++ b/lib/SNMP/Info/Layer3/CiscoFWSM.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer3::CiscoFWSM
 # $Id$
 #
 # Copyright (c) 2010 Brian De Wolf
 # All rights reserved.
@@ -41,9 +40,9 @@ use SNMP::Info::Layer3;
 	Exporter/;
@SNMP::Info::Layer3::CiscoFWSM::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CiscoStats::MIBS, );
@@ -196,10 +195,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.
 =over
 =back
 =head2 Overrides
 =over
--- a/lib/SNMP/Info/Layer3/CiscoSwitch.pm
+++ b/lib/SNMP/Info/Layer3/CiscoSwitch.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer3::CiscoSwitch
 # $Id$
 #
 # Copyright (c) 2014 Eric Miller
 # All rights reserved.
@@ -37,7 +36,7 @@ use SNMP::Info::CiscoAgg;
 use SNMP::Info::CiscoPortSecurity;
 use SNMP::Info::Layer3::Cisco;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
@SNMP::Info::Layer3::CiscoSwitch::ISA = qw/
    SNMP::Info::CiscoAgg
@@ -48,9 +47,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
@SNMP::Info::Layer3::CiscoSwitch::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
+$VERSION = '3.70-135';
 $VERSION = '3.57';
 %MIBS = (
    %SNMP::Info::Layer3::Cisco::MIBS,
@@ -157,10 +154,6 @@ Returns 1.  Use vlan indexing.
 =back
 =head2 Global Methods imported from SNMP::Info::CiscoAgg
 See documentation in L<SNMP::Info::CiscoAgg/"GLOBALS"> for details.
 =head2 Globals imported from SNMP::Info::CiscoPortSecurity
 See documentation in L<SNMP::Info::CiscoPortSecurity/"GLOBALS"> for details.
--- a/lib/SNMP/Info/Layer3/Contivity.pm
+++ b/lib/SNMP/Info/Layer3/Contivity.pm
@@ -1,5 +1,4 @@
 # SNMP::Info::Layer3::Contivity
 # $Id$
 #
 # Copyright (c) 2010 Eric Miller
 # All rights reserved.
@@ -31,36 +30,32 @@
 package SNMP::Info::Layer3::Contivity;
 use strict;
 use warnings;
 use Exporter;
 use SNMP::Info;
 use SNMP::Info::Layer3;
 use SNMP::Info::Entity;
@SNMP::Info::Layer3::Contivity::ISA
-    = qw/SNMP::Info SNMP::Info::Layer3 SNMP::Info::Entity Exporter/;
+    = qw/SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer3::Contivity::EXPORT_OK = qw//;
-use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
+our ($VERSION, %GLOBALS, %FUNCS, %MIBS, %MUNGE);
-$VERSION = '3.57';
+$VERSION = '3.70-135';
 %MIBS = (
-    %SNMP::Info::MIBS, %SNMP::Info::Layer3::MIBS, %SNMP::Info::Entity::MIBS,
+    %SNMP::Info::Layer3::MIBS,
 );
 %GLOBALS = (
-    %SNMP::Info::GLOBALS, %SNMP::Info::Layer3::GLOBALS,
+    %SNMP::Info::Layer3::GLOBALS,
    %SNMP::Info::Entity::GLOBALS,
 );
 %FUNCS = (
-    %SNMP::Info::FUNCS, %SNMP::Info::Layer3::FUNCS,
+  %SNMP::Info::Layer3::FUNCS,
    %SNMP::Info::Entity::FUNCS,
 );
 %MUNGE = (
-    %SNMP::Info::MUNGE, %SNMP::Info::Layer3::MUNGE,
+  %SNMP::Info::Layer3::MUNGE,
    %SNMP::Info::Entity::MUNGE,
 );
 sub layers {
@@ -189,21 +184,12 @@ Eric Miller
 Abstraction subclass for Avaya/Nortel VPN Routers (formerly Contivity
 Extranet Switch).
 For speed or debugging purposes you can call the subclass directly, but not
 after determining a more specific class using the method above. 
 my $contivity = new SNMP::Info::Layer3::Contivity(...);
 =head2 Inherited Classes
 =over
 =item SNMP::Info
 =item SNMP::Info::Layer3
 =item SNMP::Info::Entity
 =back
 =head2 Required MIBs
@@ -212,12 +198,8 @@ after determining a more specific class using the method above.
 =item Inherited Classes' MIBs
 See L<SNMP::Info/"Required MIBs"> for its own MIB requirements.
 See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
 See L<SNMP::Info::Entity/"Required MIBs"> for its own MIB requirements.
 =back
 =head1 GLOBALS
@@ -238,7 +220,7 @@ Returns the chassis name.
 =item $contivity->os()
-Returns C<'CES'>
+Returns C<'contivity'>
 =item $contivity->os_ver()
@@ -267,18 +249,10 @@ layers.
 =back
 =head2 Globals imported from SNMP::Info
 See documentation in L<SNMP::Info/"GLOBALS"> for details.
 =head2 Globals imported from SNMP::Info::Layer3
 See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
 =head2 Globals imported from SNMP::Info::Entity
 See documentation in L<SNMP::Info::Entity/"GLOBALS"> for details.
 =head1 TABLE METHODS
 These are methods that return tables of information in the form of a reference
@@ -299,16 +273,8 @@ Interface Name field.  Skips loopback and tunnel interfaces.
 =back
 =head2 Table Methods imported from SNMP::Info
 See documentation in L<SNMP::Info/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::Layer3
 See documentation in L<SNMP::Info::Layer3/"TABLE METHODS"> for details.
 =head2 Table Methods imported from SNMP::Info::Entity
 See documentation in L<SNMP::Info::Entity/"TABLE METHODS"> for details.
 =cut
--- a/Show More
+++ b/Show More