parallelvirtualcluster/pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 115 Wiki Activity

Fix handling of array of information

Browse Source 
With a benchmark info we only ever want test one, so pass only that to
the formatter. Simplifies the format function.
This commit is contained in:
Joshua Boniface
2021-10-02 01:28:39 -04:00
parent 8f8f00b2e9
commit 8de63b2785
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client-cli/pvc/cli_lib/ceph.py
View File

@@ -1601,21 +1601,21 @@ def format_info_benchmark(config, oformat, benchmark_information):
0: format_info_benchmark_legacy,
}
benchmark_version = benchmark_information['test_format']
benchmark_version = benchmark_information[0]['test_format']
if oformat == 'json-pretty':
return dumps(benchmark_information, indent=4)
elif oformat == 'json':
return dumps(benchmark_information)
else:
return benchmark_matrix.get(benchmark_version, lambda: 'Invalid format function')(config, benchmark_information)
return benchmark_matrix.get(benchmark_version, lambda: 'Invalid format function')(config, benchmark_information[0])
def format_info_benchmark_legacy(config, benchmark_information):
if benchmark_information[0]['benchmark_result'] == "Running":
if benchmark_information['benchmark_result'] == "Running":
return "Benchmark test is still running."
benchmark_details = benchmark_information[0]['benchmark_result']
benchmark_details = benchmark_information['benchmark_result']
# Format a nice output; do this line-by-line then concat the elements at the end
ainformation = []