135/snmp-info
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#58] Fix inheritance in L3::FWSM and L3::CiscoASA

Browse Source
This commit is contained in:
Eric A. Miller
2014-07-01 20:05:46 -04:00
parent f1e9e3423d
commit 46b3127bb5
3 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -10,6 +10,7 @@ version 3.18
* Correctly identify device type (class) for instantiated objects which * Correctly identify device type (class) for instantiated objects which
have overridden layers. have overridden layers.
* [#58] Fix inheritance in L3::FWSM and L3::CiscoASA
version 3.17 (2014-06-23) version 3.17 (2014-06-23)
@@ -27,7 +28,7 @@ version 3.16 (2014-06-23)
all applicable classes now inherit CiscoAgg, CiscoStpExtensions, all applicable classes now inherit CiscoAgg, CiscoStpExtensions,
CiscoPortSecurity, CiscoPower, and LLDP classes. CiscoPortSecurity, CiscoPower, and LLDP classes.
* Remove inheritance of classes the devices do not support in L3::FWSM * Remove inheritance of classes the devices do not support in L3::FWSM
andL3::CiscoASA and L3::CiscoASA
[BUG FIXES] [BUG FIXES]

22
Info/Layer3/CiscoASA.pm
View File

@@ -34,7 +34,7 @@ package SNMP::Info::Layer3::CiscoASA;
use strict; use strict;
use warnings; use warnings;
use Exporter; use Exporter;
use SNMP::Info::CiscoStack; use SNMP::Info::CiscoStats;
use SNMP::Info::Layer3; use SNMP::Info::Layer3;
@SNMP::Info::Layer3::CiscoASA::ISA = qw/ @SNMP::Info::Layer3::CiscoASA::ISA = qw/
@@ -47,20 +47,20 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
$VERSION = '3.17'; $VERSION = '3.17';
%MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CiscoStack::MIBS, ); %MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CiscoStats::MIBS, );
%GLOBALS %GLOBALS
= ( %SNMP::Info::Layer3::GLOBALS, %SNMP::Info::CiscoStack::GLOBALS, ); = ( %SNMP::Info::Layer3::GLOBALS, %SNMP::Info::CiscoStats::GLOBALS, );
%FUNCS = ( %FUNCS = (
%SNMP::Info::Layer3::FUNCS, %SNMP::Info::Layer3::FUNCS,
%SNMP::Info::CiscoStack::FUNCS, %SNMP::Info::CiscoStats::FUNCS,
'mac_table' => 'ifPhysAddress', 'mac_table' => 'ifPhysAddress',
); );
%MUNGE = ( %MUNGE = (
%SNMP::Info::Layer3::MUNGE, %SNMP::Info::Layer3::MUNGE,
%SNMP::Info::CiscoStack::MUNGE, %SNMP::Info::CiscoStats::MUNGE,
'mac_table' => \&SNMP::Info::munge_mac, 'mac_table' => \&SNMP::Info::munge_mac,
); );
@@ -134,7 +134,7 @@ Subclass for Cisco ASA Devices
=over =over
=item SNMP::Info::CiscoStack =item SNMP::Info::CiscoStats
=item SNMP::Info::Layer3 =item SNMP::Info::Layer3
@@ -146,7 +146,7 @@ Subclass for Cisco ASA Devices
=item Inherited Classes' MIBs =item Inherited Classes' MIBs
See L<SNMP::Info::CiscoStack/"Required MIBs"> for its own MIB requirements. See L<SNMP::Info::CiscoStats/"Required MIBs"> for its own MIB requirements.
See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements. See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
@@ -171,9 +171,9 @@ configured interface name instead of "Adaptive Security Appliance
=back =back
=head2 Globals imported from SNMP::Info::CiscoStack =head2 Globals imported from SNMP::Info::CiscoStats
See documentation in L<SNMP::Info::CiscoStack/"GLOBALS"> for details. See documentation in L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
=head2 Global Methods imported from SNMP::Info::Layer3 =head2 Global Methods imported from SNMP::Info::Layer3
@@ -184,9 +184,9 @@ See documentation in L<SNMP::Info::Layer3/"GLOBALS"> for details.
These are methods that return tables of information in the form of a These are methods that return tables of information in the form of a
reference to a hash. reference to a hash.
=head2 Table Methods imported from SNMP::Info::CiscoStack =head2 Table Methods imported from SNMP::Info::CiscoStats
See documentation in L<SNMP::Info::CiscoStack/"TABLE METHODS"> for details. See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
=head2 Table Methods imported from SNMP::Info::Layer3 =head2 Table Methods imported from SNMP::Info::Layer3

24
Info/Layer3/CiscoFWSM.pm
View File

@@ -33,10 +33,10 @@ package SNMP::Info::Layer3::CiscoFWSM;
use strict; use strict;
use warnings; use warnings;
use Exporter; use Exporter;
use SNMP::Info::CiscoStack; use SNMP::Info::CiscoStats;
use SNMP::Info::Layer3; use SNMP::Info::Layer3;
@SNMP::Info::Layer3::CiscoFWSM::ISA = qw/SNMP::Info::CiscoStack @SNMP::Info::Layer3::CiscoFWSM::ISA = qw/SNMP::Info::CiscoStats
SNMP::Info::Layer3 SNMP::Info::Layer3
Exporter/; Exporter/;
@SNMP::Info::Layer3::CiscoFWSM::EXPORT_OK = qw//; @SNMP::Info::Layer3::CiscoFWSM::EXPORT_OK = qw//;
@@ -45,17 +45,17 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
$VERSION = '3.17'; $VERSION = '3.17';
%MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CiscoStack::MIBS, ); %MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CiscoStats::MIBS, );
%GLOBALS %GLOBALS
= ( %SNMP::Info::Layer3::GLOBALS, %SNMP::Info::CiscoStack::GLOBALS, ); = ( %SNMP::Info::Layer3::GLOBALS, %SNMP::Info::CiscoStats::GLOBALS, );
%FUNCS = ( %FUNCS = (
%SNMP::Info::Layer3::FUNCS, %SNMP::Info::Layer3::FUNCS,
%SNMP::Info::CiscoStack::FUNCS, %SNMP::Info::CiscoStats::FUNCS,
); );
%MUNGE = ( %SNMP::Info::Layer3::MUNGE, %SNMP::Info::CiscoStack::MUNGE, ); %MUNGE = ( %SNMP::Info::Layer3::MUNGE, %SNMP::Info::CiscoStats::MUNGE, );
# For FWSMs, the ipNetToPhysicalPhysAddress table appears to be of the form: # For FWSMs, the ipNetToPhysicalPhysAddress table appears to be of the form:
# $ifindex.$inetaddresstype.$proto.$ip_address -> $mac_address # $ifindex.$inetaddresstype.$proto.$ip_address -> $mac_address
@@ -163,7 +163,7 @@ Subclass for Cisco Firewall Services Modules
=over =over
=item SNMP::Info::CiscoStack =item SNMP::Info::CiscoStats
=item SNMP::Info::Layer3 =item SNMP::Info::Layer3
@@ -175,7 +175,7 @@ Subclass for Cisco Firewall Services Modules
=item Inherited Classes' MIBs =item Inherited Classes' MIBs
See L<SNMP::Info::CiscoStack/"Required MIBs"> for its own MIB requirements. See L<SNMP::Info::CiscoStats/"Required MIBs"> for its own MIB requirements.
See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements. See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
@@ -183,9 +183,9 @@ See L<SNMP::Info::Layer3/"Required MIBs"> for its own MIB requirements.
=head1 GLOBALS =head1 GLOBALS
=head2 Globals imported from SNMP::Info::CiscoStack =head2 Globals imported from SNMP::Info::CiscoStats
See documentation in L<SNMP::Info::CiscoStack/"GLOBALS"> for details. See documentation in L<SNMP::Info::CiscoStats/"GLOBALS"> for details.
=head2 Global Methods imported from SNMP::Info::Layer3 =head2 Global Methods imported from SNMP::Info::Layer3
@@ -221,9 +221,9 @@ the MIB to provide that information isn't supported on FWSM.
=back =back
=head2 Table Methods imported from SNMP::Info::CiscoStack =head2 Table Methods imported from SNMP::Info::CiscoStats
See documentation in L<SNMP::Info::CiscoStack/"TABLE METHODS"> for details. See documentation in L<SNMP::Info::CiscoStats/"TABLE METHODS"> for details.
=head2 Table Methods imported from SNMP::Info::Layer3 =head2 Table Methods imported from SNMP::Info::Layer3