X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=9bc2624b86242cc070f823d16fd9fb5ea0829e30;hb=refs%2Fchanges%2F60%2F11060%2F1;hp=beea5753197a9bc43d4a66bb30e572d5f9f433ba;hpb=329b81892dc8d2549209fd73505d1f88cf862a72;p=osm%2FNBI.git diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py index beea575..9bc2624 100644 --- a/osm_nbi/validation.py +++ b/osm_nbi/validation.py @@ -261,6 +261,7 @@ additional_params_for_vnf = { "kdu_model": name_schema, "k8s-namespace": name_schema, "config-units": integer1_schema, # number of configuration units of this knf, by default 1 + "kdu-deployment-name": name_schema, }, "required": ["kdu_name"], "minProperties": 2, @@ -286,7 +287,7 @@ ns_instantiate = { "nsDescription": {"oneOf": [description_schema, null_schema]}, "nsdId": id_schema, "vimAccountId": id_schema, - "wimAccountId": {"OneOf": [id_schema, bool_schema, null_schema]}, + "wimAccountId": {"oneOf": [id_schema, bool_schema, null_schema]}, "placement-engine": string_schema, "placement-constraints": object_schema, "additionalParamsForNs": object_schema, @@ -328,10 +329,10 @@ ns_instantiate = { "type": "object", "properties": { "name": string_schema, - "vim-network-name": {"OneOf": [string_schema, object_schema]}, - "vim-network-id": {"OneOf": [string_schema, object_schema]}, + "vim-network-name": {"oneOf": [string_schema, object_schema]}, + "vim-network-id": {"oneOf": [string_schema, object_schema]}, "ns-net": object_schema, - "wimAccountId": {"OneOf": [id_schema, bool_schema, null_schema]}, + "wimAccountId": {"oneOf": [id_schema, bool_schema, null_schema]}, "ip-profile": object_schema, "provider-network": provider_network_schema, "vnfd-connection-point-ref": { @@ -447,7 +448,7 @@ vim_account_edit_schema = { # "vim_url_admin": description_schema, # "vim_tenant": name_schema, "vim_tenant_name": name_schema, - "vim_user": shortname_schema, + "vim_user": string_schema, "vim_password": passwd_schema, "config": {"type": "object"} }, @@ -470,7 +471,7 @@ vim_account_new_schema = { # "vim_url_admin": description_schema, # "vim_tenant": name_schema, "vim_tenant_name": name_schema, - "vim_user": shortname_schema, + "vim_user": string_schema, "vim_password": passwd_schema, "config": {"type": "object"} }, @@ -938,8 +939,8 @@ nsi_vld_instantiate = { "type": "object", "properties": { "name": string_schema, - "vim-network-name": {"OneOf": [string_schema, object_schema]}, - "vim-network-id": {"OneOf": [string_schema, object_schema]}, + "vim-network-name": {"oneOf": [string_schema, object_schema]}, + "vim-network-id": {"oneOf": [string_schema, object_schema]}, "ip-profile": object_schema, }, "required": ["name"],