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/compute/memload.py | |
parent | af7518c51362ce882972c4b2168dbbfa4f5dcb2d (diff) | |
parent | 99abbb424007da2e01762f3c040a39c0157cbe1f (diff) |
Merge "standardize ssh auth"
Diffstat (limited to 'yardstick/benchmark/scenarios/compute/memload.py')
-rw-r--r-- | yardstick/benchmark/scenarios/compute/memload.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/yardstick/benchmark/scenarios/compute/memload.py b/yardstick/benchmark/scenarios/compute/memload.py index 2ef5a6302..93d10c0b5 100644 --- a/yardstick/benchmark/scenarios/compute/memload.py +++ b/yardstick/benchmark/scenarios/compute/memload.py @@ -49,14 +49,8 @@ class MEMLoad(base.Scenario): def setup(self): """Scenario setup.""" host = self.context_cfg['host'] - user = host.get('user', 'ubuntu') - ssh_port = host.get("ssh_port", ssh.DEFAULT_PORT) - ip = host.get('ip', None) - key_filename = host.get('key_filename', '~/.ssh/id_rsa') - - LOG.info("user:%s, host:%s", user, ip) - self.client = ssh.SSH(user, ip, key_filename=key_filename, - port=ssh_port) + + self.client = ssh.SSH.from_node(host, defaults={"user": "ubuntu"}) self.client.wait(timeout=600) self.setup_done = True |