WIP glusterfs: switch from sr_disk_for_all_hosts to pool_with_unused_disk

TODO: needs --disks on CLI to get feature parity first.

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

Author: ydirson

tests/storage/glusterfs/conftest.py

@@ -71,13 +71,14 @@ def pool_with_glusterfs(pool_without_glusterfs, pool_with_saved_yum_state):
     pool.exec_on_hosts_on_error_continue(_teardown_host_with_glusterfs)
 
 @pytest.fixture(scope='package')
-def gluster_disk(host, sr_disk_for_all_hosts):
-    sr_disk = sr_disk_for_all_hosts
+def gluster_disk(pool_with_unused_disk, unused_disks):
+    pool = pool_with_unused_disk
     mountpoint = '/mnt/sr_disk'
-    for h in host.pool.hosts:
+    for h in pool.hosts:
+        sr_disk = unused_disks[h][0]
         setup_formatted_and_mounted_disk(h, sr_disk, 'xfs', mountpoint)
     yield
-    host.pool.exec_on_hosts_on_error_continue(
+    pool.exec_on_hosts_on_error_continue(
         lambda h: teardown_formatted_and_mounted_disk(h, mountpoint)
     )
 

tests/storage/glusterfs/test_glusterfs_sr.py

@@ -9,7 +9,7 @@
 # - one XCP-ng host >= 8.2 with an additional unused disk for the SR
 # - access to XCP-ng RPM repository from the host
 
-@pytest.mark.usefixtures("sr_disk_for_all_hosts") # don't even run the tests if there's no free disk
+@pytest.mark.usefixtures("pool_with_unused_disk") # don't even run the tests if there's no free disk
 class TestGlusterFSSRCreateDestroy:
     """
     Tests that do not use fixtures that setup the SR or import VMs,