X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=505201c722af4266e137091fa2de3a4d013ccfbf;hp=c4f6fb7e605e5f64db0a5133aaf7c112c716e6cb;hb=26202bbc90a8e3008c8458d68a6abebc55d79d6c;hpb=7adaeb0a49340e8f46e82b6526bce4d6ecefd80e diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py index c4f6fb7..505201c 100644 --- a/osm_nbi/validation.py +++ b/osm_nbi/validation.py @@ -43,7 +43,7 @@ time_schema = {"type": "string", "pattern": "^[0-9]{4}-[0-1][0-9]-[0-3][0-9]T[0- pci_schema = {"type": "string", "pattern": "^[0-9a-fA-F]{4}(:[0-9a-fA-F]{2}){2}\\.[0-9a-fA-F]$"} # allows [] for wildcards. For that reason huge length limit is set pci_extended_schema = {"type": "string", "pattern": "^[0-9a-fA-F.:-\\[\\]]{12,40}$"} -http_schema = {"type": "string", "pattern": "^https?://[^'\"=]+$"} +http_schema = {"type": "string", "pattern": "^(https?|http)://[^'\"=]+$"} bandwidth_schema = {"type": "string", "pattern": "^[0-9]+ *([MG]bps)?$"} memory_schema = {"type": "string", "pattern": "^[0-9]+ *([MG]i?[Bb])?$"} integer0_schema = {"type": "integer", "minimum": 0} @@ -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": { @@ -173,14 +173,28 @@ ip_profile_update_schema = { } provider_network_schema = { - "title": "provider network validation schame", + "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": False + "additionalProperties": True } ns_instantiate_internal_vld = { @@ -221,6 +235,8 @@ additional_params_for_vnf = { "properties": { "member-vnf-index": name_schema, "additionalParams": object_schema, + "k8s-namespace": name_schema, + "config-units": integer1_schema, # number of configuration units of this vnf, by default 1 "additionalParamsForVdu": { "type": "array", "items": { @@ -228,8 +244,10 @@ additional_params_for_vnf = { "properties": { "vdu_id": name_schema, "additionalParams": object_schema, + "config-units": integer1_schema, # number of configuration units of this vdu, by default 1 }, - "required": ["vdu_id", "additionalParams"], + "required": ["vdu_id"], + "minProperties": 2, "additionalProperties": False, }, }, @@ -240,8 +258,12 @@ additional_params_for_vnf = { "properties": { "kdu_name": name_schema, "additionalParams": object_schema, + "kdu_model": name_schema, + "k8s-namespace": name_schema, + "config-units": integer1_schema, # number of configuration units of this knf, by default 1 }, - "required": ["kdu_name", "additionalParams"], + "required": ["kdu_name"], + "minProperties": 2, "additionalProperties": False, }, }, @@ -265,9 +287,14 @@ 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, + "config-units": integer1_schema, # number of configuration units of this ns, by default 1 + "k8s-namespace": name_schema, "ssh_keys": {"type": "array", "items": {"type": "string"}}, + "timeout_ns_deploy": integer1_schema, "nsr_id": id_schema, "vduImage": name_schema, "vnf": { @@ -333,6 +360,21 @@ ns_instantiate = { "additionalProperties": False } +ns_terminate = { + "title": "ns terminate input schema", + "$schema": "http://json-schema.org/draft-04/schema#", + "type": "object", + "properties": { + "lcmOperationType": string_schema, + "nsInstanceId": id_schema, + "autoremove": bool_schema, + "timeout_ns_terminate": integer1_schema, + "skip_terminate_primitives": bool_schema, + "netsliceInstanceId": id_schema, + }, + "additionalProperties": False +} + ns_action = { # TODO for the moment it is only contemplated the vnfd primitive execution "title": "ns action input schema", "$schema": "http://json-schema.org/draft-04/schema#", @@ -346,6 +388,7 @@ ns_action = { # TODO for the moment it is only contemplated the vnfd primitive "vdu_count_index": integer0_schema, "kdu_name": name_schema, "primitive": name_schema, + "timeout_ns_action": integer1_schema, "primitive_params": {"type": "object"}, }, "required": ["primitive", "primitive_params"], # TODO add member_vnf_index @@ -359,6 +402,7 @@ ns_scale = { # TODO for the moment it is only VDU-scaling "lcmOperationType": string_schema, "nsInstanceId": id_schema, "scaleType": {"enum": ["SCALE_VNF"]}, + "timeout_ns_scale": integer1_schema, "scaleVnfData": { "type": "object", "properties": { @@ -434,7 +478,7 @@ vim_account_new_schema = { "additionalProperties": False } -wim_type = shortname_schema # {"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", @@ -549,7 +593,7 @@ k8scluster_nets_schema = { "title": "k8scluster nets input schema", "$schema": "http://json-schema.org/draft-04/schema#", "type": "object", - "patternProperties": {".": {"oneOf": [description_schema, null_schema]}}, + "patternProperties": {".": {"oneOf": [name_schema, null_schema]}}, "minProperties": 1, "additionalProperties": False } @@ -613,6 +657,32 @@ k8srepo_edit_schema = { "additionalProperties": False } +# OSM Repos +osmrepo_types = {"enum": ["osm"]} +osmrepo_properties = { + "name": name_schema, + "description": description_schema, + "type": osmrepo_types, + "url": description_schema + # "user": shortname_schema, + # "password": passwd_schema +} +osmrepo_new_schema = { + "title": "osm repo creation input schema", + "$schema": "http://json-schema.org/draft-04/schema#", + "type": "object", + "properties": osmrepo_properties, + "required": ["name", "type", "url"], + "additionalProperties": False +} +osmrepo_edit_schema = { + "title": "osm repo edit input schema", + "$schema": "http://json-schema.org/draft-04/schema#", + "type": "object", + "properties": osmrepo_properties, + "additionalProperties": False +} + # PDUs pdu_interface = { "type": "object", @@ -654,7 +724,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#", @@ -679,6 +748,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", @@ -716,6 +801,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, @@ -754,6 +840,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}, @@ -870,7 +957,8 @@ nsi_instantiate = { "nsiDescription": {"oneOf": [description_schema, null_schema]}, "nstId": string_schema, "vimAccountId": id_schema, - "ssh_keys": {"type": "string"}, + "timeout_nsi_deploy": integer1_schema, + "ssh_keys": {"type": "array", "items": {"type": "string"}}, "nsi_id": id_schema, "additionalParamsForNsi": object_schema, "netslice-subnet": {