diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2022-07-14 17:56:31 +0200 |
|---|---|---|
| committer | Dmitry Tantsur <dtantsur@protonmail.com> | 2022-07-14 18:07:48 +0200 |
| commit | 55b9579f14ea08a2dc732336d8f552cc14ab895d (patch) | |
| tree | f2ce2c7714d6fe876cb051b35594053429fffd34 /ironic/api/controllers | |
| parent | 0c4401cfbbe6f28aee6cd4ba86089936ebdb37bc (diff) | |
| download | ironic-55b9579f14ea08a2dc732336d8f552cc14ab895d.tar.gz | |
Fix compatibility with jsonschema>=4.0.0
Specify the schema version for network_data and node, otherwise the
latest one is used.
Also fix one test where the error messages was changed.
Change-Id: I4a614d7e73348bbe6c355a40881b013cbfe00b03
Diffstat (limited to 'ironic/api/controllers')
| -rw-r--r-- | ironic/api/controllers/v1/network-data-schema.json | 2 | ||||
| -rw-r--r-- | ironic/api/controllers/v1/node.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ironic/api/controllers/v1/network-data-schema.json b/ironic/api/controllers/v1/network-data-schema.json index 7162daf34..c27c84871 100644 --- a/ironic/api/controllers/v1/network-data-schema.json +++ b/ironic/api/controllers/v1/network-data-schema.json @@ -1,5 +1,5 @@ { - "$schema": "http://openstack.org/nova/network_data.json#", + "$schema": "http://json-schema.org/draft-07/schema#", "id": "http://openstack.org/nova/network_data.json", "type": "object", "title": "OpenStack Nova network metadata schema", diff --git a/ironic/api/controllers/v1/node.py b/ironic/api/controllers/v1/node.py index f182e2fd2..2ef369e13 100644 --- a/ironic/api/controllers/v1/node.py +++ b/ironic/api/controllers/v1/node.py @@ -140,6 +140,7 @@ def network_data_schema(): def node_schema(): network_data = network_data_schema() return { + '$schema': 'http://json-schema.org/draft-07/schema#', 'type': 'object', 'properties': { 'automated_clean': {'type': ['string', 'boolean', 'null']}, |