From 30570bd89c04a56b35b91a0bc1d5fc00bb6ad266 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Mon, 24 Sep 2012 22:21:50 +0900
Subject: add schema to JSONLeapConfig classes

and a jsonvalidate function too,
that calls to jsonchemea.validate(self, data) with self.schema

We're using the specs to both purposes now:
* providing a type casting system for our config options (work in
  progress for the type casting)
* json schema validation
---
 src/leap/base/specs.py | 98 ++++++++++++++++++++++++++------------------------
 1 file changed, 51 insertions(+), 47 deletions(-)

(limited to 'src/leap/base/specs.py')

diff --git a/src/leap/base/specs.py b/src/leap/base/specs.py
index d88dc63f..e75eca70 100644
--- a/src/leap/base/specs.py
+++ b/src/leap/base/specs.py
@@ -1,49 +1,53 @@
 leap_provider_spec = {
-    'serial': {
-        'type': int,
-        'default': 1,
-        'required': True,
-    },
-    'version': {
-        'type': unicode,
-        'default': '0.1.0'
-        #'required': True
-    },
-    'domain': {
-        'type': unicode,  # XXX define uri type
-        'default': 'testprovider.example.org'
-        #'required': True,
-    },
-    'display_name': {
-        'type': unicode,  # XXX multilingual object?
-        'default': 'test provider'
-        #'required': True
-    },
-    'description': {
-        'default': 'test provider'
-    },
-    'enrollment_policy': {
-        'type': unicode,  # oneof ??
-        'default': 'open'
-    },
-    'services': {
-        'type': list,  # oneof ??
-        'default': ['eip']
-    },
-    'api_version': {
-        'type': unicode,
-        'default': '0.1.0'  # version regexp
-    },
-    'api_uri': {
-        'type': unicode  # uri
-    },
-    'public_key': {
-        'type': unicode  # fingerprint
-    },
-    'ca_cert': {
-        'type': unicode
-    },
-    'ca_cert_uri': {
-        'type': unicode
-    },
+    'description': 'provider definition',
+    'type': 'object',
+    'properties': {
+        'serial': {
+            'type': int,
+            'default': 1,
+            'required': True,
+        },
+        'version': {
+            'type': unicode,
+            'default': '0.1.0'
+            #'required': True
+        },
+        'domain': {
+            'type': unicode,  # XXX define uri type
+            'default': 'testprovider.example.org'
+            #'required': True,
+        },
+        'display_name': {
+            'type': unicode,  # XXX multilingual object?
+            'default': 'test provider'
+            #'required': True
+        },
+        'description': {
+            'default': 'test provider'
+        },
+        'enrollment_policy': {
+            'type': unicode,  # oneof ??
+            'default': 'open'
+        },
+        'services': {
+            'type': list,  # oneof ??
+            'default': ['eip']
+        },
+        'api_version': {
+            'type': unicode,
+            'default': '0.1.0'  # version regexp
+        },
+        'api_uri': {
+            'type': unicode  # uri
+        },
+        'public_key': {
+            'type': unicode  # fingerprint
+        },
+        'ca_cert': {
+            'type': unicode
+        },
+        'ca_cert_uri': {
+            'type': unicode
+        }
+    }
 }
-- 
cgit v1.2.3


From 5d8e518d03e9fd045a75a63fec79b52392266c26 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Tue, 25 Sep 2012 07:19:07 +0900
Subject: make test for provider pass

---
 src/leap/base/specs.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/leap/base/specs.py')

diff --git a/src/leap/base/specs.py b/src/leap/base/specs.py
index e75eca70..641e795a 100644
--- a/src/leap/base/specs.py
+++ b/src/leap/base/specs.py
@@ -18,12 +18,13 @@ leap_provider_spec = {
             #'required': True,
         },
         'display_name': {
-            'type': unicode,  # XXX multilingual object?
-            'default': 'test provider'
+            'type': dict,  # XXX multilingual object?
+            'default': {u'en': u'Test Provider'}
             #'required': True
         },
         'description': {
-            'default': 'test provider'
+            'type': dict,
+            'default': {u'en': u'Test provider'}
         },
         'enrollment_policy': {
             'type': unicode,  # oneof ??
-- 
cgit v1.2.3


From abf481cab381a86d8a9c5607a131b56636081382 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Tue, 25 Sep 2012 05:48:06 +0900
Subject: refactored jsonconfig, included jsonschema validation

and type casting.
---
 src/leap/base/specs.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/leap/base/specs.py')

diff --git a/src/leap/base/specs.py b/src/leap/base/specs.py
index 641e795a..b4bb8dcf 100644
--- a/src/leap/base/specs.py
+++ b/src/leap/base/specs.py
@@ -44,11 +44,16 @@ leap_provider_spec = {
         'public_key': {
             'type': unicode  # fingerprint
         },
-        'ca_cert': {
-            'type': unicode
+        'ca_cert_fingerprint': {
+            'type': unicode,
         },
         'ca_cert_uri': {
-            'type': unicode
+            'type': unicode,
+            'format': 'https-uri'
+        },
+        'languages': {
+            'type': list,
+            'default': ['en']
         }
     }
 }
-- 
cgit v1.2.3