Merge "Update to support using external heat template"

2 files changed, 27 insertions, 1 deletions

diff --git a/yardstick/benchmark/contexts/heat.py b/yardstick/benchmark/contexts/heat.py
index 403562c46..917aa9c39 100644
--- a/yardstick/benchmark/contexts/heat.py
+++ b/yardstick/benchmark/contexts/heat.py
@@ -509,6 +509,14 @@ class HeatContext(Context):
 
             server.private_ip = self.stack.outputs.get(
                 attr_name.get("private_ip_attr", object()), None)
+
+            # Try to find interfaces
+            for key, value in attr_name.get("interfaces", {}).items():
+                value["local_ip"] = server.private_ip
+                for k in ["local_mac", "netmask", "gateway_ip"]:
+                    # Keep explicit None or missing entry as is
+                    value[k] = self.stack.outputs.get(value[k])
+                server.interfaces.update({key: value})
         else:
             try:
                 server = self._server_map[attr_name]
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"""