X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=e5c2a0328fe2addfbad187fd8aef8325b7f3fe15;hb=refs%2Fchanges%2F63%2F13263%2F6;hp=58ecaf72a444f61d5970133ed9c20b3435af10bd;hpb=f2af4a100d308e07f355d61b94fb27d1ccc97aa2;p=osm%2FNBI.git diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py index 58ecaf7..e5c2a03 100644 --- a/osm_nbi/validation.py +++ b/osm_nbi/validation.py @@ -137,6 +137,7 @@ ns_instantiate_vdu = { "type": "object", "properties": { "id": name_schema, + "vim-flavor-id": name_schema, "volume": { "type": "array", "minItems": 1, @@ -194,19 +195,6 @@ ip_profile_dhcp_schema = { } ip_profile_schema = { - "title": "ip profile validation schema", - "$schema": "http://json-schema.org/draft-04/schema#", - "type": "object", - "properties": { - "ip-version": {"enum": ["ipv4", "ipv6"]}, - "subnet-address": ip_prefix_schema, - "gateway-address": ip_schema, - "dns-server": ip_profile_dns_schema, - "dhcp-params": ip_profile_dhcp_schema, - }, -} - -ip_profile_update_schema = { "title": "ip profile validation schema", "$schema": "http://json-schema.org/draft-04/schema#", "type": "object", @@ -253,7 +241,7 @@ ns_instantiate_internal_vld = { "name": name_schema, "vim-network-name": name_schema, "vim-network-id": name_schema, - "ip-profile": ip_profile_update_schema, + "ip-profile": ip_profile_schema, "provider-network": provider_network_schema, "internal-connection-point": { "type": "array", @@ -394,7 +382,7 @@ ns_instantiate = { "vim-network-id": {"oneOf": [string_schema, object_schema]}, "ns-net": object_schema, "wimAccountId": {"oneOf": [id_schema, bool_schema, null_schema]}, - "ip-profile": object_schema, + "ip-profile": ip_profile_schema, "provider-network": provider_network_schema, "vnfd-connection-point-ref": { "type": "array",