Modify ComputeCapacity scenario host key name

Adjust target node key name.

Signed-off-by: JingLu5 <lvjing5@huawei.com>
Change-Id: I5daee8c2579aa1f14aac076c49803eb8b5029a97

diff --git a/samples/computecapacity.yaml b/samples/computecapacity.yaml
index 0c6d46b..006b3ef 100644 (file)
--- 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 5745b7e..660bb33 100644 (file)
--- 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 366b470..0d7d761 100644 (file)
--- 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')