X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=7707a754fad6588de9e86412a11a4434732a0e2a;hb=032916caa09d64edf381dec5d66c6a8cc50e75a6;hp=1dd70dc1e8ff4ac22d3fb91ba3a053b2db1cb340;hpb=4f9d4ae68e34cd69fbef5f6f4d74833f03832562;p=osm%2FNBI.git diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py index 1dd70dc..7707a75 100644 --- a/osm_nbi/validation.py +++ b/osm_nbi/validation.py @@ -638,26 +638,10 @@ nbi_edit_input_schemas = { } # NETSLICE SCHEMAS -nsi_slice_instantiate = deepcopy(ns_instantiate) -nsi_slice_instantiate["title"] = "netslice subnet instantiation params input schema" -nsi_slice_instantiate["properties"]["id"] = name_schema -nsi_slice_instantiate["properties"]["additionalParamsForNsi"] = object_schema -nsi_slice_instantiate["properties"]["additionalParamsForSubnet"] = { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": name_schema, - "additionalParamsForNs": object_schema, - "additionalParamsForVnf": additional_params_for_vnf - }, - "required": ["id"], - "additionalProperties": False - } -} -del nsi_slice_instantiate["required"] -del nsi_slice_instantiate["properties"]["additionalParamsForNs"] -del nsi_slice_instantiate["properties"]["additionalParamsForVnf"] +nsi_subnet_instantiate = deepcopy(ns_instantiate) +nsi_subnet_instantiate["title"] = "netslice subnet instantiation params input schema" +nsi_subnet_instantiate["properties"]["id"] = name_schema +del nsi_subnet_instantiate["required"] nsi_vld_instantiate = { "title": "netslice vld instantiation params input schema", @@ -686,10 +670,11 @@ nsi_instantiate = { "vimAccountId": id_schema, "ssh_keys": {"type": "string"}, "nsi_id": id_schema, + "additionalParamsForNsi": object_schema, "netslice-subnet": { "type": "array", "minItems": 1, - "items": nsi_slice_instantiate + "items": nsi_subnet_instantiate }, "netslice-vld": { "type": "array",