Merge pull request #5926 from mxie91/add-v2v-case-about-dvs-network-a…

…nd-correc-some-mistake Add v2v case about dvs net and correct a mistake
autotest · Sep 29, 2024 · 49de846 · 49de846
2 parents d08aa7e + de8ff9e
commit 49de846
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/v2v/tests/cfg/function_test_esx.cfg b/v2v/tests/cfg/function_test_esx.cfg
@@ -938,6 +938,11 @@
             main_vm = VM_NAME_NO_ENTRY_NETWORKNAME_V2V_EXAMPLE
             skip_vm_check = yes
             skip_reason = 'The VM doesn\'t have a network'
+        - dvs_net_no_portid_connectionid:
+            only esx_80
+            main_vm = VM_NAME_DVS_NET_NO_PORTID_CONNECTIONID_V2V_EXAMPLE
+            skip_vm_check = yes
+            skip_reason = 'Bug RHEL-732 is not fixed'
     variants:
         - positive_test:
             status_error = 'no'

diff --git a/v2v/tests/src/function_test_esx.py b/v2v/tests/src/function_test_esx.py
@@ -598,7 +598,7 @@ def vm_check(status_error):
 
             # Check guest following the checkpoint document after conversion
             LOG.info('Checking common checkpoints for v2v')
-            if 'ogac_balloon' in checkpoint:
+            if checkpoint[0].startswith('ogac'):
                 # windows guests will reboot at any time after qemu-ga is
                 # installed. The process cannot be controlled. In order to
                 # don't break vmchecker.run() process, It's better to put
@@ -804,9 +804,10 @@ def vm_check(status_error):
             ovirt4_path = os.path.dirname(ovirtsdk4.__file__)
             dst_ovirt4_path = ovirt4_path + '.bak'
             os.rename(ovirt4_path, dst_ovirt4_path)
-        if 'ogac_balloon' in checkpoint:
+        if checkpoint[0].startswith('ogac'):
             os.environ['VIRTIO_WIN'] = virtio_win_path
-            if os_type == 'linux' and not utils_v2v.multiple_versions_compare(implementation_change_ver) and os.path.isdir(os.getenv('VIRTIO_WIN')):
+            if os_type == 'linux' and not utils_v2v.multiple_versions_compare(implementation_change_ver) and \
+                    os.path.isdir(os.getenv('VIRTIO_WIN')):
                 export_path = os.getenv('VIRTIO_WIN')
                 qemu_guest_agent_dir = os.path.join(export_path, qa_path)
                 if not os.path.exists(qemu_guest_agent_dir) and os.access(