feat: Add pool_with_qcow2 to check if qcow2 is already present before tests. Install qcow2 before tests and remove qcow2 after tests

Add pool_with_qcow2 fixture in ext, lvm, xfs, zfs & largeblock SR.

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

Author: rushikeshjadhav

tests/storage/conftest.py

@@ -1,7 +1,66 @@
+from __future__ import annotations
+
+import pytest
+
+import logging
+
+# explicit import for package-scope fixtures
+from pkgfixtures import pool_with_saved_yum_state
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from lib.host import Host
+
+QCOW2_REPO = "qcow2"
+QCOW2_REPO_FILE = f"/etc/yum.repos.d/xcp-ng-{QCOW2_REPO}.repo"
+
+
 def pytest_collection_modifyitems(config, items):
     # modify ordering so that ext is always tested first,
     # before more complex storage drivers
     for item in reversed(list(items)):
         if "_ext_" in item.path.name:
             items.remove(item)
             items.insert(0, item)
+
+
+@pytest.fixture(scope='package')
+def pool_with_qcow2(hostA1: Host, image_format):
+    import concurrent.futures
+    pool = hostA1.pool
+
+    # If we're testing VHD image format, skip installing qcow2 and just return the pool.
+    # Use yield+return because this is a generator fixture.
+    if image_format == "vhd":
+        yield pool
+        return
+
+    def check_qcow2_installed(host):
+        if host.file_exists(QCOW2_REPO_FILE):
+            raise Exception(
+                f'{QCOW2_REPO_FILE} is already installed on host {host}. This should not be the case.'
+            )
+
+    with concurrent.futures.ThreadPoolExecutor() as executor:
+        list(executor.map(check_qcow2_installed, pool.hosts))
+
+    def install_qcow2(host):
+        logging.info(f"Installing qcow2 packages on host {host}...")
+        host.add_xcpng_repo(QCOW2_REPO, base_repo="vates")
+        host.yum_install(["sm", "sm-fairlock", "blktap"])
+        host.restart_toolstack(verify=True)
+
+    with concurrent.futures.ThreadPoolExecutor() as executor:
+        list(executor.map(install_qcow2, pool.hosts))
+
+    yield pool
+
+    def remove_qcow2(host):
+        logging.info(f"Cleaning up qcow2 packages from host {host}...")
+        host.remove_xcpng_repo(QCOW2_REPO)
+        host.yum_downgrade(["sm", "sm-fairlock", "blktap"])
+        host.restart_toolstack(verify=True)
+
+    with concurrent.futures.ThreadPoolExecutor() as executor:
+        list(executor.map(remove_qcow2, pool.hosts))

tests/storage/ext/conftest.py

@@ -4,6 +4,8 @@
 
 import logging
 
+from lib.pool import Pool
+
 from typing import TYPE_CHECKING, Generator
 
 if TYPE_CHECKING:
@@ -13,7 +15,8 @@
 @pytest.fixture(scope='package')
 def ext_sr(host: Host,
            unused_512B_disks: dict[Host, list[Host.BlockDeviceInfo]],
-           image_format: str
+           image_format: str,
+           pool_with_qcow2: Pool
            ) -> Generator[SR]:
     """ An EXT SR on first host. """
     sr_disk = unused_512B_disks[host][0]["name"]

tests/storage/ext/test_ext_sr.py

@@ -7,6 +7,7 @@
 from lib.commands import SSHCommandFailed
 from lib.common import vm_image, wait_for
 from lib.fistpoint import FistPoint
+from lib.pool import Pool
 from lib.vdi import VDI
 from tests.storage import try_to_create_sr_with_missing_device, vdi_is_open
 
@@ -30,7 +31,8 @@ def test_create_sr_with_missing_device(self, host):
 
     def test_create_and_destroy_sr(self, host: Host,
                                    unused_512B_disks: dict[Host, list[Host.BlockDeviceInfo]],
-                                   image_format: str
+                                   image_format: str,
+                                   pool_with_qcow2: Pool
                                    ) -> None:
         # Create and destroy tested in the same test to leave the host as unchanged as possible
         sr_disk = unused_512B_disks[host][0]["name"]

tests/storage/largeblock/conftest.py

@@ -8,13 +8,16 @@
 
 if TYPE_CHECKING:
     from lib.host import Host
+    from lib.pool import Pool
     from lib.sr import SR
 
 @pytest.fixture(scope='package')
 def largeblock_sr(host: Host,
                   unused_4k_disks: dict[Host,
                   list[Host.BlockDeviceInfo]],
-                  image_format: str) -> Generator[SR]:
+                  image_format: str,
+                  pool_with_qcow2: Pool
+                  ) -> Generator[SR]:
     """ A LARGEBLOCK SR on first host. """
     sr_disk = unused_4k_disks[host][0]["name"]
     sr = host.sr_create('largeblock', "LARGEBLOCK-local-SR-test",

tests/storage/largeblock/test_largeblock_sr.py

@@ -3,6 +3,7 @@
 import pytest
 
 from lib.common import vm_image, wait_for
+from lib.pool import Pool
 from tests.storage import try_to_create_sr_with_missing_device, vdi_is_open
 
 from typing import TYPE_CHECKING
@@ -25,7 +26,9 @@ def test_create_sr_with_missing_device(self, host):
 
     def test_create_and_destroy_sr(self, host: Host,
                                    unused_4k_disks: dict[Host, list[Host.BlockDeviceInfo]],
-                                   image_format: str) -> None:
+                                   image_format: str,
+                                   pool_with_qcow2: Pool
+                                   ) -> None:
         # Create and destroy tested in the same test to leave the host as unchanged as possible
         sr_disk = unused_4k_disks[host][0]["name"]
         sr = host.sr_create('largeblock', "LARGEBLOCK-local-SR-test",

tests/storage/lvm/conftest.py

@@ -8,12 +8,14 @@
 
 if TYPE_CHECKING:
     from lib.host import Host
+    from lib.pool import Pool
     from lib.sr import SR
 
 @pytest.fixture(scope='package')
 def lvm_sr(host: Host,
            unused_512B_disks: dict[Host, list[Host.BlockDeviceInfo]],
-           image_format: str
+           image_format: str,
+           pool_with_qcow2: Pool
            ) -> Generator[SR]:
     """ An LVM SR on first host. """
     sr_disk = unused_512B_disks[host][0]["name"]

tests/storage/lvm/test_lvm_sr.py

@@ -7,6 +7,7 @@
 from lib.commands import SSHCommandFailed
 from lib.common import vm_image, wait_for
 from lib.fistpoint import FistPoint
+from lib.pool import Pool
 from lib.vdi import VDI
 from tests.storage import try_to_create_sr_with_missing_device, vdi_is_open
 
@@ -30,7 +31,8 @@ def test_create_sr_with_missing_device(self, host):
 
     def test_create_and_destroy_sr(self, host: Host,
                                    unused_512B_disks: dict[Host, list[Host.BlockDeviceInfo]],
-                                   image_format: str
+                                   image_format: str,
+                                   pool_with_qcow2: Pool
                                    ) -> None:
         sr_disk = unused_512B_disks[host][0]["name"]
         # Create and destroy tested in the same test to leave the host as unchanged as possible

tests/storage/xfs/conftest.py

@@ -8,6 +8,7 @@
 
 if TYPE_CHECKING:
     from lib.host import Host
+    from lib.pool import Pool
     from lib.sr import SR
 
 # NOTE: @pytest.mark.usefixtures does not parametrize this fixture.
@@ -28,7 +29,8 @@ def host_with_xfsprogs(host: Host, image_format: str):
 def xfs_sr(unused_512B_disks: dict[Host,
            list[Host.BlockDeviceInfo]],
            host_with_xfsprogs: Host,
-           image_format: str
+           image_format: str,
+           pool_with_qcow2: Pool
            ) -> Generator[SR]:
     """ A XFS SR on first host. """
     sr_disk = unused_512B_disks[host_with_xfsprogs][0]["name"]

tests/storage/xfs/test_xfs_sr.py

@@ -48,7 +48,8 @@ def test_create_xfs_sr_without_xfsprogs(self,
 
     def test_create_and_destroy_sr(self,
                                    unused_512B_disks: dict[Host, list[Host.BlockDeviceInfo]],
-                                   host_with_xfsprogs: Host
+                                   host_with_xfsprogs: Host,
+                                   pool_with_qcow2
                                    ) -> None:
         # Create and destroy tested in the same test to leave the host as unchanged as possible
         host = host_with_xfsprogs

tests/storage/zfs/conftest.py

@@ -3,6 +3,7 @@
 import logging
 
 # Explicitly import package-scoped fixtures (see explanation in pkgfixtures.py)
+from lib.pool import Pool
 from pkgfixtures import host_with_saved_yum_state, sr_disk_wiped
 
 from typing import TYPE_CHECKING, Generator
@@ -46,7 +47,10 @@ 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: Host, image_format: str, zpool_vol0: None) -> Generator[SR]:
+def zfs_sr(host: Host, image_format: str,
+           zpool_vol0: None,
+           pool_with_qcow2: Pool
+           ) -> Generator[SR]:
     """ A ZFS SR on first host. """
     sr = host.sr_create('zfs', "ZFS-local-SR-test", {
         'location': POOL_PATH,