summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingLu5 <lvjing5@huawei.com>2016-07-18 13:09:57 +0800
committerJingLu5 <lvjing5@huawei.com>2016-07-18 13:13:13 +0800
commit290819311d37937e24907d956f1b5de45b06870c (patch)
tree26b33e52e0322290fc93772234f308d2b765367e
parente6277570188829687b2ecf48adbd10bc3c9d46bd (diff)
Modify ComputeCapacity scenario host key name
Adjust target node key name. Signed-off-by: JingLu5 <lvjing5@huawei.com> Change-Id: I5daee8c2579aa1f14aac076c49803eb8b5029a97
-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')