WIP install 2/n: create VDIs for VMs

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

Author: ydirson

conftest.py

@@ -10,6 +10,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
 
@@ -309,7 +310,8 @@ def imported_vm(host, vm_ref):
 
 @pytest.fixture(scope="class")
 def create_vms(request, host):
-    """Returns list of VM objects created from `vm_definitions` marker.
+    """
+    Returns list of VM objects created from `vm_definitions` marker.
 
     `vm_definitions` marker test author to specify one or more VMs,
     using one `dict` per VM.
@@ -318,11 +320,25 @@ 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"))
-> def test_foo(create_vms):
->    ...
+    -------
+    > @pytest.mark.vm_definitions(dict(name="vm 1", template="Other install media"),
+    >                             dict(name="vm 2",
+    >                                  template="CentOS 7",
+    >                                  vdis=[dict(name="vm 2 system disk",
+    >                                         size="1GiB",
+    >                                         )],
+    >
+    >     ))
+    > def test_foo(create_vms):
+    >    ...
+
     """
     vm_name = "Test VM from scratch"
     markers = request.node.get_closest_marker("vm_definitions")
@@ -331,10 +347,12 @@ def create_vms(request, host):
     for marker in markers.args:
         assert "name" in marker
         assert "template" in marker
+        # FIXME should check optional vdis contents
         # FIXME should check for extra args
 
     try:
         vms = []
+        vdis = []
         for marker in markers.args:
             vm_name = marker["name"]
             vm_template = marker["template"]
@@ -343,15 +361,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_install.py

@@ -3,6 +3,7 @@
 
 @pytest.mark.vm_definitions(dict(name="vm 1",
                                  template="Other install media",
+                                 vdis=[dict(name="vm 1 system disk", size="1GiB")],
                                  ))
 class TestInstallNested:
     def test_install_nested_821(self, create_vms):