summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliang gao <jean.gaoliang@huawei.com>2016-06-30 02:24:28 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-30 02:24:28 +0000
commitd7aca2eadc53a1e1dbf7c7c29f2a83e7e5085b0c (patch)
treec69930d283afa382cfede16e185c3a51489f45d6
parent41dde94d0a4e575317c297e124ba0624e64c8552 (diff)
parent0df428ebf9ded14254f73085b28c264086a1bf0d (diff)
Merge "fix ssh bug when running tc043 on huawei_pod1"
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml4
-rw-r--r--yardstick/benchmark/scenarios/networking/ping.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml
index b45e41ebf..6f2952f97 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml
@@ -9,8 +9,8 @@ scenarios:
type: Ping
options:
packetsize: 100
- host: node1.LF
- target: node2.LF
+ host: node4.LF
+ target: node5.LF
runner:
type: Duration
diff --git a/yardstick/benchmark/scenarios/networking/ping.py b/yardstick/benchmark/scenarios/networking/ping.py
index aa1a500cf..ae2166687 100644
--- a/yardstick/benchmark/scenarios/networking/ping.py
+++ b/yardstick/benchmark/scenarios/networking/ping.py
@@ -40,10 +40,10 @@ class Ping(base.Scenario):
host = self.context_cfg['host']
user = host.get('user', 'ubuntu')
ip = host.get('ip', None)
- key_filename = host.get('key_filename', '~/.ssh/id_rsa')
+ key_filename = host.get('key_filename', '/root/.ssh/id_rsa')
password = host.get('password', 'root')
- LOG.info("user:%s, host:%s", user, ip)
+ LOG.info("user:%s, host:%s, key_filename:%s", user, ip, key_filename)
self.connection = ssh.SSH(user, ip, key_filename=key_filename,
password=password)
self.connection.wait()