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

L3::Force10 now inherits i_vlan_membership() and i_vlan_membership_untagged() from Bridge and only overrides VLAN mapping

Browse Source
This commit is contained in:
Eric A. Miller
2014-11-08 09:52:41 -05:00
parent 49b853de1a
commit 7ad449303b
1 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Info/Layer3/Force10.pm
View File

@@ -121,29 +121,25 @@ sub i_vlan {
return $i_vlan; return $i_vlan;
} }
sub i_vlan_membership { # Apparently index doesn't use VLAN ID, so override the HOA private
# method here to correct the mapping
sub _vlan_hoa {
my $force10 = shift; my $force10 = shift;
my $partial = shift; my ( $v_ports, $partial ) = @_;
my $index = $force10->bp_index(); my $index = $force10->bp_index();
my $v_index = $force10->v_index(); my $v_index = $force10->v_index();
my $v_ports = $force10->qb_v_egress(); my $vlan_hoa = {};
# If given a partial it will be an ifIndex, we need to use dot1dBasePort
if ($partial) {
my %r_index = reverse %$index;
$partial = $r_index{$partial};
}
my $i_vlan_membership = {};
foreach my $idx ( sort keys %{$v_ports} ) { foreach my $idx ( sort keys %{$v_ports} ) {
next unless ( defined $v_ports->{$idx} ); next unless ( defined $v_ports->{$idx} );
my $portlist = $v_ports->{$idx}; # is an array reference my $portlist = $v_ports->{$idx}; # is an array reference
my $ret = []; my $ret = [];
my $vlan_ndx = $idx; my $vlan_ndx = $idx;
# Strip TimeFilter if we're using VlanCurrentTable
( $vlan_ndx = $idx ) =~ s/^\d+\.//;
# Convert portlist bit array to bp_index array # Convert portlist bit array to bp_index array
for ( my $i = 0; $i <= $#$portlist; $i++ ) { for ( my $i = 0; $i <= $#$portlist; $i++ ) {
push( @{$ret}, $i + 1 ) if ( @$portlist[$i] ); push( @{$ret}, $i + 1 ) if ( @$portlist[$i] );
@@ -160,11 +156,10 @@ sub i_vlan_membership {
# the mapping from Q-BRIDGE-MIB::dot1qVlanFdbId # the mapping from Q-BRIDGE-MIB::dot1qVlanFdbId
my $mod = $vlan_tag % 4096; my $mod = $vlan_tag % 4096;
push ( @{ $i_vlan_membership->{$ifindex} }, ($mod) ); push ( @{ $vlan_hoa->{$ifindex} }, ($mod) );
} }
} }
return $vlan_hoa;
return $i_vlan_membership;
} }
1; 1;
@@ -278,12 +273,6 @@ Returns the VLAN names.
Currently not implemented. Currently not implemented.
=item $force10->i_vlan_membership()
Returns reference to hash of arrays:
key = C<ifIndex>, value = array of VLAN IDs.
These are the VLANs which are members of the egress list for the port.
=item $force10->i_duplex_admin() =item $force10->i_duplex_admin()
Returns info from F<MAU-MIB> Returns info from F<MAU-MIB>