benchmark-runner 1.0.836__tar.gz → 1.0.838__tar.gz

{benchmark_runner-1.0.836/benchmark_runner.egg-info → benchmark_runner-1.0.838}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: benchmark-runner
-Version: 1.0.836
+Version: 1.0.838
 Summary: Benchmark Runner Tool
 Home-page: https://github.com/redhat-performance/benchmark-runner
 Author: Red Hat

{benchmark_runner-1.0.836 → benchmark_runner-1.0.838}/benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py

@@ -288,24 +288,34 @@ class BareMetalOperations:
         else:
             return True
 
-    def is_cluster_upgraded(self, oc: OC, cnv_version: str, odf_version: str, lso_version: str):
+    def is_cluster_upgraded(self, oc: OC, cnv_version: str = None, odf_version: str = None,
+                            lso_version: str = None) -> bool:
         """
-        This method checks if cluster/operators upgraded successfully
-        @param oc:
-        @param cnv_version:
-        @param odf_version:
-        @param lso_version:
-        @return:
+        Checks if the cluster and the specified operators were successfully upgraded.
+
+        :param oc: OC client instance
+        :param cnv_version: (Optional) Target CNV operator version
+        :param odf_version: (Optional) Target ODF operator version
+        :param lso_version: (Optional) Target LSO operator version
+        :return: True if the upgrade (cluster + specified operators) is successful, otherwise False
         """
-        # check cluster version upgrade
-        if oc.get_upgrade_version() == self._upgrade_ocp_version:
-            lso_upgraded = oc.wait_for_operator_installation(operator='lso', version=lso_version, namespace='openshift-local-storage')
-            odf_upgraded = oc.wait_for_operator_installation(operator='odf', version=odf_version, namespace='openshift-storage')
-            cnv_upgraded = oc.wait_for_operator_installation(operator='cnv', version=cnv_version, namespace='openshift-cnv')
-            # check operators versions upgrade
-            if cnv_upgraded and lso_upgraded and odf_upgraded:
-                return True
-        return False
+        if oc.get_upgrade_version() != self._upgrade_ocp_version:
+            return False
+
+        # Operator details mapping
+        operators_to_check = {
+            "cnv": (cnv_version, "openshift-cnv"),
+            "odf": (odf_version, "openshift-storage"),
+            "lso": (lso_version, "openshift-local-storage"),
+        }
+
+        upgrade_checks = [
+            oc.wait_for_operator_installation(operator=op, version=ver, namespace=ns)
+            for op, (ver, ns) in operators_to_check.items()
+            if ver  # only include if a version was specified
+        ]
+
+        return all(upgrade_checks) if upgrade_checks else True
 
     @logger_time_stamp
     def verify_upgrade_complete(self, oc: OC):

{benchmark_runner-1.0.836 → benchmark_runner-1.0.838/benchmark_runner.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: benchmark-runner
-Version: 1.0.836
+Version: 1.0.838
 Summary: Benchmark Runner Tool
 Home-page: https://github.com/redhat-performance/benchmark-runner
 Author: Red Hat

{benchmark_runner-1.0.836 → benchmark_runner-1.0.838}/setup.py

@@ -4,7 +4,7 @@ from os import path
 from setuptools import setup, find_packages
 
 
-__version__ = '1.0.836'  # update also .bumpversion.cfg
+__version__ = '1.0.838'  # update also .bumpversion.cfg
 
 
 here = path.abspath(path.dirname(__file__))