Commit dc428cf6 authored by Jérome Perrin's avatar Jérome Perrin

*: reformat json with format-json

parent cecf100b
...@@ -18,7 +18,10 @@ ...@@ -18,7 +18,10 @@
}, },
"serialisation": { "serialisation": {
"description": "How the parameters and results are serialised", "description": "How the parameters and results are serialised",
"enum": ["xml", "json-in-xml"], "enum": [
"xml",
"json-in-xml"
],
"type": "string" "type": "string"
}, },
"software-type": { "software-type": {
...@@ -44,7 +47,10 @@ ...@@ -44,7 +47,10 @@
}, },
"serialisation": { "serialisation": {
"description": "How the parameters and results are serialised, if different from global setting, required if global setting is not provided", "description": "How the parameters and results are serialised, if different from global setting, required if global setting is not provided",
"enum": ["xml", "json-in-xml"], "enum": [
"xml",
"json-in-xml"
],
"type": "string" "type": "string"
}, },
"request": { "request": {
...@@ -55,11 +61,11 @@ ...@@ -55,11 +61,11 @@
"description": "URL, relative to Software Release base path, of a json schema for values published by instance of current software type", "description": "URL, relative to Software Release base path, of a json schema for values published by instance of current software type",
"type": "string" "type": "string"
}, },
"software-type" : { "software-type": {
"description": "Value to be used as software type instead of the software type id (in order to use multiple diferent forms for the same software type).", "description": "Value to be used as software type instead of the software type id (in order to use multiple diferent forms for the same software type).",
"type": "string" "type": "string"
}, },
"shared" : { "shared": {
"description": "Define if the request will request a Slave or Software Instance.", "description": "Define if the request will request a Slave or Software Instance.",
"default": "false", "default": "false",
"type": "boolean" "type": "boolean"
...@@ -78,4 +84,3 @@ ...@@ -78,4 +84,3 @@
}, },
"type": "object" "type": "object"
} }
...@@ -12,4 +12,4 @@ ...@@ -12,4 +12,4 @@
"type": "string" "type": "string"
} }
} }
} }
\ No newline at end of file
{ {
"id": "http://json-schema.org/draft-04/schema#", "id": "http://json-schema.org/draft-04/schema#",
"$schema": "http://json-schema.org/draft-04/schema#", "$schema": "http://json-schema.org/draft-04/schema#",
"description": "Core schema meta-schema", "description": "Core schema meta-schema",
"definitions": { "definitions": {
"schemaArray": { "schemaArray": {
"type": "array", "type": "array",
"minItems": 1, "minItems": 1,
"items": { "$ref": "#" } "items": {
"$ref": "#"
}
},
"positiveInteger": {
"type": "integer",
"minimum": 0
},
"positiveIntegerDefault0": {
"allOf": [
{
"$ref": "#/definitions/positiveInteger"
}, },
"positiveInteger": { {
"type": "integer", "default": 0
"minimum": 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"
}, },
"positiveIntegerDefault0": { {
"allOf": [ { "$ref": "#/definitions/positiveInteger" }, { "default": 0 } ] "$ref": "#"
}
],
"default": {}
},
"items": {
"anyOf": [
{
"$ref": "#"
}, },
"simpleTypes": { {
"enum": [ "array", "boolean", "integer", "null", "number", "object", "string" ] "$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"
}, },
"stringArray": { {
"type": "array", "$ref": "#"
"items": { "type": "string" },
"minItems": 1,
"uniqueItems": true
} }
],
"default": {}
},
"definitions": {
"type": "object",
"additionalProperties": {
"$ref": "#"
},
"default": {}
}, },
"type": "object",
"properties": { "properties": {
"id": { "type": "object",
"type": "string", "additionalProperties": {
"format": "uri" "$ref": "#"
}, },
"$schema": { "default": {}
"type": "string", },
"format": "uri" "patternProperties": {
}, "type": "object",
"title": { "additionalProperties": {
"type": "string" "$ref": "#"
}, },
"description": { "default": {}
"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": { "dependencies": {
"exclusiveMaximum": [ "maximum" ], "type": "object",
"exclusiveMinimum": [ "minimum" ] "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"
}, },
"default": {} "not": {
"$ref": "#"
}
},
"dependencies": {
"exclusiveMaximum": [
"maximum"
],
"exclusiveMinimum": [
"minimum"
]
},
"default": {}
} }
...@@ -14,7 +14,10 @@ ...@@ -14,7 +14,10 @@
"serialisation": { "serialisation": {
"description": "How the parameters and results are serialised", "description": "How the parameters and results are serialised",
"require": true, "require": true,
"enum": ["xml", "json-in-xml"], "enum": [
"xml",
"json-in-xml"
],
"type": "string" "type": "string"
}, },
"software-type": { "software-type": {
...@@ -35,7 +38,10 @@ ...@@ -35,7 +38,10 @@
}, },
"serialisation": { "serialisation": {
"description": "How the parameters and results are serialised, if different from global setting", "description": "How the parameters and results are serialised, if different from global setting",
"enum": ["xml", "json-in-xml"], "enum": [
"xml",
"json-in-xml"
],
"type": "string" "type": "string"
}, },
"request": { "request": {
...@@ -48,11 +54,11 @@ ...@@ -48,11 +54,11 @@
"description": "URL, relative to Software Release base path, of a json schema for values published by instance of current software type", "description": "URL, relative to Software Release base path, of a json schema for values published by instance of current software type",
"type": "string" "type": "string"
}, },
"software-type" : { "software-type": {
"description": "Value to be used as software type instead of the software type id (in order to use multiple diferent forms for the same software type).", "description": "Value to be used as software type instead of the software type id (in order to use multiple diferent forms for the same software type).",
"type": "string" "type": "string"
}, },
"shared" : { "shared": {
"description": "Define if the request will request a Slave or Software Instance.", "description": "Define if the request will request a Slave or Software Instance.",
"type": "boolean" "type": "boolean"
}, },
...@@ -69,4 +75,3 @@ ...@@ -69,4 +75,3 @@
}, },
"type": "object" "type": "object"
} }
{ {
"type": "object", "type": "object",
"$schema": "http://json-schema.org/draft-04/schema", "$schema": "http://json-schema.org/draft-04/schema",
"title": "Input Parameters",
"title": "Input Parameters", "properties": {
"properties": { "public-ipv4": {
"public-ipv4": { "title": "Public IPv4",
"title": "Public IPv4", "description": "Public ipv4 of the frontend (the one Apache will be indirectly listening to).",
"description": "Public ipv4 of the frontend (the one Apache will be indirectly listening to).", "type": "string"
"type": "string" },
}, "ip-read-limit": {
"ip-read-limit": { "title": "IPReadLimit",
"title": "IPReadLimit", "description": "Value used to set IPReadLimit Parameter for antiloris.",
"description": "Value used to set IPReadLimit Parameter for antiloris.", "type": "integer",
"type": "integer", "default": 10
"default": 10 },
}, "mpm-server-limit": {
"mpm-server-limit": { "title": "ServerLimit",
"title": "ServerLimit", "description": "Value used to set ServerLimit on apache configuration.",
"description": "Value used to set ServerLimit on apache configuration.", "type": "integer",
"type": "integer", "default": 16
"default": 16 },
}, "mpm-max-clients": {
"mpm-max-clients": { "title": "MaxClients",
"title": "MaxClients", "description": "Value used to set MaxClients on apache configuration.",
"description": "Value used to set MaxClients on apache configuration.", "type": "integer",
"type": "integer", "default": 400
"default": 400 },
}, "mpm-start-servers": {
"mpm-start-servers": { "title": "StartServers",
"title": "StartServers", "description": "Value used to set StartServers on apache configuration.",
"description": "Value used to set StartServers on apache configuration.", "type": "integer",
"type": "integer", "default": 3
"default": 3 },
}, "mpm-thread-per-child": {
"mpm-thread-per-child": { "title": "ThreadsPerChild",
"title": "ThreadsPerChild", "description": "Value used to set ThreadsPerChild on apache configuration.",
"description": "Value used to set ThreadsPerChild on apache configuration.", "type": "integer",
"type": "integer", "default": 25
"default": 25 },
}, "mpm-graceful-shutdown-timeout": {
"mpm-graceful-shutdown-timeout": { "title": "ThreadsPerChild",
"title": "ThreadsPerChild", "description": "Value used to set ThreadsPerChild on apache configuration.",
"description": "Value used to set ThreadsPerChild on apache configuration.", "type": "integer",
"type": "integer", "default": 5
"default": 5 },
}, "enable-http2-by-default": {
"enable-http2-by-default": { "title": "Enable HTTP2 by Default",
"title": "Enable HTTP2 by Default", "description": "Use HTTP2 as default Protocol",
"description": "Use HTTP2 as default Protocol", "type": "string",
"type": "string", "default": "true",
"default": "true", "enum": [
"enum": ["true", "false"] "true",
}, "false"
"re6st-verification-url": { ]
"title": "Test Verification URL", },
"description": "Url to verify if the internet and/or re6stnet is working.", "re6st-verification-url": {
"type": "string" "title": "Test Verification URL",
}, "description": "Url to verify if the internet and/or re6stnet is working.",
"-frontend-authorized-slave-string": { "type": "string"
"title": "Authorized Slave String", },
"description": "List of SOFTINST-XXX of Slaves, separated by space which is allowed to use custom configuration.", "-frontend-authorized-slave-string": {
"type": "string" "title": "Authorized Slave String",
}, "description": "List of SOFTINST-XXX of Slaves, separated by space which is allowed to use custom configuration.",
"apache-key": { "type": "string"
"title": "Apache Key", },
"description": "Apache Key", "apache-key": {
"textarea": true, "title": "Apache Key",
"type": "string" "description": "Apache Key",
}, "textarea": true,
"apache-certificate": { "type": "string"
"title": "Apache Certificate", },
"description": "Apache Certificate", "apache-certificate": {
"textarea": true, "title": "Apache Certificate",
"type": "string" "description": "Apache Certificate",
}, "textarea": true,
"apache-ca-certificate": { "type": "string"
"title": "Apache CA Certificate", },
"description": "Apache CA Certificate", "apache-ca-certificate": {
"textarea": true, "title": "Apache CA Certificate",
"type": "string" "description": "Apache CA Certificate",
}, "textarea": true,
"domain": { "type": "string"
"title": "Domain", },
"description": "Base Domain for create subdomains (ie.: example.com).", "domain": {
"type": "string", "title": "Domain",
"pattern": "^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}$" "description": "Base Domain for create subdomains (ie.: example.com).",
}, "type": "string",
"nginx-domain": { "pattern": "^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}$"
"title": "Nginx Domain", },
"description": "Base Domain for create subdomains (ie.: example2.com) for websocket, notebook and eventsource.", "nginx-domain": {
"type": "string", "title": "Nginx Domain",
"pattern": "^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}$" "description": "Base Domain for create subdomains (ie.: example2.com) for websocket, notebook and eventsource.",
}, "type": "string",
"-frontend-quantity": { "pattern": "^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}$"
"title": "Frontend Replication Quantity", },
"description": "Quantity of Frontends Replicate.", "-frontend-quantity": {
"type": "integer" "title": "Frontend Replication Quantity",
} "description": "Quantity of Frontends Replicate.",
} "type": "integer"
}
}
} }
...@@ -6,31 +6,31 @@ ...@@ -6,31 +6,31 @@
"description": "Amount of Slaves allocated to the Instance which are deployed", "description": "Amount of Slaves allocated to the Instance which are deployed",
"type": "integer" "type": "integer"
}, },
"slave-amount": { "slave-amount": {
"description": "Total amount of Slaves allocated to the Instance (include blocked ones)", "description": "Total amount of Slaves allocated to the Instance (include blocked ones)",
"type": "integer" "type":