benchmark-runner 1.0.754__py3-none-any.whl → 1.0.756__py3-none-any.whl

benchmark_runner/benchmark_operator/benchmark_operator_workloads_operations.py

@@ -67,8 +67,8 @@ class BenchmarkOperatorWorkloadsOperations:
                                                            timeout=self._timeout)
         # Generate template class
         self._template = TemplateOperations(workload=self._workload)
-        # set oc login
-        self._oc = self.set_login(kubeadmin_password=self._kubeadmin_password)
+        # get oc instance
+        self._oc = self.get_oc(kubeadmin_password=self._kubeadmin_password)
         self._virtctl = Virtctl()
         # PrometheusSnapshot
         if self._enable_prometheus_snapshot:
@@ -87,14 +87,13 @@ class BenchmarkOperatorWorkloadsOperations:
         else:
             self._lso_disk_id = None
 
-    def set_login(self, kubeadmin_password: str = ''):
+    def get_oc(self, kubeadmin_password: str = ''):
         """
-        This method sets oc login
+        This method returns oc instance
         :param kubeadmin_password:
         :return:
         """
         self._oc = OC(kubeadmin_password=kubeadmin_password)
-        self._oc.login()
         return self._oc
 
     @logger_time_stamp
@@ -163,13 +162,6 @@ class BenchmarkOperatorWorkloadsOperations:
             logger.info('make undeploy benchmark operator running pod')
             self.make_undeploy_benchmark_controller_manager(runner_path=runner_path)
 
-    @logger_time_stamp
-    def login(self):
-        """
-        This method logs in to the cluster
-        """
-        self._oc.login()
-
     @logger_time_stamp
     def tear_down_pod_after_error(self, yaml: str, pod_name: str):
         """

benchmark_runner/common/clouds/Azure/azure_operations.py

@@ -76,13 +76,12 @@ class AzureOperations:
         return vm_instance
 
     @logger_time_stamp
-    def oc_login(self):
+    def get_oc(self):
         """
         This method login to the cluster with new credentials
         :return:
         """
         oc = OC(kubeadmin_password=self.__kubeadmin_password)
-        oc.login()
         return oc
 
     def verify_sno_cluster_is_up(self):
@@ -90,7 +89,7 @@ class AzureOperations:
         This method verifies sno cluster is up and running
         @return:
         """
-        master_nodes = self.oc_login().get_master_nodes()
+        master_nodes = self.get_oc().get_master_nodes()
         if len(master_nodes.split()) == 1:
             return True
         else:

benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py

@@ -304,7 +304,7 @@ class BareMetalOperations:
         raise OCPUpgradeFailed(status=oc.get_cluster_status())
 
     @logger_time_stamp
-    def oc_login(self, kubeadmin_password: str = ''):
+    def get_oc(self, kubeadmin_password: str = ''):
         """
         This method login to the cluster with new credentials
         :param kubeadmin_password, default empty
@@ -314,7 +314,6 @@ class BareMetalOperations:
             oc = OC(kubeadmin_password=kubeadmin_password)
         else:
             oc = OC(kubeadmin_password=self._get_kubeadmin_password())
-        oc.login()
         return oc
 
     @staticmethod

benchmark_runner/common/oc/oc.py

@@ -50,6 +50,9 @@ class OC(SSH):
         else:
             self.__kubeadmin_password = self.__environment_variables_dict.get('kubeadmin_password', '')
         self.__kubeconfig_path = self.__environment_variables_dict.get('kubeconfig_path', '')
+        self._is_logged_in = False  # Shared across all instances
+        # singleton login
+        self.__login()
 
     def _ocp_server_version(self, jsonpath: str):
         """
@@ -732,38 +735,32 @@ class OC(SSH):
         self.run(f"{self.__cli} get events -A > '{output_filename}' ")
         return output_filename
 
-    def get_kube_api_server(self):
-        try:
-            with open(self.__kubeconfig_path, "r") as f:
-                config = yaml.safe_load(f)
-
-            # Extract the API server URL from the clusters section
-            return config["clusters"][0]["cluster"]["server"]
-        except FileNotFoundError:
-            return "Kubeconfig file not found."
-        except KeyError:
-            return "Invalid kubeconfig format. Could not find API server."
-        except Exception as e:
-            return f"Error: {str(e)}"
-
     @logger_time_stamp
-    def login(self):
+    def __login(self):
         """
-        Logs in to the cluster with retries.
+        Logs in to the cluster with retries, ensuring only a single login per execution.
         """
+        if self._is_logged_in:
+            logger.info("Already logged in. Skipping login.")
+            return True  # Avoid redundant login attempts
+
         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)
+                        f'{self.__cli} login -u kubeadmin -p {self.__kubeadmin_password}',
+                        is_check=True
+                    )
+                    self._is_logged_in = True  # Mark as logged in globally
                     return True  # Success
             except Exception as err:
-                logger.info(f"Login attempt {attempt + 1} failed: {err}")
+                logger.warning(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")
+                    raise LoginFailed("Login failed after multiple attempts")
+
+        return self._is_logged_in  # Ensure return after loop
 
     @typechecked
     @logger_time_stamp

benchmark_runner/common/ocp_resources/create_ocp_resource.py

@@ -21,7 +21,6 @@ class CreateOCPResource:
         self.__dir_path = f'{os.path.dirname(os.path.realpath(__file__))}'
         self.__environment_variables_dict = environment_variables.environment_variables_dict
         self.__oc = OC(kubeadmin_password=self.__environment_variables_dict.get('kubeadmin_password', ''))
-        self.__oc.login()
         self.__oc.populate_additional_template_variables(self.__environment_variables_dict)
         self.__worker_disk_prefix = self.__environment_variables_dict.get('worker_disk_prefix', '')
         self.__worker_disk_ids = self.__environment_variables_dict.get('worker_disk_ids', '')

benchmark_runner/main/main.py

@@ -165,7 +165,7 @@ def upgrade_ocp_bare_metal(step: str):
     :return:
     """
     bare_metal_operations = BareMetalOperations()
-    oc = bare_metal_operations.oc_login(kubeadmin_password=kubeadmin_password)
+    oc = bare_metal_operations.get_oc(kubeadmin_password=kubeadmin_password)
     if step == 'run_bare_metal_ocp_upgrade':
         if not bare_metal_operations.is_ocp_already_upgraded(oc):
             bare_metal_operations.run_ocp_upgrade(oc)
@@ -198,7 +198,7 @@ def install_resources():
     except (ValueError, SyntaxError):
         resources = [install_resources_list]
     logger.info(f'Start Bare-Metal OpenShift resources installation')
-    oc = bare_metal_operations.oc_login()
+    oc = bare_metal_operations.get_oc()
     bare_metal_operations.verify_cluster_is_up(oc)
     oc.wait_for_node_ready()
     bare_metal_operations.install_ocp_resources(resources=resources)

benchmark_runner/workloads/workloads_operations.py

@@ -90,10 +90,9 @@ class WorkloadsOperations:
         # Generate templates class
         self._template = TemplateOperations(workload=self._workload)
 
-        # set oc login
+        # get oc instance
         if WorkloadsOperations.oc is None:
-            WorkloadsOperations.oc = self.set_login(kubeadmin_password=self._kubeadmin_password)
-        self._oc = WorkloadsOperations.oc
+            self._oc = self.get_oc(kubeadmin_password=self._kubeadmin_password)
         self._virtctl = Virtctl()
 
         # Prometheus Snapshot
@@ -131,14 +130,13 @@ class WorkloadsOperations:
         else:
             return f'{workload}-{self._time_stamp_format}'
 
-    def set_login(self, kubeadmin_password: str = ''):
+    def get_oc(self, kubeadmin_password: str = ''):
         """
-        This method sets login
+        This method returns oc instance
         :param kubeadmin_password:
         :return: oc instance
         """
         self._oc = OC(kubeadmin_password=kubeadmin_password)
-        self._oc.login()
         return self._oc
 
     @logger_time_stamp

{benchmark_runner-1.0.754.dist-info → benchmark_runner-1.0.756.dist-info}/METADATA

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

{benchmark_runner-1.0.754.dist-info → benchmark_runner-1.0.756.dist-info}/RECORD

@@ -2,7 +2,7 @@ benchmark_runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 benchmark_runner/benchmark_operator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchmark_runner/benchmark_operator/benchmark_operator_exceptions.py,sha256=5BCKcvLBMLFW4-XgZ7uXrja7uOE0UaplxAsdkKTpmek,1668
 benchmark_runner/benchmark_operator/benchmark_operator_workloads.py,sha256=dL09ni6x4yaNFHs5djEebe4KE7M4n_rupWH7ngHpJwc,1425
-benchmark_runner/benchmark_operator/benchmark_operator_workloads_operations.py,sha256=vIIYvwfiiDItJsfUe93cxWpN5oHPZEfFKt7b6ZbChjo,25180
+benchmark_runner/benchmark_operator/benchmark_operator_workloads_operations.py,sha256=enJr5Syq1UFJAVPfUsFfBZ39IKqAgR7DoP3JYjkf1JU,25021
 benchmark_runner/benchmark_operator/hammerdb_pod.py,sha256=Xe3ZDHnbxQgUx9DAkjyeCI9rLqzuVV69GiC8J_FUvKc,8127
 benchmark_runner/benchmark_operator/hammerdb_vm.py,sha256=bG7nb07cL0GuB7-oxf3jFx8bkolD_MujYykUacWqJOM,5785
 benchmark_runner/benchmark_operator/stressng_pod.py,sha256=wOPjETpeUfS7Ey6bpmmYVQas9vtlmyujLf0swemaP4g,5268
@@ -20,10 +20,10 @@ benchmark_runner/common/assisted_installer/assisted_installer_latest_version.py,
 benchmark_runner/common/assisted_installer/jetlag/run_jetlag.sh,sha256=-iJunF4fAQEWdWfICnwCx0xVBb4T_eVTYCi58yY6SpU,947
 benchmark_runner/common/clouds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchmark_runner/common/clouds/Azure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-benchmark_runner/common/clouds/Azure/azure_operations.py,sha256=S9_ZI0ESASUNWIpQ1WeekjrKBVtVWZDdFoIL0qEC35s,4758
+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=OWzpIHu-Xqixb5YviJD5oCji_eqFAfra1ienIHxlAxw,18065
+benchmark_runner/common/clouds/BareMetal/bare_metal_operations.py,sha256=RjocXfXX8T4cTGgBkEi6LBRX-y5xk6mQmj7aMvqBu1Q,18044
 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
@@ -46,7 +46,7 @@ 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=UMPUxMdQfjvIA2tOipodxDnGRbbWc56aYDXXgonyuGU,69500
+benchmark_runner/common/oc/oc.py,sha256=wVxDXkQwNpNTjENnIwtIQha6K971mt3xns09niZO2-8,69413
 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
@@ -54,7 +54,7 @@ benchmark_runner/common/ocp_resources/create_custom.py,sha256=rthm96yDzI-Hke54hL
 benchmark_runner/common/ocp_resources/create_kata.py,sha256=IhfnDHj0lLUVENA-Nh9BucSAt0BqL8mtqT6QloMzIDg,3721
 benchmark_runner/common/ocp_resources/create_lso.py,sha256=uzhYTUK-645_2L45Q2sbDOuvSLeGnN-UdbdrkYR5PqQ,1634
 benchmark_runner/common/ocp_resources/create_nhc_snr.py,sha256=ejbX-KhkvqU9SCEX1-tA7xiZRXe5bsSAQoyyjMC15IU,1991
-benchmark_runner/common/ocp_resources/create_ocp_resource.py,sha256=ik0lotwiuECRDCbPYfDpi2Q_qjhtc2XDCR9zbY_Z9V0,5504
+benchmark_runner/common/ocp_resources/create_ocp_resource.py,sha256=Tq_M3AtykXo7Cp7rZ1nhGnhb_dJdd774C9166qCxQ_Q,5478
 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
@@ -162,7 +162,7 @@ benchmark_runner/krkn_hub/krknhub_workloads.py,sha256=qNRZA-FBQZiT6h013WbP6zBRIN
 benchmark_runner/main/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchmark_runner/main/environment_variables.py,sha256=FqXk-zKvmunv9vV2td9bYfpeFWaY5s2D38fEnzO-tw0,28189
 benchmark_runner/main/environment_variables_exceptions.py,sha256=UR0Ith0P0oshsDZdJRlRq8ZUTt0h8jFvUtrnP4m4AIY,437
-benchmark_runner/main/main.py,sha256=MWZnLXCAvx9lC2l9s6q3fzI5iiSnYA2ybyNhDhud3aA,14087
+benchmark_runner/main/main.py,sha256=A744O550wQh37hhk10H0HlT28LZ_2EOaRlJyWG6Pras,14083
 benchmark_runner/main/temporary_environment_variables.py,sha256=ODSHkfhgvdr_b2e3XyvykW21MVjSdyqimREyMc2klRE,957
 benchmark_runner/workloads/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 benchmark_runner/workloads/bootstorm_vm.py,sha256=gQcAhsu-5aWp55JqzgLUskCZGZrX53KXoE_Cz2O-6HA,18606
@@ -171,9 +171,9 @@ benchmark_runner/workloads/vdbench_vm.py,sha256=Yhoz-GbvZwA8q6qGIeSUsYhEIERj8SmJ
 benchmark_runner/workloads/windows_vm.py,sha256=eHK79ueAkSlNC1uamz19o7CO20wzJi-UIqRuTByTVxg,2373
 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=zhMAL-Zc2JtdI-LG4kxGwbGwHaLY2DfklpzM4bBG-eo,25261
-benchmark_runner-1.0.754.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.754.dist-info/METADATA,sha256=mFEt4g06ObE604fDUpWFShra2V7_FP6I76WOsNsA9O0,11498
-benchmark_runner-1.0.754.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-benchmark_runner-1.0.754.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.754.dist-info/RECORD,,
+benchmark_runner/workloads/workloads_operations.py,sha256=EEIZjNYGjEkyUafxFKSu4X9jaN_wgYDbMeCi1hZBZ-0,25186
+benchmark_runner-1.0.756.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.756.dist-info/METADATA,sha256=uJUeRf5xwfVuCV97vkTLEkf4PXRW28Z-onnhf5rH-JU,11498
+benchmark_runner-1.0.756.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+benchmark_runner-1.0.756.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.756.dist-info/RECORD,,