diff options
author | shangxdy <shang.xiaodong@zte.com.cn> | 2016-05-26 15:41:41 +0800 |
---|---|---|
committer | shangxdy <shang.xiaodong@zte.com.cn> | 2016-06-04 12:18:19 +0800 |
commit | 58f38efb387b12c1dd2a49b07bd88438fa0c0581 (patch) | |
tree | 754ebc9881d1533e2233140d9369f0a74a1a5749 | |
parent | 531f79e045d0c2a35328d44d568557bdde68c543 (diff) |
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>
-rw-r--r-- | tosca2heat/tosca-parser/toscaparser/elements/nodetype.py | 4 |
1 files changed, 4 insertions, 0 deletions
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 |