Improved fetchRemoteSetupFromConfig to follow remote naming standards (#36)

* [add] improved fetchRemoteSetupFromConfig to follow remote naming standards

* Bumping version from 0.1.35 to 0.1.36

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.1.35"
+version = "0.1.36"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <filipecosta.90@gmail.com>"]
 readme = "README.md"

redisbench_admin/utils/remote.py

@@ -283,29 +283,25 @@ def get_run_full_filename(
     return benchmark_output_filename
 
 
-def fetchRemoteSetupFromConfig(remote_setup_config):
-    branch = "master"
-    repo = None
-    path = None
+def fetchRemoteSetupFromConfig(remote_setup_config, repo="https://github.com/RedisLabsModules/testing-infrastructure.git",branch="master"):
+    type = None
+    setup = None
     for remote_setup_property in remote_setup_config:
-        if "repo" in remote_setup_property:
-            repo = remote_setup_property["repo"]
-        if "branch" in remote_setup_property:
-            branch = remote_setup_property["branch"]
-        if "path" in remote_setup_property:
-            path = remote_setup_property["path"]
+        if "type" in remote_setup_property:
+            type = remote_setup_property["type"]
+        if "setup" in remote_setup_property:
+            setup = remote_setup_property["setup"]
     # fetch terraform folder
+    path = "/terraform/{}-{}".format(type,setup)
     temporary_dir = tempfile.mkdtemp()
     logging.info(
         "Fetching infrastructure definition from git repo {}/{} (branch={})".format(
             repo, path, branch
         )
     )
     git.Repo.clone_from(repo, temporary_dir, branch=branch, depth=1)
-    terraform_working_dir = temporary_dir
-    if path is not None:
-        terraform_working_dir += path
-    return terraform_working_dir
+    terraform_working_dir = temporary_dir + path
+    return terraform_working_dir, type
 
 
 def pushDataToRedisTimeSeries(rts: Client, branch_time_series_dict: dict):