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

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

Author: rushikeshjadhav

tests/storage/xfs/conftest.py

@@ -12,9 +12,12 @@ def host_with_xfsprogs(host):
     host.yum_restore_saved_state()
 
 @pytest.fixture(scope='package')
-def xfs_sr(sr_disk, host_with_xfsprogs):
+def xfs_sr(sr_disk, host_with_xfsprogs, image_format):
     """ A XFS SR on first host. """
-    sr = host_with_xfsprogs.sr_create('xfs', "XFS-local-SR-test", {'device': '/dev/' + sr_disk})
+    sr = host_with_xfsprogs.sr_create('xfs', "XFS-local-SR-test", {
+        'device': '/dev/' + sr_disk,
+        'preferred-image-formats': image_format
+    })
     yield sr
     # teardown
     sr.destroy()

tests/storage/xfs/test_xfs_sr.py

@@ -17,23 +17,29 @@ class TestXFSSRCreateDestroy:
     and VM import.
     """
 
-    def test_create_xfs_sr_without_xfsprogs(self, host, sr_disk):
+    def test_create_xfs_sr_without_xfsprogs(self, host, image_format, sr_disk):
         # This test must be the first in the series in this module
         assert not host.file_exists('/usr/sbin/mkfs.xfs'), \
             "xfsprogs must not be installed on the host at the beginning of the tests"
         sr = None
         try:
-            sr = host.sr_create('xfs', "XFS-local-SR-test", {'device': '/dev/' + sr_disk})
+            sr = host.sr_create('xfs', "XFS-local-SR-test", {
+                'device': '/dev/' + sr_disk,
+                'preferred-image-formats': image_format
+            })
         except Exception:
             logging.info("SR creation failed, as expected.")
         if sr is not None:
             sr.destroy()
             assert False, "SR creation should not have succeeded!"
 
-    def test_create_and_destroy_sr(self, sr_disk, host_with_xfsprogs):
+    def test_create_and_destroy_sr(self, sr_disk, host_with_xfsprogs, image_format):
         # Create and destroy tested in the same test to leave the host as unchanged as possible
         host = host_with_xfsprogs
-        sr = host.sr_create('xfs', "XFS-local-SR-test", {'device': '/dev/' + sr_disk}, verify=True)
+        sr = host.sr_create('xfs', "XFS-local-SR-test", {
+            'device': '/dev/' + sr_disk,
+            '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)