X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=7d03d906030e35ece1453c34fe68f7ca9436ed0a;hp=62d9d22cf503c7c888b9183dc7e6576720abd61a;hb=c37b384ffcbc4963da849f202d6590f86ab060b4;hpb=07f3172ef24dab2c7c47c9a8e726f1f9876f13b3 diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py index 62d9d22..7d03d90 100644 --- a/osm_nbi/validation.py +++ b/osm_nbi/validation.py @@ -1,6 +1,21 @@ # -*- coding: utf-8 -*- +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + from jsonschema import validate as js_v, exceptions as js_e +from http import HTTPStatus +from copy import deepcopy __author__ = "Alfonso Tierno " __version__ = "0.1" @@ -163,6 +178,7 @@ ns_instantiate_internal_vld = { "properties": { "name": name_schema, "vim-network-name": name_schema, + "vim-network-id": name_schema, "ip-profile": ip_profile_update_schema, "internal-connection-point": { "type": "array", @@ -197,6 +213,18 @@ ns_instantiate = { "nsDescription": {"oneOf": [description_schema, {"type": "null"}]}, "nsdId": id_schema, "vimAccountId": id_schema, + "additionalParamsForNs": object_schema, + "additionalParamsForVnf": { + "type": "array", + "items": { + "type": "object", + "properties": { + "member-vnf-index": name_schema, + "additionalParams": object_schema, + }, + "required": ["member-vnf-index", "additionalParams"] + } + }, "ssh_keys": {"type": "array", "items": {"type": "string"}}, "nsr_id": id_schema, "vduImage": name_schema, @@ -232,6 +260,7 @@ ns_instantiate = { "properties": { "name": string_schema, "vim-network-name": {"OneOf": [string_schema, object_schema]}, + "vim-network-id": {"OneOf": [string_schema, object_schema]}, "ip-profile": object_schema, "vnfd-connection-point-ref": { "type": "array", @@ -310,6 +339,7 @@ ns_scale = { # TODO for the moment it is only VDU-scaling schema_version = {"type": "string", "enum": ["1.0"]} +schema_type = {"type": "string"} vim_account_edit_schema = { "title": "vim_account edit input schema", "$schema": "http://json-schema.org/draft-04/schema#", @@ -317,7 +347,7 @@ vim_account_edit_schema = { "properties": { "name": name_schema, "description": description_schema, - "type": nameshort_schema, # currently "openvim" or "openstack", can be enlarged with plugins + "type": nameshort_schema, "vim": name_schema, "datacenter": name_schema, "vim_url": description_schema, @@ -330,7 +360,6 @@ vim_account_edit_schema = { }, "additionalProperties": False } -schema_type = {"type": "string"} vim_account_new_schema = { "title": "vim_account creation input schema", @@ -356,6 +385,42 @@ vim_account_new_schema = { "additionalProperties": False } +wim_account_edit_schema = { + "title": "wim_account edit input schema", + "$schema": "http://json-schema.org/draft-04/schema#", + "type": "object", + "properties": { + "name": name_schema, + "description": description_schema, + "type": nameshort_schema, + "wim": name_schema, + "wim_url": description_schema, + "user": nameshort_schema, + "password": passwd_schema, + "config": {"type": "object"} + }, + "additionalProperties": False +} + +wim_account_new_schema = { + "title": "wim_account creation input schema", + "$schema": "http://json-schema.org/draft-04/schema#", + "type": "object", + "properties": { + "schema_version": schema_version, + "schema_type": schema_type, + "name": name_schema, + "description": description_schema, + "wim": name_schema, + "wim_type": {"enum": ["tapi", "onos", "odl", "dynpac"]}, + "wim_url": description_schema, + "user": nameshort_schema, + "password": passwd_schema, + "config": {"type": "object"} + }, + "required": ["name", "wim_url", "wim_type"], + "additionalProperties": False +} sdn_properties = { "name": name_schema, @@ -427,18 +492,18 @@ pdu_interface = { "name": nameshort_schema, "mgmt": bool_schema, "type": {"enum": ["overlay", 'underlay']}, - "ip_address": ip_schema, + "ip-address": ip_schema, # TODO, add user, password, ssh-key - "mac_address": mac_schema, - "vim_network_name": nameshort_schema, # interface is connected to one vim network, or switch port - "vim_network_id": nameshort_schema, - # provide this in case SDN assist must deal with this interface - "switch_dpid": dpid_Schema, - "switch_port": nameshort_schema, - "switch_mac": nameshort_schema, - "switch_vlan": vlan_schema, + "mac-address": mac_schema, + "vim-network-name": nameshort_schema, # interface is connected to one vim network, or switch port + "vim-network-id": nameshort_schema, + # # provide this in case SDN assist must deal with this interface + # "switch-dpid": dpid_Schema, + # "switch-port": nameshort_schema, + # "switch-mac": nameshort_schema, + # "switch-vlan": vlan_schema, }, - "required": ["name", "mgmt", "ip_address"], + "required": ["name", "mgmt", "ip-address"], "additionalProperties": False } pdu_new_schema = { @@ -454,7 +519,7 @@ pdu_new_schema = { "vim_accounts": nameshort_list_schema, "interfaces": { "type": "array", - "items": {"type": pdu_interface}, + "items": pdu_interface, "minItems": 1 } }, @@ -471,13 +536,13 @@ pdu_edit_schema = { "type": nameshort_schema, "description": description_schema, "shared": bool_schema, - "vims": {"oneOff": [array_edition_schema, nameshort_list_schema]}, - "vim_accounts": {"oneOff": [array_edition_schema, nameshort_list_schema]}, - "interfaces": {"oneOff": [ + "vims": {"oneOf": [array_edition_schema, nameshort_list_schema]}, + "vim_accounts": {"oneOf": [array_edition_schema, nameshort_list_schema]}, + "interfaces": {"oneOf": [ array_edition_schema, { "type": "array", - "items": {"type": pdu_interface}, + "items": pdu_interface, "minItems": 1 } ]} @@ -506,7 +571,7 @@ user_edit_schema = { "properties": { "password": passwd_schema, "projects": { - "oneOff": [ + "oneOf": [ nameshort_list_schema, array_edition_schema ] @@ -561,6 +626,25 @@ 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 +del nsi_slice_instantiate["required"] + +nsi_vld_instantiate = { + "title": "netslice vld instantiation params input schema", + "$schema": "http://json-schema.org/draft-04/schema#", + "type": "object", + "properties": { + "name": string_schema, + "vim-network-name": {"OneOf": [string_schema, object_schema]}, + "vim-network-id": {"OneOf": [string_schema, object_schema]}, + "ip-profile": object_schema, + }, + "required": ["name"], + "additionalProperties": False +} + nsi_instantiate = { "title": "netslice action instantiate input schema", "$schema": "http://json-schema.org/draft-04/schema#", @@ -570,17 +654,22 @@ nsi_instantiate = { "nsiInstanceId": id_schema, "nsiName": name_schema, "nsiDescription": {"oneOf": [description_schema, {"type": "null"}]}, - "nstdId": string_schema, + "nstId": string_schema, "vimAccountId": id_schema, "ssh_keys": {"type": "string"}, "nsi_id": id_schema, - "ns": { + "netslice-subnet": { + "type": "array", + "minItems": 1, + "items": nsi_slice_instantiate + }, + "netslice-vld": { "type": "array", "minItems": 1, - "items": ns_instantiate + "items": nsi_vld_instantiate }, }, - "required": ["nsiName", "nstdId", "vimAccountId"], + "required": ["nsiName", "nstId", "vimAccountId"], "additionalProperties": False } @@ -594,7 +683,9 @@ nsi_terminate = { class ValidationError(Exception): - pass + def __init__(self, message, http_code=HTTPStatus.UNPROCESSABLE_ENTITY): + self.http_code = http_code + Exception.__init__(self, message) def validate_input(indata, schema_to_use): @@ -614,3 +705,5 @@ def validate_input(indata, schema_to_use): else: error_pos = "" raise ValidationError("Format error {} '{}' ".format(error_pos, e.message)) + except js_e.SchemaError: + raise ValidationError("Bad json schema {}".format(schema_to_use), http_code=HTTPStatus.INTERNAL_SERVER_ERROR)