storage/linstor: fix linstor upgrade test

Use new function `yum_update` instead of redundant function added
previously, also fix name of function to be more accurate on what's it
does

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

Author: DatBewar

lib/host.py

@@ -480,11 +480,6 @@ 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: str | None = None) -> str:
-        logging.info("Install updates on host %s" % self)
-        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 +606,10 @@ 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: str | None = None) -> bool:
-        enablerepo_arg = f" --enablerepo={enablerepo}" if enablerepo is not None else ""
+    def has_updates(self) -> bool:
         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_arg}")
+            self.ssh('yum check-update')
             # returned 0, else there would have been a SSHCommandFailed
             return False
         except commands.SSHCommandFailed as e:

pytest.ini

@@ -5,7 +5,6 @@ markers =
     default_vm: mark a test with a default VM in case no --vm parameter was given.
 
     # *** Markers used to select tests at collect stage ***
-    upgrade_test: mark a test which will upgrade packages from testing repo
 
     # * Host-related markers, automatically set based on fixtures
     hostA2: a second member in the first pool.

tests/storage/linstor/conftest.py

@@ -108,21 +108,6 @@ 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):
-    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"):
-            _linstor_upgrade_test = True
-            break
-
 @pytest.fixture(scope='package')
 def pool_with_linstor(
     hostA2: Host,
@@ -146,10 +131,7 @@ 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 _linstor_upgrade_test:
-            host.yum_install([LINSTOR_PACKAGE], enablerepo="xcp-ng-linstor-testing")
-        else:
-            host.yum_install([LINSTOR_PACKAGE])
+        host.yum_install([LINSTOR_PACKAGE], enablerepo="xcp-ng-linstor-testing")
         # 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

@@ -255,12 +255,11 @@ 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: 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.
+        2. Update all hosts if updates are available from xcp-ng-linstor-testing.
         3. Reboot updated hosts.
         4. Sequentially ensure that the VM can start on all hosts.
         """
@@ -274,17 +273,18 @@ def test_linstor_sr_pool_update(self, linstor_sr: SR, vm_on_linstor_sr: VM) -> N
 
         # 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: 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")
+        def update_host(host: Host) -> None:
+            logging.info("Updating host %s", host.hostname_or_ip)
+            host.yum_clean_metadata()
+            output = host.yum_update(enablerepos=["xcp-ng-linstor-testing"])
+            if "No packages marked for update" not in output:
                 with updates_lock:
                     updates_applied.append(host)
             else:
                 logging.info("No updates available for host %s", host.hostname_or_ip)
 
         with concurrent.futures.ThreadPoolExecutor() as executor:
-            executor.map(install_updates_on, hosts)
+            executor.map(update_host, hosts)
 
         # Reboot updated hosts
         def reboot_updated(host: Host) -> None:
@@ -301,8 +301,6 @@ def reboot_updated(host: Host) -> None:
             vm.wait_for_os_booted()
             vm.shutdown(verify=True)
 
-        sr.scan()
-
     # *** End of tests with reboots
 
 # --- Test diskless resources --------------------------------------------------