diff options
author | Gordon Chung <chungg@ca.ibm.com> | 2013-10-24 19:04:13 -0400 |
---|---|---|
committer | Gordon Chung <chungg@ca.ibm.com> | 2013-10-25 11:39:22 -0400 |
commit | 2e436ada18e5b6d37342ff7969b189d4827df45d (patch) | |
tree | ec89a381ab2884c5dcb5b63182cfc770f939fe3b /pycadf/reason.py | |
parent | 52aa7818bba4c16229d9d2b402009a36d781ea5f (diff) | |
download | pycadf-2e436ada18e5b6d37342ff7969b189d4827df45d.tar.gz |
improve model validation
- add isset to check "real" attribute and not descriptor
- verify only id is set in shortform
- verify either resource or resourceId value is set, not both.
blueprint improve-validation
related-bug: #1242830
Change-Id: Ie9e3f26c5d30cd36e6013a1f0b77c8fe466cb3f7
Diffstat (limited to 'pycadf/reason.py')
-rw-r--r-- | pycadf/reason.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pycadf/reason.py b/pycadf/reason.py index cf41f8c..85d4ed6 100644 --- a/pycadf/reason.py +++ b/pycadf/reason.py @@ -68,7 +68,7 @@ class Reason(cadftype.CADFAbstractType): # TODO(mrutkows): validate this cadf:Reason type against schema def is_valid(self): # MUST have at least one valid pairing of reason+code or policy+id - return ((hasattr(self, REASON_KEYNAME_REASONTYPE) and - hasattr(self, REASON_KEYNAME_REASONCODE)) or - (hasattr(self, REASON_KEYNAME_POLICYTYPE) and - hasattr(self, REASON_KEYNAME_POLICYID))) + return ((self._isset(REASON_KEYNAME_REASONTYPE) and + self._isset(REASON_KEYNAME_REASONCODE)) or + (self._isset(REASON_KEYNAME_POLICYTYPE) and + self._isset(REASON_KEYNAME_POLICYID))) |