From: rexlee8776 <limingjiang@huawei.com>
Date: Mon, 21 Aug 2017 03:49:03 +0000 (+0000)
Subject: bugfix: tc063 fails to get the correct result in ubuntu node
X-Git-Tag: opnfv-5.0.RC1~225^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=395bef41759c09e73310bf9244c929013fa3097e;p=yardstick.git

bugfix: tc063 fails to get the correct result in ubuntu node

Change-Id: If96dc008d898a77445246aa7e9c98fab160626df
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
---

diff --git a/yardstick/benchmark/scenarios/storage/storagecapacity.bash b/yardstick/benchmark/scenarios/storage/storagecapacity.bash
index f963782d8..96db6e1be 100644
--- a/yardstick/benchmark/scenarios/storage/storagecapacity.bash
+++ b/yardstick/benchmark/scenarios/storage/storagecapacity.bash
@@ -17,7 +17,7 @@ OUTPUT_FILE=/tmp/storagecapacity-out.log
 # run disk_size test
 run_disk_size()
 {
-    fdisk -l | grep '^Disk.*bytes$' | awk -F [:,\ ] '{print $2,$7}' > $OUTPUT_FILE
+    fdisk -l | grep '^Disk.*bytes' | awk -F [:,\ ] '{print $2,$7}' > $OUTPUT_FILE
 }
 
 # write the disk size to stdout in json format
@@ -35,7 +35,7 @@ output_disk_size()
 run_block_size()
 {
     echo -n "" > $OUTPUT_FILE
-    blkdevices=`fdisk -l | grep '^Disk.*bytes$' | awk -F [:,\ ] '{print $2}'`
+    blkdevices=`fdisk -l | grep '^Disk.*bytes' | awk -F [:,\ ] '{print $2}'`
     blkdevices=($blkdevices)
     for bd in "${blkdevices[@]}";do
         blk_size=`blockdev --getbsz $bd`