From: shangxdy <shang.xiaodong@zte.com.cn>
Date: Thu, 26 May 2016 07:41:41 +0000 (+0800)
Subject: Nodetype's logical is incomplete
X-Git-Tag: colorado.1.0~72^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F91%2F14691%2F4;p=parser.git

Nodetype's logical is incomplete

When node is selected by abstract description and the node capability
is customed, None will be return.

JIRA:PARSER-41

Change-Id: I4b3e7233f766aac61a4ffc363c000bb3ebea19ad
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
---

diff --git a/tosca2heat/tosca-parser/toscaparser/elements/nodetype.py b/tosca2heat/tosca-parser/toscaparser/elements/nodetype.py
index 148d2b6..f5e4eb0 100644
--- a/tosca2heat/tosca-parser/toscaparser/elements/nodetype.py
+++ b/tosca2heat/tosca-parser/toscaparser/elements/nodetype.py
@@ -98,6 +98,10 @@ class NodeType(StatefulEntityType):
         provided capability.
         '''
 
+        # All types,include normative and custom types, here will
+        # be substituted because the global moification of TOSCA_DEF
+        self.TOSCA_DEF.update(self.custom_def)
+
         # Filter the node types
         node_types = [node_type for node_type in self.TOSCA_DEF.keys()
                       if node_type.startswith(self.NODE_PREFIX) and