xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 09:13:08 +00:00
Code Issues Releases Wiki Activity

unify chdef and mkdef some actions for node type (#4968)

Browse Source 
* unify chdef and mkdef some actions for node type

* polished

* adjust format
This commit is contained in:
Yuan Bai 2018-03-26 11:31:55 +08:00 committed by yangsong
parent 1e1d5b5a75
commit 492b8fe5a9
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
View File

@ -2374,7 +2374,8 @@ sub defch
$objTypeListsHash{$objk}{$obj} = 1;
}
}
my $nodewithdomain;
my $invalidobjname = ();
foreach my $obj (keys %::FINALATTRS)
{
@ -2397,7 +2398,17 @@ sub defch
$error = 1;
next;
}
if ($obj =~ /\./ && $type eq "node")
{
$nodewithdomain .= ",$obj";
delete($::FINALATTRS{$obj});
next;
}
unless(isobjnamevalid($obj,$type)){
$invalidobjname .= ",$obj";
delete($::FINALATTRS{$obj});
next;
}
if (defined($objTypeListsHash{$type}{$obj}) && ($objTypeListsHash{$type}{$obj} == 1))
{
$isDefined = 1;
@ -2860,7 +2871,17 @@ sub defch
}
} # end - for each object to update
my $rsp;
if ($nodewithdomain) {
$nodewithdomain =~ s/,//;
$rsp->{data}->[0] = "The object name \'$nodewithdomain\' is invalid, Cannot use '.' in node name.";
xCAT::MsgUtils->message("E", $rsp, $::callback);
}
if ($invalidobjname) {
$invalidobjname =~ s/,//;
$rsp->{data}->[0] = "The object name \'$invalidobjname\' is invalid, please refer to \"man xcatdb\" for the valid \"xCAT Object Name Format\"";
xCAT::MsgUtils->message("E", $rsp, $::callback);
}
#
# write each object into the tables in the xCAT database
#