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

fix for bug 4676: add more error checks when the groups is blank when running mkdef/chdef

Browse Source
This commit is contained in:
ligc
2015-05-24 22:10:41 -04:00
parent c8b7962416
commit dfb5132d84
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1661,7 +1661,7 @@ sub defmk
# If none of the attributes in nodelist is defined: groups,status,appstatus,primarysn,comments,disable
# the nodelist table will not be updated, caused mkdef failed.
# We give a restriction that the "groups" must be specified with mkdef.
if (($type eq "node") && !defined($::FINALATTRS{$obj}{groups}))
if (($type eq "node") && (!defined($::FINALATTRS{$obj}{groups}) || !$::FINALATTRS{$obj}{groups}))
{
my $rsp;
$rsp->{data}->[0] =
@ -2048,12 +2048,18 @@ sub defch
$isDefined = 1;
}
if (!$isDefined && ($type eq 'node') && (!defined($::FINALATTRS{$obj}{'groups'}) || !$::FINALATTRS{$obj}{'groups'}))
{
my $rsp;
$rsp->{data}->[0] = "Attribute \'groups\' is not specified for node \'$obj\', skipping to the next node.";
xCAT::MsgUtils->message("E", $rsp, $::callback);
$error = 1;
next;
}
if (!$isDefined)
{
$newobjects{$obj} = $type;
if (! grep (/^groups$/, keys %{$::FINALATTRS{$obj}}) ) {
$::FINALATTRS{$obj}{'groups'} = "all";
}
}
if (!$isDefined && $::opt_m)