Add more changes

Signed-off-by: Divya Madala <[email protected]>

src/test_workflow/benchmark_test/benchmark_test_runner_opensearch.py

@@ -11,6 +11,7 @@
 import subprocess
 import yaml
 
+from functools import partial
 from retry.api import retry_call  # type: ignore
 
 from git.git_repository import GitRepository
@@ -39,24 +40,30 @@ def get_cluster_repo_url(self) -> str:
         return "https://github.com/opensearch-project/opensearch-cluster-cdk.git"
 
     def run_tests(self) -> None:
+        local_path = os.getcwd()
         if self.args.cluster_endpoint:
             cluster = BenchmarkTestCluster(self.args)
             cluster.start()
             benchmark_test_suite = BenchmarkTestSuite(cluster.endpoint_with_port, self.security, self.args, cluster.fetch_password())
             try:
-                retry_call(benchmark_test_suite.execute, tries=3, delay=60, backoff=2)
+                execute_with_params = partial(benchmark_test_suite.execute, local_path)
+
+                retry_call(execute_with_params, tries=3, delay=60, backoff=2)
             finally:
                 subprocess.check_call(f"docker rm docker-container-{self.args.stack_suffix}", cwd=os.getcwd(), shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         else:
             config = yaml.safe_load(self.args.config)
 
             with TemporaryDirectory(keep=self.args.keep, chdir=True) as work_dir:
+
                 current_workspace = os.path.join(work_dir.name, "opensearch-cluster-cdk")
                 with GitRepository(self.get_cluster_repo_url(), self.get_git_ref(), current_workspace):
                     with WorkingDirectory(current_workspace):
                         with BenchmarkCreateCluster.create(self.args, self.test_manifest, config, current_workspace) as test_cluster:
                             benchmark_test_suite = BenchmarkTestSuite(test_cluster.endpoint_with_port, self.security, self.args, test_cluster.fetch_password())
                             try:
-                                retry_call(benchmark_test_suite.execute, tries=3, delay=60, backoff=2)
+                                execute_with_params = partial(benchmark_test_suite.execute, local_path)
+
+                                retry_call(execute_with_params, tries=3, delay=60, backoff=2)
                             finally:
                                 subprocess.check_call(f"docker rm docker-container-{self.args.stack_suffix}", cwd=os.getcwd(), shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)

src/test_workflow/benchmark_test/benchmark_test_suite.py

@@ -77,21 +77,22 @@ def __init__(
         else:
             self.command += ' --client-options="timeout:300"'
 
-    def execute(self) -> None:
+    def execute(self, path: str) -> None:
         log_info = f"Executing {self.command.replace(self.endpoint, len(self.endpoint) * '*').replace(self.args.username, len(self.args.username) * '*')}"
         logging.info(log_info.replace(self.password, len(self.password) * '*') if self.password else log_info)
         subprocess.check_call(f"{self.command}", cwd=os.getcwd(), shell=True)
         with TemporaryDirectory() as work_dir:
             subprocess.check_call(f"docker cp docker-container-{self.args.stack_suffix}:opensearch-benchmark/. {str(work_dir.path)}", cwd=os.getcwd(), shell=True)
             file_path = glob.glob(os.path.join(str(work_dir.path), "test_executions", "*", "test_execution.json"))
-            self.convert(file_path[0])
+            self.convert(file_path[0], path)
 
-    def convert(self, results: str) -> None:
+    def convert(self, results: str, path: str) -> None:
         with open(results) as file:
             data = json.load(file)
         formatted_data = pd.json_normalize(data["results"]["op_metrics"])
-        formatted_data.to_csv(os.path.join(os.getcwd(), f"test_execution_{self.args.stack_suffix}.csv"), index=False)
-        df = pd.read_csv(os.path.join(os.getcwd(), f"test_execution_{self.args.stack_suffix}.csv"))
+        formatted_data.to_csv(os.path.join(path, f"test_execution_{self.args.stack_suffix}.csv"), index=False)
+        logging.info(os.getcwd())
+        df = pd.read_csv(os.path.join(path, f"test_execution_{self.args.stack_suffix}.csv"))
         pd.set_option('display.width', int(2 * shutil.get_terminal_size().columns))
         pd.set_option('display.max_rows', None)
         pd.set_option('display.max_columns', None)