diff options
| author |   treyad <treyad@viosoft.com> | 2018-10-16 10:50:12 -0700 |
|---|---|---|
| committer | treyad <treyad@viosoft.com> | 2019-04-04 04:04:21 -0700 |
| commit | 489a6064839920121866f8fb3d3a86ab86e5e663 (patch) | |
| tree | 5f622b6c1992a17feca6e6e04c71d431d260bbc9 /yardstick/benchmark/core/task.py | |
| parent | 8db9e58a32ef06737faf98757a123cc8e5e02c28 (diff) | |
Update to support using external heat template
Modify the _get_server() function when using external heat template.
The server attrs should be read from stack.outputs.
JIRA: YARDSTICK-1453
Change-Id: I00eda7476e77fc0a5c15ef8db7d057fa1cf267e6
Signed-off-by: treyad <treyad@viosoft.com>
Diffstat (limited to 'yardstick/benchmark/core/task.py')
| -rw-r--r-- | yardstick/benchmark/core/task.py | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/yardstick/benchmark/core/task.py b/yardstick/benchmark/core/task.py index afd805f94..bcca3558f 100644 --- a/yardstick/benchmark/core/task.py +++ b/yardstick/benchmark/core/task.py @@ -624,6 +624,16 @@ class TaskParser(object): # pragma: no cover tg__0: trafficgen_0.yardstick vnf__0: vnf_0.yardstick + scenario: + nodes: + tg__0: + name: trafficgen_0.yardstick + public_ip_attr: "server1_public_ip" + private_ip_attr: "server1_private_ip" + vnf__0: + name: vnf_0.yardstick + public_ip_attr: "server2_public_ip" + private_ip_attr: "server2_private_ip" NOTE: in Kubernetes context, the separator character between the server name and the context name is "-": scenario: @@ -655,7 +665,15 @@ class TaskParser(object): # pragma: no cover scenario['targets'][idx] = qualified_name(target) if 'nodes' in scenario: for scenario_node, target in scenario['nodes'].items(): - scenario['nodes'][scenario_node] = qualified_name(target) + if isinstance(target, collections.Mapping): + # Update node info on scenario with context info + # Just update the node name with context + # Append context information + target['name'] = qualified_name(target['name']) + # Then update node + scenario['nodes'][scenario_node] = target + else: + scenario['nodes'][scenario_node] = qualified_name(target) def _check_schema(self, cfg_schema, schema_type): """Check if config file is using the correct schema type""" |