Merge pull request #5923 from mxie91/check-balloon-service-in-windows…

…-guests Check balloon service in windows guests
autotest · Sep 27, 2024 · 2c75700 · 2c75700
2 parents b9aa15f + de3b02a
commit 2c75700
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/v2v/tests/cfg/function_test_esx.cfg b/v2v/tests/cfg/function_test_esx.cfg
@@ -128,9 +128,9 @@
                     virtio_win_path = "/usr/share/virtio-win/"
                     os_version = VM_VERSION_WIN_SCHTASKS_V2V_EXAMPLE
                     main_vm = VM_NAME_WIN_SCHTASKS_V2V_EXAMPLE
-                - OGAC:
+                - OGAC_balloon:
                     only esx_80
-                    checkpoint = "ogac"
+                    checkpoint = "ogac_balloon"
                     virtio_win_path = EXPORT_VIRTIO_WIN_PATH_V2V_EXAMPLE
                     variants:
                         - win2022:

diff --git a/v2v/tests/src/function_test_esx.py b/v2v/tests/src/function_test_esx.py
@@ -598,15 +598,15 @@ def vm_check(status_error):
 
             # Check guest following the checkpoint document after conversion
             LOG.info('Checking common checkpoints for v2v')
-            if 'ogac' in checkpoint:
+            if 'ogac_balloon' in checkpoint:
                 # 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
                 # check_windows_ogac before vmchecker.run(). Because in
                 # check_windows_ogac, it waits until rebooting completes.
                 vmchecker.checker.create_session()
                 if os_type == 'windows':
-                    services = ['qemu-ga']
+                    services = ['qemu-ga', 'balloon']
                     virtio_win_env = os.getenv('VIRTIO_WIN')
                     if virtio_win_env and 'rhv-guest-tools' in virtio_win_env:
                         services.append('spice-ga')
@@ -804,7 +804,7 @@ 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' in checkpoint:
+        if 'ogac_balloon' in checkpoint:
             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')):
                 export_path = os.getenv('VIRTIO_WIN')