benchmark-runner 1.0.693__py3-none-any.whl → 1.0.695__py3-none-any.whl

benchmark_runner/common/oc/oc.py

@@ -379,22 +379,28 @@ class OC(SSH):
     def wait_for_odf_healthcheck(self, pod_name: str, namespace: str,
                                  timeout: int = int(environment_variables.environment_variables_dict['timeout'])):
         """
-        This method waits for patch, needs to wait that pod is created and then wait for ready
-        @param pod_name:
-        @param namespace:
-        @param timeout:
-        @return:
+        This method waits for the ODF health check by ensuring the pod is created and reaches the 'HEALTH_OK' status.
+
+        @param pod_name: Name of the pod to check health.
+        @param namespace: Namespace where the pod is located.
+        @param timeout: Timeout in seconds for waiting. If set to 0 or negative, wait indefinitely.
+        @return: True if health check passes within the timeout.
+        @raise ODFHealthCheckTimeout: If health check fails within the timeout.
         """
         current_wait_time = 0
         health_check = f"{self.__cli} -n {namespace} rsh {self._get_pod_name(pod_name=pod_name, namespace=namespace)} ceph health"
-        while timeout <= 0 or current_wait_time <= timeout and 'HEALTH_OK' != self.run(health_check).strip():
-            # sleep for x seconds
+
+        while timeout <= 0 or current_wait_time <= timeout:
+            if 'HEALTH_OK' == self.run(health_check).strip():
+                return True
+
+            # Sleep for a defined interval and update the wait time
             time.sleep(OC.SLEEP_TIME)
             current_wait_time += OC.SLEEP_TIME
-        if 'HEALTH_OK' == self.run(health_check).strip():
-            return True
-        else:
-            raise ODFHealthCheckTimeout()
+
+        # Raise exception if health check fails within the timeout
+        raise ODFHealthCheckTimeout(
+            message=f"Health check failed for pod '{pod_name}' in namespace '{namespace}' after {timeout} seconds.")
 
     @typechecked
     @logger_time_stamp
@@ -471,7 +477,7 @@ class OC(SSH):
         wait_time = wait_time or OC.SHORT_TIMEOUT
         nodes_status = None
         current_wait_time = 0
-        while timeout <= 0 or current_wait_time < timeout:
+        while timeout <= 0 or current_wait_time <= timeout:
             nodes_status = self.check_node_status(node=node)
             if nodes_status is True:
                 return True

benchmark_runner/common/oc/oc_exceptions.py

@@ -161,8 +161,8 @@ class OperatorUpgradeTimeout(OCError):
 
 class ODFHealthCheckTimeout(OCError):
     """This exception return odf healthcheck timeout error"""
-    def __init__(self):
-        self.message = f"ODF health check timeout"
+    def __init__(self, message: str):
+        self.message = message
         super(ODFHealthCheckTimeout, self).__init__(self.message)
 
 

benchmark_runner/common/ocp_resources/create_nhc_snr.py

@@ -0,0 +1,43 @@
+
+import os
+
+from benchmark_runner.common.oc.oc import OC
+from benchmark_runner.common.logger.logger_time_stamp import logger_time_stamp, logger
+from benchmark_runner.common.ocp_resources.create_ocp_resource_operations import CreateOCPResourceOperations
+
+
+class CreateNHCSNR(CreateOCPResourceOperations):
+    """
+    This class is created node-health-check and self-node-remediation operators
+    """
+    def __init__(self, oc: OC, path: str, resource_list: list):
+        super().__init__(oc)
+        self.__oc = oc
+        self.__path = path
+        self.__resource_list = resource_list
+
+    @logger_time_stamp
+    def create_nhc_snr(self):
+        """
+        This method creates node-health-check and self-node-remediation operators
+        :return:
+        """
+        for resource in self.__resource_list:
+            logger.info(f'run {resource}')
+            self.__oc.create_async(yaml=os.path.join(self.__path, resource))
+
+            if '03_subscription.yaml' in resource:
+                # verify once after create all resource files
+                self.wait_for_ocp_resource_create(operator='nhc',
+                                                  verify_cmd="oc get csv -n openshift-workload-availability -o jsonpath='{.items[0].status.phase}'",
+                                                  status='Succeeded')
+                self.wait_for_ocp_resource_create(operator='snr',
+                                                  verify_cmd="oc get csv -n openshift-workload-availability -o jsonpath='{.items[1].status.phase}'",
+                                                  status='Succeeded')
+            # SNR is automatically enabled when NHC is enabled
+            if '04_nhc_snr.yaml' in resource:
+                # Verify NHC is enabled
+                self.wait_for_ocp_resource_create(operator='nhc',
+                                                  verify_cmd="oc get nhc -A -o jsonpath='{range .items[*]}{.status.phase}{\"\\n\"}{end}'",
+                                                  status='Enabled')
+        return True

benchmark_runner/common/ocp_resources/create_ocp_resource.py

@@ -8,6 +8,7 @@ from benchmark_runner.common.ocp_resources.create_lso import CreateLSO
 from benchmark_runner.common.ocp_resources.create_odf import CreateODF
 from benchmark_runner.common.ocp_resources.create_kata import CreateKata
 from benchmark_runner.common.ocp_resources.create_cnv import CreateCNV
+from benchmark_runner.common.ocp_resources.create_nhc_snr import CreateNHCSNR
 from benchmark_runner.common.ocp_resources.create_custom import CreateCustom
 from benchmark_runner.common.ocp_resources.migrate_infra import MigrateInfra
 
@@ -91,6 +92,9 @@ class CreateOCPResource:
         elif 'cnv' == resource:
             create_cnv = CreateCNV(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
             create_cnv.create_cnv()
+        elif 'nhc_snr' == resource:
+            create_nhc_snr = CreateNHCSNR(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
+            create_nhc_snr.create_nhc_snr()
         elif 'infra' == resource:
             create_infra = MigrateInfra(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
             create_infra.migrate_infra()

{benchmark_runner-1.0.693.dist-info → benchmark_runner-1.0.695.dist-info}/METADATA

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

{benchmark_runner-1.0.693.dist-info → benchmark_runner-1.0.695.dist-info}/RECORD

@@ -46,14 +46,15 @@ benchmark_runner/common/logger/init_logger.py,sha256=ERa-gNqrl2pZybj7v3csvmao7Mv
 benchmark_runner/common/logger/logger_exceptions.py,sha256=rivdlRm_jIsKQ53rP_-HX8emdtOmQNO4JuIkg8fnBoc,454
 benchmark_runner/common/logger/logger_time_stamp.py,sha256=2JgugN9LpXF4Ijx0wPRzz3DAGJB8eJpM5g1qPvbWbV8,1479
 benchmark_runner/common/oc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-benchmark_runner/common/oc/oc.py,sha256=Z_XGh_PJzKfN7kfSwhoCJs7ZofynPaziN20nNKLHUBM,66236
-benchmark_runner/common/oc/oc_exceptions.py,sha256=Hj0IIjIbLkKnfhErynpAIzupdsU-eerndwQBPoNWShs,6342
+benchmark_runner/common/oc/oc.py,sha256=VfD-IQRjRT5-nhkCi1zH9rhY6giOywQJw2oIkgf6GZM,66694
+benchmark_runner/common/oc/oc_exceptions.py,sha256=4JDebyFqe6yIN6Y70E-oscWnme0t7Ggg_CJBBoOuFPs,6336
 benchmark_runner/common/ocp_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchmark_runner/common/ocp_resources/create_cnv.py,sha256=AXsyR8_g_RIFHz2rkyHzzvvUDIiGdOi9rZWJPhiPzDQ,3511
 benchmark_runner/common/ocp_resources/create_custom.py,sha256=rthm96yDzI-Hke54hLWTs0O3gDtpQPR6n184ehaEevo,1029
 benchmark_runner/common/ocp_resources/create_kata.py,sha256=IhfnDHj0lLUVENA-Nh9BucSAt0BqL8mtqT6QloMzIDg,3721
 benchmark_runner/common/ocp_resources/create_lso.py,sha256=anrLu2NymdxE7LkJ9fytqmhkysq7hVLOYBVxjfFlmVE,1634
-benchmark_runner/common/ocp_resources/create_ocp_resource.py,sha256=iBiT5CfuaYuDfX5zc64IzZhQKGrGHzVSLK9eyJmjDkk,5217
+benchmark_runner/common/ocp_resources/create_nhc_snr.py,sha256=pTyx6Y5BNfXvRtJcbfLtUlqdEb1eB7ypCFv9-kBEIuU,2057
+benchmark_runner/common/ocp_resources/create_ocp_resource.py,sha256=ik0lotwiuECRDCbPYfDpi2Q_qjhtc2XDCR9zbY_Z9V0,5504
 benchmark_runner/common/ocp_resources/create_ocp_resource_exceptions.py,sha256=hthowyHAeg66IZHYPe1FWU3dnhwXcQtPBrOQSO1RZMU,941
 benchmark_runner/common/ocp_resources/create_ocp_resource_operations.py,sha256=47SyVjtv5e9vKuRQFlC-VfGKXBLEl46rut4XVeZRsMo,6834
 benchmark_runner/common/ocp_resources/create_odf.py,sha256=3ZwFaiLB-j062W-6SESZRzh6thUrn1dAzDQ07FISOjE,4441
@@ -165,8 +166,8 @@ benchmark_runner/workloads/windows_vm.py,sha256=eHK79ueAkSlNC1uamz19o7CO20wzJi-U
 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=tAgvdMRMu5Ybck81UBCBE6H76PN0L2GptjNRnYoFv2M,25221
-benchmark_runner-1.0.693.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.693.dist-info/METADATA,sha256=05rM5Gt5Prd1es2pxpYcHYzYd4SpH4RTSRqvPwj599E,11309
-benchmark_runner-1.0.693.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
-benchmark_runner-1.0.693.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.693.dist-info/RECORD,,
+benchmark_runner-1.0.695.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.695.dist-info/METADATA,sha256=1wql7Qer_yLnmASjjKhTqjNzbvG7-LB7AQ2eu3NU1cc,11309
+benchmark_runner-1.0.695.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+benchmark_runner-1.0.695.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.695.dist-info/RECORD,,

{benchmark_runner-1.0.693.dist-info → benchmark_runner-1.0.695.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.4.0)
+Generator: setuptools (75.5.0)
 Root-Is-Purelib: true
 Tag: py3-none-any