Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
standardize ssh auth
[yardstick.git]
/
yardstick
/
benchmark
/
scenarios
/
availability
/
attacker
/
attacker_general.py
diff --git
a/yardstick/benchmark/scenarios/availability/attacker/attacker_general.py
b/yardstick/benchmark/scenarios/availability/attacker/attacker_general.py
index
ab5e998
..
35cbccd
100644
(file)
--- a/
yardstick/benchmark/scenarios/availability/attacker/attacker_general.py
+++ b/
yardstick/benchmark/scenarios/availability/attacker/attacker_general.py
@@
-24,13
+24,8
@@
class GeneralAttacker(BaseAttacker):
def setup(self):
LOG.debug("config:%s context:%s", self._config, self._context)
host = self._context.get(self._config['host'], None)
def setup(self):
LOG.debug("config:%s context:%s", self._config, self._context)
host = self._context.get(self._config['host'], None)
- ip = host.get("ip", None)
- user = host.get("user", "root")
- ssh_port = host.get("ssh_port", ssh.DEFAULT_PORT)
- key_filename = host.get("key_filename", "~/.ssh/id_rsa")
- self.connection = ssh.SSH(user, ip, key_filename=key_filename,
- port=ssh_port)
+ self.connection = ssh.SSH.from_node(host, defaults={"user": "root"})
self.connection.wait(timeout=600)
LOG.debug("ssh host success!")
self.connection.wait(timeout=600)
LOG.debug("ssh host success!")