diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-09-20 20:57:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-20 20:57:41 +0000 |
| commit | d374dc8ca09e7d6e08a531e68a21a8b107af21d0 (patch) | |
| tree | ca4ef0b3435a596ebf476ad54d099f2c300a924f /yardstick/benchmark/contexts | |
| parent | 62c775f7261dca0081283fadcaa18e53cf2f181c (diff) | |
| parent | be06e38960cea8a54c85418948e8453861012d2d (diff) | |
Merge "Generate pod.yaml from current context"
Diffstat (limited to 'yardstick/benchmark/contexts')
| -rw-r--r-- | yardstick/benchmark/contexts/heat.py | 2 | ||||
| -rw-r--r-- | yardstick/benchmark/contexts/node.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/yardstick/benchmark/contexts/heat.py b/yardstick/benchmark/contexts/heat.py index 374be0b1b..f93dfac28 100644 --- a/yardstick/benchmark/contexts/heat.py +++ b/yardstick/benchmark/contexts/heat.py @@ -442,6 +442,8 @@ class HeatContext(Context): "routing_table": self.generate_routing_table(server), # empty IPv6 routing table "nd_route_tbl": [], + # we want to save the contex name so we can generate pod.yaml + "name": server.name, } # Target server may only have private_ip if server.public_ip: diff --git a/yardstick/benchmark/contexts/node.py b/yardstick/benchmark/contexts/node.py index 250032efc..ffc82c8ed 100644 --- a/yardstick/benchmark/contexts/node.py +++ b/yardstick/benchmark/contexts/node.py @@ -74,11 +74,11 @@ class NodeContext(Context): self.nodes.extend(cfg["nodes"]) self.controllers.extend([node for node in cfg["nodes"] - if node["role"] == "Controller"]) + if node.get("role") == "Controller"]) self.computes.extend([node for node in cfg["nodes"] - if node["role"] == "Compute"]) + if node.get("role") == "Compute"]) self.baremetals.extend([node for node in cfg["nodes"] - if node["role"] == "Baremetal"]) + if node.get("role") == "Baremetal"]) LOG.debug("Nodes: %r", self.nodes) LOG.debug("Controllers: %r", self.controllers) LOG.debug("Computes: %r", self.computes) |