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/vnf_generic.py | |
parent | af7518c51362ce882972c4b2168dbbfa4f5dcb2d (diff) | |
parent | 99abbb424007da2e01762f3c040a39c0157cbe1f (diff) |
Merge "standardize ssh auth"
Diffstat (limited to 'yardstick/benchmark/scenarios/networking/vnf_generic.py')
-rw-r--r-- | yardstick/benchmark/scenarios/networking/vnf_generic.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/yardstick/benchmark/scenarios/networking/vnf_generic.py b/yardstick/benchmark/scenarios/networking/vnf_generic.py index 447c550ed..be179631e 100644 --- a/yardstick/benchmark/scenarios/networking/vnf_generic.py +++ b/yardstick/benchmark/scenarios/networking/vnf_generic.py @@ -60,13 +60,9 @@ class SshManager(object): returns -> ssh connection ready to be used """ try: - ssh_port = self.node.get("ssh_port", ssh.DEFAULT_PORT) - self.conn = ssh.SSH(user=self.node["user"], - host=self.node["ip"], - password=self.node["password"], - port=ssh_port) + self.conn = ssh.SSH.from_node(self.node) self.conn.wait() - except (SSHError) as error: + except SSHError as error: LOG.info("connect failed to %s, due to %s", self.node["ip"], error) # self.conn defaults to None return self.conn |