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

Merge pull request #3953 from cxhong/3952

Browse Source 
Discover Coral PDUs with same default hostname
This commit is contained in:
zet809
2017-09-19 15:51:23 +08:00
committed by GitHub
parent 8a66d84381 cb7babd868
commit 59cb8554f4
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
xCAT-server/lib/xcat/plugins/switchdiscover.pm
View File

@@ -350,7 +350,6 @@ sub process_request {
}
#consolidate the results by merging the swithes with the same ip or same mac
#or same hostname
my $result;
my $merged;
my $counter=0;
@@ -366,12 +365,11 @@ sub process_request {
my $new_ip = $result->{$new_mac}->{ip};
my $new_name = $result->{$new_mac}->{name};
my $new_vendor = $result->{$new_mac}->{vendor};
my $key =$new_mac;
if (($old_mac eq $new_mac) ||
($old_ip && ($old_ip eq $new_ip)) ||
($old_name && ($old_name eq $new_name))) {
($old_ip && ($old_ip eq $new_ip))) {
$same = 1;
my $key =$new_mac;
if ($new_mac =~ /nomac/) {
if ($old_mac =~ /nomac/) {
$key = "nomac_$counter";
@@ -380,9 +378,6 @@ sub process_request {
$key = $old_mac;
}
}
if ($old_name) {
$result->{$key}->{name} = $old_name;
}
if ($old_ip) {
$result->{$key}->{ip} = $old_ip;
}
@@ -399,6 +394,12 @@ sub process_request {
delete $result->{$new_mac};
}
}
if ( $old_name && ($old_name eq $new_name)) {
#appending mac address to end of hostname
my $mac_str = lc($old_mac);
$mac_str =~ s/\://g;
$result->{$key}->{name} = "$old_name-$mac_str";
}
}
if (!$same) {
$result->{$old_mac} = $tmp_result->{$old_mac};
@@ -1107,7 +1108,7 @@ sub get_snmphostname {
my ($desc,$hostname) = split /: /, $result;
if (exists($globalopt{verbose})) {
send_msg($request, 0, "switch hostname = $hostname\n" );
send_msg($request, 0, "$device hostname = $hostname\n" );
}
return $hostname;
@@ -1140,7 +1141,7 @@ sub get_hostname {
if ( !$host ) {
my $ip_str = $ip;
$ip_str =~ s/\./\-/g;
$host = "switch-$ip_str";
$host = "$device-$ip_str";
}
}
return $host;