From e4f14c5957e50d8c42eed476e8c70fee55f1db6f Mon Sep 17 00:00:00 2001
From: Ming Xie <mxie@redhat.com>
Date: Mon, 29 Jan 2024 11:10:04 +0800
Subject: [PATCH] Rename main name in v2v jobs

Signed-off-by: Ming Xie <mxie@redhat.com>
---
 v2v/tests/cfg/convert_vm_to_libvirt.cfg | 6 ++----
 v2v/tests/cfg/convert_vm_to_ovirt.cfg   | 6 ++----
 v2v/tests/cfg/function_test_xen.cfg     | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/v2v/tests/cfg/convert_vm_to_libvirt.cfg b/v2v/tests/cfg/convert_vm_to_libvirt.cfg
index a274d74573..268a3f1682 100644
--- a/v2v/tests/cfg/convert_vm_to_libvirt.cfg
+++ b/v2v/tests/cfg/convert_vm_to_libvirt.cfg
@@ -163,8 +163,7 @@
                     vir_mode = "hvm"
             variants:
                 - vm:
-                    # main_vm = ${hypervisor}-${vir_mode}-${os_version}-${vm_arch}
-                    main_vm = "XEN_VM_NAME_V2V_EXAMPLE"
+                    main_vm = ${hypervisor}-${vir_mode}-${os_version}-${vm_arch}
         - esx:
             only source_esx
             vpx_pwd = ${vpx_password}
@@ -190,5 +189,4 @@
             hostname = ${esx_hostname}
             variants:
                 - vm:
-                    # main_vm = ${esx_version}-${os_version}-${vm_arch}${vm_boot}
-                    main_vm = "ESX_VM_NAME_V2V_EXAMPLE"
+                    main_vm = ${esx_version}-${os_version}-${vm_arch}${vm_boot}
diff --git a/v2v/tests/cfg/convert_vm_to_ovirt.cfg b/v2v/tests/cfg/convert_vm_to_ovirt.cfg
index 6292337d52..90db46add7 100644
--- a/v2v/tests/cfg/convert_vm_to_ovirt.cfg
+++ b/v2v/tests/cfg/convert_vm_to_ovirt.cfg
@@ -195,8 +195,7 @@
                     vir_mode = "hvm"
             variants:
                 - vm:
-                    # main_vm = ${hypervisor}-${vir_mode}-${os_version}-${vm_arch}
-                    main_vm = "XEN_VM_NAME_V2V_EXAMPLE"
+                    main_vm = ${hypervisor}-${vir_mode}-${os_version}-${vm_arch}
         - esx:
             only source_esx
             vpx_pwd = ${vpx_password}
@@ -222,5 +221,4 @@
             hostname = ${vpx_hostname}
             variants:
                 - vm:
-                    # main_vm = ${esx_version}-${os_version}-${vm_arch}${vm_boot}
-                    main_vm = "ESX_VM_NAME_V2V_EXAMPLE"
+                    main_vm = ${esx_version}-${os_version}-${vm_arch}${vm_boot}
diff --git a/v2v/tests/cfg/function_test_xen.cfg b/v2v/tests/cfg/function_test_xen.cfg
index 037281c347..1d6b9c253c 100644
--- a/v2v/tests/cfg/function_test_xen.cfg
+++ b/v2v/tests/cfg/function_test_xen.cfg
@@ -14,7 +14,7 @@
 
     # Guest info
     os_type = 'linux'
-    main_vm = 'XEN_VM_NAME_V2V_EXAMPLE'
+    main_vm = ${hypervisor}-${vir_mode}-${os_version}-${vm_arch}
     username = 'root'
     password = GENERAL_GUEST_PASSWORD
     os_version = 'XEN_VM_OS_VERSION_V2V_EXAMPLE'