From: shangxdy <shang.xiaodong@zte.com.cn>
Date: Tue, 11 Jul 2017 16:38:06 +0000 (+0800)
Subject: Fix import nested list bugs
X-Git-Tag: 0.5.0~22
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F97%2F37197%2F1;p=parser.git

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 <shang.xiaodong@zte.com.cn>
---

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: