X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fbenchmark%2Fscenarios%2Fnetworking%2Fping.py;h=6caeab5eff14b5b2e2cdaca18d592153cfb9e63b;hb=5cc6023d88bb6f57cc86957369f5f0516a466c8a;hp=95367b3bb164b3db6afd545a95c923f7f3247cf4;hpb=87559e992c1f68559950b258146a530c49db9df0;p=yardstick.git

diff --git a/yardstick/benchmark/scenarios/networking/ping.py b/yardstick/benchmark/scenarios/networking/ping.py
index 95367b3bb..6caeab5ef 100644
--- a/yardstick/benchmark/scenarios/networking/ping.py
+++ b/yardstick/benchmark/scenarios/networking/ping.py
@@ -15,6 +15,7 @@ import pkg_resources
 import logging
 
 import yardstick.ssh as ssh
+from yardstick.common import utils
 from yardstick.benchmark.scenarios import base
 
 LOG = logging.getLogger(__name__)
@@ -23,6 +24,8 @@ LOG = logging.getLogger(__name__)
 class Ping(base.Scenario):
     """Execute ping between two hosts
 
+    If ping error, RTT will be set to 999999
+
   Parameters
     packetsize - number of data bytes to send
         type:    int
@@ -32,6 +35,8 @@ class Ping(base.Scenario):
 
     __scenario_type__ = "Ping"
 
+    PING_ERROR_RTT = 999999
+
     TARGET_SCRIPT = 'ping_benchmark.bash'
 
     def __init__(self, scenario_cfg, context_cfg):
@@ -57,8 +62,9 @@ class Ping(base.Scenario):
         destination = self.context_cfg['target'].get('ipaddr', '127.0.0.1')
         dest_list = [s.strip() for s in destination.split(',')]
 
-        result["rtt"] = {}
-        rtt_result = result["rtt"]
+        rtt_result = {}
+        ping_result = {"rtt": rtt_result}
+        sla_max_rtt = self.scenario_cfg.get("sla", {}).get("max_rtt")
 
         for pos, dest in enumerate(dest_list):
             if 'targets' in self.scenario_cfg:
@@ -66,7 +72,7 @@ class Ping(base.Scenario):
             else:
                 target_vm = self.scenario_cfg['target']
 
-            LOG.debug("ping '%s' '%s'", options, dest)
+            LOG.debug("ping %s %s", options, dest)
             with open(self.target_script, "r") as stdin_file:
                 exit_status, stdout, stderr = self.connection.execute(
                     "/bin/sh -s {0} {1}".format(dest, options),
@@ -75,16 +81,34 @@ class Ping(base.Scenario):
             if exit_status != 0:
                 raise RuntimeError(stderr)
 
-            if stdout:
+            if isinstance(target_vm, dict):
+                target_vm_name = target_vm.get("name")
+            else:
                 target_vm_name = target_vm.split('.')[0]
-                rtt_result[target_vm_name] = float(stdout)
-                if "sla" in self.scenario_cfg:
-                    sla_max_rtt = int(self.scenario_cfg["sla"]["max_rtt"])
-                    assert rtt_result[target_vm_name] <= sla_max_rtt,\
-                        "rtt %f > sla: max_rtt(%f); " % \
-                        (rtt_result[target_vm_name], sla_max_rtt)
+            if stdout:
+                rtt_result[target_vm_name] = float(stdout.strip())
+                # store result before potential AssertionError
+                result.update(utils.flatten_dict_key(ping_result))
+                if sla_max_rtt is not None:
+                    sla_max_rtt = float(sla_max_rtt)
+                    self.verify_SLA(
+                        rtt_result[target_vm_name] <= sla_max_rtt,
+                        "rtt %f > sla: max_rtt(%f); "
+                        % (rtt_result[target_vm_name], sla_max_rtt))
             else:
                 LOG.error("ping '%s' '%s' timeout", options, target_vm)
+                # we need to specify a result to satisfy influxdb schema
+                # choose a very large number to inidcate timeout
+                # in this case choose an order of magnitude greater than the SLA
+                rtt_result[target_vm_name] = float(self.PING_ERROR_RTT)
+                # store result before potential AssertionError
+                result.update(utils.flatten_dict_key(ping_result))
+                self.verify_SLA(sla_max_rtt is None,
+                                "packet dropped rtt %f > sla: max_rtt(%f)"
+                                % (rtt_result[target_vm_name], sla_max_rtt))
+                self.verify_SLA(False,
+                                "packet dropped rtt %f"
+                                % (rtt_result[target_vm_name]))
 
 
 def _test():    # pragma: no cover