change exception

Signed-off-by: dw035535 <diane.wang@broadcom.com>

Author: Tomorrow9

windows/check_os_fullname/check_os_fullname.yml

@@ -2,10 +2,10 @@
 # SPDX-License-Identifier: BSD-2-Clause
 ---
 # Description:
-#   This test case is used for check VM guest fullname and guest ID
-# are reported correctly in the VM guest info through VMware Tools.
-# When VMware Tools is not installed or not running in VM,
-# this test case result is 'Blocked'.
+#   This test case is used for checking VM guest OS fullname
+# and guest OS ID are reported correctly in the VM guest info
+# by VMware Tools. When VMware Tools is not installed or not
+# running in the guest OS, this test case result is 'Blocked'.
 #
 - name: check_os_fullname
   hosts: localhost
@@ -21,7 +21,7 @@
         - name: "Get VM guest info"
           include_tasks: ../../common/vm_get_guest_info.yml
 
-        - name: "Set fact of the pre-defined guest OS info"
+        - name: "Set fact of the pre-defined guest OS info list"
           include_tasks: win_guest_os_info.yml
 
         - name: "Print the guest OS info before checking"
@@ -32,6 +32,7 @@
               - "OS fullname got in VM guest info: {{ guestinfo_guest_full_name }}"
               - "VM guest ID configured: {{ vm_guest_id }}"
               - "VM guest ID got in VM guest info: {{ guestinfo_guest_id }}"
+              - "VM hardware version: {{ vm_hardware_version }}"
 
         - name: "Set fact of current OS name"
           ansible.builtin.set_fact:
@@ -45,15 +46,15 @@
           ansible.builtin.assert:
             that:
               - current_gos_info
-            fail_msg:
-              - "The pre-defined guest OS info list does not contain this OS version: {{ current_gos }},"
-              - "please check whether this guest OS is supported and add it's info to the list accordingly."
+            fail_msg: >
+              "The pre-defined guest OS info list does not contain this OS version: {{ current_gos }},
+              please check whether this guest OS is supported and add it to the list accordingly."
 
-        - name: "Check whether meet the conditions of known issue"
+        - name: "Handle Windows 11 known issue"
           include_tasks: win11_guest_info_exception.yml
 
         - name: "Check guest fullname in VM guest info"
-          include_tasks: check_guest_info.yml
+          include_tasks: check_vm_guest_info.yml
           when: win11_70u3c_exception is undefined
       rescue:
         - name: "Test case failure"

…s/check_os_fullname/check_guest_info.yml …heck_os_fullname/check_vm_guest_info.ymlwindows/check_os_fullname/check_guest_info.yml renamed to windows/check_os_fullname/check_vm_guest_info.yml windows/check_os_fullname/check_guest_info.yml renamed to windows/check_os_fullname/check_vm_guest_info.yml

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 ---
 # On ESXi 7.0U3c, guest fullname is 'Windows 11 Enterprise, 64-bit (Build xxxxx)',
-# guest ID is empty.
+# guest ID is empty in VM guest info.
 #
 - name: "Set fact of the exception of Windows 11 guest fullname"
   ansible.builtin.set_fact:
@@ -12,6 +12,8 @@
     - esxi_version is version('7.0.3', '=')
     - esxi_build == "19193900"
     - vmtools_version is version('12.0.0', '>=')
+    - guestinfo_guest_id == ''
+    - guestinfo_guest_full_name is search('Build')
 
 - name: "Known issue - incorrect/empty guestID in guest info of Windows 11"
   ansible.builtin.debug:
@@ -20,4 +22,6 @@
       - "Please refer to https://knowledge.broadcom.com/external/article?legacyId=86517."
   tags:
     - known_issue
-  when: win11_70u3c_exception is defined and win11_70u3c_exception
+  when:
+    - win11_70u3c_exception is defined
+    - win11_70u3c_exception