From: JingLu5 Date: Fri, 12 Aug 2016 04:55:29 +0000 (+0800) Subject: BugFix: modify storagecapacity output format for result visualization in grafana... X-Git-Tag: colorado.1.0~51^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F18499%2F1;p=yardstick.git BugFix: modify storagecapacity output format for result visualization in grafana dashboard Change-Id: I255586efb0d1e25d7505838693d90a40282249b4 Signed-off-by: JingLu5 --- 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\" \ }" }