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

Signed-off-by: Rushikesh Jadhav <rushikesh7@gmail.com>

Author: rushikeshjadhav

tests/storage/xfs/conftest.py

@@ -17,6 +17,11 @@
 class XfsConfig:
     uninstall_xfs: bool = True
 
+# NOTE: @pytest.mark.usefixtures does not parametrize this fixture.
+# To recreate host_with_xfsprogs for each image_format value, accept
+# image_format in the fixture arguments.
+# ref https://docs.pytest.org/en/7.1.x/how-to/fixtures.html#use-fixtures-in-classes-and-modules-with-usefixtures
+
 @pytest.fixture(scope='package')
 def _xfs_config() -> XfsConfig:
     return XfsConfig()
@@ -37,10 +42,13 @@ def xfs_sr(
     unused_512B_disks: dict[Host, list[Host.BlockDeviceInfo]],
     host_with_xfsprogs: Host,
     _xfs_config: XfsConfig,
+    image_format: str
 ) -> Generator[SR]:
     """ A XFS SR on first host. """
     sr_disk = unused_512B_disks[host_with_xfsprogs][0]["name"]
-    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
     try:

tests/storage/xfs/test_xfs_sr.py

@@ -13,6 +13,7 @@
 
 if TYPE_CHECKING:
     from lib.host import Host
+    from lib.vdi import VDI
 
 # Requirements:
 # - one XCP-ng host >= 8.2 with an additional unused disk for the SR
@@ -27,15 +28,19 @@ class TestXFSSRCreateDestroy:
 
     def test_create_xfs_sr_without_xfsprogs(self,
                                             host: Host,
-                                            unused_512B_disks: dict[Host, list[Host.BlockDeviceInfo]]
+                                            unused_512B_disks: dict[Host, list[Host.BlockDeviceInfo]],
+                                            image_format: str
                                             ) -> None:
         # 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_disk = unused_512B_disks[host][0]["name"]
         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:
@@ -56,7 +61,17 @@ def test_create_and_destroy_sr(self,
         vm.destroy(verify=True)
         sr.destroy(verify=True)
 
-@pytest.mark.usefixtures("xfs_sr")
+# We want to skip class tests for qcow2 if the SM does not support qcow2
+@pytest.fixture(scope="class")
+def for_qcow2_vdi_image_format(vdi_on_xfs_sr: VDI, image_format: str):
+    # only check qcow2-specific behavior
+    if image_format != "qcow2":
+        return
+    # feature-detect: if the SM doesn't report image-format, skip this check
+    if not vdi_on_xfs_sr.get_image_format():
+        pytest.skip("SM does not report sm-config:image-format; skipping qcow2 format check")
+
+@pytest.mark.usefixtures("for_qcow2_vdi_image_format", "xfs_sr")
 class TestXFSSR:
     @pytest.mark.quicktest
     def test_quicktest(self, xfs_sr):