Don't include LLDP in Layer2/HP.om directly, it's inherited via Layer3 class now

This commit is contained in:
Jeroen van Ingen
2014-12-02 13:45:53 +01:00
parent 7b2051b55c
commit afef2e6732

View File

@@ -36,7 +36,6 @@ use strict;
use Exporter; use Exporter;
use SNMP::Info::Layer3; use SNMP::Info::Layer3;
use SNMP::Info::MAU; use SNMP::Info::MAU;
use SNMP::Info::LLDP;
use SNMP::Info::CDP; use SNMP::Info::CDP;
use SNMP::Info::Aggregate; use SNMP::Info::Aggregate;
@@ -44,7 +43,6 @@ use SNMP::Info::Aggregate;
SNMP::Info::Aggregate SNMP::Info::Aggregate
SNMP::Info::Layer3 SNMP::Info::Layer3
SNMP::Info::MAU SNMP::Info::MAU
SNMP::Info::LLDP
SNMP::Info::CDP SNMP::Info::CDP
Exporter Exporter
/; /;
@@ -57,7 +55,6 @@ $VERSION = '3.21_001';
%MIBS = ( %MIBS = (
%SNMP::Info::Layer3::MIBS, %SNMP::Info::Layer3::MIBS,
%SNMP::Info::MAU::MIBS, %SNMP::Info::MAU::MIBS,
%SNMP::Info::LLDP::MIBS,
%SNMP::Info::CDP::MIBS, %SNMP::Info::CDP::MIBS,
%SNMP::Info::Aggregate::MIBS, %SNMP::Info::Aggregate::MIBS,
'RFC1271-MIB' => 'logDescription', 'RFC1271-MIB' => 'logDescription',
@@ -74,7 +71,6 @@ $VERSION = '3.21_001';
%GLOBALS = ( %GLOBALS = (
%SNMP::Info::Layer3::GLOBALS, %SNMP::Info::Layer3::GLOBALS,
%SNMP::Info::MAU::GLOBALS, %SNMP::Info::MAU::GLOBALS,
%SNMP::Info::LLDP::GLOBALS,
%SNMP::Info::CDP::GLOBALS, %SNMP::Info::CDP::GLOBALS,
%SNMP::Info::Aggregate::GLOBALS, %SNMP::Info::Aggregate::GLOBALS,
'serial1' => 'entPhysicalSerialNum.1', 'serial1' => 'entPhysicalSerialNum.1',
@@ -93,7 +89,6 @@ $VERSION = '3.21_001';
%FUNCS = ( %FUNCS = (
%SNMP::Info::Layer3::FUNCS, %SNMP::Info::Layer3::FUNCS,
%SNMP::Info::MAU::FUNCS, %SNMP::Info::MAU::FUNCS,
%SNMP::Info::LLDP::FUNCS,
%SNMP::Info::CDP::FUNCS, %SNMP::Info::CDP::FUNCS,
%SNMP::Info::Aggregate::FUNCS, %SNMP::Info::Aggregate::FUNCS,
'i_type2' => 'ifType', 'i_type2' => 'ifType',
@@ -119,7 +114,6 @@ $VERSION = '3.21_001';
# Inherit all the built in munging # Inherit all the built in munging
%SNMP::Info::Layer3::MUNGE, %SNMP::Info::Layer3::MUNGE,
%SNMP::Info::MAU::MUNGE, %SNMP::Info::MAU::MUNGE,
%SNMP::Info::LLDP::MUNGE,
%SNMP::Info::CDP::MUNGE, %SNMP::Info::CDP::MUNGE,
%SNMP::Info::Aggregate::MUNGE, %SNMP::Info::Aggregate::MUNGE,
'c_id' => \&munge_hp_c_id, 'c_id' => \&munge_hp_c_id,
@@ -582,8 +576,6 @@ after determining a more specific class using the method above.
=item SNMP::Info::Layer2 =item SNMP::Info::Layer2
=item SNMP::Info::LLDP
=item SNMP::Info::MAU =item SNMP::Info::MAU
=back =back
@@ -809,10 +801,6 @@ Returns what version of STP the device is running.
See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details. See documentation in L<SNMP::Info::Layer2/"GLOBALS"> for details.
=head2 Globals imported from SNMP::Info::LLDP
See documentation in L<SNMP::Info::LLDP/"GLOBALS"> for details.
=head2 Globals imported from SNMP::Info::MAU =head2 Globals imported from SNMP::Info::MAU
See documentation in L<SNMP::Info::MAU/"GLOBALS"> for details. See documentation in L<SNMP::Info::MAU/"GLOBALS"> for details.
@@ -864,10 +852,6 @@ ifIndex of the corresponding master ports.
See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details. See documentation in L<SNMP::Info::Layer2/"TABLE METHODS"> for details.
=head2 Table Methods imported from SNMP::Info::LLDP
See documentation in L<SNMP::Info::LLDP/"TABLE METHODS"> for details.
=head2 Table Methods imported from SNMP::Info::MAU =head2 Table Methods imported from SNMP::Info::MAU
See documentation in L<SNMP::Info::MAU/"TABLE METHODS"> for details. See documentation in L<SNMP::Info::MAU/"TABLE METHODS"> for details.