summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepak S <deepak.s@linux.intel.com>2017-02-12 15:34:57 -0800
committerDeepak S <deepak.s@linux.intel.com>2017-02-12 18:52:02 -0800
commit2fa45d2f7e175cc5cbb57671dfc1c4afdd12a784 (patch)
treecfb94e0985d1acb863ad5c8a209f10c3e4dc39e1
parentd45d6aacdd769f07bfc2bad92be57a1c2ccf5d1f (diff)
BugFix: Adopt to latest result structure while parsing the results
Change-Id: I298ea69c86019936585df4bae30ce8ea12d179f4 Signed-off-by: Deepak S <deepak.s@linux.intel.com>
-rw-r--r--tests/unit/cmd/test_NSBperf.py3
-rwxr-xr-xyardstick/cmd/NSBperf.py7
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/unit/cmd/test_NSBperf.py b/tests/unit/cmd/test_NSBperf.py
index a14c08464..5bd248a84 100644
--- a/tests/unit/cmd/test_NSBperf.py
+++ b/tests/unit/cmd/test_NSBperf.py
@@ -40,7 +40,8 @@ class TestYardstickNSCli(unittest.TestCase):
def test_generate_final_report(self):
yardstick_ns_cli = YardstickNSCli()
test_case = "tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml"
- subprocess.call(["touch", "/tmp/yardstick.out"])
+ if os.path.isfile("/tmp/yardstick.out"):
+ os.remove('/tmp/yardstick.out')
self.assertIsNone(yardstick_ns_cli.generate_final_report(test_case))
def test_generate_kpi_results(self):
diff --git a/yardstick/cmd/NSBperf.py b/yardstick/cmd/NSBperf.py
index dd96b7fc8..8f493dd0a 100755
--- a/yardstick/cmd/NSBperf.py
+++ b/yardstick/cmd/NSBperf.py
@@ -24,7 +24,7 @@ import argparse
import json
import subprocess
import signal
-
+from oslo_serialization import jsonutils
from six.moves import input
@@ -126,10 +126,11 @@ class YardstickNSCli(object):
if os.path.isfile("/tmp/yardstick.out"):
lines = []
with open("/tmp/yardstick.out") as infile:
- lines = infile.readlines()
+ lines = jsonutils.load(infile)
if lines:
- tc_res = json.loads(lines.pop(len(lines) - 1))
+ lines = lines['result']
+ tc_res = lines.pop(len(lines) - 1)
for key, value in tc_res["benchmark"]["data"].items():
self.generate_kpi_results(key, value)
self.generate_nfvi_results(value)