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

Merge pull request #6451 from gurevichmark/bmcdiscover_zero_sn

Browse Source 
bmcdiscover node name when serial or mtm and mac not available
This commit is contained in:
besawn 2019-10-30 14:33:50 -04:00 committed by GitHub
commit daa0ab1782
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1160,8 +1160,10 @@ sub bmcdiscovery_ipmi {
$mtm = '' if ($mtm =~ /^0+$/);
$serial = '' if ($serial =~ /^0+$/);
unless (($mtm or $serial) or $ipmac{$ip}) {
xCAT::MsgUtils->message("W", { data => ["BMC Type/Model and/or Serial and MAC Address is unavailable for $ip"] }, $::CALLBACK);
# To constract a node name need either mac or both mtm and serial
# Exit if mac AND one of mtm or serial is missing
if (!($mtm and $serial) and !$ipmac{$ip}) {
xCAT::MsgUtils->message("W", { data => ["BMC Type/Model and Serial or MAC Address is unavailable for $ip"] }, $::CALLBACK);
return;
}
@ -1292,8 +1294,10 @@ sub bmcdiscovery_openbmc{
$mtm = '' if ($mtm =~ /^0+$/);
$serial = '' if ($serial =~ /^0+$/);
unless (($mtm or $serial) or $ipmac{$ip}) {
xCAT::MsgUtils->message("W", { data => ["Could not obtain Valid Model Type and/or Serial Number and MAC Address for BMC at $ip"] }, $::CALLBACK);
# To constract a node name need either mac or both mtm and serial
# Exit if mac AND one of mtm or serial is missing
if (!($mtm and $serial) and !$ipmac{$ip}) {
xCAT::MsgUtils->message("W", { data => ["BMC Type/Model and Serial or MAC Address is unavailable for $ip"] }, $::CALLBACK);
return;
}