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

Merge pull request #4237 from bybai/defch

Browse Source 
enhance chdef for invalid attribute check
This commit is contained in:
chenglch
2017-11-06 15:03:05 +08:00
committed by GitHub
parent 375594411f ea58eaae63
commit 66bacfb8c0
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
perl-xCAT/xCAT/DBobjUtils.pm
View File

@@ -949,6 +949,7 @@ sub setobjdefs
my @setattrlist = ();
my %checkedattrs;
my $invalidattr;
my $conditionlist;
foreach my $this_attr (@{ $datatype->{'attrs'} }) {
my %keyhash;
@@ -1008,7 +1009,12 @@ sub setobjdefs
$checkedattrs{$attr_name} = 1;
if ($invalidattr->{$attr_name}->{valid} != 1) {
$invalidattr->{$attr_name}->{valid} = 0;
$invalidattr->{$attr_name}->{condition} = "\'$check_attr=$check_value\'";
$invalidattr->{$attr_name}->{condition}=$check_attr;
if (defined($conditionlist->{$check_attr})) {
$conditionlist->{$check_attr}=$conditionlist->{$check_attr}.",".$check_value;
} else {
$conditionlist->{$check_attr}=$check_value;
}
}
next;
@@ -1017,8 +1023,12 @@ sub setobjdefs
if (!($objhash{$objname}{$check_attr} =~ /\b$check_value\b/) && !($DBattrvals{$objname}{$check_attr} =~ /\b$check_value\b/)) {
if ($invalidattr->{$attr_name}->{valid} != 1) {
$invalidattr->{$attr_name}->{valid} = 0;
$invalidattr->{$attr_name}->{condition} = "\'$check_attr=$check_value\'";
$invalidattr->{$attr_name}->{condition}=$check_attr;
if (defined($conditionlist->{$check_attr})) {
$conditionlist->{$check_attr}=$conditionlist->{$check_attr}.",".$check_value;
} else {
$conditionlist->{$check_attr}=$check_value;
}
}
next;
@@ -1163,20 +1173,19 @@ sub setobjdefs
if ($invalidattr->{$att}->{valid} != 1) {
my $tt = $invalidattr->{$att}->{valid};
#if attribute is set invalid, check if its pre-check attribute exists in group objects, pick the attribute into valid.
# ex. if I want to set hdwctrlpoint I will have
# to match the right value for mgtmethod, but mgtmethod does exist in node object in chdef command
# if mgtmethod exists in group objects, set hdwctrlpoint valid
my $conditionkv=$invalidattr->{$att}->{condition};
$conditionkv=~s/(^'|'$)//g;
my ($attk, $attv)=split("=", $conditionkv);
foreach my $tmpgrp (@tmplgrplist) {
if ($DBgroupsattr{$tmpgrp}{$attk} eq $attv) {
$pickvalidattr=1;
last;
}
# ex. like if I want to set hdwctrlpoint I will have
# to match the right value for mgtmethod
# if mgtmethod exists in group objects and its value match the one of only_if value, set hdwctrlpoint valid
my $conditionkey=$invalidattr->{$att}->{condition};
foreach my $tmpgrp (@tmplgrplist) {
if (($DBgroupsattr{$tmpgrp}{$conditionkey}) && ($conditionlist->{$conditionkey} =~ $DBgroupsattr{$tmpgrp}{$conditionkey})) {
$pickvalidattr=1;
last;
}
}
if ($pickvalidattr != 1) {
push @{ $rsp->{data} }, "Cannot set the attr=\'$att\' attribute unless $invalidattr->{$att}->{condition}.";
$conditionlist->{$conditionkey}=~s/,/ or /g;
push @{ $rsp->{data} }, "Cannot set the attr=\'$att\' attribute unless $invalidattr->{$att}->{condition} value is $conditionlist->{$conditionkey}.";
xCAT::MsgUtils->message("E", $rsp, $::callback);
}
}