X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=cb249ba539a37c13197f449098f87ced56dee1a0;hp=5a2fbdc406334a6268766c4462b65146a8642f11;hb=f759d820955aab196d3bfbbd1b3d0a258ae125ae;hpb=65acb4d5d56a90c9c4ff101b931f5fa6d65dcb51 diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py index 5a2fbdc..cb249ba 100644 --- a/osm_nbi/validation.py +++ b/osm_nbi/validation.py @@ -15,11 +15,14 @@ patern_name = "^[ -~]+$" passwd_schema = {"type": "string", "minLength": 1, "maxLength": 60} nameshort_schema = {"type": "string", "minLength": 1, "maxLength": 60, "pattern": "^[^,;()'\"]+$"} name_schema = {"type": "string", "minLength": 1, "maxLength": 255, "pattern": "^[^,;()'\"]+$"} +string_schema = {"type": "string", "minLength": 1, "maxLength": 255} xml_text_schema = {"type": "string", "minLength": 1, "maxLength": 1000, "pattern": "^[^']+$"} description_schema = {"type": ["string", "null"], "maxLength": 255, "pattern": "^[^'\"]+$"} id_schema_fake = {"type": "string", "minLength": 2, - "maxLength": 36} # "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$" + "maxLength": 36} +# "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$" id_schema = {"type": "string", "pattern": "^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$"} +time_schema = {"type": "string", "pattern": "^[0-9]{4}-[0-1][0-9]-[0-3][0-9]T[0-2][0-9]([0-5]:){2}"} pci_schema = {"type": "string", "pattern": "^[0-9a-fA-F]{4}(:[0-9a-fA-F]{2}){2}\.[0-9a-fA-F]$"} http_schema = {"type": "string", "pattern": "^https?://[^'\"=]+$"} bandwidth_schema = {"type": "string", "pattern": "^[0-9]+ *([MG]bps)?$"} @@ -35,7 +38,8 @@ mac_schema = {"type": "string", ip_schema = {"type": "string", "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"} ip_prefix_schema = {"type": "string", - "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/(30|[12]?[0-9])$"} + "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}" + "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/(30|[12]?[0-9])$"} port_schema = {"type": "integer", "minimum": 1, "maximum": 65534} object_schema = {"type": "object"} schema_version_2 = {"type": "integer", "minimum": 2, "maximum": 2} @@ -49,67 +53,137 @@ ns_instantiate = { "title": "ns action instantiate input schema", "$schema": "http://json-schema.org/draft-04/schema#", "type": "object", + "properties": { + "nsName": name_schema, + "nsDescription": description_schema, + "nsdId": id_schema, + "vimAccountId": id_schema, + "ssh_keys": {"type": "string"}, + "vnf": { + "type": "array", + "minItems": 1, + "items": { + "type": "object", + "properties": { + "member-vnf-index": name_schema, + "vimAccountId": id_schema, + }, + "required": ["member-vnf-index"] + } + }, + "vld": { + "type": "array", + "minItems": 1, + "items": { + "type": "object", + "properties": { + "name": string_schema, + "vim-network-name": {"OneOf": [string_schema, object_schema]}, + "ip-profile": object_schema, + }, + "required": ["name"] + } + }, + }, + "required": ["nsName", "nsdId", "vimAccountId"] } + ns_action = { # TODO for the moment it is only contemplated the vnfd primitive execution - "title": "ns action update input schema", + "title": "ns action input schema", "$schema": "http://json-schema.org/draft-04/schema#", "type": "object", "properties": { - "vnf_member_index": name_schema, + "member_vnf_index": name_schema, + "vnf_member_index": name_schema, # TODO for backward compatibility. To remove in future "primitive": name_schema, "primitive_params": {"type": "object"}, }, - "required": ["vnf_member_index", "primitive", "primitive_params"], + "required": ["primitive", "primitive_params"], # TODO add member_vnf_index + "additionalProperties": False +} +ns_scale = { # TODO for the moment it is only VDU-scaling + "title": "ns scale input schema", + "$schema": "http://json-schema.org/draft-04/schema#", + "type": "object", + "properties": { + "scaleType": {"enum": ["SCALE_VNF"]}, + "scaleVnfData": { + "type": "object", + "properties": { + "vnfInstanceId": name_schema, + "scaleVnfType": {"enum": ["SCALE_OUT", 'SCALE_IN']}, + "scaleByStepData": { + "type": "object", + "properties": { + "scaling-group-descriptor": name_schema, + "member-vnf-index": name_schema, + "scaling-policy": name_schema, + }, + "required": ["scaling-group-descriptor", "member-vnf-index"], + "additionalProperties": False + }, + }, + "required": ["scaleVnfType", "scaleByStepData"], # vnfInstanceId + "additionalProperties": False + }, + "scaleTime": time_schema, + }, + "required": ["scaleType", "scaleVnfData"], "additionalProperties": False } schema_version = {"type": "string", "enum": ["1.0"]} -schema_type = {"type": "string"} - -vim_new_schema = { - "title": "vims new user input schema", +vim_account_edit_schema = { + "title": "vim_account edit 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, - "vim_type": {"enum": ["openstack", "openvim", "vmware", "opennebula", "aws"]}, + "type": nameshort_schema, # currently "openvim" or "openstack", can be enlarged with plugins + "vim": name_schema, + "datacenter": name_schema, "vim_url": description_schema, - # "vim_url_admin": description_schema, - # "vim_tenant": name_schema, + "vim_url_admin": description_schema, + "vim_tenant": name_schema, "vim_tenant_name": name_schema, - "vim_user": nameshort_schema, + "vim_username": nameshort_schema, "vim_password": nameshort_schema, "config": {"type": "object"} }, - "required": ["name", "vim_url", "vim_type", "vim_user", "vim_password", "vim_tenant_name"], "additionalProperties": False } -vim_edit_schema = { - "title": "datacenter edit nformation schema", +schema_type = {"type": "string"} + +vim_account_new_schema = { + "title": "vim_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, - "type": nameshort_schema, # currently "openvim" or "openstack", can be enlarged with plugins + "vim": name_schema, + "datacenter": name_schema, + "vim_type": {"enum": ["openstack", "openvim", "vmware", "opennebula", "aws"]}, "vim_url": description_schema, - "vim_url_admin": description_schema, - "vim_tenant": name_schema, + # "vim_url_admin": description_schema, + # "vim_tenant": name_schema, "vim_tenant_name": name_schema, - "vim_username": nameshort_schema, + "vim_user": nameshort_schema, "vim_password": nameshort_schema, "config": {"type": "object"} }, + "required": ["name", "vim_url", "vim_type", "vim_user", "vim_password", "vim_tenant_name"], "additionalProperties": False } sdn_properties = { "name": name_schema, + "description": description_schema, "dpid": {"type": "string", "pattern": "^[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){7}$"}, "ip": ip_schema, "port": port_schema, @@ -131,7 +205,7 @@ sdn_edit_schema = { "$schema": "http://json-schema.org/draft-04/schema#", "type": "object", "properties": sdn_properties, - "required": ["name", "port", 'ip', 'dpid', 'type'], + # "required": ["name", "port", 'ip', 'dpid', 'type'], "additionalProperties": False } sdn_port_mapping_schema = { @@ -172,14 +246,15 @@ sdn_external_port_schema = { nbi_new_input_schemas = { - "vims": vim_new_schema, + "vim_accounts": vim_account_new_schema, "sdns": sdn_new_schema, "ns_instantiate": ns_instantiate, "ns_action": ns_action, + "ns_scale": ns_scale } nbi_edit_input_schemas = { - "vims": vim_edit_schema, + "vim_accounts": vim_account_edit_schema, "sdns": sdn_edit_schema } @@ -206,7 +281,7 @@ def validate_input(indata, item, new=True): return None except js_e.ValidationError as e: if e.path: - error_pos = "at '" + ":".join(e.path) + "'" + error_pos = "at '" + ":".join(map(str, e.path)) + "'" else: error_pos = "" raise ValidationError("Format error {} '{}' ".format(error_pos, e))