diff options
| author |   shangxdy <shang.xiaodong@zte.com.cn> | 2017-08-29 16:42:20 +0800 |
|---|---|---|
| committer | shangxdy <shang.xiaodong@zte.com.cn> | 2017-09-05 13:45:28 +0800 |
| commit | a9eee2ea67be0b45cec1cfe84ac760293d9473fa (patch) | |
| tree | 05f0cbb2fcd9bd347aca41c72bf36e28eae97fb9 /tosca2heat/tosca-parser/toscaparser/tosca_template.py | |
| parent | 6eac11f48f8b664af928620bf2661987aa318725 (diff) | |
Fix exceptions overwritten when nested import service topology
Currently exceptions will be overwritten when import nested service
topology, the patch will fix the issue.
JIRA: PARSER-145
Change-Id: I531755efe55b43aef304fa972773c63613c915ff
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
Diffstat (limited to 'tosca2heat/tosca-parser/toscaparser/tosca_template.py')
| -rw-r--r-- | tosca2heat/tosca-parser/toscaparser/tosca_template.py | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/tosca2heat/tosca-parser/toscaparser/tosca_template.py b/tosca2heat/tosca-parser/toscaparser/tosca_template.py index 3301999..4832bbb 100644 --- a/tosca2heat/tosca-parser/toscaparser/tosca_template.py +++ b/tosca2heat/tosca-parser/toscaparser/tosca_template.py @@ -236,12 +236,29 @@ class ToscaTemplate(object): if self._is_sub_mapped_node(nodetemplate, tosca_tpl): parsed_params = self._get_params_for_nested_template( nodetemplate) - nested_template = ToscaTemplate( - path=fname, parsed_params=parsed_params, - yaml_dict_tpl=tosca_tpl, - sub_mapped_node_template=nodetemplate, - no_required_paras_valid=self.no_required_paras_valid) - if nested_template._has_substitution_mappings(): + + cache_exeptions = deepcopy(ExceptionCollector.exceptions) + cache_exeptions_state = \ + deepcopy(ExceptionCollector.collecting) + nested_template = None + try: + nrpv = self.no_required_paras_valid + nested_template = ToscaTemplate( + path=fname, parsed_params=parsed_params, + sub_mapped_node_template=nodetemplate, + no_required_paras_valid=nrpv) + except ValidationError as e: + msg = _(' ===== nested service template ===== ') + log.error(msg) + log.error(e.message) + raise e + + ExceptionCollector.exceptions = deepcopy(cache_exeptions) + ExceptionCollector.collecting = \ + deepcopy(cache_exeptions_state) + + if nested_template and \ + nested_template._has_substitution_mappings(): # Record the nested templates in top level template self.nested_tosca_templates_with_topology.\ append(nested_template) |