From a6a14d3bfedd81adcae6e4842ea71f1cbf8faf42 Mon Sep 17 00:00:00 2001 From: Yuan Bai Date: Thu, 15 Mar 2018 14:13:13 +0800 Subject: [PATCH] group validation (#4945) --- xCAT-server/lib/xcat/plugins/DBobjectdefs.pm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm index abc9174d0..f51543a5f 100755 --- a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm +++ b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm @@ -4721,12 +4721,20 @@ sub initialize_variables sub isobjnamevalid{ my $objname=shift; my $objtype=shift; + my %options; + $options{keepmissing}=1; + $options{genericrange}=1; $objtype="node" unless(defined $objtype and ($objtype ne "")); if($objtype eq "node"){ #the ip address as a valid node object name is a hack for p7IH support if(($objname !~ /^[a-zA-Z0-9-_]+$/) and !xCAT::NetworkUtils->isIpaddr($objname)){ return 0; } + } elsif ($objtype eq "group"){ + my @tmpnodes=xCAT::NodeRange::noderange($objname,0,0,%options); + if(scalar(@tmpnodes)>1 || $tmpnodes[0] ne $objname ){ + return 0; + } } return 1; }