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

Fix Extreme XOS i_vlan_membership - Revert [28bbe0], fix bug with untagged being added to @ret twice (Robert Kerr)

Browse Source
This commit is contained in:
Eric A. Miller
2014-01-09 21:31:58 -05:00
parent d82d8781c4
commit a4e7c3a61a
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -9,6 +9,8 @@ version 3.11
* [#51] Netdisco shows broken topology for devices with no alias entry * [#51] Netdisco shows broken topology for devices with no alias entry
for primary IP - Collect nsIfMngIp when getting IP interfaces in for primary IP - Collect nsIfMngIp when getting IP interfaces in
L3::Netscreen L3::Netscreen
* Fix Extreme XOS i_vlan_membership - Revert [28bbe0], fix bug with
untagged being added to @ret twice (Robert Kerr)
version 3.10 (2013-12-16) version 3.10 (2013-12-16)

13
Info/Layer3/Extreme.pm
View File

@@ -485,21 +485,26 @@ sub _xos_i_vlan_membership {
my $index = $extreme->i_index(); my $index = $extreme->i_index();
my $vlans = $extreme->ex_vlan_id(); my $vlans = $extreme->ex_vlan_id();
my $slotx = $extreme->_slot_factor() || 1000; my $slotx = $extreme->_slot_factor() || 1000;
my $u_ports = $extreme->ex_vlan_untagged() || {};
my $t_ports = $extreme->ex_vlan_tagged() || {}; my $t_ports = $extreme->ex_vlan_tagged() || {};
my $i_vlan_membership = {}; my $i_vlan_membership = {};
foreach my $idx ( keys %$t_ports ) { foreach my $idx ( keys %$u_ports ) {
next unless ( defined $t_ports->{$idx} ); next unless ( defined $u_ports->{$idx} );
my $u_portlist = $u_ports->{$idx};
my $t_portlist = $t_ports->{$idx}; my $t_portlist = $t_ports->{$idx};
my $ret = []; my $ret = [];
my ( $vlan_if, $slot ) = $idx =~ /^(\d+)\.(\d+)/; my ( $vlan_if, $slot ) = $idx =~ /^(\d+)\.(\d+)/;
my $vlan = $vlans->{$vlan_if} || ''; my $vlan = $vlans->{$vlan_if} || '';
foreach my $portlist ( $u_portlist, $t_portlist ) {
# Convert portlist bit array to bp_index array # Convert portlist bit array to bp_index array
for ( my $i = 0; $i <= $#$t_portlist; $i++ ) { for ( my $i = 0; $i <= $#$portlist; $i++ ) {
push( @{$ret}, ( $slotx * $slot + $i + 1 ) ) push( @{$ret}, ( $slotx * $slot + $i + 1 ) )
if ( @$t_portlist[$i] ); if ( @$portlist[$i] );
}
} }
#Create HoA ifIndex -> VLAN array #Create HoA ifIndex -> VLAN array