tests/storage/zfsvol: Updated zfsvol to handle both vhd and qcow2 vdi image format

Signed-off-by: Rushikesh Jadhav <[email protected]>

Author: rushikeshjadhav

tests/storage/zfsvol/conftest.py

@@ -6,17 +6,22 @@
 from pkgfixtures import host_with_saved_yum_state, sr_disk_wiped
 
 @pytest.fixture(scope='package')
-def host_with_zfsvol(host_with_saved_yum_state):
+def host_with_zfsvol(host_with_saved_yum_state, image_format):
     host = host_with_saved_yum_state
     host.yum_install(['xcp-ng-xapi-storage-volume-zfsvol'])
     host.restart_toolstack(verify=True)
     yield host
+    host.yum_remove(['xcp-ng-xapi-storage-volume-zfsvol'])
+    host.restart_toolstack(verify=True)
 
 @pytest.fixture(scope='package')
-def zfsvol_sr(host, sr_disk_wiped, host_with_zfsvol):
+def zfsvol_sr(host, image_format, sr_disk_wiped, host_with_zfsvol):
     """ A ZFS Volume SR on first host. """
     device = '/dev/' + sr_disk_wiped
-    sr = host.sr_create('zfs-vol', "ZFS-local-SR-test", {'device': device})
+    sr = host.sr_create('zfs-vol', "ZFS-local-SR-test", {
+        'device': device,
+        'preferred-image-formats': image_format
+    }, verify=True)
     yield sr
     # teardown violently - we don't want to require manual recovery when a test fails
     sr.forget()

tests/storage/zfsvol/test_zfsvol_sr.py

@@ -20,10 +20,13 @@ class TestZfsvolSRCreateDestroy:
     and VM import.
     """
 
-    def test_create_and_destroy_sr(self, sr_disk_wiped, host_with_zfsvol):
+    def test_create_and_destroy_sr(self, image_format, sr_disk_wiped, host_with_zfsvol):
         host = host_with_zfsvol
         # Create and destroy tested in the same test to leave the host as unchanged as possible
-        sr = host.sr_create('zfs-vol', "ZFS-local-SR-test", {'device': '/dev/' + sr_disk_wiped}, verify=True)
+        sr = host.sr_create('zfs-vol', "ZFS-local-SR-test", {
+            'device': '/dev/' + sr_disk_wiped,
+            'preferred-image-formats': image_format
+        }, verify=True)
         # import a VM in order to detect vm import issues here rather than in the vm_on_xfs_fixture used in
         # the next tests, because errors in fixtures break teardown
         vm = host.import_vm(vm_image('mini-linux-x86_64-bios'), sr_uuid=sr.uuid)