Merge pull request autotest#5807 from vwu-vera/cpu-top10

v2v: fix cpu-topology case on rhel10
nanli1 · Jul 25, 2024 · 1de8ac0 · 1de8ac0
2 parents 856ab66 + 28578d4
commit 1de8ac0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/v2v/tests/cfg/convert_from_file.cfg b/v2v/tests/cfg/convert_from_file.cfg
@@ -112,6 +112,7 @@
                                     ova_dir = OVA_DIR_BUG_2069768_V2V_EXAMPLE
                                     input_file = '${ova_copy_dir}/OVA_FILE_BUG_2069768_V2V_EXAMPLE'
                                 - cpu_topology:
+                                    only output_mode.rhev
                                     checkpoint = 'cpu_topology'
                                     v2v_debug = force_on
                                     ova_file_name = OVA_FILE_CPU_TOPOLOGY_V2V_EXAMPLE
@@ -301,6 +302,7 @@
                                     main_vm = 'VM_NAME_RHEL6_V2V_EXAMPLE'
                                 - cpu_topology:
                                     only esx_70
+                                    only output_mode.rhev
                                     vmx_nfs_src = NFS_ESX70_FUNC_VMX_V2V_EXAMPLE
                                     main_vm = 'VM_NAME_CPU_TOPOLOGY_V2V_EXAMPLE'
                                     v2v_debug = force_on

diff --git a/v2v/tests/cfg/function_test_esx.cfg b/v2v/tests/cfg/function_test_esx.cfg
@@ -895,6 +895,7 @@
         - cpu_topology:
             only esx_70
             only it_vddk
+            only rhev
             main_vm = VM_NAME_CPU_TOPOLOGY_V2V_EXAMPLE
             checkpoint = 'cpu_topology'
             v2v_debug = force_on