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

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

Author: rushikeshjadhav

tests/storage/zfs/conftest.py

@@ -13,11 +13,14 @@ def host_without_zfs(host):
         "zfs must not be installed on the host at the beginning of the tests"
 
 @pytest.fixture(scope='package')
-def host_with_zfs(host_without_zfs, host_with_saved_yum_state):
+def host_with_zfs(host_without_zfs, host_with_saved_yum_state, image_format):
     host = host_with_saved_yum_state
     host.yum_install(['zfs'])
     host.ssh(['modprobe', 'zfs'])
     yield host
+    host.ssh(["systemctl", "stop", "zfs-zed"])
+    host.ssh(['rmmod', 'zfs'])
+    host.yum_remove(['zfs'])
 
 @pytest.fixture(scope='package')
 def zpool_vol0(sr_disk_wiped, host_with_zfs):
@@ -27,9 +30,12 @@ def zpool_vol0(sr_disk_wiped, host_with_zfs):
     host_with_zfs.ssh(['zpool', 'destroy', POOL_NAME])
 
 @pytest.fixture(scope='package')
-def zfs_sr(host, zpool_vol0):
+def zfs_sr(host, image_format, zpool_vol0):
     """ A ZFS SR on first host. """
-    sr = host.sr_create('zfs', "ZFS-local-SR-test", {'location': POOL_PATH})
+    sr = host.sr_create('zfs', "ZFS-local-SR-test", {
+        'location': POOL_PATH,
+        'preferred-image-formats': image_format
+    }, verify=True)
     yield sr
     # teardown
     sr.destroy()

tests/storage/zfs/test_zfs_sr.py

@@ -19,23 +19,29 @@ class TestZFSSRCreateDestroy:
     and VM import.
     """
 
-    def test_create_zfs_sr_without_zfs(self, host):
+    def test_create_zfs_sr_without_zfs(self, host, image_format):
         # This test must be the first in the series in this module
         assert not host.file_exists('/usr/sbin/zpool'), \
             "zfs must not be installed on the host at the beginning of the tests"
         sr = None
         try:
-            sr = host.sr_create('zfs', "ZFS-local-SR-test", {'location': POOL_PATH})
+            sr = host.sr_create('zfs', "ZFS-local-SR-test", {
+                'location': POOL_PATH,
+                'preferred-image-formats': image_format
+            }, verify=True)
         except Exception:
             logging.info("SR creation failed, as expected.")
         if sr is not None:
             sr.destroy()
             assert False, "SR creation should not have succeeded!"
 
     @pytest.mark.usefixtures("zpool_vol0")
-    def test_create_and_destroy_sr(self, host):
+    def test_create_and_destroy_sr(self, host, image_format):
         # Create and destroy tested in the same test to leave the host as unchanged as possible
-        sr = host.sr_create('zfs', "ZFS-local-SR-test", {'location': POOL_PATH}, verify=True)
+        sr = host.sr_create('zfs', "ZFS-local-SR-test", {
+            'location': POOL_PATH,
+            '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)