WIP install 2/n: create VDIs for VMs

This only creates the VDIs, and does not connect them yet to the VM.

TODO:
- early check of optional vdis contents

Author: ydirson

conftest.py

@@ -11,6 +11,7 @@
 from lib.common import setup_formatted_and_mounted_disk, teardown_formatted_and_mounted_disk
 from lib.netutil import is_ipv6
 from lib.pool import Pool
+from lib.sr import SR
 from lib.vm import VM
 from lib.xo import xo_cli
 
@@ -343,10 +344,22 @@ def create_vms(request, host):
     - `name`: name of the VM to create (str)
     - `template`: name (or UUID) of template to use (str)
 
+    Optional keys:
+    - `vdis`: dict-specifications for VDIs (Iterable[dict[str, str]])
+      Mandatory keys:
+      - `name`
+      - `size`
+
     Example:
     -------
     > @pytest.mark.vm_definitions(dict(name="vm 1", template="Other install media"),
-    >                             dict(name="vm 2", template="CentOS 7"))
+    >                             dict(name="vm 2",
+    >                                  template="CentOS 7",
+    >                                  vdis=[dict(name="vm 2 system disk",
+    >                                             size="100GiB",
+    >                                             )],
+    >
+    >     ))
     > def test_foo(create_vms):
     >    ...
 
@@ -357,10 +370,12 @@ def create_vms(request, host):
     for vm_def in marker.args:
         assert "name" in vm_def
         assert "template" in vm_def
+        # FIXME should check optional vdis contents
         # FIXME should check for extra args
 
     try:
         vms = []
+        vdis = []
         for vm_def in marker.args:
             vm_name = vm_def["name"]
             vm_template = vm_def["template"]
@@ -369,15 +384,25 @@ def create_vms(request, host):
 
             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)
+
         yield vms
 
     except Exception:
         logging.error("exception caught...")
         raise
 
     finally:
+        for vdi in vdis:
+            logging.info("<< Destroy VDI %s", vdi.uuid)
+            vdi.destroy()
         for vm in vms:
             logging.info("<< Destroy VM %s", vm.uuid)
             vm.destroy(verify=True)

tests/install/test.py

@@ -5,6 +5,7 @@ class TestNested:
     @pytest.mark.vm_definitions(
         dict(name="vm 1",
              template="Other install media",
+             vdis=[dict(name="vm 1 system disk", size="100GiB")],
              ))
     def test_nested_821_uefi(self, create_vms):
         assert len(create_vms) == 1