Skip to content

Commit bdca040

Browse files
committed
schema: network-config optional network key. route uses oneOf (#4482)
network-config schema now permits optional top-level network key. We should generally be using oneOf declarations in JSON schema. Fix anyOf_type_route schema definition. Update route definition to oneOf from anyOf requiring either 'network' or 'destination' key, combined with a 'gateway' key.
1 parent 159db3a commit bdca040

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

cloudinit/config/schemas/schema-network-config-v1.json

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@
417417
"anyOf_type_route": {
418418
"type": "object",
419419
"additionalProperties": false,
420-
"anyOf": [
420+
"oneOf": [
421421
{
422422
"required": [
423423
"network",
@@ -566,13 +566,20 @@
566566
}
567567
}
568568
},
569-
"required": [
570-
"network"
571-
],
572-
"properties": {
573-
"network": {
569+
"oneOf": [
570+
{
574571
"$ref": "#/$defs/network_config_version1"
572+
},
573+
{
574+
"required": [
575+
"network"
576+
],
577+
"properties": {
578+
"network": {
579+
"$ref": "#/$defs/network_config_version1"
580+
}
581+
},
582+
"additionalProperties": false
575583
}
576-
},
577-
"additionalProperties": false
584+
]
578585
}

0 commit comments

Comments
 (0)