From 9fc3d52b8186031f89402fd3104abd852cd70c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20Ferr=C3=A3o?=
 <2031761+viniciusferrao@users.noreply.github.com>
Date: Fri, 21 Aug 2026 01:13:50 -0300
Subject: [PATCH] test(getinstdisk): follow the log lines of the new selection

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.
---
 .../autotest/testcase/get_install_disk/fresh_install_disk | 4 ++--
 .../autotest/testcase/get_install_disk/reinstall_disk     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/xCAT-test/autotest/testcase/get_install_disk/fresh_install_disk b/xCAT-test/autotest/testcase/get_install_disk/fresh_install_disk
index c75af50c8..8d7756a5e 100644
--- a/xCAT-test/autotest/testcase/get_install_disk/fresh_install_disk
+++ b/xCAT-test/autotest/testcase/get_install_disk/fresh_install_disk
@@ -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
diff --git a/xCAT-test/autotest/testcase/get_install_disk/reinstall_disk b/xCAT-test/autotest/testcase/get_install_disk/reinstall_disk
index 8e096114f..dc3b3b396 100644
--- a/xCAT-test/autotest/testcase/get_install_disk/reinstall_disk
+++ b/xCAT-test/autotest/testcase/get_install_disk/reinstall_disk
@@ -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