# ping scenario
+from __future__ import print_function
+from __future__ import absolute_import
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__)
self.target_script = pkg_resources.resource_filename(
'yardstick.benchmark.scenarios.networking', Ping.TARGET_SCRIPT)
host = self.context_cfg['host']
- 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')
- 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()
+ self.connection = ssh.SSH.from_node(host, defaults={"user": "ubuntu"})
+
+ self.connection.wait(timeout=600)
def run(self, result):
"""execute the benchmark"""
else:
options = ""
- destination = self.context_cfg['target'].get("ipaddr", '127.0.0.1')
-
- LOG.debug("ping '%s' '%s'", options, destination)
-
- exit_status, stdout, stderr = self.connection.execute(
- "/bin/sh -s {0} {1}".format(destination, options),
- stdin=open(self.target_script, "r"))
-
- if exit_status != 0:
- raise RuntimeError(stderr)
-
- if stdout:
- result["rtt"] = float(stdout)
-
- if "sla" in self.scenario_cfg:
- sla_max_rtt = int(self.scenario_cfg["sla"]["max_rtt"])
- assert result["rtt"] <= sla_max_rtt, \
- "rtt %f > sla:max_rtt(%f); " % (result["rtt"], sla_max_rtt)
- else:
- LOG.error("ping '%s' '%s' timeout", options, destination)
-
-
-def _test():
- '''internal test function'''
+ destination = self.context_cfg['target'].get('ipaddr', '127.0.0.1')
+ dest_list = [s.strip() for s in destination.split(',')]
+
+ rtt_result = {}
+ ping_result = {"rtt": rtt_result}
+
+ 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)
+ with open(self.target_script, "r") as stdin_file:
+ exit_status, stdout, stderr = self.connection.execute(
+ "/bin/sh -s {0} {1}".format(dest, options),
+ stdin=stdin_file)
+
+ 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)
+ else:
+ LOG.error("ping '%s' '%s' timeout", options, target_vm)
+ result.update(utils.flatten_dict_key(ping_result))
+
+
+def _test(): # pragma: no cover
+ """internal test function"""
key_filename = pkg_resources.resource_filename("yardstick.resources",
"files/yardstick_key")
ctx = {
p = Ping(args, ctx)
p.run(result)
- print result
+ print(result)
+
-if __name__ == '__main__':
+if __name__ == '__main__': # pragma: no cover
_test()