From b74bf46baed7e586028255c8274ebf563d2ff446 Mon Sep 17 00:00:00 2001 From: shangxdy Date: Sun, 31 Jul 2016 02:10:03 +0800 Subject: Distinguish the mapping and mapped by name. 1. Use complete name like nested_topology_tpls here and other places like get_nested_topology_tpls for better readability; 2. Use "sub_mapped_node_tpl" instead of submaped_node_tpl; 3. Use sub_mapped_ instead of submaped. Upper changed in substitution_mappings.py, tosca_template.py, tosca_template.py and others JIRA:PARSER-73 Change-Id: I21b2d3a35773078d7437bbae9ff5d1522608c4d2 Signed-off-by: shangxdy --- tosca2heat/tosca-parser/toscaparser/tests/test_topology_template.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tosca2heat/tosca-parser/toscaparser/tests') diff --git a/tosca2heat/tosca-parser/toscaparser/tests/test_topology_template.py b/tosca2heat/tosca-parser/toscaparser/tests/test_topology_template.py index 877c72f..3d1b55d 100644 --- a/tosca2heat/tosca-parser/toscaparser/tests/test_topology_template.py +++ b/tosca2heat/tosca-parser/toscaparser/tests/test_topology_template.py @@ -159,4 +159,6 @@ class TopologyTemplateTest(TestCase): "data/topology_template/system.yaml") system_tosca_template = ToscaTemplate(tpl_path) self.assertIsNotNone(system_tosca_template) - self.assertEqual(len(system_tosca_template.nested_tosca_templates), 3) + self.assertEqual( + len(system_tosca_template. + nested_tosca_templates_with_topology), 3) -- cgit 1.2.3-korg