benchmark-runner 1.0.748__py3-none-any.whl → 1.0.750__py3-none-any.whl

benchmark_runner/common/oc/oc.py

@@ -31,6 +31,8 @@ class OC(SSH):
     SHORT_TIMEOUT = 600
     # sleep time between checks is 5 sec
     SLEEP_TIME = 3
+    RETRIES = 10
+    DELAY = 30
 
     def __init__(self, kubeadmin_password: str = ''):
         super().__init__()
@@ -49,20 +51,33 @@ class OC(SSH):
             self.__kubeadmin_password = self.__environment_variables_dict.get('kubeadmin_password', '')
         self.__kubeconfig_path = self.__environment_variables_dict.get('kubeconfig_path', '')
 
+    def _ocp_server_version(self, jsonpath: str):
+        """
+        This method returns the OCP server version with retries.
+        :return: OCP server version as string.
+        """
+        for attempt in range(self.RETRIES):
+            try:
+                version = self.run(f"{self.__cli} get clusterversion version -o jsonpath={{{jsonpath}}}")
+                return version
+            except Exception as err:
+                logger.info(f"Attempt {attempt + 1}/{self.RETRIES}: Failed to fetch OCP version. Error: {err}")
+                time.sleep(self.DELAY)
+        raise Exception("Failed to retrieve OCP server version after multiple attempts.")
+
     def get_ocp_server_version(self):
         """
-        This method returns ocp server version
-        :return:
+        This method returns the OCP server version with retries.
+        :return: OCP server version as string.
         """
-        return self.run(f"{self.__cli} get clusterversion version -o jsonpath='{{.status.desired.version}}'")
+        return self._ocp_server_version(jsonpath='.status.desired.version')
 
     def get_previous_ocp_version(self):
         """
-        This method returns the previous OpenShift server version from the history.
-        :return: Previous OpenShift server version as a string
+        This method returns the previous OpenShift server version from the history with retries.
+        :return: Previous OCP server version as string.
         """
-        # Run the `oc` command to get the ClusterVersion history and extract the previous version
-        return self.run(f"{self.__cli} get clusterversion version -o jsonpath='{{.status.history[1].version}}'")
+        return self._ocp_server_version(jsonpath='.status.history[1].version')
 
     def upgrade_ocp(self, upgrade_ocp_version: str, upgrade_channel: str = 'stable'):
         """
@@ -734,15 +749,21 @@ class OC(SSH):
     @logger_time_stamp
     def login(self):
         """
-        This method logs in to the cluster
-        :return:
+        Logs in to the cluster with retries.
         """
-        try:
-            if self.__kubeadmin_password and self.__kubeadmin_password != '':
-                self.run(f'{self.__cli} login {self.get_kube_api_server()} -u kubeadmin -p {self.__kubeadmin_password}', is_check=True)
-        except Exception as err:
-            raise LoginFailed
-        return True
+        for attempt in range(self.RETRIES):
+            try:
+                if self.__kubeadmin_password and self.__kubeadmin_password.strip():
+                    self.run(
+                        f'{self.__cli} login {self.get_kube_api_server()} -u kubeadmin -p {self.__kubeadmin_password}',
+                        is_check=True)
+                    return True  # Success
+            except Exception as err:
+                logger.info(f"Login attempt {attempt + 1} failed: {err}")
+                if attempt < self.RETRIES - 1:
+                    time.sleep(self.DELAY)
+                else:
+                    raise LoginFailed(msg="Login failed after multiple attempts")
 
     @typechecked
     @logger_time_stamp

benchmark_runner/common/oc/oc_exceptions.py

@@ -7,8 +7,8 @@ class OCError(Exception):
 
 class LoginFailed(OCError):
     """This exception return login failed error"""
-    def __init__(self):
-        self.message = f'Login error, check credentials'
+    def __init__(self, msg):
+        self.message = msg
         super(LoginFailed, self).__init__(self.message)
 
 

{benchmark_runner-1.0.748.dist-info → benchmark_runner-1.0.750.dist-info}/METADATA

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

{benchmark_runner-1.0.748.dist-info → benchmark_runner-1.0.750.dist-info}/RECORD

@@ -46,8 +46,8 @@ 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=Y0POw_y6HSA0QGLMy5hnBAzbEjVR5TmNiqoszLCZ3Og,68560
-benchmark_runner/common/oc/oc_exceptions.py,sha256=4JDebyFqe6yIN6Y70E-oscWnme0t7Ggg_CJBBoOuFPs,6336
+benchmark_runner/common/oc/oc.py,sha256=UMPUxMdQfjvIA2tOipodxDnGRbbWc56aYDXXgonyuGU,69500
+benchmark_runner/common/oc/oc_exceptions.py,sha256=XfKUzeK3Ors_Y2csQEoGqrlsZlYvq6OXLkFh9s_mQRM,6311
 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
@@ -172,8 +172,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=SdddQUbAN5biRjZr5CvmlgKxcE4xatCnoSBm9cn1K9A,25286
-benchmark_runner-1.0.748.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.748.dist-info/METADATA,sha256=oM0ncfbh10EECRnTEWmIu1kGxNZW4ixgxtBPa8G8f4w,11498
-benchmark_runner-1.0.748.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-benchmark_runner-1.0.748.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.748.dist-info/RECORD,,
+benchmark_runner-1.0.750.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.750.dist-info/METADATA,sha256=aQWMmpbytUbaMi2gUufFV2zAcCia1M2VFyy9u6sny08,11498
+benchmark_runner-1.0.750.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+benchmark_runner-1.0.750.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.750.dist-info/RECORD,,