Updated ann-benchmark to the latest pkg version and extend tests on create_website.py (#336)

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.7.29"
+version = "0.7.35"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <[email protected]>","Redis Performance Group <[email protected]>"]
 readme = "README.md"

redisbench_admin/run/ann/pkg

@@ -115,27 +115,16 @@ def run_remote_client_tool(
         pkg_path = get_ann_remote_pkg_path(
             client_public_ip, client_ssh_port, private_key, username
         )
-        benchmark_suffix = local_bench_fname[: len(local_bench_fname) - 5]
-        create_website_path = pkg_path + "/run/ann/pkg/"
-        logging.info("Remote create website path: {}".format(create_website_path))
-        website_outputdir = "website-{}".format(benchmark_suffix)
-        website_outputdir_zip = "/tmp/website-{}.zip".format(benchmark_suffix)
-        website_outputdir_zip_local = "website-{}.zip".format(benchmark_suffix)
-        results_outputdir = pkg_path + "/run/ann/pkg"
-        results_outputdir_zip = "/tmp/results-{}.zip".format(benchmark_suffix)
-        results_outputdir_zip_local = "results-{}.zip".format(benchmark_suffix)
-
-        mkdir_command = "mkdir -p /tmp/{}".format(website_outputdir)
-        create_website_command = "cd {} && sudo python3 create_website.py --scatter --outputdir /tmp/{}".format(
-            create_website_path, website_outputdir
-        )
-        zip_website_command = "cd /tmp && zip -r {} {}/*".format(
-            website_outputdir_zip, website_outputdir
-        )
-
-        zip_results_command = "cd {} && zip -r {} results/*".format(
-            results_outputdir, results_outputdir_zip
-        )
+        (
+            create_website_command,
+            mkdir_command,
+            results_outputdir_zip,
+            results_outputdir_zip_local,
+            website_outputdir_zip,
+            website_outputdir_zip_local,
+            zip_results_command,
+            zip_website_command,
+        ) = ann_benchmark_remote_cmds(local_bench_fname, pkg_path)
         post_commands.append(mkdir_command)
         post_commands.append(create_website_command)
         post_commands.append(zip_website_command)
@@ -261,6 +250,40 @@ def run_remote_client_tool(
     )
 
 
+def ann_benchmark_remote_cmds(local_bench_fname, pkg_path):
+    benchmark_suffix = local_bench_fname[: len(local_bench_fname) - 5]
+    create_website_path = pkg_path + "/run/ann/pkg/"
+    logging.info("Remote create website path: {}".format(create_website_path))
+    website_outputdir = "website-{}".format(benchmark_suffix)
+    website_outputdir_zip = "/tmp/website-{}.zip".format(benchmark_suffix)
+    website_outputdir_zip_local = "website-{}.zip".format(benchmark_suffix)
+    results_outputdir = pkg_path + "/run/ann/pkg"
+    results_outputdir_zip = "/tmp/results-{}.zip".format(benchmark_suffix)
+    results_outputdir_zip_local = "results-{}.zip".format(benchmark_suffix)
+    mkdir_command = "mkdir -p /tmp/{}".format(website_outputdir)
+    create_website_command = (
+        "cd {} && sudo python3 create_website.py --scatter --outputdir /tmp/{}".format(
+            create_website_path, website_outputdir
+        )
+    )
+    zip_website_command = "cd /tmp && zip -r {} {}/*".format(
+        website_outputdir_zip, website_outputdir
+    )
+    zip_results_command = "cd {} && zip -r {} results/*".format(
+        results_outputdir, results_outputdir_zip
+    )
+    return (
+        create_website_command,
+        mkdir_command,
+        results_outputdir_zip,
+        results_outputdir_zip_local,
+        website_outputdir_zip,
+        website_outputdir_zip_local,
+        zip_results_command,
+        zip_website_command,
+    )
+
+
 def setup_remote_benchmark_ann(
     client_public_ip, username, private_key, client_ssh_port
 ):

redisbench_admin/run_remote/remote_client.py

@@ -6,6 +6,7 @@
 import yaml
 
 from redisbench_admin.run.common import prepare_benchmark_parameters
+from redisbench_admin.run_remote.remote_client import ann_benchmark_remote_cmds
 from redisbench_admin.utils.benchmark_config import extract_benchmark_tool_settings
 
 
@@ -46,3 +47,24 @@ def test_run_remote_benchmark():
         #     port,
         # )
         # assert remote_run_result is False
+
+
+def test_ann_benchmark_remote_cmds():
+    pkg_path = "/usr/local/lib/python3.6/dist-packages/redisbench_admin"
+    local_bench_fname = "local-fname.log"
+    (
+        create_website_command,
+        mkdir_command,
+        results_outputdir_zip,
+        results_outputdir_zip_local,
+        website_outputdir_zip,
+        website_outputdir_zip_local,
+        zip_results_command,
+        zip_website_command,
+    ) = ann_benchmark_remote_cmds(local_bench_fname, pkg_path)
+    assert (
+        create_website_command
+        == "cd {}/run/ann/pkg/ && sudo python3 create_website.py --scatter --outputdir /tmp/website-local-fnam".format(
+            pkg_path
+        )
+    )