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

Add fallback method to determine IOS & IOS-XE versions when parsing description() failed

Browse Source
This commit is contained in:
Jeroen van Ingen
2012-12-13 17:10:35 +01:00
parent 7cef8465fa
commit 688a0de498
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -29,6 +29,7 @@ version 3.00
* Dynamically generated methods are added to symbol table to avoid * Dynamically generated methods are added to symbol table to avoid
AUTOLOAD on subsequent calls AUTOLOAD on subsequent calls
* L2::Airspace now supports 802.11n client tx rates * L2::Airspace now supports 802.11n client tx rates
* CiscoStats improvements to determine IOS-XE versions properly
[BUG FIXES] [BUG FIXES]

20
Info/CiscoStats.pm
View File

@@ -51,6 +51,7 @@ $VERSION = '2.11';
'OLD-CISCO-SYSTEM-MIB' => 'writeMem', 'OLD-CISCO-SYSTEM-MIB' => 'writeMem',
'CISCO-PRODUCTS-MIB' => 'sysName', 'CISCO-PRODUCTS-MIB' => 'sysName',
'ENTITY-MIB' => 'entPhysicalSoftwareRev', 'ENTITY-MIB' => 'entPhysicalSoftwareRev',
'CISCO-IMAGE-MIB' => 'ciscoImageString',
# some older catalysts live here # some older catalysts live here
'CISCO-STACK-MIB' => 'wsc1900sysID', 'CISCO-STACK-MIB' => 'wsc1900sysID',
@@ -100,7 +101,8 @@ sub os {
my $descr = $l2->description() || ''; my $descr = $l2->description() || '';
# order here matters - there are Catalysts that run IOS and have catalyst # order here matters - there are Catalysts that run IOS and have catalyst
# in their description field. # in their description field, as well as Catalysts that run IOS-XE.
return 'ios-xe' if ( $descr =~ /IOS-XE/ );
return 'ios' if ( $descr =~ /IOS/ ); return 'ios' if ( $descr =~ /IOS/ );
return 'catalyst' if ( $descr =~ /catalyst/i ); return 'catalyst' if ( $descr =~ /catalyst/i );
return 'css' if ( $descr =~ /Content Switch SW/ ); return 'css' if ( $descr =~ /Content Switch SW/ );
@@ -203,6 +205,15 @@ sub os_ver {
return $1; return $1;
} }
# Generic fallback: try to determine running image from CISCO-IMAGE-MIB
my $image_info = $l2->ciscoImageString() || {};
foreach my $row (keys %$image_info) {
my $info_string = $image_info->{$row};
if ($info_string =~ /CW_VERSION\$([^$]+)\$/) {
return $1;
}
}
return; return;
} }
@@ -358,6 +369,8 @@ None.
=item F<ENTITY-MIB> =item F<ENTITY-MIB>
=item F<CISCO-IMAGE-MIB>
=back =back
MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz MIBs can be found at ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz
@@ -388,7 +401,7 @@ Returns mem_free() + mem_used()
=item $ciscostats->os() =item $ciscostats->os()
Tries to parse if device is running IOS or CatOS from description() Tries to parse if device is running IOS, CatOS, IOS-XE or something else from description()
Available values : Available values :
@@ -435,7 +448,8 @@ Cisco Content Switch Secure Content Acceleration
=item $ciscostats->os_ver() =item $ciscostats->os_ver()
Tries to parse device operating system version from description() Tries to parse device operating system version from description(), falls back
to parsing C<CISCO-IMAGE-MIB::ciscoImageString> if needed
=item $ciscostats->os_bin() =item $ciscostats->os_bin()