Merge "Remove setting logger level to debug in scenarios"

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

diff --git a/yardstick/benchmark/scenarios/networking/ping.py b/yardstick/benchmark/scenarios/networking/ping.py
index a027c81..41395d8 100644 (file)
--- a/yardstick/benchmark/scenarios/networking/ping.py
+++ b/yardstick/benchmark/scenarios/networking/ping.py
@@ -19,7 +19,15 @@ LOG = logging.getLogger(__name__)
 
 
 class Ping(base.Scenario):
-    """Executes a ping benchmark between two hosts"""
+    """Execute ping between two hosts
+
+  Parameters
+    packetsize - number of data bytes to send
+        type:    int
+        unit:    bytes
+        default: 56
+    """
+
     __scenario_type__ = "Ping"
 
     TARGET_SCRIPT = 'ping_benchmark.bash'
@@ -32,7 +40,7 @@ class Ping(base.Scenario):
         host = self.context.get('host', None)
         key_filename = self.context.get('key_filename', '~/.ssh/id_rsa')
 
-        LOG.debug("user:%s, host:%s", user, host)
+        LOG.info("user:%s, host:%s", user, host)
 
         self.connection = ssh.SSH(user, host, key_filename=key_filename)
         self.connection.wait()
@@ -40,13 +48,17 @@ class Ping(base.Scenario):
     def run(self, args):
         """execute the benchmark"""
 
-        self.options = "-s %s" % args['options'].get("packetsize", '56')
-        self.ipaddr = args.get("ipaddr", '127.0.0.1')
+        if "options" in args:
+            options = "-s %s" % args['options'].get("packetsize", '56')
+        else:
+            options = ""
+
+        destination = args.get("ipaddr", '127.0.0.1')
 
-        LOG.debug("ping %s %s", self.options, self.ipaddr)
+        LOG.debug("ping '%s' '%s'", options, destination)
 
         exit_status, stdout, stderr = self.connection.execute(
-            "/bin/sh -s {0} {1}".format(self.ipaddr, self.options),
+            "/bin/sh -s {0} {1}".format(destination, options),
             stdin=open(self.target_script, "r"))
 
         if exit_status != 0:
@@ -56,6 +68,7 @@ class Ping(base.Scenario):
 
         if "sla" in args:
             sla_max_rtt = int(args["sla"]["max_rtt"])
-            assert rtt <= sla_max_rtt, "rtt %f > sla_max_rtt" % rtt
+            assert rtt <= sla_max_rtt, "rtt %f > sla:max_rtt(%f)" % \
+                (rtt, sla_max_rtt)
 
         return rtt