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

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