diff options
| author |   julien zhang <zhang.jun3g@zte.com.cn> | 2016-06-16 09:25:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-16 09:25:12 +0000 |
| commit | 19c8bc04f854a448bf5778ab00c6260a04700980 (patch) | |
| tree | 8b6ccf6c861f1e1a275d34d5a6ae192e8dab03fd /tosca2heat/tosca-parser/toscaparser | |
| parent | 793354696202ad4eb98882265b780ed8c1446825 (diff) | |
| parent | 58f38efb387b12c1dd2a49b07bd88438fa0c0581 (diff) | |
Merge "Nodetype's logical is incomplete"
Diffstat (limited to 'tosca2heat/tosca-parser/toscaparser')
| -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 |