xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00
Code Issues Releases Wiki Activity

Skip built-in MAC addresses on switches

Browse Source 
Newer Cumulus versions show a MAC address on each port. Those MACs
aren't discoverable devices, so skip them to clean up the
'xcatprobe switch_macmap' output.
This commit is contained in:
Matt Ezell 2017-08-17 00:05:45 -04:00
parent 502bf262e0
commit ad7793909c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
perl-xCAT/xCAT/MacMap.pm
View File

@ -734,6 +734,9 @@ sub refresh_switch {
xCAT::MsgUtils->message("I", "MTU information is not availabe for this switch $switch");
}
# get port state
my $mactostate = walkoid($session, '.1.3.6.1.2.1.17.7.1.2.2.1.3', silentfail => 1, verbose => $self->{show_verbose_info}, switch => $switch, callback => $self->{callback});
#Above is valid without community string indexing, on cisco, we need it on the next one and onward
my $iftovlanmap = walkoid($session, '.1.3.6.1.4.1.9.9.68.1.2.2.1.2', silentfail => 1, verbose => $self->{show_verbose_info}, switch => $switch, callback => $self->{callback}); #use cisco vlan membership mib to ascertain vlan
my $trunktovlanmap = walkoid($session, '.1.3.6.1.4.1.9.9.46.1.6.1.1.5', silentfail => 1, verbose => $self->{show_verbose_info}, switch => $switch, callback => $self->{callback}); #for trunk ports, we are interested in the native vlan, so we need cisco vtp mib too
@ -807,8 +810,11 @@ sub refresh_switch {
my $vlan = @tmp[0];
my @mac = @tmp[ -6 .. -1 ];
my $macstring = sprintf("%02x:%02x:%02x:%02x:%02x:%02x", @mac);
push @{ $index_to_mac{$index} }, $macstring;
push @{ $index_to_vlan{$index} }, $vlan;
# Skip "permanent" ports
if (!defined($mactostate->{$_}) || $mactostate->{$_} != 4) {
push @{ $index_to_mac{$index} }, $macstring;
push @{ $index_to_vlan{$index} }, $vlan;
}
}
foreach my $boid (keys %$bridgetoifmap) {
my $port_index = $boid;