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

ENHANCEMENT ADD CISCO SMALL BUSINESS SUPPORT

Browse Source 
Updated new package Info::Layer2::CiscoSB to remove hackish
index with index derived from EntPhysicalEntry table search.
This commit is contained in:
Nic Bernstein
2013-08-09 12:21:10 -05:00
parent 37737a6494
commit 4efa0fd509
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Info/Layer2/CiscoSB.pm
View File

@@ -52,12 +52,9 @@ use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
$VERSION = '3.03'; $VERSION = '3.03';
# NB - This is a huge hack. This is our index into the various # This will be filled in with the device's index into the EntPhysicalEntry
# Entity MIB tables. This should be devined by using the entPhysicalContainsTable # table by the serial() function.
# and working from there, but the current Entity.pm doesn't provide our $index = undef;
# direct support for the entityMapping branch of the MIB.
# This must be revisited.
our $magic_number = 67108992;
%GLOBALS = ( %GLOBALS = (
%SNMP::Info::Layer2::GLOBALS, %SNMP::Info::Layer2::GLOBALS,
@@ -101,29 +98,41 @@ sub vendor {
return 'cisco'; return 'cisco';
} }
# Walk the entPhysicalSerialNum table and return both the first serial
# number found as well as the index of that entry.
sub serial { sub serial {
my $ciscosb = shift; my $ciscosb = shift;
my $serial = $ciscosb->e_serial(); my $serial = undef;
my $e_serial = $ciscosb->e_serial();
return $serial->{$magic_number}; # Find entity table entry for this unit
foreach my $e ( keys %$e_serial ) {
if (defined ($e_serial->{$e}) and $e_serial->{$e} !~ /^\s*$/) {
$index = $e;
last;
}
}
return $e_serial->{$index} if defined $index;
} }
sub os_ver { sub os_ver {
my $ciscosb = shift; my $ciscosb = shift;
my $os_ver = $ciscosb->e_swver(); my $os_ver = $ciscosb->e_swver();
return $os_ver->{$magic_number}; return $os_ver->{$index} if defined $index;
} }
# Grab e_model from Entity and tag on e_hwver # Grab e_model from Entity and tag on e_hwver
sub model { sub model {
my $ciscosb = shift; my $ciscosb = shift;
my $model = $ciscosb->e_model(); my $e_model = $ciscosb->e_model();
my $e_hwver = $ciscosb->e_hwver(); my $e_hwver = $ciscosb->e_hwver();
$model = "$model->{$magic_number} $e_hwver->{$magic_number}"; if (defined ($index)) {
my $model = "$e_model->{$index} $e_hwver->{$index}";
return $model; return $model;
}
return $ciscosb->description();
} }
# ifDescr is the same for all interfaces in a class, but the ifName is # ifDescr is the same for all interfaces in a class, but the ifName is
@@ -169,10 +178,6 @@ Nic Bernstein (shamelessly stolen from Max Baker's Aironet code)
Provides interface to SNMP Data available on Cisco Small Business (nee LinkSys) Provides interface to SNMP Data available on Cisco Small Business (nee LinkSys)
managed switches. [i.e. those matching enterprises(1).cisco(9).otherEnterprises(6).ciscosb(1)] managed switches. [i.e. those matching enterprises(1).cisco(9).otherEnterprises(6).ciscosb(1)]
Currently implemented via a "magic number" which is our index into the
Entity MIB tables. This is a hack, but this number seems to be constant
between various models, and a work around will take time.
=head2 Inherited Classes =head2 Inherited Classes
=over =over