Dlink bugfix with syntax ($$ instead $)

Dlink RC.
A hard different SNMP behavoiur for Dlink models. Sometimes return HASH, sometimes SCALAR and after that we got 'NOSUCHOBJET' or undef or normal value. Refactored. need to mass test for all Dlink.
2020-05-22 21:31:51 +03:00 · 2020-05-22 14:53:04 +03:00 · 2020-05-21 04:55:38 +03:00 · 2020-05-21 04:41:26 +03:00 · 2020-05-21 03:55:54 +03:00 · 2020-05-21 02:23:58 +03:00
157 changed files with 2878 additions and 844 deletions
--- a/15
+++ b/15
@@ -1,18 +1,3 @@
-Version 3.71 (2020-11-27)
-
-  [NEW FEATURES]
-
-  * #386 Teltonika RUT9XX support (jeroenvis)
-
-  [ENHANCEMENTS]
-
-  * #398, 411 more ubiquiti cleanup and support for er-12 (lbegnaud & inphobia)
-
-  [BUG FIXES]
-
-  * #409, 410 Don't add AUTOLOAD generated methods in symbol table
-  * #372, 375 fix lldp on nx-os6 (inphobia)
-
 Version 3.70 (2019-10-15)

  [NEW FEATURES]
--- a/2
+++ b/2
@@ -126,7 +126,6 @@ lib/SNMP/Info/Layer3/SonicWALL.pm
 lib/SNMP/Info/Layer3/Steelhead.pm
 lib/SNMP/Info/Layer3/Sun.pm
 lib/SNMP/Info/Layer3/Tasman.pm
-lib/SNMP/Info/Layer3/Teltonika.pm
 lib/SNMP/Info/Layer3/Timetra.pm
 lib/SNMP/Info/Layer3/VMware.pm
 lib/SNMP/Info/Layer3/VyOS.pm
@@ -275,7 +274,6 @@ xt/lib/Test/SNMP/Info/Layer3/SonicWALL.pm
 xt/lib/Test/SNMP/Info/Layer3/Steelhead.pm
 xt/lib/Test/SNMP/Info/Layer3/Sun.pm
 xt/lib/Test/SNMP/Info/Layer3/Tasman.pm
-xt/lib/Test/SNMP/Info/Layer3/Teltonika.pm
 xt/lib/Test/SNMP/Info/Layer3/Timetra.pm
 xt/lib/Test/SNMP/Info/Layer3/VMware.pm
 xt/lib/Test/SNMP/Info/Layer3/VyOS.pm
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
      "Eric A. Miller <emiller@cpan.org>"
   ],
   "dynamic_config" : 1,
-   "generated_by" : "Module::Build version 0.4231",
+   "generated_by" : "Module::Build version 0.4224",
   "license" : [
      "bsd"
   ],
@@ -53,547 +53,543 @@
   "provides" : {
      "SNMP::Info" : {
         "file" : "lib/SNMP/Info.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::AMAP" : {
         "file" : "lib/SNMP/Info/AMAP.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::AdslLine" : {
         "file" : "lib/SNMP/Info/AdslLine.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Aggregate" : {
         "file" : "lib/SNMP/Info/Aggregate.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Airespace" : {
         "file" : "lib/SNMP/Info/Airespace.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Bridge" : {
         "file" : "lib/SNMP/Info/Bridge.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::CDP" : {
         "file" : "lib/SNMP/Info/CDP.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoAgg" : {
         "file" : "lib/SNMP/Info/CiscoAgg.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoConfig" : {
         "file" : "lib/SNMP/Info/CiscoConfig.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoPortSecurity" : {
         "file" : "lib/SNMP/Info/CiscoPortSecurity.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoPower" : {
         "file" : "lib/SNMP/Info/CiscoPower.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoQOS" : {
         "file" : "lib/SNMP/Info/CiscoQOS.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoRTT" : {
         "file" : "lib/SNMP/Info/CiscoRTT.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoStack" : {
         "file" : "lib/SNMP/Info/CiscoStack.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoStats" : {
         "file" : "lib/SNMP/Info/CiscoStats.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoStpExtensions" : {
         "file" : "lib/SNMP/Info/CiscoStpExtensions.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::CiscoVTP" : {
         "file" : "lib/SNMP/Info/CiscoVTP.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::DocsisCM" : {
         "file" : "lib/SNMP/Info/DocsisCM.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::DocsisHE" : {
         "file" : "lib/SNMP/Info/DocsisHE.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::EDP" : {
         "file" : "lib/SNMP/Info/EDP.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Entity" : {
         "file" : "lib/SNMP/Info/Entity.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::EtherLike" : {
         "file" : "lib/SNMP/Info/EtherLike.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::FDP" : {
         "file" : "lib/SNMP/Info/FDP.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::IEEE802dot11" : {
         "file" : "lib/SNMP/Info/IEEE802dot11.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::IEEE802dot3ad" : {
         "file" : "lib/SNMP/Info/IEEE802dot3ad.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::IPv6" : {
         "file" : "lib/SNMP/Info/IPv6.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::LLDP" : {
         "file" : "lib/SNMP/Info/LLDP.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer1" : {
         "file" : "lib/SNMP/Info/Layer1.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer1::Allied" : {
         "file" : "lib/SNMP/Info/Layer1/Allied.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer1::Asante" : {
         "file" : "lib/SNMP/Info/Layer1/Asante.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer1::Bayhub" : {
         "file" : "lib/SNMP/Info/Layer1/Bayhub.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer1::Cyclades" : {
         "file" : "lib/SNMP/Info/Layer1/Cyclades.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer1::S3000" : {
         "file" : "lib/SNMP/Info/Layer1/S3000.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2" : {
         "file" : "lib/SNMP/Info/Layer2.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::3Com" : {
         "file" : "lib/SNMP/Info/Layer2/3Com.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Adtran" : {
         "file" : "lib/SNMP/Info/Layer2/Adtran.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Aerohive" : {
         "file" : "lib/SNMP/Info/Layer2/Aerohive.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Airespace" : {
         "file" : "lib/SNMP/Info/Layer2/Airespace.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Aironet" : {
         "file" : "lib/SNMP/Info/Layer2/Aironet.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Allied" : {
         "file" : "lib/SNMP/Info/Layer2/Allied.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Atmedia" : {
         "file" : "lib/SNMP/Info/Layer2/Atmedia.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Baystack" : {
         "file" : "lib/SNMP/Info/Layer2/Baystack.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::C1900" : {
         "file" : "lib/SNMP/Info/Layer2/C1900.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::C2900" : {
         "file" : "lib/SNMP/Info/Layer2/C2900.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Catalyst" : {
         "file" : "lib/SNMP/Info/Layer2/Catalyst.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Centillion" : {
         "file" : "lib/SNMP/Info/Layer2/Centillion.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Cisco" : {
         "file" : "lib/SNMP/Info/Layer2/Cisco.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::CiscoSB" : {
         "file" : "lib/SNMP/Info/Layer2/CiscoSB.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Exinda" : {
         "file" : "lib/SNMP/Info/Layer2/Exinda.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::HP" : {
         "file" : "lib/SNMP/Info/Layer2/HP.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::HP4000" : {
         "file" : "lib/SNMP/Info/Layer2/HP4000.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::HPVC" : {
         "file" : "lib/SNMP/Info/Layer2/HPVC.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Kentrox" : {
         "file" : "lib/SNMP/Info/Layer2/Kentrox.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::N2270" : {
         "file" : "lib/SNMP/Info/Layer2/N2270.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::NAP222x" : {
         "file" : "lib/SNMP/Info/Layer2/NAP222x.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::NWSS2300" : {
         "file" : "lib/SNMP/Info/Layer2/NWSS2300.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Netgear" : {
         "file" : "lib/SNMP/Info/Layer2/Netgear.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Nexans" : {
         "file" : "lib/SNMP/Info/Layer2/Nexans.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Orinoco" : {
         "file" : "lib/SNMP/Info/Layer2/Orinoco.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Sixnet" : {
         "file" : "lib/SNMP/Info/Layer2/Sixnet.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Trapeze" : {
         "file" : "lib/SNMP/Info/Layer2/Trapeze.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::Ubiquiti" : {
         "file" : "lib/SNMP/Info/Layer2/Ubiquiti.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer2::ZyXEL_DSLAM" : {
         "file" : "lib/SNMP/Info/Layer2/ZyXEL_DSLAM.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3" : {
         "file" : "lib/SNMP/Info/Layer3.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Aironet" : {
         "file" : "lib/SNMP/Info/Layer3/Aironet.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::AlcatelLucent" : {
         "file" : "lib/SNMP/Info/Layer3/AlcatelLucent.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::AlteonAD" : {
         "file" : "lib/SNMP/Info/Layer3/AlteonAD.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Altiga" : {
         "file" : "lib/SNMP/Info/Layer3/Altiga.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Arista" : {
         "file" : "lib/SNMP/Info/Layer3/Arista.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Aruba" : {
         "file" : "lib/SNMP/Info/Layer3/Aruba.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::BayRS" : {
         "file" : "lib/SNMP/Info/Layer3/BayRS.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::BlueCoatSG" : {
         "file" : "lib/SNMP/Info/Layer3/BlueCoatSG.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::C3550" : {
         "file" : "lib/SNMP/Info/Layer3/C3550.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::C4000" : {
         "file" : "lib/SNMP/Info/Layer3/C4000.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::C6500" : {
         "file" : "lib/SNMP/Info/Layer3/C6500.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::CheckPoint" : {
         "file" : "lib/SNMP/Info/Layer3/CheckPoint.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Ciena" : {
         "file" : "lib/SNMP/Info/Layer3/Ciena.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Cisco" : {
         "file" : "lib/SNMP/Info/Layer3/Cisco.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::CiscoASA" : {
         "file" : "lib/SNMP/Info/Layer3/CiscoASA.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::CiscoFWSM" : {
         "file" : "lib/SNMP/Info/Layer3/CiscoFWSM.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::CiscoSwitch" : {
         "file" : "lib/SNMP/Info/Layer3/CiscoSwitch.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Contivity" : {
         "file" : "lib/SNMP/Info/Layer3/Contivity.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Cumulus" : {
         "file" : "lib/SNMP/Info/Layer3/Cumulus.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::DLink" : {
         "file" : "lib/SNMP/Info/Layer3/DLink.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Dell" : {
         "file" : "lib/SNMP/Info/Layer3/Dell.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::ERX" : {
         "file" : "lib/SNMP/Info/Layer3/ERX.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Enterasys" : {
         "file" : "lib/SNMP/Info/Layer3/Enterasys.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Extreme" : {
         "file" : "lib/SNMP/Info/Layer3/Extreme.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::F5" : {
         "file" : "lib/SNMP/Info/Layer3/F5.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Force10" : {
         "file" : "lib/SNMP/Info/Layer3/Force10.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Fortinet" : {
         "file" : "lib/SNMP/Info/Layer3/Fortinet.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Foundry" : {
         "file" : "lib/SNMP/Info/Layer3/Foundry.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Genua" : {
         "file" : "lib/SNMP/Info/Layer3/Genua.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::H3C" : {
         "file" : "lib/SNMP/Info/Layer3/H3C.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::HP9300" : {
         "file" : "lib/SNMP/Info/Layer3/HP9300.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Huawei" : {
         "file" : "lib/SNMP/Info/Layer3/Huawei.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::IBMGbTor" : {
         "file" : "lib/SNMP/Info/Layer3/IBMGbTor.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Juniper" : {
         "file" : "lib/SNMP/Info/Layer3/Juniper.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Lantronix" : {
         "file" : "lib/SNMP/Info/Layer3/Lantronix.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Lenovo" : {
         "file" : "lib/SNMP/Info/Layer3/Lenovo.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Microsoft" : {
         "file" : "lib/SNMP/Info/Layer3/Microsoft.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Mikrotik" : {
         "file" : "lib/SNMP/Info/Layer3/Mikrotik.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::N1600" : {
         "file" : "lib/SNMP/Info/Layer3/N1600.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::NetSNMP" : {
         "file" : "lib/SNMP/Info/Layer3/NetSNMP.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Netscreen" : {
         "file" : "lib/SNMP/Info/Layer3/Netscreen.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Nexus" : {
         "file" : "lib/SNMP/Info/Layer3/Nexus.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::OneAccess" : {
         "file" : "lib/SNMP/Info/Layer3/OneAccess.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::PacketFront" : {
         "file" : "lib/SNMP/Info/Layer3/PacketFront.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::PaloAlto" : {
         "file" : "lib/SNMP/Info/Layer3/PaloAlto.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Passport" : {
         "file" : "lib/SNMP/Info/Layer3/Passport.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Pf" : {
         "file" : "lib/SNMP/Info/Layer3/Pf.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Pica8" : {
         "file" : "lib/SNMP/Info/Layer3/Pica8.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Redlion" : {
         "file" : "lib/SNMP/Info/Layer3/Redlion.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Scalance" : {
         "file" : "lib/SNMP/Info/Layer3/Scalance.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::SonicWALL" : {
         "file" : "lib/SNMP/Info/Layer3/SonicWALL.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Steelhead" : {
         "file" : "lib/SNMP/Info/Layer3/Steelhead.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Sun" : {
         "file" : "lib/SNMP/Info/Layer3/Sun.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Tasman" : {
         "file" : "lib/SNMP/Info/Layer3/Tasman.pm",
-         "version" : "3.71"
-      },
-      "SNMP::Info::Layer3::Teltonika" : {
-         "file" : "lib/SNMP/Info/Layer3/Teltonika.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::Timetra" : {
         "file" : "lib/SNMP/Info/Layer3/Timetra.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::VMware" : {
         "file" : "lib/SNMP/Info/Layer3/VMware.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer3::VyOS" : {
         "file" : "lib/SNMP/Info/Layer3/VyOS.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer7" : {
         "file" : "lib/SNMP/Info/Layer7.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer7::APC" : {
         "file" : "lib/SNMP/Info/Layer7/APC.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer7::Arbor" : {
         "file" : "lib/SNMP/Info/Layer7/Arbor.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer7::CiscoIPS" : {
         "file" : "lib/SNMP/Info/Layer7/CiscoIPS.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer7::Gigamon" : {
         "file" : "lib/SNMP/Info/Layer7/Gigamon.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer7::Liebert" : {
         "file" : "lib/SNMP/Info/Layer7/Liebert.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer7::Neoteris" : {
         "file" : "lib/SNMP/Info/Layer7/Neoteris.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::Layer7::Netscaler" : {
         "file" : "lib/SNMP/Info/Layer7/Netscaler.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::MAU" : {
         "file" : "lib/SNMP/Info/MAU.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::MRO" : {
         "file" : "lib/SNMP/Info/MRO.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::NortelStack" : {
         "file" : "lib/SNMP/Info/NortelStack.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::PowerEthernet" : {
         "file" : "lib/SNMP/Info/PowerEthernet.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::RapidCity" : {
         "file" : "lib/SNMP/Info/RapidCity.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      },
      "SNMP::Info::SONMP" : {
         "file" : "lib/SNMP/Info/SONMP.pm",
-         "version" : "3.71"
+         "version" : "3.70"
      }
   },
   "release_status" : "stable",
@@ -611,6 +607,6 @@
      "x_IRC" : "irc://irc.freenode.org/#netdisco",
      "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/snmp-info-users"
   },
-   "version" : "3.71",
-   "x_serialization_backend" : "JSON::PP version 4.02"
+   "version" : "3.70",
+   "x_serialization_backend" : "JSON::PP version 2.97001"
 }
--- a/META.yml
+++ b/META.yml
@@ -18,7 +18,7 @@ build_requires:
 configure_requires:
  Module::Build: '0.42'
 dynamic_config: 1
-generated_by: 'Module::Build version 0.4231, CPAN::Meta::Converter version 2.150010'
+generated_by: 'Module::Build version 0.4224, CPAN::Meta::Converter version 2.150010'
 license: bsd
 meta-spec:
  url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -27,412 +27,409 @@ name: SNMP-Info
 provides:
  SNMP::Info:
    file: lib/SNMP/Info.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::AMAP:
    file: lib/SNMP/Info/AMAP.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::AdslLine:
    file: lib/SNMP/Info/AdslLine.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Aggregate:
    file: lib/SNMP/Info/Aggregate.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Airespace:
    file: lib/SNMP/Info/Airespace.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Bridge:
    file: lib/SNMP/Info/Bridge.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::CDP:
    file: lib/SNMP/Info/CDP.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::CiscoAgg:
    file: lib/SNMP/Info/CiscoAgg.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::CiscoConfig:
    file: lib/SNMP/Info/CiscoConfig.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::CiscoPortSecurity:
    file: lib/SNMP/Info/CiscoPortSecurity.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::CiscoPower:
    file: lib/SNMP/Info/CiscoPower.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::CiscoQOS:
    file: lib/SNMP/Info/CiscoQOS.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::CiscoRTT:
    file: lib/SNMP/Info/CiscoRTT.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::CiscoStack:
    file: lib/SNMP/Info/CiscoStack.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::CiscoStats:
    file: lib/SNMP/Info/CiscoStats.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::CiscoStpExtensions:
    file: lib/SNMP/Info/CiscoStpExtensions.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::CiscoVTP:
    file: lib/SNMP/Info/CiscoVTP.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::DocsisCM:
    file: lib/SNMP/Info/DocsisCM.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::DocsisHE:
    file: lib/SNMP/Info/DocsisHE.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::EDP:
    file: lib/SNMP/Info/EDP.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Entity:
    file: lib/SNMP/Info/Entity.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::EtherLike:
    file: lib/SNMP/Info/EtherLike.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::FDP:
    file: lib/SNMP/Info/FDP.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::IEEE802dot11:
    file: lib/SNMP/Info/IEEE802dot11.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::IEEE802dot3ad:
    file: lib/SNMP/Info/IEEE802dot3ad.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::IPv6:
    file: lib/SNMP/Info/IPv6.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::LLDP:
    file: lib/SNMP/Info/LLDP.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer1:
    file: lib/SNMP/Info/Layer1.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer1::Allied:
    file: lib/SNMP/Info/Layer1/Allied.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer1::Asante:
    file: lib/SNMP/Info/Layer1/Asante.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer1::Bayhub:
    file: lib/SNMP/Info/Layer1/Bayhub.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer1::Cyclades:
    file: lib/SNMP/Info/Layer1/Cyclades.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer1::S3000:
    file: lib/SNMP/Info/Layer1/S3000.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2:
    file: lib/SNMP/Info/Layer2.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::3Com:
    file: lib/SNMP/Info/Layer2/3Com.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Adtran:
    file: lib/SNMP/Info/Layer2/Adtran.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Aerohive:
    file: lib/SNMP/Info/Layer2/Aerohive.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Airespace:
    file: lib/SNMP/Info/Layer2/Airespace.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Aironet:
    file: lib/SNMP/Info/Layer2/Aironet.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Allied:
    file: lib/SNMP/Info/Layer2/Allied.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Atmedia:
    file: lib/SNMP/Info/Layer2/Atmedia.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Baystack:
    file: lib/SNMP/Info/Layer2/Baystack.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::C1900:
    file: lib/SNMP/Info/Layer2/C1900.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::C2900:
    file: lib/SNMP/Info/Layer2/C2900.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Catalyst:
    file: lib/SNMP/Info/Layer2/Catalyst.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Centillion:
    file: lib/SNMP/Info/Layer2/Centillion.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Cisco:
    file: lib/SNMP/Info/Layer2/Cisco.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::CiscoSB:
    file: lib/SNMP/Info/Layer2/CiscoSB.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Exinda:
    file: lib/SNMP/Info/Layer2/Exinda.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::HP:
    file: lib/SNMP/Info/Layer2/HP.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::HP4000:
    file: lib/SNMP/Info/Layer2/HP4000.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::HPVC:
    file: lib/SNMP/Info/Layer2/HPVC.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Kentrox:
    file: lib/SNMP/Info/Layer2/Kentrox.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::N2270:
    file: lib/SNMP/Info/Layer2/N2270.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::NAP222x:
    file: lib/SNMP/Info/Layer2/NAP222x.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::NWSS2300:
    file: lib/SNMP/Info/Layer2/NWSS2300.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Netgear:
    file: lib/SNMP/Info/Layer2/Netgear.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Nexans:
    file: lib/SNMP/Info/Layer2/Nexans.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Orinoco:
    file: lib/SNMP/Info/Layer2/Orinoco.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Sixnet:
    file: lib/SNMP/Info/Layer2/Sixnet.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Trapeze:
    file: lib/SNMP/Info/Layer2/Trapeze.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::Ubiquiti:
    file: lib/SNMP/Info/Layer2/Ubiquiti.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer2::ZyXEL_DSLAM:
    file: lib/SNMP/Info/Layer2/ZyXEL_DSLAM.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3:
    file: lib/SNMP/Info/Layer3.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Aironet:
    file: lib/SNMP/Info/Layer3/Aironet.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::AlcatelLucent:
    file: lib/SNMP/Info/Layer3/AlcatelLucent.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::AlteonAD:
    file: lib/SNMP/Info/Layer3/AlteonAD.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Altiga:
    file: lib/SNMP/Info/Layer3/Altiga.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Arista:
    file: lib/SNMP/Info/Layer3/Arista.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Aruba:
    file: lib/SNMP/Info/Layer3/Aruba.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::BayRS:
    file: lib/SNMP/Info/Layer3/BayRS.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::BlueCoatSG:
    file: lib/SNMP/Info/Layer3/BlueCoatSG.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::C3550:
    file: lib/SNMP/Info/Layer3/C3550.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::C4000:
    file: lib/SNMP/Info/Layer3/C4000.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::C6500:
    file: lib/SNMP/Info/Layer3/C6500.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::CheckPoint:
    file: lib/SNMP/Info/Layer3/CheckPoint.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Ciena:
    file: lib/SNMP/Info/Layer3/Ciena.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Cisco:
    file: lib/SNMP/Info/Layer3/Cisco.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::CiscoASA:
    file: lib/SNMP/Info/Layer3/CiscoASA.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::CiscoFWSM:
    file: lib/SNMP/Info/Layer3/CiscoFWSM.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::CiscoSwitch:
    file: lib/SNMP/Info/Layer3/CiscoSwitch.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Contivity:
    file: lib/SNMP/Info/Layer3/Contivity.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Cumulus:
    file: lib/SNMP/Info/Layer3/Cumulus.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::DLink:
    file: lib/SNMP/Info/Layer3/DLink.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Dell:
    file: lib/SNMP/Info/Layer3/Dell.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::ERX:
    file: lib/SNMP/Info/Layer3/ERX.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Enterasys:
    file: lib/SNMP/Info/Layer3/Enterasys.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Extreme:
    file: lib/SNMP/Info/Layer3/Extreme.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::F5:
    file: lib/SNMP/Info/Layer3/F5.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Force10:
    file: lib/SNMP/Info/Layer3/Force10.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Fortinet:
    file: lib/SNMP/Info/Layer3/Fortinet.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Foundry:
    file: lib/SNMP/Info/Layer3/Foundry.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Genua:
    file: lib/SNMP/Info/Layer3/Genua.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::H3C:
    file: lib/SNMP/Info/Layer3/H3C.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::HP9300:
    file: lib/SNMP/Info/Layer3/HP9300.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Huawei:
    file: lib/SNMP/Info/Layer3/Huawei.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::IBMGbTor:
    file: lib/SNMP/Info/Layer3/IBMGbTor.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Juniper:
    file: lib/SNMP/Info/Layer3/Juniper.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Lantronix:
    file: lib/SNMP/Info/Layer3/Lantronix.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Lenovo:
    file: lib/SNMP/Info/Layer3/Lenovo.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Microsoft:
    file: lib/SNMP/Info/Layer3/Microsoft.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Mikrotik:
    file: lib/SNMP/Info/Layer3/Mikrotik.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::N1600:
    file: lib/SNMP/Info/Layer3/N1600.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::NetSNMP:
    file: lib/SNMP/Info/Layer3/NetSNMP.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Netscreen:
    file: lib/SNMP/Info/Layer3/Netscreen.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Nexus:
    file: lib/SNMP/Info/Layer3/Nexus.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::OneAccess:
    file: lib/SNMP/Info/Layer3/OneAccess.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::PacketFront:
    file: lib/SNMP/Info/Layer3/PacketFront.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::PaloAlto:
    file: lib/SNMP/Info/Layer3/PaloAlto.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Passport:
    file: lib/SNMP/Info/Layer3/Passport.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Pf:
    file: lib/SNMP/Info/Layer3/Pf.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Pica8:
    file: lib/SNMP/Info/Layer3/Pica8.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Redlion:
    file: lib/SNMP/Info/Layer3/Redlion.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Scalance:
    file: lib/SNMP/Info/Layer3/Scalance.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::SonicWALL:
    file: lib/SNMP/Info/Layer3/SonicWALL.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Steelhead:
    file: lib/SNMP/Info/Layer3/Steelhead.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Sun:
    file: lib/SNMP/Info/Layer3/Sun.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Tasman:
    file: lib/SNMP/Info/Layer3/Tasman.pm
-    version: '3.71'
-  SNMP::Info::Layer3::Teltonika:
-    file: lib/SNMP/Info/Layer3/Teltonika.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::Timetra:
    file: lib/SNMP/Info/Layer3/Timetra.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::VMware:
    file: lib/SNMP/Info/Layer3/VMware.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer3::VyOS:
    file: lib/SNMP/Info/Layer3/VyOS.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer7:
    file: lib/SNMP/Info/Layer7.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer7::APC:
    file: lib/SNMP/Info/Layer7/APC.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer7::Arbor:
    file: lib/SNMP/Info/Layer7/Arbor.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer7::CiscoIPS:
    file: lib/SNMP/Info/Layer7/CiscoIPS.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer7::Gigamon:
    file: lib/SNMP/Info/Layer7/Gigamon.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer7::Liebert:
    file: lib/SNMP/Info/Layer7/Liebert.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer7::Neoteris:
    file: lib/SNMP/Info/Layer7/Neoteris.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::Layer7::Netscaler:
    file: lib/SNMP/Info/Layer7/Netscaler.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::MAU:
    file: lib/SNMP/Info/MAU.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::MRO:
    file: lib/SNMP/Info/MRO.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::NortelStack:
    file: lib/SNMP/Info/NortelStack.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::PowerEthernet:
    file: lib/SNMP/Info/PowerEthernet.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::RapidCity:
    file: lib/SNMP/Info/RapidCity.pm
-    version: '3.71'
+    version: '3.70'
  SNMP::Info::SONMP:
    file: lib/SNMP/Info/SONMP.pm
-    version: '3.71'
+    version: '3.70'
 recommends:
  Class::ISA: '0'
  File::Slurp: '0'
@@ -450,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.71'
+version: '3.70'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
--- a/15
+++ b/15
@@ -2,7 +2,7 @@ NAME
    SNMP::Info - OO Interface to Network devices and MIBs through SNMP

 VERSION
-    SNMP::Info - Version 3.71
+    SNMP::Info - Version 3.70

 AUTHOR
    SNMP::Info is maintained by team of Open Source authors headed by Eric
@@ -867,11 +867,6 @@ SUBCLASSES

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

-        SNMP::Info::Layer3::Teltonika
-            Subclass for Teltonika RUT9xx series routers.
-
-            See documentation in SNMP::Info::Layer3::Teltonika for details.
-
        SNMP::Info::Layer3::Timetra
            Alcatel-Lucent SR Class.

@@ -2212,13 +2207,17 @@ SNMP::INFO INTERNALS

        Calls parent can() first to see if method exists, if not validates
        that a method should be created then dispatches to the appropriate
-        internal method for creation.
+        internal method for creation. The newly created method is inserted
+        into the symbol table returning to AUTOLOAD only for the initial
+        method call.

        Returns undef if the method does not exist and can not be created.

  AUTOLOAD
    Each entry in either %FUNCS, %GLOBALS, or MIB Leaf node names present in
-    loaded MIBs are used by AUTOLOAD() to create dynamic methods.
+    loaded MIBs are used by AUTOLOAD() to create dynamic methods. Generated
+    methods are inserted into the symbol table so that subsequent calls can
+    avoid AUTOLOAD() and dispatch directly.

    1. Returns unless method is listed in %FUNCS, %GLOBALS, or is a MIB Leaf
    node name in a loaded MIB for given class.
--- a/lib/SNMP/Info.pm
+++ b/lib/SNMP/Info.pm
@@ -25,7 +25,7 @@ our
    ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE, $AUTOLOAD, $INIT, $DEBUG, %SPEED_MAP,
     $NOSUCH, $BIGINT, $REPEATERS);

-$VERSION = '3.71';
+$VERSION = '3.70-135-20.5.7';

 =head1 NAME

@@ -33,7 +33,7 @@ SNMP::Info - OO Interface to Network devices and MIBs through SNMP

 =head1 VERSION

-SNMP::Info - Version 3.71
+SNMP::Info - Version 3.70-135

 =head1 AUTHOR

@@ -1038,12 +1038,6 @@ Subclass for Avaya Secure Routers.

 See documentation in L<SNMP::Info::Layer3::Tasman> for details.

-=item SNMP::Info::Layer3::Teltonika
-
-Subclass for Teltonika RUT9xx series routers.
-
-See documentation in L<SNMP::Info::Layer3::Teltonika> for details.
-
 =item SNMP::Info::Layer3::Timetra

 Alcatel-Lucent SR Class.
@@ -1356,7 +1350,7 @@ sub new {
        delete $sess_args{Offline};
    }

-    if ( defined $args{Cache} and ref {} eq ref $args{Cache} ) {
+    if ( defined $args{Cache} and ref({}) eq ref $args{Cache} ) {
        $new_obj->{$_} = $args{Cache}->{$_} for keys %{$args{Cache}};
        delete $sess_args{Cache};
    }
@@ -1577,7 +1571,7 @@ sub cache {
    my $self = shift;
    my $data = shift;

-    if ( defined $data and ref {} eq ref $data ) {
+    if ( defined $data and ref({}) eq ref $data ) {
        $self->{$_} = $data->{$_} for keys %$data;
    }

@@ -1677,10 +1671,17 @@ sub device_type {
        45    => 'SNMP::Info::Layer2::Baystack',
        171   => 'SNMP::Info::Layer3::DLink',
        244   => 'SNMP::Info::Layer3::Lantronix',
+        259   => 'SNMP::Info::Layer3::Accton',
        311   => 'SNMP::Info::Layer3::Microsoft',
+        637   => 'SNMP::Info::Layer3::AlcatelLucent',
+        655   => 'SNMP::Info::Layer2::Carelink',
        664   => 'SNMP::Info::Layer2::Adtran',
        674   => 'SNMP::Info::Layer3::Dell',
+        776   => 'SNMP::Info::Layer2::Telindus',
+        890   => 'SNMP::Info::Layer2::Zyxel',
+        1286  => 'SNMP::Info::Layer2::ECI',
        1588  => 'SNMP::Info::Layer3::Foundry',
+        1795  => 'SNMP::Info::Layer2::Paradyne',
        1872  => 'SNMP::Info::Layer3::AlteonAD',
        1890  => 'SNMP::Info::Layer3::Redlion',
        1916  => 'SNMP::Info::Layer3::Extreme',
@@ -1702,10 +1703,13 @@ sub device_type {
        5624  => 'SNMP::Info::Layer3::Enterasys',
        6027  => 'SNMP::Info::Layer3::Force10',
        6141  => 'SNMP::Info::Layer3::Ciena',
+        6339  => 'SNMP::Info::Layer3::DigitalChina',
        6486  => 'SNMP::Info::Layer3::AlcatelLucent',
        6527  => 'SNMP::Info::Layer3::Timetra',
+        6672  => 'SNMP::Info::Layer2::Proscend',
        6876  => 'SNMP::Info::Layer3::VMware',
        8072  => 'SNMP::Info::Layer3::NetSNMP',
+        8886  => 'SNMP::Info::Layer3::Raisecom',
        9303  => 'SNMP::Info::Layer3::PacketFront',
        10002 => 'SNMP::Info::Layer2::Ubiquiti',
        10418 => 'SNMP::Info::Layer1::Cyclades',
@@ -1723,13 +1727,19 @@ sub device_type {
        25506 => 'SNMP::Info::Layer3::H3C',
        26543 => 'SNMP::Info::Layer3::IBMGbTor',
        26928 => 'SNMP::Info::Layer2::Aerohive',
+        27514 => 'SNMP::Info::Layer3::Qtech',
        30065 => 'SNMP::Info::Layer3::Arista',
        30803 => 'SNMP::Info::Layer3::VyOS',
+        32761 => 'SNMP::Info::Layer3::Deliberant',
+        34300 => 'SNMP::Info::Layer3::Eltex',
        35098 => 'SNMP::Info::Layer3::Pica8',
+        35265 => 'SNMP::Info::Layer3::Eltex',
        40310 => 'SNMP::Info::Layer3::Cumulus',
+        40418 => 'SNMP::Info::Layer3::Nag',
        41112 => 'SNMP::Info::Layer2::Ubiquiti',
        44641 => 'SNMP::Info::Layer3::VyOS',
-        48690 => 'SNMP::Info::Layer3::Teltonika',
+        41752 => 'SNMP::Info::Layer3::Rotek',
+        42926 => 'SNMP::Info::Layer2::NSC',
    );

    my %l2sysoidmap = (
@@ -1739,9 +1749,16 @@ sub device_type {
        45    => 'SNMP::Info::Layer2::Baystack',
        171   => 'SNMP::Info::Layer3::DLink',
        207   => 'SNMP::Info::Layer2::Allied',
+        259   => 'SNMP::Info::Layer3::Accton',
        266   => 'SNMP::Info::Layer2::Nexans',
+        637   => 'SNMP::Info::Layer3::AlcatelLucent',
+        655   => 'SNMP::Info::Layer2::Carelink',
        664   => 'SNMP::Info::Layer2::Adtran',
        674   => 'SNMP::Info::Layer3::Dell',
+        776   => 'SNMP::Info::Layer2::Telindus',
+        890   => 'SNMP::Info::Layer2::Zyxel',
+        1286  => 'SNMP::Info::Layer2::ECI',
+        1795  => 'SNMP::Info::Layer2::Paradyne',
        1872  => 'SNMP::Info::Layer3::AlteonAD',
        1890  => 'SNMP::Info::Layer3::Redlion',
        1916  => 'SNMP::Info::Layer3::Extreme',
@@ -1754,7 +1771,10 @@ sub device_type {
        4526  => 'SNMP::Info::Layer2::Netgear',
        5624  => 'SNMP::Info::Layer3::Enterasys',
        6141  => 'SNMP::Info::Layer3::Ciena',
+        6339  => 'SNMP::Info::Layer3::DigitalChina',
        6486  => 'SNMP::Info::Layer3::AlcatelLucent',
+        6672  => 'SNMP::Info::Layer2::Proscend',
+        8886  => 'SNMP::Info::Layer3::Raisecom',
        9303  => 'SNMP::Info::Layer3::PacketFront',
        10418 => 'SNMP::Info::Layer1::Cyclades',
        11898 => 'SNMP::Info::Layer2::Orinoco',
@@ -1767,7 +1787,13 @@ sub device_type {
        21091 => 'SNMP::Info::Layer2::Exinda',
        26543 => 'SNMP::Info::Layer3::IBMGbTor',
        26928 => 'SNMP::Info::Layer2::Aerohive',
-        48690 => 'SNMP::Info::Layer3::Teltonika',
+        27514 => 'SNMP::Info::Layer3::Qtech',
+        32761 => 'SNMP::Info::Layer3::Deliberant',
+        34300 => 'SNMP::Info::Layer3::Eltex',
+        35265 => 'SNMP::Info::Layer3::Eltex',
+        40418 => 'SNMP::Info::Layer3::Nag',
+        41752 => 'SNMP::Info::Layer3::Rotek',
+        42926 => 'SNMP::Info::Layer2::NSC',
    );

    my %l1sysoidmap = (
@@ -1783,6 +1809,7 @@ sub device_type {
        12532 => 'SNMP::Info::Layer7::Neoteris',
        14525 => 'SNMP::Info::Layer2::Trapeze',
        26866 => 'SNMP::Info::Layer7::Gigamon',
+        41752 => 'SNMP::Info::Layer3::Rotek', #Rotek and Raisecom fucking crap -(
    );

    # Get just the enterprise number for generic mapping
@@ -1931,10 +1958,6 @@ sub device_type {
        $objtype = 'SNMP::Info::Layer3::Scalance'
 	    if ( $soid =~ /\.1\.3\.6\.1\.4\.1\.4329\.6\.1\.2/i );

-        # Teltonika RUT9xx Series
-        $objtype = 'SNMP::Info::Layer3::Teltonika'
-            if (
-            $desc =~ /\bTeltonika.*RUT9\d{2}\b/);

        # Generic device classification based upon sysObjectID
        if (    ( $objtype eq 'SNMP::Info::Layer3' )
@@ -2146,11 +2169,6 @@ sub device_type {
        $objtype = 'SNMP::Info::Layer3::Scalance'
 	    if ( $soid =~ /\.1\.3\.6\.1\.4\.1\.4329\.6\.1\.2/i );

-        # Teltonika RUT9xx Series
-        $objtype = 'SNMP::Info::Layer3::Teltonika'
-            if (
-            $desc =~ /\bTeltonika.*RUT9\d{2}\b/);
-
        # Generic device classification based upon sysObjectID
        if ( defined($id) and $objtype eq 'SNMP::Info') {
            if ( defined $l3sysoidmap{$id} ) {
@@ -2888,7 +2906,7 @@ sub ip_index {

    my $o_ip_idx = $self->old_ip_index();
    return $o_ip_idx
-        if ( ref {} eq ref $o_ip_idx and scalar keys %$o_ip_idx );
+        if ( ref({}) eq ref $o_ip_idx and scalar keys %$o_ip_idx );

    # Since callers may be using the old iid to get the IP, strip protocol
    # and length from the index
@@ -2914,7 +2932,7 @@ sub ip_table {

    my $o_ip_table = $self->old_ip_table();
    return $o_ip_table
-        if ( ref {} eq ref $o_ip_table and scalar keys %$o_ip_table );
+        if ( ref({}) eq ref $o_ip_table and scalar keys %$o_ip_table );

    my $n_ip_idx  = $self->new_ip_index() || {};
    my $n_ip_type = $self->new_ip_type()  || {};
@@ -2938,7 +2956,7 @@ sub ip_netmask {

    my $o_ip_mask = $self->old_ip_netmask();
    return $o_ip_mask
-        if ( ref {} eq ref $o_ip_mask and scalar keys %$o_ip_mask );
+        if ( ref({}) eq ref $o_ip_mask and scalar keys %$o_ip_mask );

    my $n_ip_pfx  = $self->new_ip_prefix() || {};
    my $n_ip_type = $self->new_ip_type()   || {};
@@ -4819,7 +4837,7 @@ sub _cache {
    my ($attr, $data) = @_;
    my $store = $self->store();

-    if (ref {} eq ref $data) {
+    if (ref({}) eq ref $data) {
        $self->{"_${attr}"}++;
        $store->{$attr} = $data;
    }
@@ -4847,7 +4865,7 @@ sub _munge {

    return $data unless defined $munge->{$attr};

-    if (ref {} eq ref $data) {
+    if (ref({}) eq ref $data) {
        my $subref = $munge->{$attr};
        my %munged;
        foreach my $key ( keys %$data ) {
@@ -4989,7 +5007,8 @@ capabilities to include dynamic methods generated at run time via AUTOLOAD.

 Calls parent can() first to see if method exists, if not validates that a
 method should be created then dispatches to the appropriate internal method
-for creation.
+for creation.  The newly created method is inserted into the symbol table
+returning to AUTOLOAD only for the initial method call.

 Returns undef if the method does not exist and can not be created.

@@ -5026,21 +5045,15 @@ sub can {
    # we’ll just create if/when they are called rather than pollute the
    # symbol table with entries that never get called.

-    # Between 2012-2020 we actually added the methods generated below to the
-    # symbol table, but they were global to the SNMP::Info class, while
-    # methods for different device classes may point to different SNMP
-    # objects. This made interacting with multiple device types from a single
-    # script somewhat unreliable.
-
    # Check for set_ ing.
    if ( $method =~ /^set_/ ) {
-        return _make_setter( $method, $oid, @_ );
+        return *{$method} = _make_setter( $method, $oid, @_ );
    }
    elsif ( defined $funcs->{$base_method} || $table ) {
-        return _load_attr( $method, $oid, @_ );
+        return *{$method} = _load_attr( $method, $oid, @_ );
    }
    else {
-        return _global( $method, $oid );
+        return *{$method} = _global( $method, $oid );
    }
 }

@@ -5049,7 +5062,9 @@ sub can {
 =head2 AUTOLOAD

 Each entry in either %FUNCS, %GLOBALS, or MIB Leaf node names present in
-loaded MIBs are used by AUTOLOAD() to create dynamic methods.
+loaded MIBs are used by AUTOLOAD() to create dynamic methods.  Generated
+methods are inserted into the symbol table so that subsequent calls can avoid
+AUTOLOAD() and dispatch directly.

 =over

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

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
  'ALCATEL-IND1-INTERSWITCH-PROTOCOL-MIB' => 'aipAMAPRemDeviceType',
--- a/lib/SNMP/Info/AdslLine.pm
+++ b/lib/SNMP/Info/AdslLine.pm
@@ -39,7 +39,7 @@ use SNMP::Info;

 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

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

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

 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);

-$VERSION = '3.71';
+$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
@@ -39,7 +39,7 @@ use SNMP::Info;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::MIBS,
--- a/lib/SNMP/Info/Bridge.pm
+++ b/lib/SNMP/Info/Bridge.pm
@@ -42,7 +42,7 @@ use SNMP::Info;

 our ($VERSION, $DEBUG, %MIBS, %FUNCS, %GLOBALS, %MUNGE, $INIT);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    'BRIDGE-MIB'   => 'dot1dBaseBridgeAddress',
--- a/lib/SNMP/Info/CDP.pm
+++ b/lib/SNMP/Info/CDP.pm
@@ -43,7 +43,7 @@ use SNMP::Info;
 our
    ($VERSION, $DEBUG, %FUNCS, %GLOBALS, %MIBS, %MUNGE, $INIT, %CDP_CAPABILITIES);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 # Five data structures required by SNMP::Info
 %MIBS = ( 'CISCO-CDP-MIB' => 'cdpGlobalRun' );
--- a/lib/SNMP/Info/CiscoAgg.pm
+++ b/lib/SNMP/Info/CiscoAgg.pm
@@ -48,7 +48,7 @@ use SNMP::Info::IEEE802dot3ad;

 our ($DEBUG, $VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
  %SNMP::Info::IEEE802dot3ad::MIBS,
--- a/lib/SNMP/Info/CiscoConfig.pm
+++ b/lib/SNMP/Info/CiscoConfig.pm
@@ -39,7 +39,7 @@ use SNMP::Info;

 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    'CISCO-CONFIG-COPY-MIB' => 'ccCopyTable',
--- a/lib/SNMP/Info/CiscoPortSecurity.pm
+++ b/lib/SNMP/Info/CiscoPortSecurity.pm
@@ -39,7 +39,7 @@ use SNMP::Info;

 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE, %PAECAPABILITIES);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    'CISCO-PORT-SECURITY-MIB' => 'ciscoPortSecurityMIB',
--- a/lib/SNMP/Info/CiscoPower.pm
+++ b/lib/SNMP/Info/CiscoPower.pm
@@ -39,7 +39,7 @@ use SNMP::Info;

 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = ( 'CISCO-POWER-ETHERNET-EXT-MIB' => 'cpeExtPsePortEntPhyIndex',
          'CISCO-CDP-MIB' => 'cdpCachePowerConsumption',
--- a/lib/SNMP/Info/CiscoQOS.pm
+++ b/lib/SNMP/Info/CiscoQOS.pm
@@ -39,7 +39,7 @@ use SNMP::Info;

 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

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

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

 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

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

--- a/lib/SNMP/Info/CiscoStack.pm
+++ b/lib/SNMP/Info/CiscoStack.pm
@@ -38,7 +38,7 @@ use Exporter;

 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE, %PORTSTAT);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

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

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

 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    'SNMPv2-MIB'            => 'sysDescr',
--- a/lib/SNMP/Info/CiscoStpExtensions.pm
+++ b/lib/SNMP/Info/CiscoStpExtensions.pm
@@ -36,7 +36,7 @@ use SNMP::Info::Bridge;

 our ($VERSION, $DEBUG, %MIBS, %FUNCS, %GLOBALS, %MUNGE, %PORTSTAT, $INIT);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

@SNMP::Info::CiscoStpExtensions::ISA = qw/SNMP::Info::Bridge SNMP::Info Exporter/;
@SNMP::Info::CiscoStpExtensions::EXPORT_OK = qw//;
--- a/lib/SNMP/Info/CiscoVTP.pm
+++ b/lib/SNMP/Info/CiscoVTP.pm
@@ -41,7 +41,7 @@ use SNMP::Info;

 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    'CISCO-VTP-MIB'                       => 'vtpVlanName',
--- a/lib/SNMP/Info/DocsisCM.pm
+++ b/lib/SNMP/Info/DocsisCM.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;

 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';
 
 %MIBS = (
    %SNMP::Info::Layer2::MIBS
--- a/lib/SNMP/Info/DocsisHE.pm
+++ b/lib/SNMP/Info/DocsisHE.pm
@@ -11,7 +11,7 @@ use SNMP::Info;

 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    'DOCS-IF3-MIB' => 'docsIf3Mib',
--- a/lib/SNMP/Info/EDP.pm
+++ b/lib/SNMP/Info/EDP.pm
@@ -40,7 +40,7 @@ use SNMP::Info;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    'EXTREME-EDP-MIB'   => 'extremeEdpPortIfIndex',
--- a/lib/SNMP/Info/Entity.pm
+++ b/lib/SNMP/Info/Entity.pm
@@ -41,7 +41,7 @@ use SNMP::Info;

 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

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

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

 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

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

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

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

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

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

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

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

--- a/lib/SNMP/Info/IEEE802dot3ad.pm
+++ b/lib/SNMP/Info/IEEE802dot3ad.pm
@@ -44,7 +44,7 @@ use SNMP::Info::Aggregate;

 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
  %SNMP::Info::Aggregate::MIBS,
--- a/lib/SNMP/Info/IPv6.pm
+++ b/lib/SNMP/Info/IPv6.pm
@@ -45,7 +45,7 @@ use constant {
    IPV6MIB => 3,
 };

-$VERSION = '3.71';
+$VERSION = '3.70-135';



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

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    'LLDP-MIB'          => 'lldpLocSysCapEnabled',
@@ -55,13 +55,10 @@ $VERSION = '3.71';
 );

 %FUNCS = (
+
    # LLDP-MIB::lldpLocManAddrTable
    'lldp_lman_addr' => 'lldpLocManAddrIfId',

-    # LLDP-MIB::LldpLocPortEntry
-    'lldp_lport_id'   => 'lldpLocPortId',
-    'lldp_lport_desc' => 'lldpLocPortDesc',
-
    # LLDP-MIB::lldpRemTable
    'lldp_rem_id_type'  => 'lldpRemChassisIdSubtype',
    'lldp_rem_id'       => 'lldpRemChassisId',
@@ -95,8 +92,6 @@ $VERSION = '3.71';
    'lldp_rem_sysname'   => \&SNMP::Info::munge_null,
    'lldp_rem_sysdesc'   => \&SNMP::Info::munge_null,
    'lldp_rem_port_desc' => \&SNMP::Info::munge_null,
-    'lldp_lport_id'      => \&SNMP::Info::munge_null,
-    'lldp_lport_desc'    => \&SNMP::Info::munge_null,
    'lldp_sys_cap'       => \&SNMP::Info::munge_bits,
    'lldp_rem_sys_cap'   => \&SNMP::Info::munge_bits,
    'lldp_rem_cap_spt'   => \&SNMP::Info::munge_bits,
@@ -151,11 +146,7 @@ sub lldp_if {
        # 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.
-        # snmp::info #372 -> to make things even more complex some devices
-        # have different behaviour depending on os version (nx-os 6 vs 7)
-        # so we made this a function to allow overrides in more specific
-        # modules
-        my $lldp_desc = $lldp->lldp_lport_desc($port);
+        my $lldp_desc = $lldp->lldpLocPortDesc($port);
        my $desc      = $lldp_desc->{$port};

        # If cross reference is successful use it, otherwise stick with
--- a/lib/SNMP/Info/Layer1.pm
+++ b/lib/SNMP/Info/Layer1.pm
@@ -41,7 +41,7 @@ use SNMP::Info;

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %PORTSTAT, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

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

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

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, 'root_ip' => 'actualIPAddr', );
--- a/lib/SNMP/Info/Layer1/Asante.pm
+++ b/lib/SNMP/Info/Layer1/Asante.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer1;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, );
--- a/lib/SNMP/Info/Layer1/Bayhub.pm
+++ b/lib/SNMP/Info/Layer1/Bayhub.pm
@@ -42,7 +42,7 @@ use SNMP::Info::Layer2;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
--- a/lib/SNMP/Info/Layer1/Cyclades.pm
+++ b/lib/SNMP/Info/Layer1/Cyclades.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer1;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE, $AUTOLOAD);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer1::MIBS,
--- a/lib/SNMP/Info/Layer1/S3000.pm
+++ b/lib/SNMP/Info/Layer1/S3000.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
--- a/lib/SNMP/Info/Layer2.pm
+++ b/lib/SNMP/Info/Layer2.pm
@@ -47,7 +47,7 @@ use SNMP::Info::DocsisHE;

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %PORTSTAT, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::MIBS,         %SNMP::Info::Bridge::MIBS,
--- a/lib/SNMP/Info/Layer2/3Com.pm
+++ b/lib/SNMP/Info/Layer2/3Com.pm
@@ -39,7 +39,7 @@ use SNMP::Info::CDP;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE, $AUTOLOAD);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
--- a/lib/SNMP/Info/Layer2/Adtran.pm
+++ b/lib/SNMP/Info/Layer2/Adtran.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 # This will be filled in with the device's index into the EntPhysicalEntry
 # table by the serial() function.
--- a/lib/SNMP/Info/Layer2/Aerohive.pm
+++ b/lib/SNMP/Info/Layer2/Aerohive.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
--- a/lib/SNMP/Info/Layer2/Airespace.pm
+++ b/lib/SNMP/Info/Layer2/Airespace.pm
@@ -40,7 +40,7 @@ use SNMP::Info::Airespace;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::MIBS,      %SNMP::Info::Bridge::MIBS,
--- a/lib/SNMP/Info/Layer2/Aironet.pm
+++ b/lib/SNMP/Info/Layer2/Aironet.pm
@@ -48,7 +48,7 @@ use SNMP::Info::IEEE802dot11;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %GLOBALS = (
    %SNMP::Info::IEEE802dot11::GLOBALS,
--- a/lib/SNMP/Info/Layer2/Allied.pm
+++ b/lib/SNMP/Info/Layer2/Allied.pm
@@ -40,7 +40,7 @@ use SNMP::Info::Layer1;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );

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

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = ( %SNMP::Info::Layer2::MIBS );

--- a/lib/SNMP/Info/Layer2/Baystack.pm
+++ b/lib/SNMP/Info/Layer2/Baystack.pm
@@ -45,7 +45,7 @@ use SNMP::Info::Layer3;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
--- a/lib/SNMP/Info/Layer2/C1900.pm
+++ b/lib/SNMP/Info/Layer2/C1900.pm
@@ -48,7 +48,7 @@ use SNMP::Info::Layer2;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %GLOBALS = (
    %SNMP::Info::Layer2::GLOBALS,
--- a/lib/SNMP/Info/Layer2/C2900.pm
+++ b/lib/SNMP/Info/Layer2/C2900.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer2::Cisco;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %GLOBALS = (
    %SNMP::Info::Layer2::Cisco::GLOBALS,
--- 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
@@ -42,7 +42,7 @@ use SNMP::Info::Layer2::Cisco;

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer2::Cisco::MIBS,
--- a/lib/SNMP/Info/Layer2/Centillion.pm
+++ b/lib/SNMP/Info/Layer2/Centillion.pm
@@ -42,7 +42,7 @@ use SNMP::Info::SONMP;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::MIBS,
--- a/lib/SNMP/Info/Layer2/Cisco.pm
+++ b/lib/SNMP/Info/Layer2/Cisco.pm
@@ -52,7 +52,7 @@ use SNMP::Info::Layer2;

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
--- a/lib/SNMP/Info/Layer2/CiscoSB.pm
+++ b/lib/SNMP/Info/Layer2/CiscoSB.pm
@@ -49,7 +49,7 @@ use SNMP::Info::CDP;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %GLOBALS = (
    %SNMP::Info::Layer2::GLOBALS,
--- 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
@@ -43,7 +43,7 @@ use SNMP::Info::Layer2;

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
--- a/lib/SNMP/Info/Layer2/HP.pm
+++ b/lib/SNMP/Info/Layer2/HP.pm
@@ -50,7 +50,7 @@ use SNMP::Info::Aggregate 'agg_ports_ifstack';

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %PORTSTAT, %MODEL_MAP, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
--- a/lib/SNMP/Info/Layer2/HP4000.pm
+++ b/lib/SNMP/Info/Layer2/HP4000.pm
@@ -45,7 +45,7 @@ use SNMP::Info::CDP;

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %PORTSTAT, %MODEL_MAP, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
--- a/lib/SNMP/Info/Layer2/HPVC.pm
+++ b/lib/SNMP/Info/Layer2/HPVC.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer2;

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
--- a/lib/SNMP/Info/Layer2/Kentrox.pm
+++ b/lib/SNMP/Info/Layer2/Kentrox.pm
@@ -37,7 +37,7 @@ use SNMP::Info::Layer2;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE, $AUTOLOAD);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
--- a/lib/SNMP/Info/Layer2/N2270.pm
+++ b/lib/SNMP/Info/Layer2/N2270.pm
@@ -42,7 +42,7 @@ use SNMP::Info::Airespace;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE, $AUTOLOAD, $INIT, $DEBUG);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
--- a/lib/SNMP/Info/Layer2/NAP222x.pm
+++ b/lib/SNMP/Info/Layer2/NAP222x.pm
@@ -42,7 +42,7 @@ use SNMP::Info::Layer2;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS, %SNMP::Info::IEEE802dot11::MIBS,
--- a/lib/SNMP/Info/Layer2/NSC.pm
+++ b/lib/SNMP/Info/Layer2/NSC.pm
@@ -0,0 +1,144 @@
+# SNMP::Info::Layer2::NSC - SNMP Interface to NSC Devices
+#
+# Copyright (c) 2020 by 135.
+
+package SNMP::Info::Layer2::NSC;
+
+use strict;
+use warnings;
+use Exporter;
+use SNMP::Info::Layer2;
+
+@SNMP::Info::Layer2::NSC::ISA       = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::NSC::EXPORT_OK = qw//;
+
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
+
+$VERSION = '3.70-135';
+
+%MIBS = ( %SNMP::Info::Layer2::MIBS, );
+
+%GLOBALS = (
+    %SNMP::Info::Layer2::GLOBALS,
+    'model_oid'  => 'enterprises.42926.2.3.1.3.0',
+    'serial_oid' => 'enterprises.42926.2.3.1.8.0',
+    'hw_oid'     => 'enterprises.42926.2.3.1.1.0',
+    'os_ver_oid' => 'enterprises.42926.2.3.1.2.0',
+);
+
+%FUNCS = ( %SNMP::Info::Layer2::FUNCS, );
+
+%MUNGE = ( %SNMP::Info::Layer2::MUNGE, );
+
+sub vendor {
+    return 'nsc';
+}
+
+sub os {
+    return 'nsc-os';
+}
+
+sub os_ver {
+    my $obj = shift;
+    my $os_ver = $obj->os_ver_oid || undef;
+
+    return $os_ver
+        if defined $os_ver;
+    return 'unknown';
+}
+sub model {
+    my $obj = shift;
+    my $model = $obj->model_oid || undef;
+    my $hwver = $obj->hwver || undef;
+
+    return $model . ' HW:' . $hwver
+        if defined $model and defined $hwver;
+    return $model
+        if defined $model;
+    return $obj->SUPER::model();
+}
+
+sub hwver {
+    my $obj = shift;
+    my $hwver = $obj->hw_oid || undef;
+
+    return $hwver
+        if defined $hwver;
+}
+
+sub serial {
+    my $obj = shift;
+    my $serial = $obj->serial_oid || undef;
+
+    return $serial
+        if defined $serial;
+    return $obj->SUPER::serial();
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::NSC - SNMP Interface to NSC 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 NSC 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 'nsc-oem'
+
+=item $obj->os()
+
+Returns 'nsc-oem'
+
+=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/NWSS2300.pm
+++ b/lib/SNMP/Info/Layer2/NWSS2300.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
--- a/lib/SNMP/Info/Layer2/Netgear.pm
+++ b/lib/SNMP/Info/Layer2/Netgear.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 # This will be filled in with the device's index into the EntPhysicalEntry
 # table by the serial() function.
--- a/lib/SNMP/Info/Layer2/Nexans.pm
+++ b/lib/SNMP/Info/Layer2/Nexans.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;

 our ($VERSION, %GLOBALS, %FUNCS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
--- a/lib/SNMP/Info/Layer2/Orinoco.pm
+++ b/lib/SNMP/Info/Layer2/Orinoco.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer2;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
--- a/lib/SNMP/Info/Layer2/Paradyne.pm
+++ b/lib/SNMP/Info/Layer2/Paradyne.pm
@@ -0,0 +1,116 @@
+# SNMP::Info::Layer2::Paradyne - SNMP Interface to Paradyne Devices
+#
+# Copyright (c) 2020 by 135.
+
+package SNMP::Info::Layer2::Paradyne;
+
+use strict;
+use warnings;
+use Exporter;
+use SNMP::Info::Layer2;
+
+@SNMP::Info::Layer2::Paradyne::ISA       = qw/SNMP::Info::Layer2 Exporter/;
+@SNMP::Info::Layer2::Paradyne::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 'paradyne';
+}
+
+sub os {
+    return 'prdn-os';
+}
+
+sub os_ver {
+    my $obj = shift;
+    $obj->description =~ /S\/W\sRelease\:\s+(.*)\;/;
+    return $1 if defined($1);
+    return 'unknown';
+}
+
+sub model {
+    my $obj = shift;
+    $obj->description =~ /PARADYNE\s+(.*)\;.*\;/;
+    return $1 if defined($1);
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer2::Paradyne - SNMP Interface to Paradyne 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 Paradyne 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 'rapadyne'
+
+=item $obj->os()
+
+Returns 'prdn-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/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
@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;

 our ($VERSION, %GLOBALS, %FUNCS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (%SNMP::Info::Layer2::MIBS, 'SIXNET-MIB' => 'sxid',);

--- 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
@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
--- a/lib/SNMP/Info/Layer2/Ubiquiti.pm
+++ b/lib/SNMP/Info/Layer2/Ubiquiti.pm
@@ -43,7 +43,7 @@ use SNMP::Info::Layer3;  # only used in sub mac()

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS,
@@ -199,9 +199,6 @@ sub model {
        }if($ethCount eq 8){
            ## Could be ER-8 Pro, ER-8, or EP-R8
            return "EdgeRouter 8-Port"
-        }if($ethCount eq 12){
-            ## ER-12
-            return "EdgeRouter 12-Port"
        }elsif($ethCount eq 5 and $cpuCount eq 4){
            ## Could be ER-X or ER-X-SFP
            return "EdgeRouter X 5-Port"
@@ -233,14 +230,13 @@ sub serial {
 sub mac {
    my $ubnt = shift;
    my $ifDescs = $ubnt->ifDescr;
-    my $erModel = $ubnt->model;

    foreach my $iid ( keys %$ifDescs ) {
        my $ifDesc = $ifDescs->{$iid};
        next unless defined $ifDesc;
        ## CPU Interface will have the primary MAC for EdgeSwitch
-        ## eth0 will have primary MAC for linux-based UBNT devices, except ER-12 which is eth11
-        if($ifDesc =~ /CPU/ or ($ifDesc eq 'eth0' and !($erModel =~ /EdgeRouter 12/)) or ($ifDesc eq 'eth11' and ($erModel =~ /EdgeRouter 12/))){
+        ## eth0 will have primary MAC for linux-based UBNT devices
+        if($ifDesc =~ /CPU/ or $ifDesc eq 'eth0'){
            my $mac = $ubnt->ifPhysAddress->{$iid};

            # syntax stolen from sub munge_mac in SNMP::Info
@@ -254,11 +250,11 @@ sub mac {
 }

 sub interfaces {
-    my $ubnt = shift;
+    my $netgear = shift;
    my $partial = shift;

-    my $interfaces = $ubnt->i_index($partial)       || {};
-    my $i_descr    = $ubnt->i_description($partial) || {};
+    my $interfaces = $netgear->i_index($partial)       || {};
+    my $i_descr    = $netgear->i_description($partial) || {};
    my $return = {};

    foreach my $iid ( keys %$i_descr ) {
@@ -372,11 +368,11 @@ Bridge MAC address.

 =item $ubnt->os()

-Returns C<AirOS>, C<UniFi> or C<EdgeOS> depending on model.
+Returns 'Ubiquiti Networks, Inc.'

 =item $ubnt->os_ver()

-Returns the software version extracted from C<dot11manufacturerProductVersion>, with fallback to description splitting for EdgeMax devices
+Returns the software version extracted from C<dot11manufacturerProductVersion>, with failback to description splitting for EdgeMax devices

 =back

@@ -397,11 +393,11 @@ to a hash.

 =over

-=item $ubnt->interfaces()
+=item $ubiquiti->interfaces()

 Uses the i_name() field.

-=item $ubnt->i_ignore()
+=item $ubiquiti->i_ignore()

 Ignores interfaces with "CPU Interface" in them.

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

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );
--- 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
@@ -54,7 +54,7 @@ use SNMP::Info::DocsisHE;

 our ($VERSION, %GLOBALS, %FUNCS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::MIBS,
--- 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
@@ -41,7 +41,7 @@ use SNMP::Info::Layer3;

 our ($VERSION, %MIBS, %FUNCS, %GLOBALS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
--- a/lib/SNMP/Info/Layer3/AlcatelLucent.pm
+++ b/lib/SNMP/Info/Layer3/AlcatelLucent.pm
@@ -49,7 +49,7 @@ use SNMP::Info::LLDP;

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

-$VERSION = '3.71';
+$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//;
@@ -108,7 +110,7 @@ sub os {
 }

 sub vendor {
-    return 'alcatel-lucent';
+    return 'alcatel';
 }

 sub os_ver {
--- a/lib/SNMP/Info/Layer3/AlteonAD.pm
+++ b/lib/SNMP/Info/Layer3/AlteonAD.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;

 our ($VERSION, %GLOBALS, %FUNCS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
--- a/lib/SNMP/Info/Layer3/Altiga.pm
+++ b/lib/SNMP/Info/Layer3/Altiga.pm
@@ -40,7 +40,7 @@ use SNMP::Info::Layer3;
 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE,
            $int_include_vpn, $fake_idx, $type_class);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
            %SNMP::Info::Layer3::MIBS,
--- a/lib/SNMP/Info/Layer3/Arista.pm
+++ b/lib/SNMP/Info/Layer3/Arista.pm
@@ -46,7 +46,7 @@ use SNMP::Info::Aggregate 'agg_ports_ifstack';

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
--- a/lib/SNMP/Info/Layer3/Aruba.pm
+++ b/lib/SNMP/Info/Layer3/Aruba.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;

 our ($VERSION, %FUNCS, %GLOBALS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
--- a/lib/SNMP/Info/Layer3/BayRS.pm
+++ b/lib/SNMP/Info/Layer3/BayRS.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer3;
 our ($VERSION, %GLOBALS, %FUNCS, %MIBS, %MUNGE, %MODEL_MAP,
    %MODID_MAP, %PROCID_MAP);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
--- a/lib/SNMP/Info/Layer3/BlueCoatSG.pm
+++ b/lib/SNMP/Info/Layer3/BlueCoatSG.pm
@@ -37,7 +37,7 @@ use SNMP::Info::Layer3;

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer2::MIBS, %SNMP::Info::Layer3::MIBS,
--- a/lib/SNMP/Info/Layer3/C3550.pm
+++ b/lib/SNMP/Info/Layer3/C3550.pm
@@ -46,7 +46,7 @@ our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

@SNMP::Info::Layer3::C3550::EXPORT_OK = qw//;

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 # NOTE: Order creates precedence
 #       Example: v_name exists in Bridge.pm and CiscoVTP.pm
--- a/lib/SNMP/Info/Layer3/C4000.pm
+++ b/lib/SNMP/Info/Layer3/C4000.pm
@@ -43,7 +43,7 @@ use SNMP::Info::MAU;

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::MAU::MIBS,
--- a/lib/SNMP/Info/Layer3/C6500.pm
+++ b/lib/SNMP/Info/Layer3/C6500.pm
@@ -48,7 +48,7 @@ our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

@SNMP::Info::Layer3::C6500::EXPORT_OK = qw//;

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 # NOTE: Order creates precedence
 #       Example: v_name exists in Bridge.pm and CiscoVTP.pm
--- a/lib/SNMP/Info/Layer3/CheckPoint.pm
+++ b/lib/SNMP/Info/Layer3/CheckPoint.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
--- a/lib/SNMP/Info/Layer3/Ciena.pm
+++ b/lib/SNMP/Info/Layer3/Ciena.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
--- a/lib/SNMP/Info/Layer3/Cisco.pm
+++ b/lib/SNMP/Info/Layer3/Cisco.pm
@@ -53,7 +53,7 @@ use SNMP::Info::Layer3;

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
--- a/lib/SNMP/Info/Layer3/CiscoASA.pm
+++ b/lib/SNMP/Info/Layer3/CiscoASA.pm
@@ -44,7 +44,7 @@ use SNMP::Info::Layer3;

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CiscoStats::MIBS, );

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

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CiscoStats::MIBS, );

--- a/lib/SNMP/Info/Layer3/CiscoSwitch.pm
+++ b/lib/SNMP/Info/Layer3/CiscoSwitch.pm
@@ -47,7 +47,7 @@ our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

@SNMP::Info::Layer3::CiscoSwitch::EXPORT_OK = qw//;

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer3::Cisco::MIBS,
--- a/lib/SNMP/Info/Layer3/Contivity.pm
+++ b/lib/SNMP/Info/Layer3/Contivity.pm
@@ -40,7 +40,7 @@ use SNMP::Info::Layer3;

 our ($VERSION, %GLOBALS, %FUNCS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
--- a/lib/SNMP/Info/Layer3/Cumulus.pm
+++ b/lib/SNMP/Info/Layer3/Cumulus.pm
@@ -44,7 +44,7 @@ use SNMP::Info::IEEE802dot3ad 'agg_ports_lag';

 our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
--- a/lib/SNMP/Info/Layer3/DLink.pm
+++ b/lib/SNMP/Info/Layer3/DLink.pm
@@ -38,7 +38,7 @@ use SNMP::Info::Layer3;

 our ($VERSION, %GLOBALS, %FUNCS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
@@ -74,17 +74,23 @@ $VERSION = '3.71';

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

+sub norm($) {
+    my $var = shift;
+    return norm_hash($var) if ref $var eq 'HASH';
+    return $var if defined $var and $var !~ /^\s*$/ and $var !~ 'NOSUCHOBJECT';
+}
+
+sub norm_hash {
+    my $hash = shift;
+    return $hash->{0} if $hash->{0} !~ /^\s*$/ and $hash->{0} !~ 'NOSUCHOBJECT';
+    print "norm_hash return undef\n";
+}
+
 sub model {
    my $dlink=shift;
-    my $id = $dlink->id();
-    my $model = &SNMP::translateObj($id);
-    return $id unless defined $model;
-    if (defined $model && $model !~ /dlink-products/) {
-	return $model;
-    } else {
-    	#If don't have a device MIB
-	return $dlink->description();
-    }
+    my $hw = norm($dlink->hwver()) || undef;
+    return $dlink->description() . ' HW:' . $hw if norm($hw);
+    return $dlink->description();
 }

 # ifDescr is the same for all interfaces in a class, but the ifName is
@@ -102,48 +108,80 @@ sub vendor {
    return 'dlink';
 }

+sub os {
+    return 'dlink-os';
+}
+
+sub os_ver {
+    my $obj = shift;
+    my $os_ver = undef;
+    my $model = $obj->model();
+    my $id = $obj->id();
+
+	#Due to the zoo of MIB from DLink by 1210 series
+	$os_ver = norm($obj->session()->get($id.'.1.3.0')) if $model =~ /1210/;
+
+    while (not defined $os_ver) {
+        $os_ver = norm($obj->dlink_fw());
+        last if norm($os_ver);
+
+        $os_ver = norm($obj->session()->get('enterprises.171.10.94.89.89.2.4.0'));
+        last;
+    }
+
+    my $brom = $obj->brom();
+    $os_ver .= ' bootrom:' . $brom if norm($brom) and norm($os_ver);
+
+    return $os_ver if norm($os_ver);
+}
+
 sub serial {
-    my $dlink = shift;
-    my $model = $dlink->model();
-    my $id = $dlink->id();
+    my $obj = shift;
+    my $model = $obj->model();
+    my $id = $obj->id();
    my $serial;
    if ($model =~ /1210/) {
 	#Due to the zoo of MIB from DLink by 1210 series
-	$serial->{0} = $dlink->session()->get($id.'.1.30.0');
+	$serial = norm($obj->session()->get($id.'.1.30.0'));
    } else {
-	$serial = $dlink->dlink_serial_no();
+	$serial = norm($obj->dlink_serial_no());
    }

-    return $serial->{0} if ( defined $serial->{0} and $serial->{0} !~ /^\s*$/ and $serial->{0} !~ 'NOSUCHOBJECT' );
-    return $dlink->SUPER::serial();
+    return $serial if norm($serial);
+    return $obj->SUPER::serial();
 }

-sub fwver {
-    my $dlink=shift;
-    my $model = $dlink->model();
-    my $id = $dlink->id();
-    my $fw;
-    if ($model =~ /1210/) {
-	#Due to the zoo of MIB from DLink by 1210 series
-	$fw->{0} = $dlink->session()->get($id.'.1.3.0');
-    } else {
-	$fw = $dlink->dlink_fw();
-    }
-    return $fw->{0} if ( defined $fw->{0} and $fw->{0} !~ /^\s*$/ and $fw->{0} !~ 'NOSUCHOBJECT');
+sub brom {
+    my $obj = shift;
+    my $brom = undef;
+
+    $brom = norm($obj->session()->get('enterprises.171.10.94.89.89.2.10.0'));
+
+    return $brom if norm($brom);
 }

 sub hwver {
-    my $dlink=shift;
-    my $model = $dlink->model();
-    my $id = $dlink->id();
-    my $hw;
-    if ($model =~ /1210/) {
+    my $obj=shift;
+    my $id = $obj->id();
+    my $model = &SNMP::translateObj($id);
+    my $hw = undef;
+
 	#Due to the zoo of MIB from DLink by 1210 series
-	$hw->{0} = $dlink->session()->get($id.'.1.2.0');
-    } else {
-	$hw = $dlink->dlink_hw();
+	$hw = norm($obj->session()->get($id.'.1.2.0')) if $model =~ /1210/;
+    $hw = undef if norm($hw);
+
+    while(! defined $hw){
+        $hw = norm($obj->dlink_hw());
+        last if norm($hw);
+
+        $hw = norm($obj->session()->get('rmon.19.3.0'));
+        last if norm($hw);
+
+        $hw = norm($obj->session()->get('enterprises.171.10.94.89.89.2.10.0'));
+        last;
    }
-    return $hw->{0} if ( defined $hw->{0} and $hw->{0} !~ /^\s*$/ and $hw->{0} !~ 'NOSUCHOBJECT');
+
+    return $hw if norm($hw);
 }

 sub stp_i_root_port {
--- a/lib/SNMP/Info/Layer3/Deliberant.pm
+++ b/lib/SNMP/Info/Layer3/Deliberant.pm
@@ -0,0 +1,133 @@
+# SNMP::Info::Layer3::Deliberant - SNMP Interface to Deliberant Devices
+#
+# Copyright (c) 2020 by 135.
+
+package SNMP::Info::Layer3::Deliberant;
+
+use strict;
+use warnings;
+use Exporter;
+use SNMP::Info::Layer3;
+
+@SNMP::Info::Layer3::Deliberant::ISA       = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::Deliberant::EXPORT_OK = qw//;
+
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
+
+$VERSION = '3.70-135';
+
+%MIBS = ( %SNMP::Info::Layer3::MIBS, );
+
+%GLOBALS = (
+    %SNMP::Info::Layer3::GLOBALS,
+    'model_oid' => 'enterprises.32761.3.1.1.1.3.0',
+    'submodel'    => 'enterprises.32761.3.1.1.1.2.0',
+);
+
+%FUNCS = ( %SNMP::Info::Layer3::FUNCS, );
+
+%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );
+
+sub vendor {
+    return 'deliberant';
+}
+
+sub os {
+    return 'deliberant-os';
+}
+
+sub os_ver {
+    my $obj = shift;
+    my $os_ver;
+    my $os_ver_oid = $obj->description;
+        $os_ver_oid =~ /\,\s(.*)/;
+        $os_ver = $1;
+
+    if (defined $os_ver) {
+        return $os_ver;
+    }
+    return 'unknown';
+}
+sub model {
+    my $obj = shift;
+    my $id = $obj->id();
+    my $model = $obj->model_oid || undef;
+    my $submodel = $obj->submodel || undef;
+    $model .= ' (' . $obj->submodel . ')' if defined($submodel);
+
+    return $model if defined $model;
+    return $obj->SUPER::model();
+}
+
+sub serial {
+    my $obj = shift;
+    return $obj->SUPER::serial();
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::Deliberant - SNMP Interface to Deliberant 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 Deliberant 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 'deliberant-oem'
+
+=item $obj->os()
+
+Returns 'rotek-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/Dell.pm
+++ b/lib/SNMP/Info/Layer3/Dell.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;

 our ($VERSION, %GLOBALS, %FUNCS, %MIBS, %MUNGE);

-$VERSION = '3.71';
+$VERSION = '3.70-135';

 %MIBS = (
    %SNMP::Info::Layer3::MIBS,
--- a/lib/SNMP/Info/Layer3/DigitalChina.pm
+++ b/lib/SNMP/Info/Layer3/DigitalChina.pm
@@ -0,0 +1,149 @@
+# SNMP::Info::Layer3::DigitalChina - SNMP Interface to DigitalChina Devices
+#
+# Copyright (c) 2020 by 135.
+
+package SNMP::Info::Layer3::DigitalChina;
+
+use strict;
+use warnings;
+use Exporter;
+use SNMP::Info::Layer3;
+
+@SNMP::Info::Layer3::DigitalChina::ISA       = qw/SNMP::Info::Layer3 Exporter/;
+@SNMP::Info::Layer3::DigitalChina::EXPORT_OK = qw//;
+
+our ($VERSION, %GLOBALS, %MIBS, %FUNCS, %MUNGE);
+
+$VERSION = '3.70-135';
+
+%MIBS = ( %SNMP::Info::Layer3::MIBS, );
+
+%GLOBALS = (
+    %SNMP::Info::Layer3::GLOBALS,
+    'model_oid'  => 'mib-2.47.1.1.1.1.2.1',
+    'serial_oid' => 'mib-2.47.1.1.1.1.11.1',
+    'hw_oid'     => 'mib-2.47.1.1.1.1.8.1',
+    'brom_oid'   => 'mib-2.47.1.1.1.1.9.1',
+    'os_ver_oid' => 'mib-2.47.1.1.1.1.10.1',
+);
+
+%FUNCS = ( %SNMP::Info::Layer3::FUNCS, );
+
+%MUNGE = ( %SNMP::Info::Layer3::MUNGE, );
+
+sub vendor {
+    return 'digital-china';
+}
+
+sub os {
+    return 'snr-os';
+}
+
+sub os_ver {
+    my $obj = shift;
+    my $os_ver = $obj->os_ver_oid || undef;
+    my $brom = $obj->brom_oid || undef;
+
+
+    return $os_ver . ' bootrom:' . $brom
+        if defined $os_ver and defined $brom;
+    return $os_ver
+        if defined $os_ver;
+    return 'unknown';
+}
+sub model {
+    my $obj = shift;
+    my $model = $obj->model_oid || undef;
+    my $hwver = $obj->hwver || undef;
+
+    return $model . ' HW:' . $hwver
+        if defined $model and defined $hwver;
+    return $model
+        if defined $model;
+    return $obj->SUPER::model();
+}
+
+sub hwver {
+    my $obj = shift;
+    my $hwver = $obj->hw_oid || undef;
+
+    return $hwver
+        if defined $hwver;
+}
+
+sub serial {
+    my $obj = shift;
+    my $serial = $obj->serial_oid || undef;
+
+    return $serial
+        if defined $serial;
+    return $obj->SUPER::serial();
+}
+
+1;
+__END__
+
+=head1 NAME
+
+SNMP::Info::Layer3::DigitalChina - SNMP Interface to DigitalChina 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 DigitalChina 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 'digital-china'
+
+=item $obj->os()
+
+Returns 'snr-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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrey Pazychev	db3a764d49	Dlink bugfix with syntax ($$ instead $)	2020-05-22 21:31:51 +03:00
Andrey Pazychev	62c7719186	Dlink RC. A hard different SNMP behavoiur for Dlink models. Sometimes return HASH, sometimes SCALAR and after that we got 'NOSUCHOBJET' or undef or normal value. Refactored. need to mass test for all Dlink.	2020-05-22 14:53:04 +03:00
Andrey Pazychev	daee793df6	NSC renamed vendor code	2020-05-21 04:55:38 +03:00
Andrey Pazychev	36e8f9be61	Raisecom bugfix	2020-05-21 04:41:26 +03:00
Andrey Pazychev	91ce23ce4a	Fix vendors accoding to http://oidref.com/ - Lucent - Deliberant - Raisecom - Rotek	2020-05-21 03:55:54 +03:00
Andrey Pazychev	535379b3a1	Tomsk. Fix Dlink model. Something fail -(. Undefined OID for DLink return NOSUCHOBJECT instead undef..	2020-05-21 02:23:58 +03:00
Andrey Pazychev	b9313c2ec0	Add vendor NSC (from China to Siberia).. Kemerovo RC.	2020-05-21 01:26:11 +03:00
Andrey Pazychev	a46f27792b	Paradyne bugfix regexp	2020-05-20 22:59:07 +03:00
Andrey Pazychev	43ca61299e	Rotek. serial sub for calling from Raisecom.	2020-05-20 22:48:43 +03:00
Andrey Pazychev	a3f0109f06	Add vendor Paradyne	2020-05-20 22:47:58 +03:00
Andrey Pazychev	159ab659cb	Raisecom. cosmetic	2020-05-20 22:47:37 +03:00
Andrey Pazychev	82032a10e1	Raisecom RC. more wide regexp HW	2020-05-20 22:23:27 +03:00
Andrey Pazychev	84c870f911	Raisecom. HW regexp bugfix	2020-05-20 22:18:57 +03:00
Andrey Pazychev	2b1b53e539	Raisecom RC. Next gen perl coding style.	2020-05-20 22:01:40 +03:00
Andrey Pazychev	b019f3fa06	WIP. Raisecom crap splitting	2020-05-20 21:08:14 +03:00
Andrey Pazychev	4cb3083993	Qtech. China could use different OID prefix for same one ObjectID. Fixed.	2020-05-20 17:49:53 +03:00
Andrey Pazychev	bed7dac4ac	Eltex added one more model suport	2020-05-20 17:30:13 +03:00
Andrey Pazychev	316a799fdb	Dlink. Added HW to model info	2020-05-20 17:12:25 +03:00
Andrey Pazychev	f2cbd163c9	WIP. Initial added vendor ECI. os version, serial, hw/fw not found.	2020-05-20 17:03:06 +03:00
Andrey Pazychev	e756091565	WIP. Qtech - more wide model mask for group enterprises.27514.1.3*	2020-05-20 16:53:05 +03:00
Andrey Pazychev	02f667a05b	Qtech. Added enterprises.27514.1.3.13	2020-05-20 16:46:49 +03:00
Andrey Pazychev	14e9da0fb7	Qtech vendor refactored.	2020-05-20 05:43:58 +03:00
Andrey Pazychev	08a632c053	WIP. Added Digital China vendor Added ASAM 73xx model for Lucent	2020-05-19 21:27:08 +03:00
Andrey Pazychev	fbf0bbe880	WIP. Accton, Proscend and Nag vendors initial suppport	2020-05-19 20:33:28 +03:00
Andrey Pazychev	4ce3fd8fb6	Increase version because Rotek	2020-05-18 02:58:05 +03:00
Andrey Pazychev	cae9878c60	Rotek added. Rotek and Raisercom used the same vendor id -(	2020-05-18 02:57:20 +03:00
Andrey Pazychev	cda629bf39	Rotek vendor UCN	2020-05-18 02:09:19 +03:00
Andrey Pazychev	396eb87b57	Raisecom. Crap with OS version same. Different style inside one ObjectID.	2020-05-18 01:42:35 +03:00
Andrey Pazychev	db06c8e75b	Raisecom. Crap with HW version different style inside one object ID	2020-05-18 00:58:45 +03:00
Andrey Pazychev	3fd9f1deda	Raisecom 886 RC1	2020-05-18 00:34:24 +03:00
Andrey Pazychev	b0e9185cca	WIP. Raisecom added 886.6.140 and 191	2020-05-18 00:21:57 +03:00
Andrey Pazychev	b73f0d8d57	WIP. Telindus	2020-05-17 23:43:02 +03:00
Andrey Pazychev	5655486b80	WIP. Reaisecom	2020-05-17 23:31:22 +03:00
Andrey Pazychev	cc935a580d	WIP. Added raisecom 41752	2020-05-17 23:12:19 +03:00
Andrey Pazychev	40ff825a3a	Eltex done. I hope...	2020-05-17 20:48:30 +03:00
Andrey Pazychev	4bb40483e6	WIP. Eltex crap	2020-05-17 20:38:53 +03:00
Andrey Pazychev	8c98750541	WIP. Eltex hw crap	2020-05-17 20:32:21 +03:00
Andrey Pazychev	57aa73f613	Eltex hw version crap -(	2020-05-17 19:02:34 +03:00
Andrey Pazychev	fe3bc6afe0	Fix Eltex two verdor numer DSLAM MXA64	2020-05-17 17:07:34 +03:00
Andrey Pazychev	10e0a53b3c	Added Eltex DSLAM 35265.1.28	2020-05-17 16:53:28 +03:00
Andrey Pazychev	98d2005bae	Eltex fix undef model	2020-05-17 16:17:47 +03:00
Andrey Pazychev	272b56d625	Fix Eltex a lot model. Add Telindus Add serial to Zixel	2020-05-17 15:18:08 +03:00
Andrey Pazychev	aa44871f83	Zyxel basic support	2020-05-16 23:22:02 +03:00
Andrey Pazychev	27930d5e50	Add support Raisecom	2020-05-09 19:15:00 +03:00
Andrey Pazychev	a0d3cdcf9f	Eltex run also Layer 2	2020-05-09 13:13:08 +03:00
Andrey Pazychev	8317923f28	Eltex support. Added one Lucend OID	2020-05-09 05:04:39 +03:00
Andrey Pazychev	fc71e2d88d	Small fixes. OIDs moved to MIBs	2020-05-09 05:03:55 +03:00
Andrey Pazychev	f96d0df182	Qtech and Carelink support	2020-05-08 20:47:41 +03:00
Andrey Pazychev	1dc4baf1d9	version 135	2020-05-08 20:47:13 +03:00