benchmark-runner 1.0.823__py3-none-any.whl → 1.0.825__py3-none-any.whl

benchmark_runner/common/oc/oc.py

@@ -1582,21 +1582,24 @@ class OC(SSH):
                     raise RuntimeError(f"Failed to remove folder {folder_path}: {remove_error}")
             raise RuntimeError(f"Failed to generate CNV must-gather logs for version {cnv_version}: {e}")
 
-    def save_to_yaml(self, vm_name, output_dir='/tmp', namespace: str = environment_variables.environment_variables_dict['namespace']):
+    def save_to_yaml(self, vm_name, vm_access, output_dir='/tmp', namespace: str = environment_variables.environment_variables_dict['namespace']):
         """
         This method save pod and vm into yaml per namespace
         :param vm_name:
+        :param vm_access: True is vm accessible, if not there is no pod launcher
         :param namespace:
         :param output_dir:
         :return:
         """
-        self.run(f"oc get vmi '{vm_name}' -n '{namespace}' -o yaml > '{output_dir}/{vm_name}.yaml'")
-        pod_name = self.run(
-            f"oc get pod -n '{namespace}' -o jsonpath=\"{{.items[?(@.metadata.generateName=='virt-launcher-{vm_name}-')].metadata.name}}\""
-        )
-        self.run(f"oc get pod '{pod_name}' -n '{namespace}' -o yaml > '{output_dir}/{pod_name}.yaml'")
+        self.run(f"oc get vm '{vm_name}' -n '{namespace}' -o yaml > '{output_dir}/vm-{vm_name}.yaml'")
+        if vm_access:
+            self.run(f"oc get vmi '{vm_name}' -n '{namespace}' -o yaml > '{output_dir}/vmi-{vm_name}.yaml'")
+            pod_name = self.run(
+                f"oc get pod -n '{namespace}' -o jsonpath=\"{{.items[?(@.metadata.generateName=='virt-launcher-{vm_name}-')].metadata.name}}\""
+            )
+            self.run(f"oc get pod '{pod_name}' -n '{namespace}' -o yaml > '{output_dir}/{pod_name}.yaml'")
 
-    def save_describe_yml(self, vm_name, vm_access, output_dir='/tmp', namespace: str = environment_variables.environment_variables_dict['namespace']):
+    def save_describe_yaml(self, vm_name, vm_access, output_dir='/tmp', namespace: str = environment_variables.environment_variables_dict['namespace']):
         """
         This method save pod and vm into yaml per namespace
         :param vm_name:
@@ -1605,11 +1608,10 @@ class OC(SSH):
         :param output_dir:
         :return:
         """
+        self.run(f"oc describe vm '{vm_name}' -n '{namespace}' > '{output_dir}/describe-vm-{vm_name}.yaml'")
         if vm_access:
-            self.run(f"oc describe vmi '{vm_name}' -n '{namespace}' > '{output_dir}/describe_vmi_{vm_name}.yaml'")
+            self.run(f"oc describe vmi '{vm_name}' -n '{namespace}' > '{output_dir}/describe-vmi-{vm_name}.yaml'")
             pod_name = self.run(
                 f'oc get pod -n {namespace} -o jsonpath="{{.items[?(@.metadata.generateName==\'virt-launcher-{vm_name}-\')].metadata.name}}"'
             )
-            self.run(f"oc describe pod '{pod_name}' -n '{namespace}' > '{output_dir}/describe_pod_{pod_name}.yaml'")
-        else:
-            self.run(f"oc describe vm '{vm_name}' -n '{namespace}' > '{output_dir}/describe_vm_{vm_name}.yaml'")
+            self.run(f"oc describe pod '{pod_name}' -n '{namespace}' > '{output_dir}/describe-pod-{pod_name}.yaml'")

benchmark_runner/workloads/bootstorm_vm.py

@@ -166,7 +166,7 @@ class BootstormVM(WorkloadsOperations):
 
     def _verify_single_vm_access(self, vm_name, retries=5, delay=10):
         """
-        This method verifies single vm access using a retry mechanism
+        This method verifies access to a single VM using a retry mechanism, and saves the error and YAML file in case of failure
         :param vm_name: The name of the VM to verify.
         :param retries: Number of retry attempts.
         :param delay: Time to wait (in seconds) between retries.
@@ -214,8 +214,11 @@ class BootstormVM(WorkloadsOperations):
             status_message = self._data_dict.get('access_status') or "No status available"
 
             try:
+                self._oc.save_to_yaml(vm_name, str(access_status).lower() == 'true', output_dir=self._run_artifacts_path)
+                self._oc.save_describe_yaml(vm_name, str(access_status).lower() == 'true', output_dir=self._run_artifacts_path)
                 with open(error_log_path, "w") as error_log_file:
                     error_log_file.write(self._oc.get_vm_status(vm_name=vm_name) + "\n")
+                    error_log_file.write("VM Status: " + access_status + "\n")
                     error_log_file.write("Running node: " + self._oc.get_vm_node(vm_name=vm_name) + "\n\n")
                     error_log_file.write(str(status_message) + "\n")
             except Exception as write_err:
@@ -231,9 +234,7 @@ class BootstormVM(WorkloadsOperations):
         :param return_dict:
         :return:
         """
-        self._oc.save_to_yaml(vm_name, output_dir=self._run_artifacts_path)
         vm_access = self._verify_single_vm_access(vm_name)
-        self._oc.save_describe_yml(vm_name, str(vm_access).lower() == 'true', output_dir=self._run_artifacts_path)
         return_dict[vm_name] = vm_access
 
     def _verify_vms_access_in_parallel(self, vm_names: list):

{benchmark_runner-1.0.823.dist-info → benchmark_runner-1.0.825.dist-info}/METADATA

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

{benchmark_runner-1.0.823.dist-info → benchmark_runner-1.0.825.dist-info}/RECORD

@@ -47,7 +47,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=W54wgm8oIldi0lW5tiEimGKmg86jyjTq6Z2SyAM1_RI,71725
+benchmark_runner/common/oc/oc.py,sha256=ht1FpW5QCdFxJkEemwBXzrymIrHDw0RQoEpm5z51MNg,71949
 benchmark_runner/common/oc/oc_exceptions.py,sha256=XfKUzeK3Ors_Y2csQEoGqrlsZlYvq6OXLkFh9s_mQRM,6311
 benchmark_runner/common/oc/singleton_oc_login.py,sha256=OISe7GxN-povQBk1GYVwkdcuEvIbDQP5QImYbNvhX5Y,2395
 benchmark_runner/common/ocp_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -167,15 +167,15 @@ benchmark_runner/main/environment_variables_exceptions.py,sha256=UR0Ith0P0oshsDZ
 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=c3JOCwgKcejHIkVrdNW66tMtFVdK4wuqJL2OAPP8UuU,21279
+benchmark_runner/workloads/bootstorm_vm.py,sha256=yA6xuBQJSFz1a8YgwLgUlt6BcxjopGURLG-Z0KYWkp8,21476
 benchmark_runner/workloads/vdbench_pod.py,sha256=feu3lvNumfBCD-An6__xS5Kt9nA50A_-0FmqTXuU9iw,10011
 benchmark_runner/workloads/vdbench_vm.py,sha256=4rRbE-jAbmNrhP-k8F_OREkJ59VfQ7wLrfRQPwDneJg,9786
 benchmark_runner/workloads/windows_vm.py,sha256=qFVD3qBFMnVpYXnrpam-7H5-0Yzvx6qtaEEZx4T-ex4,2415
 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=DUwvmswAgOXEbrVrV8OTRhrX4K18jnCwedHo9-W5z2s,27068
-benchmark_runner-1.0.823.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-benchmark_runner-1.0.823.dist-info/METADATA,sha256=CbkQZrvPrz1-00Na6ELQ3D8HszLHJAsjKKlzNX4hdbM,11520
-benchmark_runner-1.0.823.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-benchmark_runner-1.0.823.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
-benchmark_runner-1.0.823.dist-info/RECORD,,
+benchmark_runner-1.0.825.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+benchmark_runner-1.0.825.dist-info/METADATA,sha256=rcZFciylRwQHKxTMjwCz8TTCWibBCG7szoHc9mPEATw,11520
+benchmark_runner-1.0.825.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+benchmark_runner-1.0.825.dist-info/top_level.txt,sha256=MP7UbTCzu59D53uKCZl5VsQeM_vheyMc7FmryczJQbk,17
+benchmark_runner-1.0.825.dist-info/RECORD,,