Merge "Add network elements as a dict in Kubernetes context"

[yardstick.git] / yardstick / benchmark / scenarios / networking / pktgen_dpdk.py

diff --git a/yardstick/benchmark/scenarios/networking/pktgen_dpdk.py b/yardstick/benchmark/scenarios/networking/pktgen_dpdk.py
index 9a7b975..efb7d8b 100644 (file)
--- a/yardstick/benchmark/scenarios/networking/pktgen_dpdk.py
+++ b/yardstick/benchmark/scenarios/networking/pktgen_dpdk.py
@@ -113,10 +113,7 @@ cat ~/result.log -vT \
 {print substr($0,RSTART,RLENGTH)}' \
 |grep -v ^$ |awk '{if ($2 != 0) print $2}'\
 """
-        client_status, client_stdout, client_stderr = self.client.execute(cmd)
-
-        if client_status:
-            raise RuntimeError(client_stderr)
+        _, client_stdout, _ = self.client.execute(cmd, raise_on_error=True)
 
         avg_latency = 0
         if client_stdout:
@@ -135,4 +132,4 @@ cat ~/result.log -vT \
             LOG.info("sla_max_latency: %d", sla_max_latency)
             debug_info = "avg_latency %d > sla_max_latency %d" \
                 % (avg_latency, sla_max_latency)
-            assert avg_latency <= sla_max_latency, debug_info
+            self.verify_SLA(avg_latency <= sla_max_latency, debug_info)