diff --git a/ChangeLog b/ChangeLog index 623ab923..66d74a40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ version 3.09 () [ENHANCEMENTS] * Remove "Switch" from model name in L3::Foundry + * Add identification of IOS XR and version in CiscoStats [BUG FIXES] @@ -18,8 +19,8 @@ version 3.09 () ports * When determining the BSSID in Airespace there is only one hexadecimal digit available so skip if outside the range of 1-16, 17 is reserved - for 3rd party AP's. - * Don't assume entity index 1 is the chassis and has serial in Layer3. + for 3rd party AP's + * Don't assume entity index 1 is the chassis and has serial in Layer3 version 3.08 (2013-10-22) diff --git a/Info/CiscoStats.pm b/Info/CiscoStats.pm index 0bfcf114..86afcb5b 100644 --- a/Info/CiscoStats.pm +++ b/Info/CiscoStats.pm @@ -103,6 +103,7 @@ sub os { # order here matters - there are Catalysts that run IOS and have catalyst # in their description field, as well as Catalysts that run IOS-XE. return 'ios-xe' if ( $descr =~ /IOS-XE/ ); + return 'ios-xr' if ( $descr =~ /IOS XR/ ); return 'ios' if ( $descr =~ /IOS/ ); return 'catalyst' if ( $descr =~ /catalyst/i ); return 'css' if ( $descr =~ /Content Switch SW/ ); @@ -198,6 +199,13 @@ sub os_ver { return $1; } + if ( defined $os + and $os eq 'ios-xr' + and defined $descr + and $descr =~ m/Version (\d+[\.\d]+)/ ) + { + return $1; + } # Newer Catalysts and IOS devices if ( defined $descr @@ -409,6 +417,7 @@ Available values: 'ios' for Cisco IOS 'ios-xe' for Cisco IOS XE + 'ios-xr' for Cisco IOS XR 'pix' for Cisco PIX 'asa' for Cisco ASA 'fwsm' for Single-mode FWSM