install 3/n: attach VDIs to VMs using VBDs

Signed-off-by: Yann Dirson <[email protected]>

Author: ydirson

conftest.py

@@ -364,6 +364,8 @@ def create_vms(request, host):
     >                                  template="CentOS 7",
     >                                  vdis=[dict(name="vm 2 system disk",
     >                                             size="100GiB",
+    >                                             device="xvda",
+    >                                             userdevice="0",
     >                                             )],
     >
     >     ))
@@ -383,6 +385,7 @@ def create_vms(request, host):
     try:
         vms = []
         vdis = []
+        vbds = []
         for marker in markers.args:
             vm_name = marker["name"]
             vm_template = marker["template"]
@@ -399,6 +402,10 @@ def create_vms(request, host):
                     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"])
 
         yield vms
 
@@ -407,6 +414,9 @@ def create_vms(request, host):
         raise
 
     finally:
+        for vbd in vbds:
+            logging.info("<< Destroy VBD %s", vbd.uuid)
+            vbd.destroy()
         for vdi in vdis:
             logging.info("<< Destroy VDI %s", vdi.uuid)
             vdi.destroy()

lib/vbd.py

@@ -0,0 +1,27 @@
+import logging
+
+from lib.common import _param_get, _param_remove, _param_set
+
+class VBD:
+    xe_prefix = "vbd"
+
+    def __init__(self, uuid, vm, device):
+        self.uuid = uuid
+        self.vm = vm
+        self.device = device
+
+    def param_get(self, param_name, key=None, accept_unknown_key=False):
+        return _param_get(self.vm.host, VBD.xe_prefix, self.uuid, param_name, key, accept_unknown_key)
+
+    def param_set(self, param_name, value, key=None):
+        _param_set(self.vm.host, VBD.xe_prefix, self.uuid, param_name, value, key)
+
+    def param_remove(self, param_name, key, accept_unknown_key=False):
+        _param_remove(self.vm.host, VBD.xe_prefix, self.uuid, param_name, key, accept_unknown_key)
+
+    def destroy(self):
+        logging.info("Destroy %s", self)
+        self.vm.host.pool.master.xe('vbd-destroy', {'uuid': self.uuid})
+
+    def __str__(self):
+        return f"VBD {self.uuid} for {self.device} of VM {self.vm.uuid}"

lib/vm.py

@@ -9,6 +9,7 @@
 from lib.basevm import BaseVM
 from lib.common import PackageManagerEnum, parse_xe_dict, safe_split, wait_for, wait_for_not
 from lib.snapshot import Snapshot
+from lib.vbd import VBD
 from lib.vif import VIF
 
 class VM(BaseVM):
@@ -477,6 +478,15 @@ def destroy_vtpm(self):
         logging.info("Destroying vTPM %s" % vtpm_uuid)
         return self.host.xe('vtpm-destroy', {'uuid': vtpm_uuid}, force=True)
 
+    def create_vbd(self, device, vdi_uuid):
+        logging.info("Create VBD %r for VDI %r on VM %s", device, vdi_uuid, self.uuid)
+        vbd_uuid = self.host.xe('vbd-create', {'vm-uuid': self.uuid,
+                                               'device': device,
+                                               'vdi-uuid': vdi_uuid,
+                                               })
+        logging.info("New VBD %s", vbd_uuid)
+        return VBD(vbd_uuid, self, device)
+
     def clone(self):
         name = self.name()
         if not name.endswith('_clone_for_tests'):

tests/install/test_install.py

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