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 "Update the upstream of tosco-parser and heat-translator to stable release...
[parser.git]
/
tosca2heat
/
tosca-parser
/
toscaparser
/
elements
/
policytype.py
diff --git
a/tosca2heat/tosca-parser/toscaparser/elements/policytype.py
b/tosca2heat/tosca-parser/toscaparser/elements/policytype.py
index
04cbab5
..
8fbb0f0
100644
(file)
--- a/
tosca2heat/tosca-parser/toscaparser/elements/policytype.py
+++ b/
tosca2heat/tosca-parser/toscaparser/elements/policytype.py
@@
-28,6
+28,7
@@
class PolicyType(StatefulEntityType):
super(PolicyType, self).__init__(ptype, self.POLICY_PREFIX,
custom_def)
self.type = ptype
super(PolicyType, self).__init__(ptype, self.POLICY_PREFIX,
custom_def)
self.type = ptype
+ self.custom_def = custom_def
self._validate_keys()
self.meta_data = None
self._validate_keys()
self.meta_data = None
@@
-55,7
+56,7
@@
class PolicyType(StatefulEntityType):
def _get_parent_policies(self):
policies = {}
def _get_parent_policies(self):
policies = {}
- parent_policy = self.parent_type
+ parent_policy = self.parent_type
.type if self.parent_type else None
if parent_policy:
while parent_policy != 'tosca.policies.Root':
policies[parent_policy] = self.TOSCA_DEF[parent_policy]
if parent_policy:
while parent_policy != 'tosca.policies.Root':
policies[parent_policy] = self.TOSCA_DEF[parent_policy]
@@
-64,8
+65,12
@@
class PolicyType(StatefulEntityType):
@property
def parent_type(self):
@property
def parent_type(self):
- '''Return a policy this policy is derived from.'''
- return self.derived_from(self.defs)
+ '''Return a policy statefulentity of this node is derived from.'''
+ if not hasattr(self, 'defs'):
+ return None
+ ppolicy_entity = self.derived_from(self.defs)
+ if ppolicy_entity:
+ return PolicyType(ppolicy_entity, self.custom_def)
def get_policy(self, name):
'''Return the definition of a policy field by name.'''
def get_policy(self, name):
'''Return the definition of a policy field by name.'''