From 8470dfaa29eec1d636b5dd6c865035a814ed3899 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 26 Nov 2021 11:34:20 -0500 Subject: [PATCH] Fix bugs with legacy benchmark format --- client-cli/pvc/cli_lib/ceph.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/client-cli/pvc/cli_lib/ceph.py b/client-cli/pvc/cli_lib/ceph.py index 0e600d74..12a1c947 100644 --- a/client-cli/pvc/cli_lib/ceph.py +++ b/client-cli/pvc/cli_lib/ceph.py @@ -21,7 +21,7 @@ import math -from json import dumps +from json import dumps, loads from requests_toolbelt.multipart.encoder import ( MultipartEncoder, MultipartEncoderMonitor, @@ -1648,6 +1648,8 @@ def ceph_benchmark_list(config, job): def get_benchmark_list_results_legacy(benchmark_data): + if isinstance(benchmark_data, str): + benchmark_data = loads(benchmark_data) benchmark_bandwidth = dict() benchmark_iops = dict() for test in ["seq_read", "seq_write", "rand_read_4K", "rand_write_4K"]: @@ -1732,7 +1734,7 @@ def format_list_benchmark(config, benchmark_information): for benchmark in benchmark_information: benchmark_job = benchmark["job"] - benchmark_format = benchmark["test_format"] # noqa: F841 + benchmark_format = benchmark.get("test_format", 0) # noqa: F841 _benchmark_job_length = len(benchmark_job) if _benchmark_job_length > benchmark_job_length: @@ -1837,7 +1839,7 @@ def format_list_benchmark(config, benchmark_information): for benchmark in benchmark_information: benchmark_job = benchmark["job"] - benchmark_format = benchmark["test_format"] # noqa: F841 + benchmark_format = benchmark.get("test_format", 0) # noqa: F841 if benchmark["benchmark_result"] == "Running": seq_benchmark_bandwidth = "Running"