Start to test all json schema and files.

setup.py

@@ -52,6 +52,7 @@ setup(name=name,
       packages=find_packages(),
       include_package_data=True,
       install_requires=[
+        'jsonschema',
         'hexagonit.recipe.download',
         'lxml', # for full blown python interpreter
         'netaddr', # to manipulate on IP addresses
@@ -215,5 +216,7 @@ setup(name=name,
           'kumo = slapos.recipe.nosqltestbed.kumo:KumoTestBed',
         ],
       },
+      test_suite='slapos.recipe.test',
+      test_requires=[ 'jsonschema' ],
     )
 

slapos/recipe/test/metaschema.json

+{
+    "id": "http://json-schema.org/draft-04/schema#",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "description": "Core schema meta-schema",
+    "definitions": {
+        "schemaArray": {
+            "type": "array",
+            "minItems": 1,
+            "items": { "$ref": "#" }
+        },
+        "positiveInteger": {
+            "type": "integer",
+            "minimum": 0
+        },
+        "positiveIntegerDefault0": {
+            "allOf": [ { "$ref": "#/definitions/positiveInteger" }, { "default": 0 } ]
+        },
+        "simpleTypes": {
+            "enum": [ "array", "boolean", "integer", "null", "number", "object", "string" ]
+        },
+        "stringArray": {
+            "type": "array",
+            "items": { "type": "string" },
+            "minItems": 1,
+            "uniqueItems": true
+        }
+    },
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string",
+            "format": "uri"
+        },
+        "$schema": {
+            "type": "string",
+            "format": "uri"
+        },
+        "title": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "default": {},
+        "multipleOf": {
+            "type": "number",
+            "minimum": 0,
+            "exclusiveMinimum": true
+        },
+        "maximum": {
+            "type": "number"
+        },
+        "exclusiveMaximum": {
+            "type": "boolean",
+            "default": false
+        },
+        "minimum": {
+            "type": "number"
+        },
+        "exclusiveMinimum": {
+            "type": "boolean",
+            "default": false
+        },
+        "maxLength": { "$ref": "#/definitions/positiveInteger" },
+        "minLength": { "$ref": "#/definitions/positiveIntegerDefault0" },
+        "pattern": {
+            "type": "string",
+            "format": "regex"
+        },
+        "additionalItems": {
+            "anyOf": [
+                { "type": "boolean" },
+                { "$ref": "#" }
+            ],
+            "default": {}
+        },
+        "items": {
+            "anyOf": [
+                { "$ref": "#" },
+                { "$ref": "#/definitions/schemaArray" }
+            ],
+            "default": {}
+        },
+        "maxItems": { "$ref": "#/definitions/positiveInteger" },
+        "minItems": { "$ref": "#/definitions/positiveIntegerDefault0" },
+        "uniqueItems": {
+            "type": "boolean",
+            "default": false
+        },
+        "maxProperties": { "$ref": "#/definitions/positiveInteger" },
+        "minProperties": { "$ref": "#/definitions/positiveIntegerDefault0" },
+        "required": { "$ref": "#/definitions/stringArray" },
+        "additionalProperties": {
+            "anyOf": [
+                { "type": "boolean" },
+                { "$ref": "#" }
+            ],
+            "default": {}
+        },
+        "definitions": {
+            "type": "object",
+            "additionalProperties": { "$ref": "#" },
+            "default": {}
+        },
+        "properties": {
+            "type": "object",
+            "additionalProperties": { "$ref": "#" },
+            "default": {}
+        },
+        "patternProperties": {
+            "type": "object",
+            "additionalProperties": { "$ref": "#" },
+            "default": {}
+        },
+        "dependencies": {
+            "type": "object",
+            "additionalProperties": {
+                "anyOf": [
+                    { "$ref": "#" },
+                    { "$ref": "#/definitions/stringArray" }
+                ]
+            }
+        },
+        "enum": {
+            "type": "array",
+            "minItems": 1,
+            "uniqueItems": true
+        },
+        "type": {
+            "anyOf": [
+                { "$ref": "#/definitions/simpleTypes" },
+                {
+                    "type": "array",
+                    "items": { "$ref": "#/definitions/simpleTypes" },
+                    "minItems": 1,
+                    "uniqueItems": true
+                }
+            ]
+        },
+        "allOf": { "$ref": "#/definitions/schemaArray" },
+        "anyOf": { "$ref": "#/definitions/schemaArray" },
+        "oneOf": { "$ref": "#/definitions/schemaArray" },
+        "not": { "$ref": "#" }
+    },
+    "dependencies": {
+        "exclusiveMaximum": [ "maximum" ],
+        "exclusiveMinimum": [ "minimum" ]
+    },
+    "default": {}
+}

slapos/recipe/test/schema.json

+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "Slapos Software Release instantiation descriptor",
+  "additionalProperties": false,
+  "properties": {
+    "name": {
+      "description": "A short human-friendly name for the sofware release",
+      "type": "string"
+    },
+    "description": {
+      "description": "A short description of the sofware release",
+      "type": "string"
+    },
+    "serialisation": {
+      "description": "How the parameters and results are serialised",
+      "require": true,
+      "enum": ["xml", "json-in-xml"],
+      "type": "string"
+    },
+    "software-type": {
+      "description": "Existing software types",
+      "require": true,
+      "patternProperties": {
+        ".*": {
+          "description": "Software type declaration",
+          "additionalProperties": false,
+          "properties": {
+            "title": {
+              "description": "A human-friendly title of the software type",
+              "type": "string"
+            },
+            "description": {
+              "description": "A human-friendly description of the software type",
+              "type": "string"
+            },
+            "serialisation": {
+              "description": "How the parameters and results are serialised, if different from global setting",
+              "enum": ["xml", "json-in-xml"],
+              "type": "string"
+            },
+            "request": {
+              "require": true,
+              "description": "URL, relative to Software Release base path, of a json schema for values expected by instance of current software type",
+              "type": "string"
+            },
+            "response": {
+              "require": true,
+              "description": "URL, relative to Software Release base path, of a json schema for values published by instance of current software type",
+              "type": "string"
+            },
+            "index": {
+              "description": "Value to use instead of software type id to sort them (in order to display most relevant software types earlier in a list, for example)",
+              "type": "number"
+            }
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    }
+  },
+  "type": "object"
+}
+

slapos/recipe/test/test_json_schema.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import unittest
+import os
+import glob
+import json
+import slapos.recipe.test
+import jsonschema
+
+
+def getSchemaValidator(filename):
+  schema_json_file = "/".join(slapos.recipe.test.__file__.split("/")[:-1])
+  schema_json_file += "/%s" % filename
+  with open(schema_json_file, "r") as json_file:
+    json_dict = json.loads(json_file.read())
+    json_file.close()
+  return json_dict
+
+def createTest(path, json_dict):
+  def run(self, *args, **kwargs):
+    with open(path, "r") as json_file:
+      self.assertEquals(jsonschema.validate(json.loads(json_file.read()), json_dict), None)
+      json_file.close()
+
+  return run
+
+def generateSoftwareCfgTest():
+  json_dict = getSchemaValidator("schema.json")
+  base_path = "/".join(slapos.recipe.test.__file__.split("/")[:-4])
+  for path in glob.glob("%s/software/*/software.cfg.json" % base_path):
+    test_name = "test_%s_software_cfg_json" % path.split("/")[-2]
+    setattr(TestJSONSchemaValidation, test_name , createTest(path, json_dict)) 
+
+
+def generateJSONSchemaTest():
+  json_dict = getSchemaValidator("metaschema.json")
+  base_path = "/".join(slapos.recipe.test.__file__.split("/")[:-4])
+  for path in glob.glob("%s/software/*/*schema.json" % base_path):
+    software_type = path.split("/")[-2]
+    filename = path.split("/")[-1].replace("-", "_").replace(".", "_")
+    test_name = "test_schema_%s_%s" % (software_type, filename)
+    setattr(TestJSONSchemaValidation, test_name , createTest(path, json_dict)) 
+
+class TestJSONSchemaValidation(unittest.TestCase):
+  pass
+
+generateSoftwareCfgTest()
+generateJSONSchemaTest()
+
+if __name__ == '__main__':
+  unittest.main()

software/kvm/instance-kvm-input-schema.json

@@ -71,12 +71,12 @@
       "title": "Existing disk image URL",
       "description": "If specified, will download an existing disk image (qcow2, raw, ...), and will use it as main virtual hard drive. Can be used to download and use an already installed and customized virtual hard drive.",
       "format": "uri",
-      "type": "string",
+      "type": "string"
     },
     "virtual-hard-drive-md5sum": {
       "title": "Checksum of virtual hard drive",
       "description": "MD5 checksum of virtual hard drive, used if virtual-hard-drive-url is specified.",
-      "type": "string",
+      "type": "string"
     },
 
     "use-tap": {
@@ -88,10 +88,8 @@
     "nat-rules": {
       "title": "List of rules for NAT of QEMU user mode network stack.",
       "description": "List of rules for NAT of QEMU user mode network stack, as comma-separated list of ports. For each port specified, it will redirect port x of the VM (example: 80) to the port x + 10000 of the public IPv6 (example: 10080). Defaults to \"22 80 443\". Ignored if \"use-tap\" parameter is enabled.",
-      "type": "string",
+      "type": "string"
     },
-
-
     "frontend-instance-guid": {
       "title": "Frontend Instance ID",
       "description": "Unique identifier of the frontend instance, like \"SOFTINST-11031\".",

software/kvm/instance-kvm-output-schema.json

@@ -4,15 +4,17 @@
     "backend-url": {
       "title": "Backend URL",
       "description": "URL used to connect directly to backend without frontend. Requires IPv6.",
-      "type": "uri",
-      "required": true
+      "type": "string",
+      "format": "uri",
+      "require": true
     },
 
     "url": {
       "title": "URL",
       "description": "URL used to connect to the service.",
-      "type": "uri",
-      "required": false
+      "type": "string",
+      "format": "uri",
+      "require": false
     }
   }
 }

software/kvm/instance-kvm-resilient-input-schema.json

 {
-  "type": "object",
-  "$schema": "http://json-schema.org/draft-04/schema",
-  "items": {
-      "allOf": [
-          {
-              "$ref": "instance-kvm-input-schema.json"
-          }
-      ],
-  "title": "Input Parameters",
-  "properties": {
-    "-sla-0-computer_guid": {
-      "title": "Target computer for main instance",
-      "description": "Target computer GUID for main instance.",
-      "type": "string"
-    },
-    "-sla-1-computer_guid": {
-      "title": "Target computer for first clone",
-      "description": "Target computer for first clone and PBS.",
-      "type": "string"
-    },
-    "-sla-2-computer_guid": {
-      "title": "Target computer for second clone",
-      "description": "Target computer for second clone and PBS.",
-      "type": "string"
-    },
-    "resiliency-backup-periodicity": {
-      "title": "Periodicity of backup",
-      "description": "Periodicity of backup, in cron format.",
-      "type": "string"
-    },
-    "remove-backup-older-than": {
-      "title": "Remove backups older than...",
-      "description": "Remove all the backups in PBS that are older than specified value. It should be rdiff-backup-compatible.",
-      "type": "string",
-      "default": "3B"
+    "type": "object",
+    "$schema": "http://json-schema.org/draft-04/schema",
+    "items": {
+        "allOf": [
+            {
+                "$ref": "instance-kvm-input-schema.json"
+            }
+        ],
+        "title": "Input Parameters",
+        "properties": {
+            "-sla-0-computer_guid": {
+                "title": "Target computer for main instance",
+                "description": "Target computer GUID for main instance.",
+                "type": "string"
+            },
+            "-sla-1-computer_guid": {
+                "title": "Target computer for first clone",
+                "description": "Target computer for first clone and PBS.",
+                "type": "string"
+            },
+            "-sla-2-computer_guid": {
+                "title": "Target computer for second clone",
+                "description": "Target computer for second clone and PBS.",
+                "type": "string"
+            },
+            "resiliency-backup-periodicity": {
+                "title": "Periodicity of backup",
+                "description": "Periodicity of backup, in cron format.",
+                "type": "string"
+            },
+            "remove-backup-older-than": {
+                "title": "Remove backups older than...",
+                "description": "Remove all the backups in PBS that are older than specified value. It should be rdiff-backup-compatible.",
+                "type": "string",
+                "default": "3B"
+            }
+        }
     }
-  }
 }

software/powerdns/instance-powerdns-input-schema.json

@@ -45,7 +45,7 @@
       "description": "Zone to be handled by the DNS cluster",
       "type": "string",
       "default": "domain.com",
-      "pattern": "^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}$"
+      "pattern": "^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}$"
     },
 
     "server-admin": {

software/slaprunner/software.cfg.json

@@ -11,7 +11,7 @@
       "index": 0
     },
     "resilient": {
-      "title": "Resilient" 
+      "title": "Resilient", 
       "description": "Resilient Runner",
       "request": "instance-runner-resilient-input-schema.json",
       "response": "instance-runner-output-schema.json",

software/varnish/instance-varnish-input-schema.json

@@ -15,7 +15,7 @@
       "type": "string"
     },
     "web-checker": {
-      "description": "Controls automated cache checker, disabled if null or empty"
+      "description": "Controls automated cache checker, disabled if null or empty",
       "properties": {
         "frontend-url": {
           "description": "Override entry-point-url web checker will check the HTTP headers of all links in the web site, '%(ip)s' and '%(port)s' being substituted with varnish's listening ip and port, respectively",