summaryrefslogtreecommitdiffstats
path: root/yardstick
diff options
context:
space:
mode:
authorRex Lee <limingjiang@huawei.com>2017-03-09 17:56:59 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-09 17:56:59 +0000
commitf73a21485dc963073f4232f1b131e503f457f9c5 (patch)
tree908a536eda690058d805fea4a15c4b4ed92772df /yardstick
parent72030a83b2cfa9f0993e22559b2b9a6261abd6b2 (diff)
parent381c91651ef414052abdc748cb9b4d8cac93a76a (diff)
Merge "Bugfix: Failed executing command: 'free -s 1 -c 10'"
Diffstat (limited to 'yardstick')
-rw-r--r--yardstick/benchmark/scenarios/compute/memload.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/yardstick/benchmark/scenarios/compute/memload.py b/yardstick/benchmark/scenarios/compute/memload.py
index 35528d4ef..2ef5a6302 100644
--- a/yardstick/benchmark/scenarios/compute/memload.py
+++ b/yardstick/benchmark/scenarios/compute/memload.py
@@ -74,10 +74,10 @@ class MEMLoad(base.Scenario):
fields = []
free = {}
ite = 0
- average = {'total': 0, 'used': 0, 'free': 0, 'cached': 0, 'shared': 0,
- 'buffers': 0}
- maximum = {'total': 0, 'used': 0, 'free': 0, 'cached': 0, 'shared': 0,
- 'buffers': 0}
+ average = {'total': 0, 'used': 0, 'free': 0, 'buff/cache': 0,
+ 'shared': 0}
+ maximum = {'total': 0, 'used': 0, 'free': 0, 'buff/cache': 0,
+ 'shared': 0}
for row in result.split('\n'):
line = row.split()
@@ -111,7 +111,7 @@ class MEMLoad(base.Scenario):
interval = options.get("interval", 1)
count = options.get("count", 1)
- cmd = "free -s %s -c %s" % (interval, count)
+ cmd = "free -c '%s' -s '%s'" % (count, interval)
result = self._execute_command(cmd)
filtrated_result = self._filtrate_result(result)