From 58f38efb387b12c1dd2a49b07bd88438fa0c0581 Mon Sep 17 00:00:00 2001 From: shangxdy Date: Thu, 26 May 2016 15:41:41 +0800 Subject: 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 --- tosca2heat/tosca-parser/toscaparser/elements/nodetype.py | 4 ++++ 1 file changed, 4 insertions(+) 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 -- cgit 1.2.3-korg