diff options
| author |   liang gao <jean.gaoliang@huawei.com> | 2016-08-12 07:56:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-12 07:56:09 +0000 |
| commit | cfca1bad6b95c205a9d98376ca977ba5b18c36ff (patch) | |
| tree | e125c1db1d32fffe06963309dc1e55e02e698e0f | |
| parent | bef0bcb1c50ea4440d251f69372480f42f7936f1 (diff) | |
| parent | 2dda8c5e98126ab650ea7da9decc10f4e2efa858 (diff) | |
Merge "BugFix: modify storagecapacity output format for result visualization in grafana dashboard"
| -rw-r--r-- | tests/unit/benchmark/scenarios/storage/test_storagecapacity.py | 2 | ||||
| -rw-r--r-- | yardstick/benchmark/scenarios/storage/storagecapacity.bash | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/unit/benchmark/scenarios/storage/test_storagecapacity.py b/tests/unit/benchmark/scenarios/storage/test_storagecapacity.py index cad5ba1d1..ace0ca374 100644 --- a/tests/unit/benchmark/scenarios/storage/test_storagecapacity.py +++ b/tests/unit/benchmark/scenarios/storage/test_storagecapacity.py @@ -18,7 +18,7 @@ import json from yardstick.benchmark.scenarios.storage import storagecapacity -DISK_SIZE_SAMPLE_OUTPUT = '{"Numberf of devides": "2", "Total disk size": "1024000000 bytes"}' +DISK_SIZE_SAMPLE_OUTPUT = '{"Numberf of devides": "2", "Total disk size in bytes": "1024000000"}' BLOCK_SIZE_SAMPLE_OUTPUT = '{"/dev/sda": 1024, "/dev/sdb": 4096}' DISK_UTIL_RAW_OUTPUT = "vda 10.00\nvda 0.00" DISK_UTIL_SAMPLE_OUTPUT = '{"vda": {"avg_util": 5.0, "max_util": 10.0, "min_util": 0.0}}' diff --git a/yardstick/benchmark/scenarios/storage/storagecapacity.bash b/yardstick/benchmark/scenarios/storage/storagecapacity.bash index 6ed4b2811..f963782d8 100644 --- a/yardstick/benchmark/scenarios/storage/storagecapacity.bash +++ b/yardstick/benchmark/scenarios/storage/storagecapacity.bash @@ -27,7 +27,7 @@ output_disk_size() DISKSIZE=`awk 'BEGIN{cnt=0;} {cnt=cnt+$2} END{print cnt}' $OUTPUT_FILE` echo -e "{\ \"Number of devices\":\"$DEVICENUM\", \ - \"Total disk size\":\"$DISKSIZE bytes\" \ + \"Total disk size in bytes\":\"$DISKSIZE\" \ }" } |