From 5b3f19f30ff02faa80ad02762ae23ad020b04218 Mon Sep 17 00:00:00 2001 From: shangxdy Date: Wed, 12 Jul 2017 00:38:06 +0800 Subject: Fix import nested list bugs When import list yaml in top service template, and the nested template import also list yaml, the result type definition is not complete JIRA: PARSER-124 Change-Id: I0ee7f4367d7fabd27641e93c498646d1d0b127b8 Signed-off-by: shangxdy --- tosca2heat/tosca-parser/toscaparser/imports.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tosca2heat') diff --git a/tosca2heat/tosca-parser/toscaparser/imports.py b/tosca2heat/tosca-parser/toscaparser/imports.py index b69bf4d..429a396 100644 --- a/tosca2heat/tosca-parser/toscaparser/imports.py +++ b/tosca2heat/tosca-parser/toscaparser/imports.py @@ -106,6 +106,9 @@ class ImportsLoader(object): outer_custom_types = custom_type.get(type_def) if outer_custom_types: if type_def == "imports": + for i in self.custom_defs.get('imports', []): + if i not in outer_custom_types: + outer_custom_types.append(i) self.custom_defs.update({'imports': outer_custom_types}) else: if namespace_prefix: -- cgit 1.2.3-korg