WIP split _create_vm out of create_vms fixture

Will help implementing vm import as alternative to creation

Author: ydirson

conftest.py

@@ -387,35 +387,7 @@ def create_vms(request, host):
         vdis = []
         vbds = []
         for marker in markers.args:
-            vm_name = marker["name"]
-            vm_template = marker["template"]
-
-            logging.info(">> Install VM %r from template %r", vm_name, vm_template)
-
-            vm = host.vm_from_template(vm_name, vm_template)
-
-            # VM is now created, make sure we clean it up on any subsequent failure
-            vms.append(vm)
-
-            if "vdis" in marker:
-                for vdi_def in marker["vdis"]:
-                    sr = SR(host.main_sr_uuid(), host.pool)
-                    vdi = sr.create_vdi(vdi_def["name"], vdi_def["size"])
-                    vdis.append(vdi)
-                    # connect to VM
-                    vbd = vm.create_vbd(vdi_def["device"], vdi.uuid)
-                    vbds.append(vbd)
-                    vbd.param_set(param_name="userdevice", value=vdi_def["userdevice"])
-
-            if "vifs" in marker:
-                for vif_def in marker["vifs"]:
-                    vm.create_vif(vif_def["index"], vif_def["network_uuid"])
-
-            if "params" in marker:
-                for param_def in marker["params"]:
-                    logging.info("Setting param %s", param_def)
-                    vm.param_set(**param_def)
-
+            _create_vm(marker, host, vms, vdis, vbds)
         yield vms
 
     except Exception:
@@ -433,6 +405,36 @@ def create_vms(request, host):
             logging.info("<< Destroy VM %s", vm.uuid)
             vm.destroy(verify=True)
 
+def _create_vm(marker, host, vms, vdis, vbds):
+    vm_name = marker["name"]
+    vm_template = marker["template"]
+
+    logging.info(">> Install VM %r from template %r", vm_name, vm_template)
+
+    vm = host.vm_from_template(vm_name, vm_template)
+
+    # VM is now created, make sure we clean it up on any subsequent failure
+    vms.append(vm)
+
+    if "vdis" in marker:
+        for vdi_def in marker["vdis"]:
+            sr = SR(host.main_sr_uuid(), host.pool)
+            vdi = sr.create_vdi(vdi_def["name"], vdi_def["size"])
+            vdis.append(vdi)
+            # connect to VM
+            vbd = vm.create_vbd(vdi_def["device"], vdi.uuid)
+            vbds.append(vbd)
+            vbd.param_set(param_name="userdevice", value=vdi_def["userdevice"])
+
+    if "vifs" in marker:
+        for vif_def in marker["vifs"]:
+            vm.create_vif(vif_def["index"], vif_def["network_uuid"])
+
+    if "params" in marker:
+        for param_def in marker["params"]:
+            logging.info("Setting param %s", param_def)
+            vm.param_set(**param_def)
+
 @pytest.fixture(scope="module")
 def running_vm(imported_vm):
     vm = imported_vm

tests/install/test_install.py

@@ -83,12 +83,8 @@ def test_install_nested_821_uefi(self, iso_remaster, create_vms):
                                          ).returncode == 1,
                      "Wait for installer to terminate")
 
-            # powercycle, catch any change of IP
-            logging.info("Rebooting Host VM after successful installation")
+            logging.info("Shutting down Host VM after successful installation")
             try:
-                # use "poweroff" because "reboot" would cause ARP and
-                # SSH to be checked before host is down, and require
-                # ssh retries
                 host_vm.ssh(["poweroff"])
             except commands.SSHCommandFailed as e:
                 # ignore connection closed by reboot
@@ -182,3 +178,9 @@ def test_install_nested_821_uefi(self, iso_remaster, create_vms):
             # wait_for(lambda: False, 'Wait "forever"', timeout_secs=100*60)
             host_vm.shutdown(force=True)
             raise
+
+        # record this state
+        # FIXME move to fixture
+        # FIXME where to store?
+        host_vm.host.ssh(["rm -f test_firstboot_nested_821_uefi-vm1.xva"])
+        host_vm.export("test_firstboot_nested_821_uefi-vm1.xva", "zstd")