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

Add support for channelized interfaces in L3::Passport.

Browse Source 
Channelized interfaces are 40G or 100G ports split into multiple 10G sub ports, reported as Slot.Port.Sub-Port.  Note: Currently ifDescr reports the interface correctly as Slot/Port/Sub-Port on channelized interfaces but ifName misreports as just Slot/Port.
This commit is contained in:
Eric A. Miller
2016-01-19 23:24:00 -05:00
parent d250a829cb
commit 508e7f77a0
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -6,6 +6,7 @@ version 3.31 ()
* Support for CiscoSB OS and Version (D. Tuecks) * Support for CiscoSB OS and Version (D. Tuecks)
* SONMP support for Enhanced Topology Table * SONMP support for Enhanced Topology Table
* Add support for channelized interfaces in L3::Passport
[BUG FIXES] [BUG FIXES]

16
Info/Layer3/Passport.pm
View File

@@ -1,6 +1,6 @@
# SNMP::Info::Layer3::Passport # SNMP::Info::Layer3::Passport
# #
# Copyright (c) 2012 Eric Miller # Copyright (c) 2016 Eric Miller
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -174,6 +174,7 @@ sub interfaces {
my $partial = shift; my $partial = shift;
my $i_index = $passport->i_index($partial); my $i_index = $passport->i_index($partial);
my $i_descr = $passport->orig_i_description($partial) || {};
my $model = $passport->model(); my $model = $passport->model();
my $index_factor = $passport->index_factor(); my $index_factor = $passport->index_factor();
my $port_offset = $passport->port_offset(); my $port_offset = $passport->port_offset();
@@ -203,7 +204,7 @@ sub interfaces {
$if{$index} = 'Cpu.Virtual'; $if{$index} = 'Cpu.Virtual';
} }
elsif ( ( $iid == 64 ) and ( $model =~ /^VSP[48]/ ) ) { elsif ( ( $iid == 64 ) and ( $model =~ /^VSP[478]/ ) ) {
$if{$index} = 'Mgmt.1'; $if{$index} = 'Mgmt.1';
} }
@@ -230,6 +231,12 @@ sub interfaces {
$if{$index} = $v_port; $if{$index} = $v_port;
} }
else {
if ($model =~ /VSP/ and $i_descr->{$iid} and $i_descr->{$iid} =~ m<Port\s+(\d+(?:/\d+)*)>) {
my $ps = $1;
$ps =~ s|/|.|g;
$if{$iid} = $ps;
}
else { else {
my $port = ( $index % $index_factor ) + $port_offset; my $port = ( $index % $index_factor ) + $port_offset;
my $slot = int( $index / $index_factor ) + $slot_offset; my $slot = int( $index / $index_factor ) + $slot_offset;
@@ -237,6 +244,7 @@ sub interfaces {
my $slotport = "$slot.$port"; my $slotport = "$slot.$port";
$if{$iid} = $slotport; $if{$iid} = $slotport;
} }
}
} }
@@ -388,7 +396,7 @@ sub i_name {
$i_name{$iid} = 'CPU Virtual Management IP'; $i_name{$iid} = 'CPU Virtual Management IP';
} }
elsif ( ( $iid == 64 ) and ( $model =~ /^VSP[48]/ ) ) { elsif ( ( $iid == 64 ) and ( $model =~ /^VSP[478]/ ) ) {
$i_name{$iid} = 'Mgmt Port'; $i_name{$iid} = 'Mgmt Port';
} }
@@ -591,7 +599,7 @@ sub slot_offset {
my $model = $passport->model(); my $model = $passport->model();
# Newer VSP 4K and 8K start at an index of 192 ~ slot 3 but really slot 1 # Newer VSP 4K and 8K start at an index of 192 ~ slot 3 but really slot 1
return -2 return -2
if ( defined $model and $model =~ /^VSP[48]/ ); if ( defined $model and $model =~ /^VSP[478]/ );
return 0; return 0;
} }