Skip to content

Commit 98d0f89

Browse files
Fixed remote setup spinning after PEP8 refactor (#74)
* [add] fixed remote setup spinning * [fix] Fixed missing identation * Bumping version from 0.1.61 to 0.1.62
1 parent b0c9d55 commit 98d0f89

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "redisbench-admin"
3-
version = "0.1.61"
3+
version = "0.1.62"
44
description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
55
authors = ["filipecosta90 <[email protected]>"]
66
readme = "README.md"

redisbench_admin/run_remote/run_remote.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ def run_remote_command_logic(args):
319319
benchmark_min_tool_version_minor,
320320
benchmark_min_tool_version_patch,
321321
benchmark_tool,
322+
benchmark_tool_source,
322323
) = extract_benchmark_tool_settings(benchmark_config)
323324
if benchmark_tool is not None:
324325
logging.info(

redisbench_admin/utils/remote.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@ def setup_remote_environment(
159159
)
160160
_, _, _ = tf.refresh()
161161
tf_output = tf.output()
162-
server_private_ip = tf_output["server_private_ip"]["value"][0]
163-
server_public_ip = tf_output["server_public_ip"]["value"][0]
164-
client_private_ip = tf_output["client_private_ip"]["value"][0]
165-
client_public_ip = tf_output["client_public_ip"]["value"][0]
162+
server_private_ip = tf_output_or_none(tf_output, "server_private_ip")
163+
server_public_ip = tf_output_or_none(tf_output, "server_public_ip")
164+
client_private_ip = tf_output_or_none(tf_output, "client_private_ip")
165+
client_public_ip = tf_output_or_none(tf_output, "client_public_ip")
166166
if (
167167
server_private_ip is not None
168168
or server_public_ip is not None
@@ -202,6 +202,13 @@ def setup_remote_environment(
202202
)
203203

204204

205+
def tf_output_or_none(tf_output, output_prop):
206+
res = None
207+
if output_prop in tf_output:
208+
res = tf_output[output_prop]["value"][0]
209+
return res
210+
211+
205212
def extract_git_vars(path=None, github_url=None):
206213
if path is None:
207214
path = get_git_root(".")

0 commit comments

Comments
 (0)