summaryrefslogtreecommitdiffstats
path: root/tosca2heat/tosca-parser
diff options
context:
space:
mode:
authorjulien zhang <zhang.jun3g@zte.com.cn>2016-08-02 21:26:41 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-02 21:26:41 +0000
commitc94de2c8594b8a5176bda7ad9a491f8a8133b09f (patch)
tree7df245abdadeabd2e631bf8f1188a657bf9ff6e5 /tosca2heat/tosca-parser
parentfe6c796bb9cf6c58aa81bfdfd796c6a9076a89b3 (diff)
parent3d71f5fd990f264275fe13c66c41bc5ae4bb66e5 (diff)
Merge "Doesn't support nested exceptioncollector when implement the nested tosca template"
Diffstat (limited to 'tosca2heat/tosca-parser')
-rw-r--r--tosca2heat/tosca-parser/toscaparser/tosca_template.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/tosca2heat/tosca-parser/toscaparser/tosca_template.py b/tosca2heat/tosca-parser/toscaparser/tosca_template.py
index fa97572..058da15 100644
--- a/tosca2heat/tosca-parser/toscaparser/tosca_template.py
+++ b/tosca2heat/tosca-parser/toscaparser/tosca_template.py
@@ -65,7 +65,8 @@ class ToscaTemplate(object):
'''Load the template data.'''
def __init__(self, path=None, parsed_params=None, a_file=True,
yaml_dict_tpl=None, submaped_node_template=None):
- ExceptionCollector.start()
+ if submaped_node_template is None:
+ ExceptionCollector.start()
self.a_file = a_file
self.input_path = None
self.path = None
@@ -107,7 +108,8 @@ class ToscaTemplate(object):
self._handle_nested_topo_templates()
self.graph = ToscaGraph(self.nodetemplates)
- ExceptionCollector.stop()
+ if submaped_node_template is None:
+ ExceptionCollector.stop()
self.verify_template()
def _topology_template(self):