diff options
author | Rex Lee <limingjiang@huawei.com> | 2017-04-24 01:58:31 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-04-24 01:58:31 +0000 |
commit | 07249e010dd9837d63f3090f1eac0fc6763b968f (patch) | |
tree | 7e9d12401220f547e499094fe8895d73fab405c5 /yardstick/benchmark/scenarios/networking/networkcapacity.py | |
parent | af7518c51362ce882972c4b2168dbbfa4f5dcb2d (diff) | |
parent | 99abbb424007da2e01762f3c040a39c0157cbe1f (diff) |
Merge "standardize ssh auth"
Diffstat (limited to 'yardstick/benchmark/scenarios/networking/networkcapacity.py')
-rw-r--r-- | yardstick/benchmark/scenarios/networking/networkcapacity.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/yardstick/benchmark/scenarios/networking/networkcapacity.py b/yardstick/benchmark/scenarios/networking/networkcapacity.py index e7ce83570..63634061c 100644 --- a/yardstick/benchmark/scenarios/networking/networkcapacity.py +++ b/yardstick/benchmark/scenarios/networking/networkcapacity.py @@ -42,14 +42,8 @@ class NetworkCapacity(base.Scenario): host = self.context_cfg['host'] if host is None: raise RuntimeError('No right node.please check the configuration') - host_user = host.get('user', 'ubuntu') - ssh_port = host.get("ssh_port", ssh.DEFAULT_PORT) - host_ip = host.get('ip', None) - host_pwd = host.get('password', None) - - LOG.debug("user:%s, host:%s", host_user, host_ip) - self.client = ssh.SSH(host_user, host_ip, password=host_pwd, - port=ssh_port) + + self.client = ssh.SSH.from_node(host, defaults={"user": "ubuntu"}) self.client.wait(timeout=600) # copy script to host |