This is an automated email from the git hooks/post-receive script. carnil pushed a commit to annotated tag upstream/3.14 in repository libsnmp-info-perl.
commit a845a358623813ca571bb0bf4985d05de828a57b Author: Salvatore Bonaccorso <car...@debian.org> Date: Sun Jun 8 11:48:26 2014 +0200 Imported Upstream version 3.14 --- ChangeLog | 13 ++++++++++++ DeviceMatrix.txt | 2 +- Info.pm | 6 +++--- Info/AMAP.pm | 2 +- Info/AdslLine.pm | 2 +- Info/Aggregate.pm | 2 +- Info/Airespace.pm | 2 +- Info/Bridge.pm | 2 +- Info/CDP.pm | 2 +- Info/CiscoAgg.pm | 2 +- Info/CiscoConfig.pm | 2 +- Info/CiscoImage.pm | 2 +- Info/CiscoPortSecurity.pm | 2 +- Info/CiscoPower.pm | 2 +- Info/CiscoQOS.pm | 2 +- Info/CiscoRTT.pm | 2 +- Info/CiscoStack.pm | 2 +- Info/CiscoStats.pm | 2 +- Info/CiscoStpExtensions.pm | 2 +- Info/CiscoVTP.pm | 2 +- Info/EDP.pm | 2 +- Info/Entity.pm | 2 +- Info/EtherLike.pm | 2 +- Info/FDP.pm | 2 +- Info/IEEE802dot11.pm | 2 +- Info/IEEE802dot3ad.pm | 2 +- Info/IPv6.pm | 2 +- Info/LLDP.pm | 10 ++++++--- Info/Layer1.pm | 2 +- Info/Layer1/Allied.pm | 2 +- Info/Layer1/Asante.pm | 2 +- Info/Layer1/Bayhub.pm | 2 +- Info/Layer1/Cyclades.pm | 2 +- Info/Layer1/S3000.pm | 2 +- Info/Layer2.pm | 2 +- Info/Layer2/Airespace.pm | 2 +- Info/Layer2/Aironet.pm | 2 +- Info/Layer2/Allied.pm | 2 +- Info/Layer2/Baystack.pm | 2 +- Info/Layer2/C1900.pm | 2 +- Info/Layer2/C2900.pm | 2 +- Info/Layer2/Catalyst.pm | 2 +- Info/Layer2/Centillion.pm | 2 +- Info/Layer2/Cisco.pm | 2 +- Info/Layer2/CiscoSB.pm | 2 +- Info/Layer2/HP.pm | 32 ++++++++++++++++++++++++++++- Info/Layer2/HP4000.pm | 2 +- Info/Layer2/HPVC.pm | 9 +++++++-- Info/Layer2/Kentrox.pm | 2 +- Info/Layer2/N2270.pm | 2 +- Info/Layer2/NAP222x.pm | 2 +- Info/Layer2/NWSS2300.pm | 2 +- Info/Layer2/Netgear.pm | 2 +- Info/Layer2/Orinoco.pm | 2 +- Info/Layer2/Trapeze.pm | 2 +- Info/Layer2/ZyXEL_DSLAM.pm | 2 +- Info/Layer3.pm | 2 +- Info/Layer3/Aironet.pm | 2 +- Info/Layer3/AlcatelLucent.pm | 2 +- Info/Layer3/AlteonAD.pm | 2 +- Info/Layer3/Altiga.pm | 2 +- Info/Layer3/Arista.pm | 2 +- Info/Layer3/Aruba.pm | 2 +- Info/Layer3/BayRS.pm | 2 +- Info/Layer3/BlueCoatSG.pm | 2 +- Info/Layer3/C3550.pm | 2 +- Info/Layer3/C4000.pm | 2 +- Info/Layer3/C6500.pm | 2 +- Info/Layer3/Cisco.pm | 2 +- Info/Layer3/CiscoASA.pm | 2 +- Info/Layer3/CiscoFWSM.pm | 2 +- Info/Layer3/Contivity.pm | 2 +- Info/Layer3/Dell.pm | 2 +- Info/Layer3/Enterasys.pm | 2 +- Info/Layer3/Extreme.pm | 2 +- Info/Layer3/F5.pm | 2 +- Info/Layer3/Force10.pm | 2 +- Info/Layer3/Foundry.pm | 2 +- Info/Layer3/H3C.pm | 25 +++++++++++++++++++---- Info/Layer3/HP9300.pm | 2 +- Info/Layer3/IBMGbTor.pm | 2 +- Info/Layer3/Juniper.pm | 2 +- Info/Layer3/Lantronix.pm | 2 +- Info/Layer3/Microsoft.pm | 2 +- Info/Layer3/Mikrotik.pm | 48 +++++++++++++++++++++++++++++++++++++++++--- Info/Layer3/N1600.pm | 2 +- Info/Layer3/NetSNMP.pm | 2 +- Info/Layer3/Netscreen.pm | 2 +- Info/Layer3/Nexus.pm | 2 +- Info/Layer3/PacketFront.pm | 2 +- Info/Layer3/Passport.pm | 2 +- Info/Layer3/Pf.pm | 2 +- Info/Layer3/Pica8.pm | 2 +- Info/Layer3/SonicWALL.pm | 2 +- Info/Layer3/Steelhead.pm | 2 +- Info/Layer3/Sun.pm | 2 +- Info/Layer3/Tasman.pm | 2 +- Info/Layer3/Timetra.pm | 2 +- Info/Layer7.pm | 2 +- Info/Layer7/APC.pm | 2 +- Info/Layer7/Neoteris.pm | 2 +- Info/Layer7/Netscaler.pm | 2 +- Info/MAU.pm | 2 +- Info/NortelStack.pm | 2 +- Info/PowerEthernet.pm | 2 +- Info/RapidCity.pm | 2 +- Info/SONMP.pm | 2 +- META.json | 14 ++++++------- META.yml | 4 ++-- 109 files changed, 236 insertions(+), 125 deletions(-) diff --git a/ChangeLog b/ChangeLog index be53704..2a8e2a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ SNMP::Info - Friendly OO-style interface to Network devices using SNMP. +version 3.14 (2014-06-07) + + [ENHANCEMENTS] + + * Improvements to Mikrotik module (Alex Z) + * Don't unshift length from broken lldpRemManAddrTable implementations (G. Shtern) + * 802.3ad LAG support in Layer3::H3C + * Add LLDP capabilities to Layer2::HPVC class + + [BUG FIXES] + + * Return correct VLAN info with qb_fw_table() on Layer2::HP + version 3.13 (2014-03-27) [ENHANCEMENTS] diff --git a/DeviceMatrix.txt b/DeviceMatrix.txt index bb25154..d846d8d 100644 --- a/DeviceMatrix.txt +++ b/DeviceMatrix.txt @@ -386,7 +386,7 @@ note: The Cisco 3000 device can return duplicate interface names, while Netdisco device: ASA note: The Cisco ASA is the successor of the PIX which was bought from Altiga Networks. -Class: Layer3::CiscoASA +class: Layer3::CiscoASA device-family: 1000 duplex: no diff --git a/Info.pm b/Info.pm index 982e167..db5dfaf 100644 --- a/Info.pm +++ b/Info.pm @@ -24,7 +24,7 @@ use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG %SPEED_MAP $NOSUCH $BIGINT $REPEATERS/; -$VERSION = '3.13'; +$VERSION = '3.14'; =head1 NAME @@ -32,7 +32,7 @@ SNMP::Info - OO Interface to Network devices and MIBs through SNMP =head1 VERSION -SNMP::Info - Version 3.12 +SNMP::Info - Version 3.14 =head1 AUTHOR @@ -108,7 +108,7 @@ See L<http://netdisco.org/doc/DeviceMatrix.html> or L<DeviceMatrix.txt> for more =head1 SUPPORT Please direct all support, help, and bug requests to the snmp-info-users -Mailing List at <http://lists.sourceforge.net/lists/listinfo/snmp-info-users>. +Mailing List at L<http://lists.sourceforge.net/lists/listinfo/snmp-info-users>. =head1 DESCRIPTION diff --git a/Info/AMAP.pm b/Info/AMAP.pm index 36e9cec..f9ccd35 100644 --- a/Info/AMAP.pm +++ b/Info/AMAP.pm @@ -38,7 +38,7 @@ use SNMP::Info; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'ALCATEL-IND1-INTERSWITCH-PROTOCOL-MIB' => 'aipAMAPRemDeviceType', ); diff --git a/Info/AdslLine.pm b/Info/AdslLine.pm index eb62c61..95ae926 100644 --- a/Info/AdslLine.pm +++ b/Info/AdslLine.pm @@ -38,7 +38,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'ADSL-LINE-MIB' => 'adslLineType' ); diff --git a/Info/Aggregate.pm b/Info/Aggregate.pm index 0491376..cbad7a1 100644 --- a/Info/Aggregate.pm +++ b/Info/Aggregate.pm @@ -38,7 +38,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = (); # IF-MIB diff --git a/Info/Airespace.pm b/Info/Airespace.pm index b92b8d1..d1cdf59 100644 --- a/Info/Airespace.pm +++ b/Info/Airespace.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::MIBS, diff --git a/Info/Bridge.pm b/Info/Bridge.pm index 0417573..ab9d976 100644 --- a/Info/Bridge.pm +++ b/Info/Bridge.pm @@ -42,7 +42,7 @@ use SNMP::Info; use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'BRIDGE-MIB' => 'dot1dBaseBridgeAddress', diff --git a/Info/CDP.pm b/Info/CDP.pm index f6a36b2..eccaa3a 100644 --- a/Info/CDP.pm +++ b/Info/CDP.pm @@ -43,7 +43,7 @@ use SNMP::Info; use vars qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT %CDP_CAPABILITIES/; -$VERSION = '3.13'; +$VERSION = '3.14'; # Five data structures required by SNMP::Info %MIBS = ( 'CISCO-CDP-MIB' => 'cdpGlobalRun' ); diff --git a/Info/CiscoAgg.pm b/Info/CiscoAgg.pm index e12cb07..5840667 100644 --- a/Info/CiscoAgg.pm +++ b/Info/CiscoAgg.pm @@ -43,7 +43,7 @@ use SNMP::Info::IEEE802dot3ad 'agg_ports_lag'; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::IEEE802dot3ad::MIBS, diff --git a/Info/CiscoConfig.pm b/Info/CiscoConfig.pm index b941b8a..ae4f1e9 100644 --- a/Info/CiscoConfig.pm +++ b/Info/CiscoConfig.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'CISCO-CONFIG-COPY-MIB' => 'ccCopyTable', diff --git a/Info/CiscoImage.pm b/Info/CiscoImage.pm index 3704c01..30e57df 100644 --- a/Info/CiscoImage.pm +++ b/Info/CiscoImage.pm @@ -38,7 +38,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'CISCO-IMAGE-MIB' => 'ciscoImageString', ); diff --git a/Info/CiscoPortSecurity.pm b/Info/CiscoPortSecurity.pm index 7272015..0c2ccf2 100644 --- a/Info/CiscoPortSecurity.pm +++ b/Info/CiscoPortSecurity.pm @@ -38,7 +38,7 @@ use Exporter; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PAECAPABILITIES/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'CISCO-PORT-SECURITY-MIB' => 'ciscoPortSecurityMIB', diff --git a/Info/CiscoPower.pm b/Info/CiscoPower.pm index 1b135ab..ebc4bc7 100644 --- a/Info/CiscoPower.pm +++ b/Info/CiscoPower.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'CISCO-POWER-ETHERNET-EXT-MIB' => 'cpeExtPsePortEntPhyIndex', 'CISCO-CDP-MIB' => 'cdpCachePowerConsumption' ); diff --git a/Info/CiscoQOS.pm b/Info/CiscoQOS.pm index 52a5add..822832c 100644 --- a/Info/CiscoQOS.pm +++ b/Info/CiscoQOS.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'CISCO-CLASS-BASED-QOS-MIB' => 'cbQosIfIndex', ); diff --git a/Info/CiscoRTT.pm b/Info/CiscoRTT.pm index 30229a2..2fe2d90 100644 --- a/Info/CiscoRTT.pm +++ b/Info/CiscoRTT.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'CISCO-RTTMON-MIB' => 'rttMonCtrlAdminOwner', ); diff --git a/Info/CiscoStack.pm b/Info/CiscoStack.pm index 96e1286..a9640aa 100644 --- a/Info/CiscoStack.pm +++ b/Info/CiscoStack.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'CISCO-STACK-MIB' => 'ciscoStackMIB', ); diff --git a/Info/CiscoStats.pm b/Info/CiscoStats.pm index 29bf0fe..1ce579e 100644 --- a/Info/CiscoStats.pm +++ b/Info/CiscoStats.pm @@ -42,7 +42,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'SNMPv2-MIB' => 'sysDescr', diff --git a/Info/CiscoStpExtensions.pm b/Info/CiscoStpExtensions.pm index ef07ce4..30adf57 100644 --- a/Info/CiscoStpExtensions.pm +++ b/Info/CiscoStpExtensions.pm @@ -36,7 +36,7 @@ use SNMP::Info::Bridge; use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT $INIT/; -$VERSION = '3.13'; +$VERSION = '3.14'; @SNMP::Info::CiscoStpExtensions::ISA = qw/SNMP::Info::Bridge SNMP::Info Exporter/; @SNMP::Info::CiscoStpExtensions::EXPORT_OK = qw//; diff --git a/Info/CiscoVTP.pm b/Info/CiscoVTP.pm index c0f6fc3..da68fc0 100644 --- a/Info/CiscoVTP.pm +++ b/Info/CiscoVTP.pm @@ -41,7 +41,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'CISCO-VTP-MIB' => 'vtpVlanName', diff --git a/Info/EDP.pm b/Info/EDP.pm index 928239f..4a323fc 100644 --- a/Info/EDP.pm +++ b/Info/EDP.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'EXTREME-EDP-MIB' => 'extremeEdpPortIfIndex', diff --git a/Info/Entity.pm b/Info/Entity.pm index 0502f29..9ed11c1 100644 --- a/Info/Entity.pm +++ b/Info/Entity.pm @@ -41,7 +41,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'ENTITY-MIB' => 'entPhysicalSerialNum' ); diff --git a/Info/EtherLike.pm b/Info/EtherLike.pm index 56cd89c..bc62679 100644 --- a/Info/EtherLike.pm +++ b/Info/EtherLike.pm @@ -41,7 +41,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'EtherLike-MIB' => 'etherMIB' ); diff --git a/Info/FDP.pm b/Info/FDP.pm index cf858e5..5609057 100644 --- a/Info/FDP.pm +++ b/Info/FDP.pm @@ -42,7 +42,7 @@ use SNMP::Info; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'FOUNDRY-SN-SWITCH-GROUP-MIB' => 'snFdpGlobalRun' ); diff --git a/Info/IEEE802dot11.pm b/Info/IEEE802dot11.pm index a2fb2c1..0344b3b 100644 --- a/Info/IEEE802dot11.pm +++ b/Info/IEEE802dot11.pm @@ -38,7 +38,7 @@ use Exporter; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'IEEE802dot11-MIB' => 'dot11DesiredSSID', ); diff --git a/Info/IEEE802dot3ad.pm b/Info/IEEE802dot3ad.pm index 536e452..84d6b4b 100644 --- a/Info/IEEE802dot3ad.pm +++ b/Info/IEEE802dot3ad.pm @@ -43,7 +43,7 @@ use SNMP::Info::Aggregate; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Aggregate::MIBS, diff --git a/Info/IPv6.pm b/Info/IPv6.pm index 625014f..4e1988f 100644 --- a/Info/IPv6.pm +++ b/Info/IPv6.pm @@ -44,7 +44,7 @@ use constant { IPV6MIB => 3, }; -$VERSION = '3.13'; +$VERSION = '3.14'; diff --git a/Info/LLDP.pm b/Info/LLDP.pm index c872aef..4311933 100644 --- a/Info/LLDP.pm +++ b/Info/LLDP.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'LLDP-MIB' => 'lldpLocSysCapEnabled', @@ -90,8 +90,12 @@ sub hasLLDP { # We may be have LLDP, but nothing in lldpRemoteSystemsData Tables # so we could be running LLDP but not return any useful information my $lldp_cap = $lldp->lldp_sys_cap(); - return 1 if defined $lldp_cap; + + # If the device doesn't return local system capabilities, fallback by checking if it would report neighbors + my $lldp_rem = $lldp->lldp_rem_id() || {}; + return 1 if scalar keys %$lldp_rem; + return; } @@ -298,7 +302,7 @@ sub _lldp_addr_index { my @oids = split( /\./, $idx ); my $index = join( '.', splice( @oids, 0, 3 ) ); my $proto = shift(@oids); - my $length = shift(@oids); + my $length = shift(@oids) if scalar @oids > 4; # IPv4 if ( $proto == 1 ) { diff --git a/Info/Layer1.pm b/Info/Layer1.pm index 6270ee2..76396cb 100644 --- a/Info/Layer1.pm +++ b/Info/Layer1.pm @@ -41,7 +41,7 @@ use SNMP::Info; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::MIBS, 'SNMP-REPEATER-MIB' => 'rptrPortGroupIndex' ); diff --git a/Info/Layer1/Allied.pm b/Info/Layer1/Allied.pm index 86b4474..4ac7816 100644 --- a/Info/Layer1/Allied.pm +++ b/Info/Layer1/Allied.pm @@ -41,7 +41,7 @@ use SNMP::Info::Layer1; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; # Set for No CDP %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, 'root_ip' => 'actualIPAddr', ); diff --git a/Info/Layer1/Asante.pm b/Info/Layer1/Asante.pm index ec5e8d6..48c7dd9 100644 --- a/Info/Layer1/Asante.pm +++ b/Info/Layer1/Asante.pm @@ -41,7 +41,7 @@ use SNMP::Info::Layer1; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; # Set for No CDP %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, ); diff --git a/Info/Layer1/Bayhub.pm b/Info/Layer1/Bayhub.pm index 6be7a8d..37c9951 100644 --- a/Info/Layer1/Bayhub.pm +++ b/Info/Layer1/Bayhub.pm @@ -42,7 +42,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer2::MIBS, diff --git a/Info/Layer1/Cyclades.pm b/Info/Layer1/Cyclades.pm index 5b1cf7a..4123e1e 100644 --- a/Info/Layer1/Cyclades.pm +++ b/Info/Layer1/Cyclades.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer1; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer1::MIBS, diff --git a/Info/Layer1/S3000.pm b/Info/Layer1/S3000.pm index 5ce30ab..acfa381 100644 --- a/Info/Layer1/S3000.pm +++ b/Info/Layer1/S3000.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer2::MIBS, diff --git a/Info/Layer2.pm b/Info/Layer2.pm index bf361db..50ef075 100644 --- a/Info/Layer2.pm +++ b/Info/Layer2.pm @@ -45,7 +45,7 @@ use SNMP::Info::PowerEthernet; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::MIBS, %SNMP::Info::Bridge::MIBS, diff --git a/Info/Layer2/Airespace.pm b/Info/Layer2/Airespace.pm index bb06415..cb16148 100644 --- a/Info/Layer2/Airespace.pm +++ b/Info/Layer2/Airespace.pm @@ -40,7 +40,7 @@ use SNMP::Info::Airespace; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::MIBS, %SNMP::Info::Bridge::MIBS, diff --git a/Info/Layer2/Aironet.pm b/Info/Layer2/Aironet.pm index d2d269c..b314e4c 100644 --- a/Info/Layer2/Aironet.pm +++ b/Info/Layer2/Aironet.pm @@ -49,7 +49,7 @@ use SNMP::Info::IEEE802dot11; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %GLOBALS = ( %SNMP::Info::IEEE802dot11::GLOBALS, diff --git a/Info/Layer2/Allied.pm b/Info/Layer2/Allied.pm index d3ca92c..93de945 100644 --- a/Info/Layer2/Allied.pm +++ b/Info/Layer2/Allied.pm @@ -40,7 +40,7 @@ use SNMP::Info::Layer1; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS ); diff --git a/Info/Layer2/Baystack.pm b/Info/Layer2/Baystack.pm index 5e2711c..51dee6c 100644 --- a/Info/Layer2/Baystack.pm +++ b/Info/Layer2/Baystack.pm @@ -46,7 +46,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::LLDP::MIBS, diff --git a/Info/Layer2/C1900.pm b/Info/Layer2/C1900.pm index 45caa64..20fec03 100644 --- a/Info/Layer2/C1900.pm +++ b/Info/Layer2/C1900.pm @@ -46,7 +46,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS, diff --git a/Info/Layer2/C2900.pm b/Info/Layer2/C2900.pm index 74039e4..09aa083 100644 --- a/Info/Layer2/C2900.pm +++ b/Info/Layer2/C2900.pm @@ -47,7 +47,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS, %SNMP::Info::CiscoConfig::GLOBALS, diff --git a/Info/Layer2/Catalyst.pm b/Info/Layer2/Catalyst.pm index c29fee2..214f86d 100644 --- a/Info/Layer2/Catalyst.pm +++ b/Info/Layer2/Catalyst.pm @@ -49,7 +49,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer2::MIBS, %SNMP::Info::CiscoPortSecurity::MIBS, diff --git a/Info/Layer2/Centillion.pm b/Info/Layer2/Centillion.pm index 9210969..30d19d9 100644 --- a/Info/Layer2/Centillion.pm +++ b/Info/Layer2/Centillion.pm @@ -43,7 +43,7 @@ use SNMP::Info::SONMP; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::MIBS, diff --git a/Info/Layer2/Cisco.pm b/Info/Layer2/Cisco.pm index c885175..13fa0d7 100644 --- a/Info/Layer2/Cisco.pm +++ b/Info/Layer2/Cisco.pm @@ -50,7 +50,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer2::MIBS, %SNMP::Info::CiscoConfig::MIBS, diff --git a/Info/Layer2/CiscoSB.pm b/Info/Layer2/CiscoSB.pm index 8665dd5..72932cb 100644 --- a/Info/Layer2/CiscoSB.pm +++ b/Info/Layer2/CiscoSB.pm @@ -50,7 +50,7 @@ use SNMP::Info::CDP; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; # This will be filled in with the device's index into the EntPhysicalEntry # table by the serial() function. diff --git a/Info/Layer2/HP.pm b/Info/Layer2/HP.pm index 2fb8c19..66298a0 100644 --- a/Info/Layer2/HP.pm +++ b/Info/Layer2/HP.pm @@ -52,7 +52,7 @@ use SNMP::Info::Aggregate; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, @@ -536,6 +536,30 @@ sub set_i_vlan_tagged { sub agg_ports { return agg_ports_ifstack(@_) } +sub qb_fw_vlan { + my $hp = shift; + my $partial = shift; + my $qb_fw_vlan = $hp->SUPER::qb_fw_vlan($partial); + + my $fdb_to_dot1q = {}; + my $fdb_id = $hp->dot1qVlanFdbId(0); + foreach my $fdb_entry (keys %$fdb_id) { + my ($timemark, $vlan_id) = split(/\./, $fdb_entry); + $fdb_to_dot1q->{$fdb_id->{$fdb_entry}} = $vlan_id; + } + foreach my $learn (keys %$qb_fw_vlan) { + my $fdb_idx = $qb_fw_vlan->{$learn}; + if (exists $fdb_to_dot1q->{$fdb_idx}) { + $qb_fw_vlan->{$learn} = $fdb_to_dot1q->{$fdb_idx}; + } + } + + return $qb_fw_vlan; +} + + + + 1; __END__ @@ -803,6 +827,12 @@ Power supplied by PoE ports, in milliwatts Returns what version of STP the device is running. (C<hpicfBridgeRstpForceVersion> with fallback to inherited stp_ver()) +=item $hp->qb_fw_vlan() + +Returns reference to hash of forwarding table entries VLAN ID + +(C<dot1qFdbId>), (C<rcBridgeTpFdbVlanId>) + =back =head2 Globals imported from SNMP::Info::Layer2 diff --git a/Info/Layer2/HP4000.pm b/Info/Layer2/HP4000.pm index 37feb45..c1e2b73 100644 --- a/Info/Layer2/HP4000.pm +++ b/Info/Layer2/HP4000.pm @@ -44,7 +44,7 @@ use SNMP::Info::CDP; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer2/HPVC.pm b/Info/Layer2/HPVC.pm index 143cb09..d6eb8db 100644 --- a/Info/Layer2/HPVC.pm +++ b/Info/Layer2/HPVC.pm @@ -33,17 +33,19 @@ package SNMP::Info::Layer2::HPVC; use strict; use Exporter; use SNMP::Info::Layer2; +use SNMP::Info::LLDP; @SNMP::Info::Layer2::HPVC::ISA - = qw/SNMP::Info::Layer2 Exporter/; + = qw/SNMP::Info::Layer2 SNMP::Info::LLDP Exporter/; @SNMP::Info::Layer2::HPVC::EXPORT_OK = qw//; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer2::MIBS, + %SNMP::Info::LLDP::MIBS, 'HPVC-MIB' => 'vcDomainName', 'CPQSINFO-MIB' => 'cpqSiSysSerialNum', 'HPVCMODULE-MIB' => 'vcModuleDomainName', @@ -51,6 +53,7 @@ $VERSION = '3.13'; %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS, + %SNMP::Info::LLDP::GLOBALS, 'serial1' => 'cpqSiSysSerialNum.0', 'os_ver' => 'cpqHoSWRunningVersion.1', 'os_bin' => 'cpqHoFwVerVersion.1', @@ -59,12 +62,14 @@ $VERSION = '3.13'; %FUNCS = ( %SNMP::Info::Layer2::FUNCS, + %SNMP::Info::LLDP::FUNCS, ); %MUNGE = ( # Inherit all the built in munging %SNMP::Info::Layer2::MUNGE, + %SNMP::Info::LLDP::MUNGE, ); diff --git a/Info/Layer2/Kentrox.pm b/Info/Layer2/Kentrox.pm index 7b7cbe9..fa843c8 100644 --- a/Info/Layer2/Kentrox.pm +++ b/Info/Layer2/Kentrox.pm @@ -36,7 +36,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer2::MIBS, diff --git a/Info/Layer2/N2270.pm b/Info/Layer2/N2270.pm index ede0ca5..bb5f751 100644 --- a/Info/Layer2/N2270.pm +++ b/Info/Layer2/N2270.pm @@ -43,7 +43,7 @@ use SNMP::Info::Airespace; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::MIBS, %SNMP::Info::Bridge::MIBS, diff --git a/Info/Layer2/NAP222x.pm b/Info/Layer2/NAP222x.pm index d75fa9f..bc118ee 100644 --- a/Info/Layer2/NAP222x.pm +++ b/Info/Layer2/NAP222x.pm @@ -42,7 +42,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer2::MIBS, %SNMP::Info::IEEE802dot11::MIBS, diff --git a/Info/Layer2/NWSS2300.pm b/Info/Layer2/NWSS2300.pm index 85f60d4..cac9988 100644 --- a/Info/Layer2/NWSS2300.pm +++ b/Info/Layer2/NWSS2300.pm @@ -39,7 +39,7 @@ use SNMP::Info::Bridge; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::MIBS, diff --git a/Info/Layer2/Netgear.pm b/Info/Layer2/Netgear.pm index aa1a8d8..3511a0c 100644 --- a/Info/Layer2/Netgear.pm +++ b/Info/Layer2/Netgear.pm @@ -41,7 +41,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; # This will be filled in with the device's index into the EntPhysicalEntry # table by the serial() function. diff --git a/Info/Layer2/Orinoco.pm b/Info/Layer2/Orinoco.pm index a1a06bf..d443925 100644 --- a/Info/Layer2/Orinoco.pm +++ b/Info/Layer2/Orinoco.pm @@ -41,7 +41,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer2::MIBS, diff --git a/Info/Layer2/Trapeze.pm b/Info/Layer2/Trapeze.pm index d33d763..1b72a72 100644 --- a/Info/Layer2/Trapeze.pm +++ b/Info/Layer2/Trapeze.pm @@ -40,7 +40,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::MIBS, diff --git a/Info/Layer2/ZyXEL_DSLAM.pm b/Info/Layer2/ZyXEL_DSLAM.pm index 26ca559..ed8110e 100644 --- a/Info/Layer2/ZyXEL_DSLAM.pm +++ b/Info/Layer2/ZyXEL_DSLAM.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer2; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; # Set for No CDP %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS ); diff --git a/Info/Layer3.pm b/Info/Layer3.pm index 683da78..66ee946 100644 --- a/Info/Layer3.pm +++ b/Info/Layer3.pm @@ -51,7 +51,7 @@ use SNMP::Info::AdslLine; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::MIBS, diff --git a/Info/Layer3/Aironet.pm b/Info/Layer3/Aironet.pm index ce45986..dc0dbbc 100644 --- a/Info/Layer3/Aironet.pm +++ b/Info/Layer3/Aironet.pm @@ -41,7 +41,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/AlcatelLucent.pm b/Info/Layer3/AlcatelLucent.pm index d5dc979..35955c1 100644 --- a/Info/Layer3/AlcatelLucent.pm +++ b/Info/Layer3/AlcatelLucent.pm @@ -49,7 +49,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/AlteonAD.pm b/Info/Layer3/AlteonAD.pm index 9f4dd6e..f8fc955 100644 --- a/Info/Layer3/AlteonAD.pm +++ b/Info/Layer3/AlteonAD.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Altiga.pm b/Info/Layer3/Altiga.pm index cc09b2b..cf0992a 100644 --- a/Info/Layer3/Altiga.pm +++ b/Info/Layer3/Altiga.pm @@ -40,7 +40,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE $int_include_vpn $fake_idx $type_class/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Arista.pm b/Info/Layer3/Arista.pm index 2566f99..3a47e53 100644 --- a/Info/Layer3/Arista.pm +++ b/Info/Layer3/Arista.pm @@ -48,7 +48,7 @@ use SNMP::Info::Aggregate; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Aruba.pm b/Info/Layer3/Aruba.pm index a665cab..1929fcd 100644 --- a/Info/Layer3/Aruba.pm +++ b/Info/Layer3/Aruba.pm @@ -40,7 +40,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/BayRS.pm b/Info/Layer3/BayRS.pm index 96fb6fb..cbf2bce 100644 --- a/Info/Layer3/BayRS.pm +++ b/Info/Layer3/BayRS.pm @@ -43,7 +43,7 @@ use SNMP::Info::Bridge; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE %MODEL_MAP %MODID_MAP %PROCID_MAP/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::MIBS, diff --git a/Info/Layer3/BlueCoatSG.pm b/Info/Layer3/BlueCoatSG.pm index d155ac1..70a56d1 100644 --- a/Info/Layer3/BlueCoatSG.pm +++ b/Info/Layer3/BlueCoatSG.pm @@ -36,7 +36,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer2::MIBS, %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/C3550.pm b/Info/Layer3/C3550.pm index 018f85d..741239f 100644 --- a/Info/Layer3/C3550.pm +++ b/Info/Layer3/C3550.pm @@ -64,7 +64,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; @SNMP::Info::Layer3::C3550::EXPORT_OK = qw//; -$VERSION = '3.13'; +$VERSION = '3.14'; # NOTE: Order creates precedence # Example: v_name exists in Bridge.pm and CiscoVTP.pm diff --git a/Info/Layer3/C4000.pm b/Info/Layer3/C4000.pm index 9d8736d..b64eebb 100644 --- a/Info/Layer3/C4000.pm +++ b/Info/Layer3/C4000.pm @@ -50,7 +50,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/C6500.pm b/Info/Layer3/C6500.pm index 01f49e7..6581229 100644 --- a/Info/Layer3/C6500.pm +++ b/Info/Layer3/C6500.pm @@ -70,7 +70,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; # NOTE: Order creates precedence # Example: v_name exists in Bridge.pm and CiscoVTP.pm diff --git a/Info/Layer3/Cisco.pm b/Info/Layer3/Cisco.pm index d1e7945..11ff2ec 100644 --- a/Info/Layer3/Cisco.pm +++ b/Info/Layer3/Cisco.pm @@ -52,7 +52,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/CiscoASA.pm b/Info/Layer3/CiscoASA.pm index 66c5d34..e71352f 100644 --- a/Info/Layer3/CiscoASA.pm +++ b/Info/Layer3/CiscoASA.pm @@ -55,7 +55,7 @@ use SNMP::Info::Layer3::Cisco; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::Cisco::MIBS, diff --git a/Info/Layer3/CiscoFWSM.pm b/Info/Layer3/CiscoFWSM.pm index 650e3b6..648329d 100644 --- a/Info/Layer3/CiscoFWSM.pm +++ b/Info/Layer3/CiscoFWSM.pm @@ -40,7 +40,7 @@ use SNMP::Info::Layer3::Cisco; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::Cisco::MIBS, diff --git a/Info/Layer3/Contivity.pm b/Info/Layer3/Contivity.pm index f035b87..ceb97f0 100644 --- a/Info/Layer3/Contivity.pm +++ b/Info/Layer3/Contivity.pm @@ -42,7 +42,7 @@ use SNMP::Info::Entity; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::MIBS, %SNMP::Info::Layer3::MIBS, %SNMP::Info::Entity::MIBS, diff --git a/Info/Layer3/Dell.pm b/Info/Layer3/Dell.pm index 62c243c..03f5511 100644 --- a/Info/Layer3/Dell.pm +++ b/Info/Layer3/Dell.pm @@ -40,7 +40,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Enterasys.pm b/Info/Layer3/Enterasys.pm index fc13a07..c9d0b6f 100644 --- a/Info/Layer3/Enterasys.pm +++ b/Info/Layer3/Enterasys.pm @@ -44,7 +44,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CDP::MIBS, diff --git a/Info/Layer3/Extreme.pm b/Info/Layer3/Extreme.pm index c27e989..2dd9dd4 100644 --- a/Info/Layer3/Extreme.pm +++ b/Info/Layer3/Extreme.pm @@ -46,7 +46,7 @@ use SNMP::Info::EDP; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/F5.pm b/Info/Layer3/F5.pm index 7d1583a..bc6aecc 100644 --- a/Info/Layer3/F5.pm +++ b/Info/Layer3/F5.pm @@ -38,7 +38,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Force10.pm b/Info/Layer3/Force10.pm index 8f350bd..796d28f 100644 --- a/Info/Layer3/Force10.pm +++ b/Info/Layer3/Force10.pm @@ -43,7 +43,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Foundry.pm b/Info/Layer3/Foundry.pm index b0a6043..a27e99e 100644 --- a/Info/Layer3/Foundry.pm +++ b/Info/Layer3/Foundry.pm @@ -48,7 +48,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/H3C.pm b/Info/Layer3/H3C.pm index 77cc0a3..dda7485 100644 --- a/Info/Layer3/H3C.pm +++ b/Info/Layer3/H3C.pm @@ -33,17 +33,26 @@ use strict; use Exporter; use SNMP::Info::Layer3; use SNMP::Info::LLDP; - -@SNMP::Info::Layer3::H3C::ISA = qw/SNMP::Info::LLDP SNMP::Info::Layer3 Exporter/; -@SNMP::Info::Layer3::H3C::EXPORT_OK = qw//; +use SNMP::Info::IEEE802dot3ad 'agg_ports_lag'; + +@SNMP::Info::Layer3::H3C::ISA = qw/ + SNMP::Info::IEEE802dot3ad + SNMP::Info::LLDP + SNMP::Info::Layer3 + Exporter +/; +@SNMP::Info::Layer3::H3C::EXPORT_OK = qw/ + agg_ports +/; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::LLDP::MIBS, + %SNMP::Info::IEEE802dot3ad::MIBS, 'HH3C-LswDEVM-MIB' => 'hh3cDevMFanStatus', 'HH3C-LswINF-MIB' => 'hh3cSlotPortMax', 'HH3C-LSW-DEV-ADM-MIB' => 'hh3cLswSysVersion', @@ -113,6 +122,8 @@ sub i_ignore { return \%i_ignore; } +sub agg_ports { return agg_ports_lag(@_) } + 1; __END__ @@ -219,6 +230,12 @@ Returns reference to hash. Increments value of IID if port is to be ignored. Ignores loopback +=item C<agg_ports> + +Returns a HASH reference mapping from slave to master port for each member of +a port bundle on the device. Keys are ifIndex of the slave ports, Values are +ifIndex of the corresponding master ports. + =back =head2 Table Methods imported from SNMP::Info::Layer3 diff --git a/Info/Layer3/HP9300.pm b/Info/Layer3/HP9300.pm index c367eb7..eebd8d3 100644 --- a/Info/Layer3/HP9300.pm +++ b/Info/Layer3/HP9300.pm @@ -42,7 +42,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/IBMGbTor.pm b/Info/Layer3/IBMGbTor.pm index 9764204..4cd1c7b 100644 --- a/Info/Layer3/IBMGbTor.pm +++ b/Info/Layer3/IBMGbTor.pm @@ -41,7 +41,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Juniper.pm b/Info/Layer3/Juniper.pm index 2d2c0cc..e34ef48 100644 --- a/Info/Layer3/Juniper.pm +++ b/Info/Layer3/Juniper.pm @@ -40,7 +40,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Lantronix.pm b/Info/Layer3/Lantronix.pm index 631f9c0..6bd9a4c 100644 --- a/Info/Layer3/Lantronix.pm +++ b/Info/Layer3/Lantronix.pm @@ -41,7 +41,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Microsoft.pm b/Info/Layer3/Microsoft.pm index a3367c8..f901955 100644 --- a/Info/Layer3/Microsoft.pm +++ b/Info/Layer3/Microsoft.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, ); diff --git a/Info/Layer3/Mikrotik.pm b/Info/Layer3/Mikrotik.pm index fd270e8..50d69cd 100644 --- a/Info/Layer3/Mikrotik.pm +++ b/Info/Layer3/Mikrotik.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, @@ -50,17 +50,30 @@ $VERSION = '3.13'; %GLOBALS = ( %SNMP::Info::Layer3::GLOBALS, 'hrSystemUptime' => 'hrSystemUptime', + 'os_level' => 'mtxrLicLevel', 'os_ver' => 'mtxrLicVersion', + 'serial1' => 'mtxrSystem.3.0', + 'firmware' => 'mtxrSystem.4.0', + 'fan_type' => 'mtxrHlActiveFan', ); -%FUNCS = ( %SNMP::Info::Layer3::FUNCS, ); +%FUNCS = ( + %SNMP::Info::Layer3::FUNCS, +); -%MUNGE = ( %SNMP::Info::Layer3::MUNGE, ); +%MUNGE = ( + %SNMP::Info::Layer3::MUNGE, +); sub vendor { return 'mikrotik'; } +sub serial { + my $mikrotik = shift; + return $mikrotik->serial1; +} + sub model { my $mikrotik = shift; my $descr = $mikrotik->description() || ''; @@ -73,6 +86,18 @@ sub os { return 'routeros'; } +sub board_temp { + my $mikrotik = shift; + my $temp = $mikrotik->mtxrHlTemperature; + return $temp / 10.0; +} + +sub cpu_temp { + my $mikrotik = shift; + my $temp = $mikrotik->mtxrHlProcessorTemperature; + return $temp / 10.0; +} + 1; __END__ @@ -148,6 +173,23 @@ Tries to extract the device model from C<sysDescr>. Returns the value of C<mtxrLicVersion>. +=item $mikrotik->os_level() + +Returns the value of RouterOS level C<mtxrLicLevel> + +=item $mikrotik->board_temp() +=item $mikrotik->cpu_temp() + +Returns the appropriate temperature values + +=item $mikrotik->serial() + +Returns the device serial. + +=item $mikrotik->firmware() + +Returns the firmware version of hardware. + =back =head2 Globals imported from SNMP::Info::Layer3 diff --git a/Info/Layer3/N1600.pm b/Info/Layer3/N1600.pm index 3a84f96..52b695a 100644 --- a/Info/Layer3/N1600.pm +++ b/Info/Layer3/N1600.pm @@ -41,7 +41,7 @@ use SNMP::Info::SONMP; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/NetSNMP.pm b/Info/Layer3/NetSNMP.pm index 60d0bec..bf354d3 100644 --- a/Info/Layer3/NetSNMP.pm +++ b/Info/Layer3/NetSNMP.pm @@ -40,7 +40,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Netscreen.pm b/Info/Layer3/Netscreen.pm index b7aaea6..adc7255 100644 --- a/Info/Layer3/Netscreen.pm +++ b/Info/Layer3/Netscreen.pm @@ -40,7 +40,7 @@ use SNMP::Info::IEEE802dot11; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Nexus.pm b/Info/Layer3/Nexus.pm index b8e6eea..13a6853 100644 --- a/Info/Layer3/Nexus.pm +++ b/Info/Layer3/Nexus.pm @@ -61,7 +61,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; # NOTE: Order creates precedence # Example: v_name exists in Bridge.pm and CiscoVTP.pm diff --git a/Info/Layer3/PacketFront.pm b/Info/Layer3/PacketFront.pm index ce3fb03..f8e936e 100644 --- a/Info/Layer3/PacketFront.pm +++ b/Info/Layer3/PacketFront.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Passport.pm b/Info/Layer3/Passport.pm index 4898ebd..1d32a6f 100644 --- a/Info/Layer3/Passport.pm +++ b/Info/Layer3/Passport.pm @@ -43,7 +43,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::RapidCity::MIBS, diff --git a/Info/Layer3/Pf.pm b/Info/Layer3/Pf.pm index 4733843..150833e 100644 --- a/Info/Layer3/Pf.pm +++ b/Info/Layer3/Pf.pm @@ -41,7 +41,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Pica8.pm b/Info/Layer3/Pica8.pm index d94f811..587e246 100644 --- a/Info/Layer3/Pica8.pm +++ b/Info/Layer3/Pica8.pm @@ -39,7 +39,7 @@ use SNMP::Info::LLDP; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/SonicWALL.pm b/Info/Layer3/SonicWALL.pm index 92831e9..84830bc 100644 --- a/Info/Layer3/SonicWALL.pm +++ b/Info/Layer3/SonicWALL.pm @@ -36,7 +36,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer2::MIBS, %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Steelhead.pm b/Info/Layer3/Steelhead.pm index 1bb0017..722b632 100644 --- a/Info/Layer3/Steelhead.pm +++ b/Info/Layer3/Steelhead.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Sun.pm b/Info/Layer3/Sun.pm index 98d4220..3f03c92 100644 --- a/Info/Layer3/Sun.pm +++ b/Info/Layer3/Sun.pm @@ -39,7 +39,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, ); diff --git a/Info/Layer3/Tasman.pm b/Info/Layer3/Tasman.pm index 8639964..2a794d0 100644 --- a/Info/Layer3/Tasman.pm +++ b/Info/Layer3/Tasman.pm @@ -41,7 +41,7 @@ use SNMP::Info::MAU; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, diff --git a/Info/Layer3/Timetra.pm b/Info/Layer3/Timetra.pm index 8f954f1..c47862c 100644 --- a/Info/Layer3/Timetra.pm +++ b/Info/Layer3/Timetra.pm @@ -40,7 +40,7 @@ use SNMP::Info::Layer3; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer3::MIBS, 'TIMETRA-GLOBAL-MIB' => 'timetraReg', ); diff --git a/Info/Layer7.pm b/Info/Layer7.pm index aea7aa8..22bc2f4 100644 --- a/Info/Layer7.pm +++ b/Info/Layer7.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::MIBS, diff --git a/Info/Layer7/APC.pm b/Info/Layer7/APC.pm index 9e82faf..2528ae7 100644 --- a/Info/Layer7/APC.pm +++ b/Info/Layer7/APC.pm @@ -40,7 +40,7 @@ use SNMP::Info::Layer7; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer7::MIBS, diff --git a/Info/Layer7/Neoteris.pm b/Info/Layer7/Neoteris.pm index 9f803e0..a072425 100644 --- a/Info/Layer7/Neoteris.pm +++ b/Info/Layer7/Neoteris.pm @@ -38,7 +38,7 @@ use SNMP::Info::Layer7; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer7::MIBS, diff --git a/Info/Layer7/Netscaler.pm b/Info/Layer7/Netscaler.pm index 6477c43..55e396d 100644 --- a/Info/Layer7/Netscaler.pm +++ b/Info/Layer7/Netscaler.pm @@ -38,7 +38,7 @@ use SNMP::Info::Layer7; use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( %SNMP::Info::Layer7::MIBS, diff --git a/Info/MAU.pm b/Info/MAU.pm index a69117c..61721d9 100644 --- a/Info/MAU.pm +++ b/Info/MAU.pm @@ -41,7 +41,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'MAU-MIB' => 'mauMod', 'IANA-MAU-MIB' => 'dot3MauType' ); diff --git a/Info/NortelStack.pm b/Info/NortelStack.pm index 68bdce7..d991a24 100644 --- a/Info/NortelStack.pm +++ b/Info/NortelStack.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( diff --git a/Info/PowerEthernet.pm b/Info/PowerEthernet.pm index 3ce21b5..bd8b954 100644 --- a/Info/PowerEthernet.pm +++ b/Info/PowerEthernet.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'POWER-ETHERNET-MIB' => 'pethPsePortDetectionStatus' ); diff --git a/Info/RapidCity.pm b/Info/RapidCity.pm index d7cb91e..a50d0b6 100644 --- a/Info/RapidCity.pm +++ b/Info/RapidCity.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'RAPID-CITY' => 'rapidCity', ); diff --git a/Info/SONMP.pm b/Info/SONMP.pm index 273248e..3cd057f 100644 --- a/Info/SONMP.pm +++ b/Info/SONMP.pm @@ -39,7 +39,7 @@ use SNMP::Info; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/; -$VERSION = '3.13'; +$VERSION = '3.14'; %MIBS = ( 'SYNOPTICS-ROOT-MIB' => 'synoptics', diff --git a/META.json b/META.json index fbd14c3..eb6b2bc 100644 --- a/META.json +++ b/META.json @@ -4,7 +4,7 @@ "Eric A. Miller <emil...@cpan.org>" ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.112621", + "generated_by" : "ExtUtils::MakeMaker version 6.88, CPAN::Meta::Converter version 2.120921", "license" : [ "bsd" ], @@ -22,22 +22,22 @@ "prereqs" : { "build" : { "requires" : { - "ExtUtils::MakeMaker" : 0 + "ExtUtils::MakeMaker" : "0" } }, "configure" : { "requires" : { - "ExtUtils::MakeMaker" : 0 + "ExtUtils::MakeMaker" : "0" } }, "runtime" : { "requires" : { - "Math::BigInt" : 0, - "SNMP" : 0, - "Test::More" : 0 + "Math::BigInt" : "0", + "SNMP" : "0", + "Test::More" : "0" } } }, "release_status" : "stable", - "version" : "3.13" + "version" : "3.14" } diff --git a/META.yml b/META.yml index eb967a6..3ef259f 100644 --- a/META.yml +++ b/META.yml @@ -7,7 +7,7 @@ build_requires: configure_requires: ExtUtils::MakeMaker: 0 dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.112621' +generated_by: 'ExtUtils::MakeMaker version 6.88, CPAN::Meta::Converter version 2.120921' license: bsd meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -21,4 +21,4 @@ requires: Math::BigInt: 0 SNMP: 0 Test::More: 0 -version: 3.13 +version: 3.14 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libsnmp-info-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits