update cadf spec to support new data model0.1.5

- add Credential type and move token into it
- add Host type and move client_addr, agent into it
- add Endpoint type and move adminUrl, privateUrl into it
- add credential, host, addresses as optional attr of Resource
- add observer attr to event

Change-Id: I663eaf0b2f239300e035f084b8574e615c40a182
Fixes: Bug #1214097

1 files changed, 49 insertions, 0 deletions

diff --git a/pycadf/credential.py b/pycadf/credential.py
new file mode 100644
index 0000000..f58f6b6
--- /dev/null
+++ b/pycadf/credential.py
@@ -0,0 +1,49 @@
+# -*- encoding: utf-8 -*-
+#
+# Copyright © 2013 IBM Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from pycadf import cadftype
+
+TYPE_URI_CRED = cadftype.CADF_VERSION_1_0_0 + 'credential'
+
+CRED_KEYNAME_TYPE = "type"
+CRED_KEYNAME_TOKEN = "token"
+
+CRED_KEYNAMES = [CRED_KEYNAME_TYPE,
+                 CRED_KEYNAME_TOKEN]
+
+
+class Credential(cadftype.CADFAbstractType):
+
+    type = cadftype.ValidatorDescriptor(
+        CRED_KEYNAME_TYPE,
+        lambda x: isinstance(x, basestring))
+    token = cadftype.ValidatorDescriptor(
+        CRED_KEYNAME_TOKEN,
+        lambda x: isinstance(x, basestring))
+
+    def __init__(self, token, type=None):
+
+        # Credential.token
+        setattr(self, CRED_KEYNAME_TOKEN, token)
+
+        # Credential.type
+        if type is not None:
+            setattr(self, CRED_KEYNAME_TYPE, type)
+
+    # TODO(mrutkows): validate this cadf:Credential type against schema
+    def is_valid(self):
+        # TODO(mrutkows): validate specific attribute type/format
+        return hasattr(self, CRED_KEYNAME_TOKEN)