Code Review
/
parser.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "EntityTemplate has no property of parent_type"
[parser.git]
/
tosca2heat
/
tosca-parser
/
toscaparser
/
elements
/
nodetype.py
diff --git
a/tosca2heat/tosca-parser/toscaparser/elements/nodetype.py
b/tosca2heat/tosca-parser/toscaparser/elements/nodetype.py
index
148d2b6
..
f5e4eb0
100644
(file)
--- 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.
'''
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
# Filter the node types
node_types = [node_type for node_type in self.TOSCA_DEF.keys()
if node_type.startswith(self.NODE_PREFIX) and