xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-07-31 18:19:40 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7632 from VersatusHPC/harvest/nodech-comma-groups

Browse Source 
fix(nodech): support comma-delimited values in the ,= and ^= operators
This commit is contained in:
Daniel Hilst
2026-07-24 18:41:53 -03:00
committed by GitHub
parent 2d26dca480 25c9fb3836
commit 137508bc06
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-server/lib/xcat/plugins/tabutils.pm
+16 -10
View File
@@ -1742,11 +1742,14 @@ sub nodech
if ($cent) { $curval = $cent->{$key}; }
}
if ($curval) {
my @vals = split(/,/, $curval);
unless (grep /^$val$/, @vals) {
unshift @vals, $val;
my $newval = join(',', @vals);
$uhsh{$key} = $newval;
foreach my $subval (split /,/, $val) {
my @vals = split(/,/, $curval);
unless (grep /^$subval$/, @vals) {
unshift @vals, $subval;
my $newval = join(',', @vals);
$uhsh{$key} = $newval;
$curval = $newval;
}
}
} else {
$uhsh{$key} = $val;
@@ -1762,11 +1765,14 @@ sub nodech
if ($cent) { $curval = $cent->{$key}; }
}
if ($curval) {
my @vals = split(/,/, $curval);
if (grep /^$val$/, @vals) { #only bother if there
@vals = grep(!/^$val$/, @vals);
my $newval = join(',', @vals);
$uhsh{$key} = $newval;
foreach my $subval (split /,/, $val) {
my @vals = split(/,/, $curval);
if (grep /^$subval$/, @vals) { #only bother if there
@vals = grep(!/^$subval$/, @vals);
my $newval = join(',', @vals);
$uhsh{$key} = $newval;
$curval = $newval;
}
}
} #else, what they asked for is the case alredy
}
xCAT-test/autotest/testcase/nodech/cases0
+8 -7
View File
@@ -14,26 +14,27 @@ end
start:nodech_noderange_table_comma
description:nodech testnode groups,=rhels5.5.Check nodech command with ,=.
description:Append multiple comma-delimited groups without duplicating an existing group.
label:mn_only,ci_test,db
cmd:chdef -t node -o testnode groups=all
cmd:chdef -t node -o testnode groups=all,rhels5.5
check:rc==0
cmd:nodech testnode groups,=rhels5.5
cmd:nodech testnode groups,=rhels5.5,rhels5.6
check:rc==0
cmd:lsdef -t node -i groups testnode
check:output=~groups=rhels5.5,all
check:output=~groups=rhels5.6,all,rhels5.5
cmd:rmdef -t node testnode
end
start:nodech_noderange_table_arrow
description:Remove multiple comma-delimited groups while ignoring a group that is absent.
label:mn_only,ci_test,db
cmd:chdef -t node -o testnode groups=all,rhels5.5
cmd:chdef -t node -o testnode groups=all,rhels5.5,rhels5.6
check:rc==0
cmd:nodech testnode groups^=rhels5.5
cmd:nodech testnode groups^=rhels5.4,rhels5.5
check:rc==0
cmd:lsdef -t node -i groups testnode
check:output!=rhels5.5
check:output=~groups=all,rhels5.6
cmd:rmdef -t node testnode
end