x/tobiko
Code Issues Proposed changes

Merge "Fix remove_log_lines_end_json_str function"

Browse Source
This commit is contained in:
Zuul 2025-04-02 16:55:30 +00:00 committed by Gerrit Code Review
commit 24f4629e22
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tobiko/podified/_topology.py
View File

@ -211,8 +211,6 @@ class PodifiedTopology(rhosp.RhospTopology):
'check_function': iperf3.check_iperf3_client_results 'check_function': iperf3.check_iperf3_client_results
} }
if not ssh_client: if not ssh_client:
LOG.debug("Running iperf3 client in the POD is "
"implemented yet.")
kwargs['start_function'] = _openshift.start_iperf3 kwargs['start_function'] = _openshift.start_iperf3
kwargs['liveness_function'] = _openshift.iperf3_pod_alive kwargs['liveness_function'] = _openshift.iperf3_pod_alive
kwargs['stop_function'] = _openshift.stop_iperf3_client kwargs['stop_function'] = _openshift.stop_iperf3_client

3
tobiko/shell/iperf3/_execute.py
View File

@ -246,7 +246,8 @@ def check_iperf3_client_results(address: typing.Union[str, netaddr.IPAddress],
def remove_log_lines_end_json_str(json_str: str) -> str: def remove_log_lines_end_json_str(json_str: str) -> str:
lines = json_str.splitlines() lines = json_str.splitlines()
while lines: while lines:
if lines[-1].strip() == "}": last_line = lines[-1].strip()
if len(last_line) > 0 and last_line[-1] == "}":
# Stop when we find } # Stop when we find }
break break
# Remove last line, remove possible error logs # Remove last line, remove possible error logs