X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=1d637c5cb33febbe37770575c222e453b1dc92f2;hb=7c958d4bde7087399a84d69b899c0fb3107bcf3e;hp=fc16f062602be428d2b0eb41d77b9f08b9e0c669;hpb=418d19d1135718f8f1a4d79621e58f9768d2d01d;p=osm%2FNBI.git diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py index fc16f06..1d637c5 100644 --- a/osm_nbi/validation.py +++ b/osm_nbi/validation.py @@ -157,7 +157,7 @@ ns_instantiate_vdu = { "type": "object", "properties": { "name": name_schema, - "ip-address": ip_schema, + "ip-address": {"oneOf": [ip_schema, ipv6_schema]}, "mac-address": mac_schema, "floating-ip-required": bool_schema, }, @@ -176,7 +176,7 @@ ip_profile_dns_schema = { "items": { "type": "object", "properties": { - "address": ip_schema, + "address": {"oneOf": [ip_schema, ipv6_schema]}, }, "required": ["address"], "additionalProperties": False, @@ -246,7 +246,7 @@ provider_network_schema = { } ns_instantiate_internal_vld = { - "title": "ns action instantiate input schema for vdu", + "title": "ns action instantiate input schema for vld", "$schema": "http://json-schema.org/draft-04/schema#", "type": "object", "properties": { @@ -316,6 +316,19 @@ additional_params_for_vnf = { "additionalProperties": False, }, }, + "affinity-or-anti-affinity-group": { + "type": "array", + "items": { + "type": "object", + "properties": { + "id": name_schema, + "vim-affinity-group-id": name_schema, + }, + "required": ["id"], + "minProperties": 2, + "additionalProperties": False, + }, + }, }, "required": ["member-vnf-index"], "minProperties": 2, @@ -391,7 +404,7 @@ ns_instantiate = { "properties": { "member-vnf-index-ref": name_schema, "vnfd-connection-point-ref": name_schema, - "ip-address": ip_schema, + "ip-address": {"oneOf": [ip_schema, ipv6_schema]}, # "mac-address": mac_schema, }, "required": [