benchmark-runner 1.0.837__py3-none-any.whl → 1.0.838__py3-none-any.whl

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.837.dist-info → benchmark_runner-1.0.838.dist-info}/METADATA

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

{benchmark_runner-1.0.837.dist-info → benchmark_runner-1.0.838.dist-info}/RECORD

@@ -23,7 +23,7 @@ benchmark_runner/common/clouds/Azure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 benchmark_runner/common/clouds/Azure/azure_operations.py,sha256=Ok3l0rxCAqZd2_yzuOuUO6Zs3KjvYC85p2VQf7uyMnM,4735
 benchmark_runner/common/clouds/BareMetal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchmark_runner/common/clouds/BareMetal/bare_metal_exceptions.py,sha256=d-aeCfsfGpZ3e1Bho1M8pYlN0D8R-ffjwPm9YwGHvhU,1552
-benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py,sha256=lNkiRDbOFdNCcwD-jrO1E3pdggElIVC2sufcjd2Jc-s,19178
+benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py,sha256=FSQ5WWEc1MnvSou643R_kNFwVA6pjOtKaEUNBXLT6q8,19462
 benchmark_runner/common/clouds/IBM/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchmark_runner/common/clouds/IBM/ibm_exceptions.py,sha256=psqHgqEBRbfFRWD1blwaWGad-QpThgOl8Puq76VIP80,417
 benchmark_runner/common/clouds/IBM/ibm_operations.py,sha256=ZpF3Vnu2YKqAEYVf7ofBg_kOavMaLCXYCt0CdX8dKd4,3419
@@ -174,8 +174,8 @@ benchmark_runner/workloads/windows_vm.py,sha256=qFVD3qBFMnVpYXnrpam-7H5-0Yzvx6qt
 benchmark_runner/workloads/workloads.py,sha256=F9fnk4h715tq7ANSCbDH0jktB8fpr_u3YG61Kdi5_os,1422
 benchmark_runner/workloads/workloads_exceptions.py,sha256=u7VII95iPRF_YhfpGH1U1RmgiIYESMOtbSF1dz7_ToE,1858
 benchmark_runner/workloads/workloads_operations.py,sha256=8utD-uU_MNZn5JOC2r5OVq5BfCPkxlUvP3xlUP9oIGk,27160
-benchmark_runner-1.0.837.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.837.dist-info/METADATA,sha256=SJUoi7m87dRJAxvOOBKJWoOPeYRSzAPlc8X7NuP3gg0,11582
-benchmark_runner-1.0.837.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-benchmark_runner-1.0.837.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.837.dist-info/RECORD,,
+benchmark_runner-1.0.838.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.838.dist-info/METADATA,sha256=78oDkfvkRDTgur6tUghpqCHcqPSJGoEoBCothjWkRpU,11582
+benchmark_runner-1.0.838.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+benchmark_runner-1.0.838.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.838.dist-info/RECORD,,