xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-22 11:10:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3703 from mattaezell/switch_macmap_natural_sort

Browse Source 
Sort 'xcatprobe switch_macmap' ports in 'natural' order
This commit is contained in:
zet809
2017-08-17 13:34:05 +08:00
committed by GitHub
parent 02be314d54 45df02f4f3
commit c798d4d029
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-server/lib/xcat/plugins/switch.pm
View File

@@ -251,7 +251,7 @@ sub process_request {
$cb->({ node => [ { name => $switch, data => ["PASS"] } ] });
next;
}
foreach my $port (sort keys %{ $macinfo->{$switch} }) {
foreach my $port (map{$_->[0]}sort{$a->[1] cmp $b->[1] || $a->[2] <=> $b->[2]}map{[$_, /^(.*?)(\d+)?$/]} keys %{ $macinfo->{$switch} }) {
my $node = '';
if (defined($macinfo->{$switch}->{$port}->{Node})) {
$node = $macinfo->{$switch}->{$port}->{Node};