New fixture unused_4k_disks for largeblocks tests

Signed-off-by: Yann Dirson <[email protected]>

Author: ydirson

conftest.py

@@ -131,6 +131,7 @@ def pytest_collection_modifyitems(items, config):
         'hostB1',
         'sr_disk_4k',
         'unused_512B_disks',
+        'unused_4k_disks',
     ]
 
     for item in items:
@@ -403,6 +404,17 @@ def unused_512B_disks(disks: dict[Host, list[Host.BlockDeviceInfo]]
     logging.debug("available disks collected: %s", {host.hostname_or_ip: value for host, value in ret.items()})
     return ret
 
+@pytest.fixture(scope='session')
+def unused_4k_disks(disks: dict[Host, list[Host.BlockDeviceInfo]]
+                    ) -> dict[Host, list[Host.BlockDeviceInfo]]:
+    """Dict identifying names of all 4K-blocks disks for on all hosts of first pool."""
+    ret = {host: [disk for disk in host_disks
+                  if disk["log-sec"] == "4096" and host.disk_is_available(disk["name"])]
+           for host, host_disks in disks.items()
+           }
+    logging.debug("available 4k disks collected: %s", {host.hostname_or_ip: value for host, value in ret.items()})
+    return ret
+
 @pytest.fixture(scope='session')
 def sr_disk_4k(pytestconfig, host: Host) -> Generator[DiskDevName]:
     """

jobs.py

@@ -91,7 +91,7 @@
             "--sr-disk": "auto",
         },
         "paths": ["tests/storage"],
-        "markers": "(small_vm or no_vm) and not reboot and not quicktest and not sr_disk_4k",
+        "markers": "(small_vm or no_vm) and not reboot and not quicktest and not unused_4k_disks",
         "name_filter": "not migration and not linstor",
     },
     "storage-migrations": {
@@ -109,7 +109,7 @@
             "--sr-disk": "auto",
         },
         "paths": ["tests/storage"],
-        "markers": "not sr_disk_4k",
+        "markers": "not unused_4k_disks",
         "name_filter": "migration and not linstor",
     },
     "storage-reboots": {
@@ -126,7 +126,7 @@
             "--sr-disk": "auto",
         },
         "paths": ["tests/storage"],
-        "markers": "reboot and not flaky and not sr_disk_4k",
+        "markers": "reboot and not flaky and not unused_4k_disks",
         "name_filter": "not linstor",
     },
     "storage-quicktest": {
@@ -141,7 +141,7 @@
             "--sr-disk": "auto",
         },
         "paths": ["tests/storage"],
-        "markers": "quicktest and not sr_disk_4k",
+        "markers": "quicktest and not unused_4k_disks",
         "name_filter": "not linstor and not zfsvol",
     },
     "linstor-main": {
@@ -218,7 +218,7 @@
             "--sr-disk-4k": "auto",
         },
         "paths": ["tests/storage"],
-        "markers": "(small_vm or no_vm) and sr_disk_4k and not reboot and not quicktest",
+        "markers": "(small_vm or no_vm) and unused_4k_disks and not reboot and not quicktest",
         "name_filter": "not migration",
     },
     "largeblock-migrations": {
@@ -235,7 +235,7 @@
             "--sr-disk-4k": "auto",
         },
         "paths": ["tests/storage"],
-        "markers": "sr_disk_4k",
+        "markers": "unused_4k_disks",
         "name_filter": "migration",
     },
     "largeblock-reboots": {
@@ -251,7 +251,7 @@
             "--sr-disk-4k": "auto",
         },
         "paths": ["tests/storage"],
-        "markers": "sr_disk_4k and reboot",
+        "markers": "unused_4k_disks and reboot",
     },
     "largeblock-quicktest": {
         "description": "runs `quicktest` on the largeblock storage driver",
@@ -264,7 +264,7 @@
             "--sr-disk-4k": "auto",
         },
         "paths": ["tests/storage"],
-        "markers": "sr_disk_4k and quicktest",
+        "markers": "unused_4k_disks and quicktest",
     },
     "sb-main": {
         "description": "tests uefistored/varstored and SecureBoot using a small unix VM (or no VM when none needed)",

pytest.ini

@@ -11,6 +11,7 @@ markers =
     hostB1: a second pool.
     sr_disk_4k: the test needs a free 4KiB block device that it can erase.
     unused_512B_disks: the test needs one or more free 512B-blocks disk or writable block device that it can erase.
+    unused_4k_disks: the test needs a free 4KiB block device that it can erase.
 
     # * VM-related markers, automatically set based on fixtures
     no_vm: tests that do not require a VM to run.

tests/storage/largeblock/conftest.py

@@ -1,11 +1,20 @@
+from __future__ import annotations
+
 import pytest
 
 import logging
 
+from typing import TYPE_CHECKING, Generator
+
+if TYPE_CHECKING:
+    from lib.host import Host
+    from lib.sr import SR
+
 @pytest.fixture(scope='package')
-def largeblock_sr(host, sr_disk_4k):
+def largeblock_sr(host: Host, unused_4k_disks: dict[Host, list[Host.BlockDeviceInfo]]) -> Generator[SR]:
     """ A LARGEBLOCK SR on first host. """
-    sr = host.sr_create('largeblock', "LARGEBLOCK-local-SR-test", {'device': '/dev/' + sr_disk_4k})
+    sr_disk = unused_4k_disks[host][0]["name"]
+    sr = host.sr_create('largeblock', "LARGEBLOCK-local-SR-test", {'device': '/dev/' + sr_disk})
     yield sr
     # teardown
     sr.destroy()

tests/storage/largeblock/test_largeblock_sr.py

@@ -1,8 +1,15 @@
+from __future__ import annotations
+
 import pytest
 
 from lib.common import vm_image, wait_for
 from tests.storage import try_to_create_sr_with_missing_device, vdi_is_open
 
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from lib.host import Host
+
 # Requirements:
 # - one XCP-ng host with an additional unused 4KiB disk for the SR
 
@@ -16,9 +23,10 @@ class TestLARGEBLOCKSRCreateDestroy:
     def test_create_sr_with_missing_device(self, host):
         try_to_create_sr_with_missing_device('largeblock', 'LARGEBLOCK-local-SR-test', host)
 
-    def test_create_and_destroy_sr(self, host, sr_disk_4k):
+    def test_create_and_destroy_sr(self, host: Host, unused_4k_disks: dict[Host, list[Host.BlockDeviceInfo]]) -> None:
         # Create and destroy tested in the same test to leave the host as unchanged as possible
-        sr = host.sr_create('largeblock', "LARGEBLOCK-local-SR-test", {'device': '/dev/' + sr_disk_4k}, verify=True)
+        sr_disk = unused_4k_disks[host][0]["name"]
+        sr = host.sr_create('largeblock', "LARGEBLOCK-local-SR-test", {'device': '/dev/' + sr_disk}, 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)