diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2017-05-04 12:59:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-04 12:59:04 +0000 |
| commit | 20f5b0a8580c0e8c659424bab434a0e30f3c88c1 (patch) | |
| tree | f683654bf3247b4d5c8903ed01eb6415105e9248 /yardstick/benchmark/scenarios/compute/cpuload.py | |
| parent | 058f0a93fd37694b74c5f1414bdfa6b35114690a (diff) | |
| parent | 150481286dcf3c3c1fedd8213070cff48e5ad61d (diff) | |
Merge "standardize ssh auth" into stable/danube
Diffstat (limited to 'yardstick/benchmark/scenarios/compute/cpuload.py')
| -rw-r--r-- | yardstick/benchmark/scenarios/compute/cpuload.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/yardstick/benchmark/scenarios/compute/cpuload.py b/yardstick/benchmark/scenarios/compute/cpuload.py index 121d5a75d..c65396185 100644 --- a/yardstick/benchmark/scenarios/compute/cpuload.py +++ b/yardstick/benchmark/scenarios/compute/cpuload.py @@ -68,14 +68,8 @@ class CPULoad(base.Scenario): def setup(self): """Scenario setup.""" host = self.context_cfg['host'] - user = host.get('user', 'ubuntu') - ip = host.get('ip', None) - ssh_port = host.get("ssh_port", ssh.DEFAULT_PORT) - 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) # Check if mpstat prog is installed |