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

software/kvm: fix json schemas

string.format must be a string according to
https://json-schema.org/understanding-json-schema/reference/string.html#format

We were using our own version of metaschema with a patch for this. Now
we are back to using official schema, but with a custom format
`internet-address` that should be equivalent to:

    "oneOf": [
      {
	"format": "hostname"
      },
      {
	"format": "ipv4"
      },
      {
	"format": "ipv6"
      }
    ],
parent 0529cb73
...@@ -368,11 +368,7 @@ ...@@ -368,11 +368,7 @@
"title": "NBD hostname or IP", "title": "NBD hostname or IP",
"description": "hostname (or IP) of the NBD server containing the boot image.", "description": "hostname (or IP) of the NBD server containing the boot image.",
"type": "string", "type": "string",
"format": [ "format": "internet-address",
"host-name",
"ip-address",
"ipv6"
],
"default": "debian.nbd.vifib.net" "default": "debian.nbd.vifib.net"
}, },
"nbd-port": { "nbd-port": {
......
...@@ -64,11 +64,7 @@ ...@@ -64,11 +64,7 @@
"title": "NBD hostname or IP", "title": "NBD hostname or IP",
"description": "hostname (or IP) of the NBD server containing the boot image.", "description": "hostname (or IP) of the NBD server containing the boot image.",
"type": "string", "type": "string",
"format": [ "format": "internet-address",
"host-name",
"ip-address",
"ipv6"
],
"default": "debian.nbd.vifib.net" "default": "debian.nbd.vifib.net"
}, },
"nbd-port": { "nbd-port": {
......
...@@ -172,11 +172,7 @@ ...@@ -172,11 +172,7 @@
"title": "NBD hostname", "title": "NBD hostname",
"description": "hostname (or IP) of the NBD server containing the boot image.", "description": "hostname (or IP) of the NBD server containing the boot image.",
"type": "string", "type": "string",
"format": [ "format": "internet-address",
"host-name",
"ip-address",
"ipv6"
],
"default": "debian.nbd.vifib.net" "default": "debian.nbd.vifib.net"
}, },
"nbd-port": { "nbd-port": {
...@@ -191,11 +187,7 @@ ...@@ -191,11 +187,7 @@
"title": "Second NBD hostname", "title": "Second NBD hostname",
"description": "hostname (or IP) of the second NBD server (containing drivers for example).", "description": "hostname (or IP) of the second NBD server (containing drivers for example).",
"type": "string", "type": "string",
"format": [ "format": "internet-address"
"host-name",
"ip-address",
"ipv6"
]
}, },
"nbd2-port": { "nbd2-port": {
"title": "Second NBD port", "title": "Second NBD port",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment