Improve test script so it will use in tls_reverse testcase specific machine_type.

The test was failing for aarch64 - as it need other machine type used in vm xml.

as there was already similar approach for ppc64 machines, I've unified the way, how it is set.

Author: hholoubk

libvirt/tests/cfg/migration/migrate_vm.cfg

@@ -208,6 +208,11 @@
                                     client_cn = "ENTER.YOUR.CLIENT_CN"
                                     extra_opt = "-c qemu+tls://${server_cn}/system"
                                     target_xml_path = "/tmp/avocado_vt_remote_vm1.xml"
+                                    aarch64:
+                                        specific_machine_type = "virt"
+                                    ppc64:
+                                        specific_machine_type = "pseries"
+
                         - bi_directional:
                             virsh_options = "--live --p2p --verbose"
                             migrate_vm_back = "yes"

libvirt/tests/src/migration/migrate_vm.py

@@ -2434,14 +2434,14 @@ def get_target_hugepage_num(params):
 
             try:
                 remote_virsh_session = virsh.VirshPersistent(**remote_virsh_dargs)
-                logging.debug("Check if remote guest exists")
+                logging.debug(f"TEST_STEP: Check if remote guest '{target_vm_name}' exists on '{server_ip}'")
                 if remote_virsh_session.domain_exists(target_vm_name) is False:
                     test.cancel("The guest '%s' on remote '%s' should be "
                                 "installed before the test."
                                 % (target_vm_name, server_ip))
                 # Check the prepared guest state on remote host.
                 # 'shut off' is expected.
-                logging.debug("Check if remote guest is in shutoff")
+                logging.debug(f"TEST_STEP: Check if remote guest is in shutoff.")
                 if remote_virsh_session.is_alive(target_vm_name):
                     test.error("The guest '%s' on remote "
                                "'%s' should not be alive."
@@ -2472,27 +2472,26 @@ def get_target_hugepage_num(params):
                                 % (nfs_mount_dir, image_name)}
                 guest_config.sub(pattern2repl)
 
-                logging.debug("Modify remote guest xml's machine type")
                 arch = platform.machine()
-                if arch.count("ppc64"):
-                    machine_type = "pseries"
-
+                specific_machine_type = params.get("specific_machine_type", machine_type)
+                logging.debug(f"TEST_STEP: Modify remote guest xml's machine type {specific_machine_type}")
                 pattern2repl = {r".*.machine=.*":
                                 "<type arch='%s' machine='%s'>hvm</type>"
-                                % (arch, machine_type)}
+                                % (arch, specific_machine_type)}
+                logging.debug(f"Pattern to replace: {pattern2repl}")
                 guest_config.sub(pattern2repl)
 
                 # undefine remote guest
-                logging.debug("Undefine remote guest")
+                logging.debug(f"TEST_STEP: Undefine remote guest {target_vm_name}")
                 remote_virsh_session.undefine(target_vm_name, options="--nvram")
 
                 # redefine remote guest using updated XML
-                logging.debug("Redefine remote guest")
+                logging.debug("TEST_STEP: Redefine remote guest")
                 result = remote_virsh_session.define(xml_path)
-                logging.debug(result.stdout.strip())
+                logging.debug(f"result of redefine: {result}")
 
                 # start remote guest
-                logging.debug("Start remote guest")
+                logging.debug("TEST_STEP: Start remote guest")
                 remote_virsh_session.start(target_vm_name)
 
                 # dumpxml remote guest