Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions v2v/tests/cfg/convert_from_file.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
ova_copy_dir = 'OVA_DIR_COPY_V2V_EXAMPLE'
variants:
- normal:
only output_mode.libvirt,output_mode.rhev
variants:
- ova_tar:
input_file = '${ova_copy_dir}/OVA_TAR_FILE_V2V_EXAMPLE'
Expand Down Expand Up @@ -122,7 +121,6 @@
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
Expand Down Expand Up @@ -319,7 +317,6 @@
main_vm = 'VM_NAME_ESX70_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
Expand Down
15 changes: 6 additions & 9 deletions v2v/tests/cfg/function_test_esx.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,6 @@
skip_reason = 'bz#1990808'
- resume_rhel7:
only esx_80
only dest_libvirt
os_version = OS_VERSION_RESUME_RHEL7_V2V_EXAMPLE
checkpoint = resume_swap
main_vm = VM_NAME_RESUME_RHEL7_V2V_EXAMPLE
Expand Down Expand Up @@ -549,7 +548,7 @@
rhv_upload_opts = "${rhv_upload_opts} -oo rhv-verifypeer=true"
msg_content = 'virt-v2v: error: failed server prechecks, see earlier errors'
expect_msg = yes
- no-copy-illegal:
- no_copy_illegal:
only esx_70
main_vm = VM_NAME_RHEL7_V2V_EXAMPLE
only negative_test..rhev.rhv_upload
Expand All @@ -559,15 +558,15 @@
version_required = "[libguestfs-1.40.2-15,)"
has_rhv_disk_uuid = 'yes'
variants:
- no_rhv-disk-uuid:
- no_rhv_disk_uuid:
# Means version between virt-v2v-1.45.1-1 and virt-v2v-1.45.3-1
version_required = "[virt-v2v-1.45.1-1,virt-v2v-1.45.3-1)"
msg_content = "virt-v2v: error: there must be .-oo rhv-disk-uuid. parameters passed on"
checkpoint = "no_uuid"
- mismatched_rhv-disk-uuid:
- mismatched_rhv_disk_uuid:
checkpoint = "mismatched_uuid"
msg_content = "virt-v2v: error: the number of .-oo rhv-disk-uuid. parameters .*? has to match the number of guest disk images"
- invalid_rhv-disk-uuid:
- invalid_rhv_disk_uuid:
msg_content = "-o rhv-upload: invalid UUID for -oo rhv-disk-uuid"
version_required = "[virt-v2v-1.45.1-1,)"
variants:
Expand All @@ -577,7 +576,7 @@
v2v_opts = "--no-copy -oo rhv-disk-uuid abc-de"
- illegal_format:
v2v_opts = "--no-copy -oo rhv-disk-uuid fc236597-1041-4885-bec9-1d71257c256u"
- exist_rhv-disk-uuid:
- exist_rhv_disk_uuid:
version_required = "[virt-v2v-1.45.1-1,)"
checkpoint = "exist_uuid"
v2v_opts = ""
Expand Down Expand Up @@ -981,8 +980,6 @@
v2v_debug = false
- 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
Expand Down Expand Up @@ -1061,4 +1058,4 @@
status_error = 'no'
- negative_test:
status_error = 'yes'
only option_root.single,invalid_rhv_pem,no-copy-illegal,system_rhv_pem.unset,logs.open_source,keys.invalid,invalid_mac_ip,block_dev.small,no_space,inodes.less_inodes,windows.external_poweroff,must_ip,no_ovirtsdk4_pkg,vddk_errors_41_disks,invalid_vddk_thumbprint,invalid_os_storage,no_vpx_username
only option_root.single,invalid_rhv_pem,no_copy_illegal,system_rhv_pem.unset,logs.open_source,keys.invalid,invalid_mac_ip,block_dev.small,no_space,inodes.less_inodes,windows.external_poweroff,must_ip,no_ovirtsdk4_pkg,vddk_errors_41_disks,invalid_vddk_thumbprint,invalid_os_storage,no_vpx_username