X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=d40814e7993eae73bb1595eee5ccbc5dcb36bac9;hp=fcd3048e32cbeafcca8d36853c6a2794a4714bbc;hb=2a929042e82cf1e010da9d8ff516f96159a57efd;hpb=fe598fe1bcb93d51b5c7bb0373bc06d74e5bf92f diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py index fcd3048..d40814e 100644 --- a/osm_nbi/validation.py +++ b/osm_nbi/validation.py @@ -145,7 +145,7 @@ ip_profile_dhcp_schema = { } ip_profile_schema = { - "title": "ip profile validation schame", + "title": "ip profile validation schema", "$schema": "http://json-schema.org/draft-04/schema#", "type": "object", "properties": { @@ -158,7 +158,7 @@ ip_profile_schema = { } ip_profile_update_schema = { - "title": "ip profile validation schame", + "title": "ip profile validation schema", "$schema": "http://json-schema.org/draft-04/schema#", "type": "object", "properties": { @@ -172,6 +172,31 @@ ip_profile_update_schema = { "additionalProperties": False } +provider_network_schema = { + "title": "provider network validation schema", + "$schema": "http://json-schema.org/draft-04/schema#", + "type": "object", + "properties": { + "physical-network": name_schema, + "segmentation-id": name_schema, + "sdn-ports": { # external ports to append to the SDN-assist network + "type": "array", + "items": { + "type": "object", + "properties": { + "switch_id": shortname_schema, + "switch_port": shortname_schema, + "mac_address": mac_schema, + "vlan": vlan_schema, + }, + "additionalProperties": True + } + }, + "network-type": shortname_schema, + }, + "additionalProperties": True +} + ns_instantiate_internal_vld = { "title": "ns action instantiate input schema for vdu", "$schema": "http://json-schema.org/draft-04/schema#", @@ -181,6 +206,7 @@ ns_instantiate_internal_vld = { "vim-network-name": name_schema, "vim-network-id": name_schema, "ip-profile": ip_profile_update_schema, + "provider-network": provider_network_schema, "internal-connection-point": { "type": "array", "minItems": 1, @@ -209,11 +235,35 @@ additional_params_for_vnf = { "properties": { "member-vnf-index": name_schema, "additionalParams": object_schema, + "additionalParamsForVdu": { + "type": "array", + "items": { + "type": "object", + "properties": { + "vdu_id": name_schema, + "additionalParams": object_schema, + }, + "required": ["vdu_id", "additionalParams"], + "additionalProperties": False, + }, + }, + "additionalParamsForKdu": { + "type": "array", + "items": { + "type": "object", + "properties": { + "kdu_name": name_schema, + "additionalParams": object_schema, + }, + "required": ["kdu_name", "additionalParams"], + "additionalProperties": False, + }, + }, }, - "required": ["member-vnf-index", "additionalParams"], + "required": ["member-vnf-index"], + "minProperties": 2, "additionalProperties": False } - } ns_instantiate = { @@ -229,9 +279,12 @@ ns_instantiate = { "nsdId": id_schema, "vimAccountId": id_schema, "wimAccountId": {"OneOf": [id_schema, bool_schema, null_schema]}, + "placement-engine": string_schema, + "placement-constraints": object_schema, "additionalParamsForNs": object_schema, "additionalParamsForVnf": additional_params_for_vnf, "ssh_keys": {"type": "array", "items": {"type": "string"}}, + "timeout_ns_deploy": integer1_schema, "nsr_id": id_schema, "vduImage": name_schema, "vnf": { @@ -270,6 +323,7 @@ ns_instantiate = { "ns-net": object_schema, "wimAccountId": {"OneOf": [id_schema, bool_schema, null_schema]}, "ip-profile": object_schema, + "provider-network": provider_network_schema, "vnfd-connection-point-ref": { "type": "array", "minItems": 1, @@ -307,6 +361,7 @@ ns_action = { # TODO for the moment it is only contemplated the vnfd primitive "vnf_member_index": name_schema, # TODO for backward compatibility. To remove in future "vdu_id": name_schema, "vdu_count_index": integer0_schema, + "kdu_name": name_schema, "primitive": name_schema, "primitive_params": {"type": "object"}, }, @@ -349,7 +404,7 @@ ns_scale = { # TODO for the moment it is only VDU-scaling schema_version = {"type": "string", "enum": ["1.0"]} schema_type = {"type": "string"} -vim_type = {"enum": ["openstack", "openvim", "vmware", "opennebula", "aws", "azure", "fos"]} +vim_type = shortname_schema # {"enum": ["openstack", "openvim", "vmware", "opennebula", "aws", "azure", "fos"]} vim_account_edit_schema = { "title": "vim_account edit input schema", @@ -396,7 +451,7 @@ vim_account_new_schema = { "additionalProperties": False } -wim_type = {"enum": ["tapi", "onos", "odl", "dynpac", "fake"]} +wim_type = shortname_schema # {"enum": ["ietfl2vpn", "onos", "odl", "dynpac", "fake"]} wim_account_edit_schema = { "title": "wim_account edit input schema", @@ -442,21 +497,24 @@ wim_account_new_schema = { sdn_properties = { "name": name_schema, + "type": {"type": "string"}, + "url": {"type": "string"}, + "user": shortname_schema, + "password": passwd_schema, + "config": {"type": "object"}, "description": description_schema, + # The folowing are deprecated. Maintanied for backward compatibility "dpid": dpid_Schema, "ip": ip_schema, "port": port_schema, - "type": {"type": "string", "enum": ["opendaylight", "floodlight", "onos"]}, "version": {"type": "string", "minLength": 1, "maxLength": 12}, - "user": shortname_schema, - "password": passwd_schema } sdn_new_schema = { "title": "sdn controller information schema", "$schema": "http://json-schema.org/draft-04/schema#", "type": "object", "properties": sdn_properties, - "required": ["name", "port", 'ip', 'dpid', 'type'], + "required": ["name", 'type'], "additionalProperties": False } sdn_edit_schema = { @@ -508,7 +566,7 @@ k8scluster_nets_schema = { "title": "k8scluster nets input schema", "$schema": "http://json-schema.org/draft-04/schema#", "type": "object", - "patternProperties": {".": string_schema}, + "patternProperties": {".": {"oneOf": [name_schema, null_schema]}}, "minProperties": 1, "additionalProperties": False } @@ -549,7 +607,7 @@ k8scluster_edit_schema = { } # K8s Repos -k8srepo_types = {"enum": ["chart", "bundle"]} +k8srepo_types = {"enum": ["helm-chart", "juju-bundle"]} k8srepo_properties = { "name": name_schema, "description": description_schema, @@ -613,7 +671,6 @@ pdu_new_schema = { "required": ["name", "type", "interfaces"], "additionalProperties": False } - pdu_edit_schema = { "title": "pdu edit input schema", "$schema": "http://json-schema.org/draft-04/schema#", @@ -638,6 +695,22 @@ pdu_edit_schema = { "minProperties": 1 } +# VNF PKG OPERATIONS +vnfpkgop_new_schema = { + "title": "VNF PKG operation creation input schema", + "$schema": "http://json-schema.org/draft-04/schema#", + "type": "object", + "properties": { + "lcmOperationType": string_schema, + "vnfPkgId": id_schema, + "kdu_name": name_schema, + "primitive": name_schema, + "primitive_params": {"type": "object"}, + }, + "required": ["lcmOperationType", "vnfPkgId", "kdu_name", "primitive", "primitive_params"], + "additionalProperties": False +} + # USERS project_role_mappings = { "title": "list pf projects/roles", @@ -675,6 +748,7 @@ user_new_schema = { "type": "object", "properties": { "username": shortname_schema, + "domain_name": shortname_schema, "password": passwd_schema, "projects": nameshort_list_schema, "project_role_mappings": project_role_mappings, @@ -713,6 +787,7 @@ project_new_schema = { "properties": { "name": shortname_schema, "admin": bool_schema, + "domain_name": shortname_schema, "quotas": { "type": "object", "properties": {topic: integer0_schema for topic in topics_with_quota}, @@ -829,6 +904,7 @@ nsi_instantiate = { "nsiDescription": {"oneOf": [description_schema, null_schema]}, "nstId": string_schema, "vimAccountId": id_schema, + "timeout_nsi_deploy": integer1_schema, "ssh_keys": {"type": "string"}, "nsi_id": id_schema, "additionalParamsForNsi": object_schema,