arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix for bug 2871938: add check for rmdef flags, check node attribute when create dynamic node group

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4337 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc 2009-10-10 07:05:40 +00:00
parent dc4d460bd3
commit 6e5f39d215
1 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,6 +308,25 @@ sub processArgs
}
}
# Check arguments for rmdef command
# rmdef is very dangerous if wrong flag is specified
# it may cause all the objects to be deleted, check the flags
# for example: rmdef -t node -d, the user want to delete the node named "-d",
# but it will delete all the nodes!
# use -o instead
if ($::command eq 'rmdef')
{
if (defined($::opt_d) || defined($::opt_i) || defined($::opt_l)
|| defined($::opt_m) || defined($::opt_p) || defined($::opt_w)
|| defined($::opt_x) || defined($::opt_z))
{
my $rsp;
$rsp->{data}->[0] = "Invalid flag specified, see rmdef manpage for details.";
xCAT::MsgUtils->message("E", $rsp, $::callback);
return 1;
}
}
# Option -h for Help
# if user specifies "-t" & "-h" they want a list of valid attrs
if (defined($::opt_h) && !defined($::opt_t))
@ -696,6 +715,26 @@ sub processArgs
xCAT::MsgUtils->message("E", $rsp, $::callback);
return 3;
}
# For dynamic node groups, check the selection string
if (($::opt_t eq 'group') && ($::opt_d))
{
my $datatype = $xCAT::Schema::defspec{'node'};
my @nodeattrs = ();
foreach my $this_attr (@{$datatype->{'attrs'}})
{
push @nodeattrs, $this_attr->{attr_name};
}
foreach my $whereattr (keys %::WhereHash)
{
if (!grep(/^$whereattr$/, @nodeattrs))
{
my $rsp;
$rsp->{data}->[0] = "Incorrect attribute \'$whereattr\' in the selection string specified with -w flag.";
xCAT::MsgUtils->message("E", $rsp, $::callback);
return 1;
}
}
}
}
# check for the -i option