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

Merge pull request #7670 from VersatusHPC/harvest/macmap-cumulus-breakout

Browse Source 
fix(MacMap): discover nodes on Cumulus breakout ports (swpNsM)
This commit is contained in:
Daniel Hilst
2026-07-27 11:09:39 -03:00
committed by GitHub
parent a7455df957 93c5f3f04a
commit 8fc3a309a0
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
perl-xCAT/xCAT/MacMap.pm
+1 -19
View File
@@ -733,30 +733,12 @@ sub refresh_switch {
}
}else{
foreach (@res){
if($_ =~ m/^([0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}) dev swp([0-9]+) vlan ([0-9]+) .*/){
if($_ =~ m/^([0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}) dev (swp[^ ]+) vlan ([0-9]+) .*/){
$mymac=$1;
$myport=$2;
$myport=sprintf("%d",$myport);
my $macport=$2;
my $macvlan=$3;
#try all the possible port number formats
#e.g, "5","swp5","05","swp05"
unless(exists $self->{switches}->{$switch}->{$myport}){
if(exists $self->{switches}->{$switch}->{"swp".$myport}){
$myport="swp".$myport;
}else{
$myport=sprintf("%02d",$myport);
unless(exists $self->{switches}->{$switch}->{$myport}){
if(exists $self->{switches}->{$switch}->{"swp".$myport}){
$myport="swp".$myport;
}else{
$myport="";
}
}
}
}
if($myport){
if($output){
printf $output "$mymac|%s\n", $self->{switches}->{$switch}->{$myport};