Merge "Support Storage Capacity Test"

[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 3af3548..54c1922 100644 (file)
--- a/yardstick/benchmark/scenarios/networking/ping.py
+++ b/yardstick/benchmark/scenarios/networking/ping.py
@@ -41,11 +41,17 @@ class Ping(base.Scenario):
         user = host.get('user', 'ubuntu')
         ip = host.get('ip', None)
         key_filename = host.get('key_filename', '/root/.ssh/id_rsa')
-        password = host.get('password', 'root')
+        password = host.get('password', None)
+
+        if password is not None:
+            LOG.info("Log in via pw, user:%s, host:%s, pw:%s",
+                     user, ip, password)
+            self.connection = ssh.SSH(user, ip, password=password)
+        else:
+            LOG.info("Log in via key, user:%s, host:%s, key_filename:%s",
+                     user, ip, key_filename)
+            self.connection = ssh.SSH(user, ip, key_filename=key_filename)
 
-        LOG.info("user:%s, host:%s, key_filename:%s", user, ip, key_filename)
-        self.connection = ssh.SSH(user, ip, key_filename=key_filename,
-                                  password=password)
         self.connection.wait()
 
     def run(self, result):
@@ -63,7 +69,12 @@ class Ping(base.Scenario):
         result["rtt"] = {}
         rtt_result = result["rtt"]
 
-        for dest in dest_list:
+        for pos, dest in enumerate(dest_list):
+            if 'targets' in self.scenario_cfg:
+                target_vm = self.scenario_cfg['targets'][pos]
+            else:
+                target_vm = self.scenario_cfg['target']
+
             LOG.debug("ping '%s' '%s'", options, dest)
             exit_status, stdout, stderr = self.connection.execute(
                 "/bin/sh -s {0} {1}".format(dest, options),
@@ -73,13 +84,15 @@ class Ping(base.Scenario):
                 raise RuntimeError(stderr)
 
             if stdout:
-                rtt_result[dest] = float(stdout)
+                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[dest] <= sla_max_rtt, "rtt %f > sla:\
-                    max_rtt(%f); " % (rtt_result[dest], 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)
             else:
-                LOG.error("ping '%s' '%s' timeout", options, dest)
+                LOG.error("ping '%s' '%s' timeout", options, target_vm)
 
 
 def _test():    # pragma: no cover