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

Inherit from Layer3. Use orig_ syntax. Remove redundant items.

Browse Source 
Support partial table fetches on overridden table methods.
Pod updates.
This commit is contained in:
Eric Miller
2006-09-01 02:09:51 +00:00
parent b8b2d337d5
commit c04dd5b3b5
1 changed files with 53 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
Info/Layer2/Baystack.pm
View File

@@ -29,49 +29,39 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
package SNMP::Info::Layer2::Baystack; package SNMP::Info::Layer2::Baystack;
$VERSION = '1.04'; $VERSION = '1.05';
use strict; use strict;
use Exporter; use Exporter;
use SNMP::Info;
use SNMP::Info::Bridge;
use SNMP::Info::SONMP; use SNMP::Info::SONMP;
use SNMP::Info::RapidCity;
use SNMP::Info::NortelStack; use SNMP::Info::NortelStack;
use SNMP::Info::RapidCity;
use SNMP::Info::Layer3;
@SNMP::Info::Layer2::Baystack::ISA = qw/SNMP::Info SNMP::Info::Bridge SNMP::Info::SONMP SNMP::Info::RapidCity SNMP::Info::NortelStack Exporter/; @SNMP::Info::Layer2::Baystack::ISA = qw/SNMP::Info::SONMP SNMP::Info::NortelStack SNMP::Info::RapidCity SNMP::Info::Layer3 Exporter/;
@SNMP::Info::Layer2::Baystack::EXPORT_OK = qw//; @SNMP::Info::Layer2::Baystack::EXPORT_OK = qw//;
use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/; use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
%MIBS = ( %MIBS = (
%SNMP::Info::MIBS, %SNMP::Info::Layer3::MIBS,
%SNMP::Info::Bridge::MIBS,
%SNMP::Info::SONMP::MIBS,
%SNMP::Info::RapidCity::MIBS, %SNMP::Info::RapidCity::MIBS,
%SNMP::Info::NortelStack::MIBS, %SNMP::Info::NortelStack::MIBS,
%SNMP::Info::SONMP::MIBS,
); );
%GLOBALS = ( %GLOBALS = (
%SNMP::Info::GLOBALS, %SNMP::Info::Layer3::GLOBALS,
%SNMP::Info::Bridge::GLOBALS,
%SNMP::Info::SONMP::GLOBALS,
%SNMP::Info::RapidCity::GLOBALS, %SNMP::Info::RapidCity::GLOBALS,
%SNMP::Info::NortelStack::GLOBALS, %SNMP::Info::NortelStack::GLOBALS,
%SNMP::Info::SONMP::GLOBALS,
); );
%FUNCS = ( %FUNCS = (
%SNMP::Info::FUNCS, %SNMP::Info::Layer3::FUNCS,
%SNMP::Info::Bridge::FUNCS,
%SNMP::Info::SONMP::FUNCS,
%SNMP::Info::RapidCity::FUNCS, %SNMP::Info::RapidCity::FUNCS,
%SNMP::Info::NortelStack::FUNCS, %SNMP::Info::NortelStack::FUNCS,
'i_name2' => 'ifName', %SNMP::Info::SONMP::FUNCS,
'i_mac2' => 'ifPhysAddress',
# From RFC1213-MIB
'at_index' => 'ipNetToMediaIfIndex',
'at_paddr' => 'ipNetToMediaPhysAddress',
'at_netaddr' => 'ipNetToMediaNetAddress',
); );
# 450's report full duplex as speed = 20mbps?! # 450's report full duplex as speed = 20mbps?!
@@ -80,13 +70,10 @@ $SNMP::Info::SPEED_MAP{200_000_000} = '100 Mbps';
$SNMP::Info::SPEED_MAP{2_000_000_000} = '1.0 Gbps'; $SNMP::Info::SPEED_MAP{2_000_000_000} = '1.0 Gbps';
%MUNGE = ( %MUNGE = (
%SNMP::Info::MUNGE, %SNMP::Info::Layer3::MUNGE,
%SNMP::Info::Bridge::MUNGE,
%SNMP::Info::SONMP::MUNGE,
%SNMP::Info::RapidCity::MUNGE, %SNMP::Info::RapidCity::MUNGE,
%SNMP::Info::NortelStack::MUNGE, %SNMP::Info::NortelStack::MUNGE,
'i_mac2' => \&SNMP::Info::munge_mac, %SNMP::Info::SONMP::MUNGE,
'at_paddr' => \&SNMP::Info::munge_mac,
); );
sub os { sub os {
@@ -157,7 +144,9 @@ sub i_ignore {
sub interfaces { sub interfaces {
my $baystack = shift; my $baystack = shift;
my $i_index = $baystack->i_index(); my $partial = shift;
my $i_index = $baystack->i_index($partial) || {};
my $index_factor = $baystack->index_factor(); my $index_factor = $baystack->index_factor();
my $slot_offset = $baystack->slot_offset(); my $slot_offset = $baystack->slot_offset();
@@ -179,7 +168,9 @@ sub interfaces {
sub i_mac { sub i_mac {
my $baystack = shift; my $baystack = shift;
my $i_mac = $baystack->i_mac2(); my $partial = shift;
my $i_mac = $baystack->orig_i_mac($partial) || {};
my %i_mac; my %i_mac;
# Baystack 303's with a hw rev < 2.11.4.5 report the mac as all zeros # Baystack 303's with a hw rev < 2.11.4.5 report the mac as all zeros
@@ -194,9 +185,11 @@ sub i_mac {
sub i_name { sub i_name {
my $baystack = shift; my $baystack = shift;
my $i_index = $baystack->i_index(); my $partial = shift;
my $i_alias = $baystack->i_alias();
my $i_name2 = $baystack->i_name2(); my $i_index = $baystack->i_index($partial) || {};
my $i_alias = $baystack->i_alias($partial) || {};
my $i_name2 = $baystack->orig_i_name($partial) || {};
my %i_name; my %i_name;
foreach my $iid (keys %$i_name2){ foreach my $iid (keys %$i_name2){
@@ -225,6 +218,7 @@ sub index_factor {
} }
1; 1;
__END__ __END__
=head1 NAME =head1 NAME
@@ -265,36 +259,32 @@ my $baystack = new SNMP::Info::Layer2::Baystack(...);
=over =over
=item SNMP::Info =item SNMP::Info::SONMP
=item SNMP::Info::Bridge
=item SNMP::Info::NortelStack =item SNMP::Info::NortelStack
=item SNMP::Info::SONMP
=item SNMP::Info::RapidCity =item SNMP::Info::RapidCity
=item SNMP::Info::Layer3
=back =back
=head2 Required MIBs =head2 Required MIBs
=over =over
=item Inherited Classes' MIBs
See SNMP::Info for its own MIB requirements.
See SNMP::Info::Bridge for its own MIB requirements.
See SNMP::Info::NortelStack for its own MIB requirements.
See SNMP::Info::SONMP for its own MIB requirements.
See SNMP::Info::RapidCity for its own MIB requirements.
=back =back
=head2 Inherited MIBs
See L<SNMP::Info::SONMP/"Required MIBs"> for its MIB requirements.
See L<SNMP::Info::NortelStack/"Required MIBs"> for its MIB requirements.
See L<SNMP::Info::RapidCity/"Required MIBs"> for its MIB requirements.
See L<SNMP::Info::Layer3/"Required MIBs"> for its MIB requirements.
=head1 GLOBALS =head1 GLOBALS
These are methods that return scalar value from SNMP These are methods that return scalar value from SNMP
@@ -343,25 +333,21 @@ Returns either 32 or 64 based upon the formula.
=back =back
=head2 Globals imported from SNMP::Info =head2 Global Methods imported from SNMP::Info::SONMP
See documentation in SNMP::Info for details. See L<SNMP::Info::SONMP/"GLOBALS"> for details.
=head2 Globals imported from SNMP::Info::Bridge
See documentation in SNMP::Info::Bridge for details.
=head2 Globals imported from SNMP::Info::NortelStack =head2 Globals imported from SNMP::Info::NortelStack
See documentation in SNMP::Info::NortelStack for details. See L<SNMP::Info::NortelStack/"GLOBALS"> for details.
=head2 Global Methods imported from SNMP::Info::SONMP
See documentation in SNMP::Info::SONMP for details.
=head2 Global Methods imported from SNMP::Info::RapidCity =head2 Global Methods imported from SNMP::Info::RapidCity
See documentation in SNMP::Info::RapidCity for details. See L<SNMP::Info::RapidCity/"GLOBALS"> for details.
=head2 Globals imported from SNMP::Info::Layer3
See L<SNMP::Info::Layer3/"GLOBALS"> for details.
=head1 TABLE ENTRIES =head1 TABLE ENTRIES
@@ -400,48 +386,20 @@ Crosses ifName with ifAlias and returns the human set port name if exists.
=back =back
=head2 RFC1213 Arp Cache Table (B<ipNetToMediaTable>) =head2 Table Methods imported from SNMP::Info::SONMP
=over See L<SNMP::Info::SONMP/"TABLE ENTRIES"> for details.
=item $baystack->at_index()
Returns reference to hash. Maps ARP table entries to Interface IIDs
(B<ipNetToMediaIfIndex>)
=item $baystack->at_paddr()
Returns reference to hash. Maps ARP table entries to MAC addresses.
(B<ipNetToMediaPhysAddress>)
=item $baystack->at_netaddr()
Returns reference to hash. Maps ARP table entries to IPs
(B<ipNetToMediaNetAddress>)
=back
=head2 Table Methods imported from SNMP::Info
See documentation in SNMP::Info for details.
=head2 Table Methods imported from SNMP::Info::Bridge
See documentation in SNMP::Info::Bridge for details.
=head2 Table Methods imported from SNMP::Info::NortelStack =head2 Table Methods imported from SNMP::Info::NortelStack
See documentation in SNMP::Info::NortelStack for details. See L<SNMP::Info::NortelStack/"TABLE ENTRIES"> for details.
=head2 Table Methods imported from SNMP::Info::SONMP
See documentation in SNMP::Info::SONMP for details.
=head2 Table Methods imported from SNMP::Info::RapidCity =head2 Table Methods imported from SNMP::Info::RapidCity
See documentation in SNMP::Info::RapidCity for details. See L<SNMP::Info::RapidCity/"TABLE ENTRIES"> for details.
=head2 Table Methods imported from SNMP::Info::Layer3
See L<SNMP::Info::Layer3/"TABLE ENTRIES"> for details.
=cut =cut