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 "Incorrect inheritance of requirements in NodeType"
[parser.git]
/
tosca2heat
/
tosca-parser
/
toscaparser
/
elements
/
entity_type.py
diff --git
a/tosca2heat/tosca-parser/toscaparser/elements/entity_type.py
b/tosca2heat/tosca-parser/toscaparser/elements/entity_type.py
index
5d620a5
..
72e7e3f
100644
(file)
--- a/
tosca2heat/tosca-parser/toscaparser/elements/entity_type.py
+++ b/
tosca2heat/tosca-parser/toscaparser/elements/entity_type.py
@@
-106,8
+106,13
@@
class EntityType(object):
value[k] = v
if isinstance(value, list):
for p_value in parent_value:
value[k] = v
if isinstance(value, list):
for p_value in parent_value:
- if p_value not in value:
- value.append(p_value)
+ if isinstance(p_value, dict):
+ if p_value.keys()[0] not in [
+ item.keys()[0] for item in value]:
+ value.append(p_value)
+ else:
+ if p_value not in value:
+ value.append(p_value)
else:
value = copy.copy(parent_value)
p = p.parent_type
else:
value = copy.copy(parent_value)
p = p.parent_type