Rebase and change from comment of the PR for test_linstor_sr_pool_update

Signed-off-by: Erwan Croze <erwan.croze@vates.tech>

Author: DatBewar

lib/host.py

@@ -480,10 +480,10 @@ def pool_has_vm(self, vm_uuid: str, vm_type: str = 'vm') -> bool:
         else:
             return self.xe('vm-list', {'uuid': vm_uuid}, minimal=True) == vm_uuid
 
-    def install_updates(self, enablerepo=None):
+    def install_updates(self, enablerepo: str | None = None) -> str:
         logging.info("Install updates on host %s" % self)
-        enablerepo_cmd = ['--enablerepo=%s' % enablerepo] if enablerepo is not None else []
-        return self.ssh(f"yum update -y {enablerepo_cmd}")
+        enablerepo_arg = f" --enablerepo={enablerepo}" if enablerepo is not None else ""
+        return self.ssh(f"yum update -y{enablerepo_arg}")
 
     def get_system_uuid(self) -> str:
         """Get system uuid of current host.
@@ -611,11 +611,11 @@ def is_enabled(self) -> bool:
             # If XAPI is not ready yet, or the host is down, this will throw. We return False in that case.
             return False
 
-    def has_updates(self, enablerepo=None):
-        enablerepo_cmd = ['--enablerepo=%s' % enablerepo] if enablerepo is not None else []
+    def has_updates(self, enablerepo: str | None = None) -> bool:
+        enablerepo_arg = f" --enablerepo={enablerepo}" if enablerepo is not None else ""
         try:
             # yum check-update returns 100 if there are updates, 1 if there's an error, 0 if no updates
-            self.ssh(f"yum check-update {enablerepo_cmd}")
+            self.ssh(f"yum check-update{enablerepo_arg}")
             # returned 0, else there would have been a SSHCommandFailed
             return False
         except commands.SSHCommandFailed as e:

tests/storage/linstor/conftest.py

@@ -108,13 +108,19 @@ def storage_pool_name(provisioning_type: str) -> str:
 def provisioning_type(request: pytest.FixtureRequest) -> str:
     return request.param
 
+_linstor_upgrade_test = False
+
+# pytest hook: called once at startup, before test collection.
 def pytest_configure(config):
-    config._linstor_upgrade_test = False
+    global _linstor_upgrade_test
+    _linstor_upgrade_test = False
 
+# pytest hook: called after all tests are collected, before any test runs.
 def pytest_collection_modifyitems(config, items):
+    global _linstor_upgrade_test
     for item in items:
         if item.get_closest_marker("upgrade_test"):
-            config._linstor_upgrade_test = True
+            _linstor_upgrade_test = True
             break
 
 @pytest.fixture(scope='package')
@@ -123,11 +129,9 @@ def pool_with_linstor(
     lvm_disks: None,
     pool_with_saved_yum_state: Pool,
     _linstor_config: LinstorConfig,
-    request
 ) -> Generator[Pool, None, None]:
     import concurrent.futures
 
-    dont_use_testing_repo = request.config._linstor_upgrade_test
     pool = pool_with_saved_yum_state
 
     def ensure_linstor_not_installed(host: Host) -> None:
@@ -142,10 +146,10 @@ def ensure_linstor_not_installed(host: Host) -> None:
     def install_linstor(host: Host) -> None:
         logging.info(f"Installing {LINSTOR_PACKAGE} on host {host}...")
         host.yum_install([LINSTOR_RELEASE_PACKAGE])
-        if dont_use_testing_repo:
-            host.yum_install([LINSTOR_PACKAGE])
-        else:
+        if _linstor_upgrade_test:
             host.yum_install([LINSTOR_PACKAGE], enablerepo="xcp-ng-linstor-testing")
+        else:
+            host.yum_install([LINSTOR_PACKAGE])
         # Needed because the linstor driver is not in the xapi sm-plugins list
         # before installing the LINSTOR packages.
         host.ssh('systemctl restart multipathd')

tests/storage/linstor/test_linstor_sr.py

@@ -1,8 +1,10 @@
 import pytest
 
+import concurrent.futures
 import json
 import logging
 import shlex
+import threading
 import time
 
 from lib.commands import SSHCommandFailed
@@ -254,16 +256,14 @@ def test_linstor_missing(self, linstor_sr: SR, host: Host) -> None:
     @pytest.mark.reboot
     @pytest.mark.small_vm
     @pytest.mark.upgrade_test
-    def test_linstor_sr_pool_update(self, linstor_sr, vm_on_linstor_sr):
+    def test_linstor_sr_pool_update(self, linstor_sr: SR, vm_on_linstor_sr: VM) -> None:
         """
         Perform update on the Linstor SR pool hosts while ensuring VM availability.
         1. Identify all hosts in the SR pool and order them with the master first.
         2. Update all hosts if updates are available.
-        3. Reboot all hosts.
+        3. Reboot updated hosts.
         4. Sequentially ensure that the VM can start on all hosts.
         """
-        import concurrent.futures, threading
-
         sr = linstor_sr
         vm = vm_on_linstor_sr
         updates_applied = []
@@ -274,7 +274,7 @@ def test_linstor_sr_pool_update(self, linstor_sr, vm_on_linstor_sr):
 
         # RPU is disabled for pools with XOSTOR SRs.
         # LINSTOR expects that we always use satellites and controllers with the same version on all hosts.
-        def install_updates_on(host):
+        def install_updates_on(host: Host) -> None:
             logging.info("Checking on host %s", host.hostname_or_ip)
             if host.has_updates(enablerepo="xcp-ng-linstor-testing"):
                 host.install_updates(enablerepo="xcp-ng-linstor-testing")
@@ -287,11 +287,13 @@ def install_updates_on(host):
             executor.map(install_updates_on, hosts)
 
         # Reboot updated hosts
-        def reboot_updated(host):
+        def reboot_updated(host: Host) -> None:
             host.reboot(verify=True)
 
-        with concurrent.futures.ThreadPoolExecutor() as executor:
-            executor.map(reboot_updated, updates_applied)
+        if updates_applied:
+            with concurrent.futures.ThreadPoolExecutor() as executor:
+                executor.map(reboot_updated, updates_applied)
+            wait_for(sr.all_pbds_attached, "Wait for PBD attached")
 
         # Ensure VM is able to boot on all the hosts
         for h in hosts: