xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00
Code Issues Releases Wiki Activity

xcattest: proper replace vars in test cases

Browse Source 
xcattest will replace vars in testcases.
But vars with same prefix will lead to a replacement failure.

Issue:
XCATTEST_PORT=500 XCATTEST_CN=xcat-com001 XCATTEST_PDU=xmount XCATTEST_PDUIP=192.168.200.100 xcattest -t mkdef_pdu_object

cmd:mkdef $$PDU groups=pdu ip=$$PDUIP mgt=pdu nodetype=pdu

will be:

RUN:mkdef xmount groups=pdu ip=xmountIP mgt=pdu nodetype=pdu

$$PDUIP had no chance to be substituted.

Reported-by: Yang Jian <fun_yang@foxmail.com>
Signed-off-by: Chen Hanxiao <chen_han_xiao@126.com>
This commit is contained in:
Chen Hanxiao 2020-06-09 15:44:11 +08:00
parent 07269dd010
commit 8bb7671a23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-test/xcattest
View File

@ -1867,9 +1867,11 @@ sub getvar
{
my $str = shift;
my $config_ref = shift;
my @vars = ($str =~ /\$\$(\w+)/g);
my @reverse_sorted_vars = reverse sort @vars;
while ($str =~ /\$\$(\w+)/) {
my $varname = $1;
# let $$AA and $$A have the same chance to be replaced.
for my $varname (@reverse_sorted_vars) {
if (exists($$config_ref{var}{$varname})) {
$str =~ s/\$\$$varname/$$config_ref{var}{$varname}/g;
} else {