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/plugintest.py | |
| parent | af7518c51362ce882972c4b2168dbbfa4f5dcb2d (diff) | |
| parent | 99abbb424007da2e01762f3c040a39c0157cbe1f (diff) | |
Merge "standardize ssh auth"
Diffstat (limited to 'yardstick/benchmark/scenarios/compute/plugintest.py')
| -rw-r--r-- | yardstick/benchmark/scenarios/compute/plugintest.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/yardstick/benchmark/scenarios/compute/plugintest.py b/yardstick/benchmark/scenarios/compute/plugintest.py index c9d025964..0ddf6b4a2 100644 --- a/yardstick/benchmark/scenarios/compute/plugintest.py +++ b/yardstick/benchmark/scenarios/compute/plugintest.py @@ -32,13 +32,10 @@ class PluginTest(base.Scenario): nodes = self.context_cfg['nodes'] node = nodes.get('host1', None) - host_user = node.get('user', 'ubuntu') - host_ssh_port = node.get('ssh_port', ssh.DEFAULT_PORT) - host_ip = node.get('ip', None) - host_pwd = node.get('password', 'root') - LOG.debug("user:%s, host:%s", host_user, host_ip) - self.client = ssh.SSH(host_user, host_ip, password=host_pwd, - port=host_ssh_port) + + self.client = ssh.SSH.from_node(node, defaults={ + "user": "ubuntu", "password": "root" + }) self.client.wait(timeout=600) self.setup_done = True |