diff options
| author |   julien zhang <zhang.jun3g@zte.com.cn> | 2016-07-08 06:06:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-08 06:06:58 +0000 |
| commit | 7fe3011a67a239f7dc04153c54eaff78ef967eaf (patch) | |
| tree | 029563d117ae964f06db9b05f714ed548d90d2be /tosca2heat/tosca-parser/toscaparser/tests | |
| parent | 870d910efa510e768b19785ec677ddb731c49bb0 (diff) | |
| parent | 74924a61a1fefe5e4977cd8d9edf7e5bbbb9f966 (diff) | |
Merge "netsted template validate type error"
Diffstat (limited to 'tosca2heat/tosca-parser/toscaparser/tests')
| -rw-r--r-- | tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/system.yaml | 3 | ||||
| -rw-r--r-- | tosca2heat/tosca-parser/toscaparser/tests/test_topology_template.py | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/system.yaml b/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/system.yaml index 2d459aa..9996e4f 100644 --- a/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/system.yaml +++ b/tosca2heat/tosca-parser/toscaparser/tests/data/topology_template/system.yaml @@ -2,6 +2,7 @@ tosca_definitions_version: tosca_simple_yaml_1_0 imports: - definitions.yaml + - subsystem.yaml topology_template: description: Template of online transaction processing service. @@ -54,4 +55,4 @@ topology_template: # to be updated when substitution_mapping is implemented # capabilities: # database_endpoint: - # to be updated when substitution_mapping is implemented
\ No newline at end of file + # to be updated when substitution_mapping is implemented diff --git a/tosca2heat/tosca-parser/toscaparser/tests/test_topology_template.py b/tosca2heat/tosca-parser/toscaparser/tests/test_topology_template.py index cbd4e3b..0f1a33e 100644 --- a/tosca2heat/tosca-parser/toscaparser/tests/test_topology_template.py +++ b/tosca2heat/tosca-parser/toscaparser/tests/test_topology_template.py @@ -34,11 +34,6 @@ class TopologyTemplateTest(TestCase): self.topo = TopologyTemplate(self.topo_tpl, self._get_all_custom_def()) - self.tosca_system_tpl_path = os.path.join( - os.path.dirname(os.path.abspath(__file__)), - "data/topology_template/system.yaml") - self.system_template = ToscaTemplate(self.tosca_system_tpl_path) - def _get_custom_def(self, type_definition): custom_defs = {} for definition in self.imports: |