Auto five v2v cases

1. Check qemu-ga for rhel8 guest with usr partition
2. Convert sles15 guest with encrypted btrfs fs
3. Check output for virt-v2v-in-place
4. Convert win11 guest with vtpm and bitlocker
5. Check disks in specific path for kubevirt output

Signed-off-by: Ming Xie <[email protected]>

Author: mxie91

provider/v2v_vmcheck_helper.py

@@ -1112,7 +1112,6 @@ def check_kubevirt_output(params):
 
     os_directory = params.get('os_directory')
     disk_count = int(params.get('vm_disk_count', 0))
-    vm_name = params.get('v2v_cmd_op_on')
 
     result = True
 
@@ -1121,11 +1120,7 @@ def check_kubevirt_output(params):
         fd.seek(0)
         data = load(fd, Loader=Loader)
 
-    if vm_name != data['metadata']['name']:
-        LOG.debug('expect vm name: %s' % vm_name)
-        result = False
-
-    if disk_count != len(data['spec']['domain']['devices']['disks']):
+    if disk_count != len(data['spec']['template']['spec']['domain']['devices']['disks']):
         LOG.debug('expect disk count: %s' % disk_count)
         result = False
 

v2v/tests/cfg/function_test_esx.cfg

@@ -38,7 +38,6 @@
     variants:
         - kubevirt:
             only dest_kubevirt
-            only multiple_disks
         - json:
             only dest_json
             only uefi.win2019,device_map,without_ip_option,env_leak,block_dev
@@ -453,7 +452,9 @@
             esx_https_proxy = HTTPS_PROXY_V2V_EXAMPLE
         - usr_partition:
             only esx_70
+            version_required = "[virt-v2v-2.8.1-8,)"
             main_vm = VM_NAME_USR_PARTITION_V2V_EXAMPLE
+            checkpoint = "ogac"
         - dir_permission:
             only esx_70
             main_vm = VM_NAME_ESX70_RHEL9_V2V_EXAMPLE
@@ -535,23 +536,13 @@
                     checkpoint = "exist_uuid"
                     v2v_opts = ""
                     msg_content = "Disk with the UUID .*? already exists"
-        - no-copy:
-            only esx_70
-            only rhev.rhv_upload
-            # Means version >= libguestfs-1.40.2-15
-            version_required = "[libguestfs-1.40.2-15,)"
-            main_vm = VM_NAME_RHEL7_V2V_EXAMPLE
-            has_rhv_disk_uuid = 'yes'
-            v2v_opts = "--no-copy"
-            skip_vm_check = yes
-            skip_reason = '--no-copy is specified, no images will be copied'
-            variants:
-                - normal:
-                - without_rhv-disk-uuid:
-                  # Means version >= virt-v2v-1.45.3-1
-                  version_required = "[virt-v2v-1.45.3-1,)"
-                  checkpoint = "no_uuid"
-        # ovirt-guest-agent-common
+        - define_disk_path:
+            only esx_80
+            only dest_kubevirt
+            version_required = "[virt-v2v-2.8.1-2,)"
+            main_vm = VM_NAME_WIN2019_ONLINE_DISKS_V2V_EXAMPLE
+            checkpoint = define_disk_path
+            vm_disk_count = 4
         - OGAC:
             checkpoint = "ogac"
             variants:
@@ -769,13 +760,21 @@
                     luks_keys = LUKS_UUID_KEYS
                     v2v_opts += "--key all:clevis"
         - win_bitlocker:
-            only esx_70
-            version_required = "[virt-v2v-1.42.0-15,)"
-            checkpoint = 'luks_dev_keys'
-            main_vm = VM_NAME_WIN_BITLOCKER_V2V_EXAMPLE
-            luks_keys = LUKS_WIN_BIT_LOCKER_DEV_KEYS
             skip_vm_check = yes
             skip_reason = 'luks encryped, cannot boots up without password'
+            variants:
+                - without_tpm:
+                    only esx_70
+                    version_required = "[virt-v2v-1.42.0-15,)"
+                    checkpoint = 'luks_dev_keys'
+                    main_vm = VM_NAME_WIN_BITLOCKER_V2V_EXAMPLE
+                    luks_keys = LUKS_WIN_BIT_LOCKER_DEV_KEYS
+                - with_tpm:
+                    only esx_80
+                    checkpoint = 'luks_dev_keys'
+                    main_vm = VM_NAME_WIN11_WITH_TPM_BITLOCKER_V2V_EXAMPLE
+                    luks_keys = VM_WIN11_WITH_TPM_BITLOCKER_KEYS
+
         - cve_2022_2211:
             only esx_70
             only dest_local
@@ -966,19 +965,28 @@
                     skip_reason = 'bug RHEL-97179 is not fixed'
                     boottype = 3
                 - encrypted:
-                    main_vm = VM_NAME_SLES_BTRFS_ENCRYPTED_SLES12SP5_V2V_EXAMPLE
-                    skip_vm_check = yes
-                    skip_reason = 'bug RHEL-93583 is not fixed and cannot boot into OS without password automatically'
-                    checkpoint = 'luks_dev_keys'
-                    luks_keys = LUKS_ALL_KEYS
+                    variants:
+                        - sles12sp5:
+                            main_vm = VM_NAME_SLES_BTRFS_ENCRYPTED_SLES12SP5_V2V_EXAMPLE
+                            skip_vm_check = yes
+                            skip_reason = 'bug RHEL-93583 is not fixed and cannot boot into OS without password automatically'
+                            checkpoint = 'luks_dev_keys'
+                            luks_keys = LUKS_ALL_KEYS
+                        - sles15sp6:
+                            main_vm = VM_NAME_SLES_BTRFS_ENCRYPTED_SLES15SP6_V2V_EXAMPLE
+                            boottype = 3
+                            checkpoint = 'luks_dev_keys'
+                            luks_keys = LUKS_ALL_KEYS
+                            skip_vm_check = yes
+                            skip_reason = 'luks encryped, cannot boots up without password'
+                            version_required = "[libguestfs-1.56.1-3,)"
         - print_blkhash:
-                    only esx_70
-                    only libvirt
-                    v2v_debug = force_on
-                    version_required = "[virt-v2v-2.7.1-12,)"
-                    checkpoint = "print_blkhash"
-                    msg_content_yes = "nbdcopy.*--blkhash"
-
+            only esx_70
+            only libvirt
+            v2v_debug = force_on
+            version_required = "[virt-v2v-2.7.1-12,)"
+            checkpoint = "print_blkhash"
+            msg_content_yes = "nbdcopy.*--blkhash"
     variants:
         - positive_test:
             status_error = 'no'

v2v/tests/cfg/v2v_options.cfg

@@ -353,6 +353,13 @@
                     only output_mode.none
                     input_disk_image = '/DISK_IMAGE_PATH_V2V_EXAMPLE/IMAGE_WITH_MEM_ALLOC_V2V_EXAMPLE'
                     v2v_options = '-i disk ${input_disk_image} -o null'
+                - in_place:
+                    only input_mode.none
+                    only output_mode.none
+                    checkpoint = 'in_place'
+                    disk_path = DEFAULT_TEST_IMAGE
+                    msg_content = 'virt-v2v-in-place: warning: virt-v2v-in-place is NOT SUPPORTED for command'
+                    expect_msg = yes
         - negative_test:
             status_error = "yes"
             variants:
@@ -408,13 +415,6 @@
                         - 2_mac:
                             v2v_options = '-i libvirt --mac 00:50:56:ac:6a:23:bridge:test --mac 00:50:56:ac:6a:23:bridge:ovirtmgmt'
                             msg_content = 'duplicate --mac parameter'
-                - in_place:
-                    only input_mode.libvirt.xen
-                    only output_mode.libvirt
-                    checkpoint = 'in_place'
-                    v2v_options = '--in-place'
-                    msg_content = 'virt-v2v: error: --in-place cannot be used in RHEL'
-                    expect_msg = yes
                 - xen_no_output_format:
                     only input_mode.libvirt.xen
                     only output_mode.libvirt

v2v/tests/src/function_test_esx.py

@@ -580,6 +580,11 @@ def vm_check(status_error):
                 test.fail('check json output failed')
             if output_mode == 'kubevirt' and not check_kubevirt_output(params):
                 test.fail('check kubevirt output failed')
+            if 'define_disk_path' in checkpoint:
+                from glob import glob
+                disk_num = len(glob(os.path.join(os_directory, 'disk*.img')))
+                if disk_num != vm_disk_count:
+                    test.fail('disk num is incorrect')
             if output_mode == 'local' and not check_local_output(params):
                 test.fail('check local output failed')
             if output_mode == 'qemu' and not check_qemu_output(params):
@@ -739,15 +744,16 @@ def vm_check(status_error):
 
         utils_v2v.set_libguestfs_backend(params)
         v2v_uri = utils_v2v.Uri('esx')
+        if src_uri_type == 'esx':
+            vpx_dc = None
         remote_uri = v2v_uri.get_uri(remote_host, vpx_dc, esx_ip)
+        LOG.debug("Remote host uri for converting: %s", remote_uri)
 
         # Create password file for access to ESX hypervisor
         vpx_passwd_file = params.get("vpx_passwd_file")
-        with open(vpx_passwd_file, 'w') as pwd_f:
-            if src_uri_type == 'esx':
-                pwd_f.write(esxi_password)
-            else:
-                pwd_f.write(vpx_passwd)
+        source_pwd = vpx_passwd if src_uri_type != 'esx' else esxi_password
+        with open(vpx_passwd_file, 'w') as f:
+            f.write(source_pwd)
         v2v_params['v2v_opts'] += " -ip %s" % vpx_passwd_file
 
         if params.get('output_format'):
@@ -922,8 +928,15 @@ def vm_check(status_error):
             luks_keys = params_get(params, 'luks_keys', '').split(':')[-1]
             v2v_params['v2v_opts'] += ' ' + "$(seq -f '--key /dev/sda%%g:key:%s' 200)" % luks_keys
 
+        if 'define_disk_path' in checkpoint:
+            os_directory = data_dir.get_tmp_dir()
+            vm_disk_count = int(params_get(params, 'vm_disk_count'))
+            v2v_params['v2v_opts'] += ' -oo create=true'
+            for i in range(1, vm_disk_count + 1):
+                v2v_params['v2v_opts'] += ' -oo disk=%s/disk%s.img' % (os_directory, i)
+
         virsh_dargs = {'uri': remote_uri, 'remote_ip': remote_host,
-                       'remote_user': 'root', 'remote_pwd': vpx_passwd,
+                       'remote_user': 'root', 'remote_pwd': source_pwd,
                        'auto_close': True,
                        'debug': True}
         remote_virsh = virsh.VirshPersistent(**virsh_dargs)

v2v/tests/src/v2v_options.py

@@ -593,7 +593,9 @@ def check_alloc():
                 virt_v2v_version = get_virt_v2v_version.group(1) + '-' + get_virt_v2v_version.group(2)
                 if (rpm_version != virt_v2v_version):
                     test.fail('v2v version is incorrect in v2v version option')
-
+            if checkpoint == 'in_place':
+                if not os.path.exists(xml_path):
+                    test.fail('Not found guest xml file')
         log_check = utils_v2v.check_log(params, output)
         if log_check:
             test.fail(log_check)
@@ -726,7 +728,7 @@ def check_alloc():
         # Output more messages except quiet mode
         if checkpoint == 'quiet':
             v2v_options += ' -q'
-        elif checkpoint not in ['length_of_error', 'empty_nic_source_network', 'line_no_wrap', 'empty_nic_source_bridge', 'machine_readable']:
+        elif checkpoint not in ['length_of_error', 'empty_nic_source_network', 'line_no_wrap', 'empty_nic_source_bridge', 'machine_readable', 'in_place']:
             v2v_options += " -v -x"
 
         # Prepare for libvirt unprivileged user session connection
@@ -846,7 +848,10 @@ def check_alloc():
 
         if checkpoint == 'length_of_error' and utils_v2v.v2v_supported_option('--wrap'):
             v2v_options += ' --wrap'
-
+        if checkpoint == 'in_place':
+            disk_path = params.get('disk_path')
+            xml_path = os.path.join(data_dir.get_tmp_dir(), 'output.xml')
+            v2v_options += '-i disk %s -O %s' % (disk_path, xml_path)
         # Running virt-v2v command
         cmd = "%s %s %s %s" % (utils_v2v.V2V_EXEC, input_option,
                                output_option, v2v_options)
@@ -875,7 +880,8 @@ def check_alloc():
                 output_func=utils_misc.log_line,
                 output_params=(params['tail_log'],)
             )
-
+        if checkpoint == 'in_place':
+            cmd = re.sub(r".*/bin/virt-v2v", '/usr/libexec/virt-v2v-in-place', cmd)
         cmd_result = process.run(cmd, timeout=v2v_timeout, verbose=True,
                                  ignore_status=True)
         if new_vm_name: