benchmark-runner 1.0.754__tar.gz → 1.0.755__tar.gz

{benchmark_runner-1.0.754/benchmark_runner.egg-info → benchmark_runner-1.0.755}/PKG-INFO

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

{benchmark_runner-1.0.754 → benchmark_runner-1.0.755}/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-1.0.754 → benchmark_runner-1.0.755}/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-1.0.754 → benchmark_runner-1.0.755}/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-1.0.754 → benchmark_runner-1.0.755}/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):
         """
@@ -747,23 +750,31 @@ class OC(SSH):
             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)
-                    return True  # Success
+                        is_check=True
+                    )
+                    self._is_logged_in = True  # Mark as logged in globally
+                    break  # Exit loop upon 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-1.0.754 → benchmark_runner-1.0.755}/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-1.0.754 → benchmark_runner-1.0.755}/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-1.0.754 → benchmark_runner-1.0.755}/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 → benchmark_runner-1.0.755/benchmark_runner.egg-info}/PKG-INFO

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

{benchmark_runner-1.0.754 → benchmark_runner-1.0.755}/setup.py

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