aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliang gao <jean.gaoliang@huawei.com>2016-07-20 03:00:18 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-20 03:00:18 +0000
commite14fbf021bdf90dc160685c23b3cbbb320e9cfbf (patch)
treec9dea91ad606c649377b953bb6fc39f8d1386473
parent1e6ca0bfaaeadff7ce8ac9b1693b03d122e58a79 (diff)
parent290819311d37937e24907d956f1b5de45b06870c (diff)
Merge "Modify ComputeCapacity scenario host key name"
-rw-r--r--samples/computecapacity.yaml2
-rw-r--r--tests/unit/benchmark/scenarios/compute/test_computecapacity.py2
-rw-r--r--yardstick/benchmark/scenarios/compute/computecapacity.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/samples/computecapacity.yaml b/samples/computecapacity.yaml
index 0c6d46bf1..006b3ef3d 100644
--- a/samples/computecapacity.yaml
+++ b/samples/computecapacity.yaml
@@ -12,7 +12,7 @@ scenarios:
options:
nodes:
- host1: node5.LF
+ host: node5.LF
runner:
type: Iteration
diff --git a/tests/unit/benchmark/scenarios/compute/test_computecapacity.py b/tests/unit/benchmark/scenarios/compute/test_computecapacity.py
index 5745b7ec9..660bb3391 100644
--- a/tests/unit/benchmark/scenarios/compute/test_computecapacity.py
+++ b/tests/unit/benchmark/scenarios/compute/test_computecapacity.py
@@ -29,7 +29,7 @@ class ComputeCapacityTestCase(unittest.TestCase):
def setUp(self):
self.ctx = {
'nodes': {
- 'host1': {
+ 'host': {
'ip': '172.16.0.137',
'user': 'cirros',
'key_filename': "mykey.key",
diff --git a/yardstick/benchmark/scenarios/compute/computecapacity.py b/yardstick/benchmark/scenarios/compute/computecapacity.py
index 366b470e8..0d7d76143 100644
--- a/yardstick/benchmark/scenarios/compute/computecapacity.py
+++ b/yardstick/benchmark/scenarios/compute/computecapacity.py
@@ -38,7 +38,7 @@ class ComputeCapacity(base.Scenario):
ComputeCapacity.TARGET_SCRIPT)
nodes = self.context_cfg['nodes']
- node = nodes.get('host1', None)
+ node = nodes.get('host', None)
host_user = node.get('user', 'ubuntu')
host_ip = node.get('ip', None)
host_pwd = node.get('password', 'root')