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/cadftype.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/cadftype.py')
-rw-r--r-- | pycadf/cadftype.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pycadf/cadftype.py b/pycadf/cadftype.py index 604b178..89dffd5 100644 --- a/pycadf/cadftype.py +++ b/pycadf/cadftype.py @@ -85,6 +85,15 @@ class CADFAbstractType(object): """Return dict representation of Event.""" return jsonutils.to_primitive(self, convert_instances=True) + def _isset(self, attr): + """Check to see if attribute is defined.""" + try: + if isinstance(getattr(self, attr), ValidatorDescriptor): + return False + return True + except AttributeError: + return False + # TODO(mrutkows): Eventually, we want to use the OrderedDict (introduced # in Python 2.7) type for all CADF classes to store attributes in a # canonical form. Currently, OpenStack/Jenkins requires 2.6 compatibility |