xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-17 11:50:32 +00:00
Code Issues Releases Wiki Activity

Add mac info in ouput of bmcdiscover when no mtms

Browse Source
This commit is contained in:
XuWei
2018-04-20 01:38:54 -04:00
parent c8f2755296
commit 98f436ef0d
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
xCAT-server/lib/xcat/plugins/bmcdiscover.pm
View File

@ -756,7 +756,7 @@ sub format_stanza {
my $node = shift;
my $data = shift;
my $mgt_type = shift;
my ($bmcip, $bmcmtm, $bmcserial, $bmcuser, $bmcpass, $nodetype, $hwtype, $sn, $conserver) = split(/,/, $data);
my ($bmcip, $bmcmtm, $bmcserial, $bmcuser, $bmcpass, $nodetype, $hwtype, $mac, $sn, $conserver) = split(/,/, $data);
my $result;
if (defined($bmcip)) {
$result .= "$node:\n\tobjtype=node\n";
@ -803,7 +803,7 @@ sub write_to_xcatdb {
my $node = shift;
my $data = shift;
my $mgt_type = shift;
my ($bmcip, $bmcmtm, $bmcserial, $bmcuser, $bmcpass, $nodetype, $hwtype, $sn, $conserver) = split(/,/, $data);
my ($bmcip, $bmcmtm, $bmcserial, $bmcuser, $bmcpass, $nodetype, $hwtype, $mac, $sn, $conserver) = split(/,/, $data);
my $request_command = shift;
my $ret;
@ -1112,15 +1112,17 @@ sub bmcdiscovery_ipmi {
} else {
$node_data .= ",,";
}
$node_data .= ",mp,bmc,$::opt_SN,$::opt_SN";
$node_data .= ",mp,bmc";
if ($mtm and $serial) {
$mtms_node = "node-$mtm-$serial";
$mtms_node =~ s/(.*)/\L$1/g;
$mtms_node =~ s/[\s:\._]/-/g;
}
if ($ipmac{$ip}) {
$node_data .= ",";
} elsif ($ipmac{$ip}) {
$mac_node = "node-$ipmac{$ip}";
$node_data .= ",$ipmac{$ip}";
}
$node_data .= ",$::opt_SN,$::opt_SN";
} elsif ($output =~ /error : unauthorized name/) {
xCAT::MsgUtils->message("W", { data => ["BMC username is incorrect for $ip"] }, $::CALLBACK);
return;
@ -1230,15 +1232,17 @@ sub bmcdiscovery_openbmc{
} else {
$node_data .= ",,";
}
$node_data .= ",mp,bmc,$::opt_SN,$::opt_SN";
$node_data .= ",mp,bmc";
if ($mtm and $serial) {
$mtms_node = "node-$mtm-$serial";
$mtms_node =~ s/(.*)/\L$1/g;
$mtms_node =~ s/[\s:\._]/-/g;
}
if ($ipmac{$ip}) {
$node_data .= ",";
} elsif ($ipmac{$ip}) {
$mac_node = "node-$ipmac{$ip}";
$node_data .= ",$ipmac{$ip}";
}
$node_data .= ",$::opt_SN,$::opt_SN";
} else {
if ($login_response->status_line =~ /401 Unauthorized/) {
xCAT::MsgUtils->message("W", { data => ["Invalid username or password for $ip"] }, $::CALLBACK);