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

test(getinstdisk): follow the log lines of the new selection

Browse Source 
The install disk autotests read the log of a provisioned node. The
choice files no longer carry the identifier in their name, and the
selection message names the driver group and the identifier instead of
the previous wording, so read the new lines. The reinstall case reads
the record of its disk without naming a group, as it did before.
This commit is contained in:
Vinícius Ferrão
2026-08-21 01:13:50 -03:00
parent 492f9171a2
commit 9fc3d52b81
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-test/autotest/testcase/get_install_disk/fresh_install_disk
+2 -2
View File
@@ -56,11 +56,11 @@ check:output=~0x500a0751036d9e61
check:output=~0x500a0751036d9e83
check:output=~0x500a0751036d9e7a
check:output=~0x500a0751036d9c24
cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "into wwn thirdchoicedisks"
cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "into thirdchoicedisks"
check:output=~sda 0x500a0751036d9e61
check:output=~sdb 0x500a0751036d9c24
check:output=~sdc 0x500a0751036d9e7a
check:output=~sdd 0x500a0751036d9e83
cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "by sorting wwn and DRIVER"
cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "by DRIVER, then by identifier"
check:output=~sdb
end
xCAT-test/autotest/testcase/get_install_disk/reinstall_disk
+4 -4
View File
@@ -35,7 +35,7 @@ check:rc==0
check:output=~booted
cmd:xdsh $$CN "scp /var/log/xcat/xcat.log root@$$MN:/tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_before_re_$$NO"
cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "by sorting wwn and DRIVER"
cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "by DRIVER, then by identifier"
check:output=~sdb
cmd:chdef $$CN status=
@@ -72,9 +72,9 @@ cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "
check:output=~The disk sdb information
cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "disk_wwn="
check:output=~0x500a0751036d9c24
cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "into wwn"
check:output=~sdb 0x500a0751036d9c24 into wwn
cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "by sorting wwn and DRIVER"
cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "0x500a0751036d9c24 into"
check:output=~sdb 0x500a0751036d9c24 into
cmd:cat /tmp/__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__fr_$$NO | grep "by DRIVER, then by identifier"
check:output=~sdb
end