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/measurement.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/measurement.py')
| -rw-r--r-- | pycadf/measurement.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pycadf/measurement.py b/pycadf/measurement.py index 58bd03b..3cef90d 100644 --- a/pycadf/measurement.py +++ b/pycadf/measurement.py @@ -64,4 +64,6 @@ class Measurement(cadftype.CADFAbstractType): # self validate this cadf:Measurement type against schema def is_valid(self): - return hasattr(self, MEASUREMENT_KEYNAME_RESULT) + return (self._isset(MEASUREMENT_KEYNAME_RESULT) and + (self._isset(MEASUREMENT_KEYNAME_METRIC) ^ + self._isset(MEASUREMENT_KEYNAME_METRICID))) |