X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=fe574e3d44b93f491aace49febb74b5f5192dfdd;hp=c6821c5240a0f91dd9819fe666b63b02756e6bdf;hb=refs%2Fchanges%2F15%2F8215%2F1;hpb=21f03f572ec5a9883107de8e7dbd7b4891f6860b;ds=sidebyside diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py index c6821c5..fe574e3 100644 --- a/osm_nbi/validation.py +++ b/osm_nbi/validation.py @@ -363,7 +363,7 @@ ns_scale = { # TODO for the moment it is only VDU-scaling schema_version = {"type": "string", "enum": ["1.0"]} schema_type = {"type": "string"} -vim_type = {"enum": ["openstack", "openvim", "vmware", "opennebula", "aws", "azure", "fos"]} +vim_type = shortname_schema # {"enum": ["openstack", "openvim", "vmware", "opennebula", "aws", "azure", "fos"]} vim_account_edit_schema = { "title": "vim_account edit input schema", @@ -410,7 +410,7 @@ vim_account_new_schema = { "additionalProperties": False } -wim_type = {"enum": ["tapi", "onos", "odl", "dynpac", "fake"]} +wim_type = shortname_schema # {"enum": ["tapi", "onos", "odl", "dynpac", "fake"]} wim_account_edit_schema = { "title": "wim_account edit input schema", @@ -522,7 +522,7 @@ k8scluster_nets_schema = { "title": "k8scluster nets input schema", "$schema": "http://json-schema.org/draft-04/schema#", "type": "object", - "patternProperties": {".": string_schema}, + "patternProperties": {".": {"oneOf": [description_schema, null_schema]}}, "minProperties": 1, "additionalProperties": False }