X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=91549e00d8ef15b04f324b6588a89308e3483746;hp=2419c1ade0753ab60b43dc3a6ad06c282134ec13;hb=refs%2Fchanges%2F59%2F6159%2F5;hpb=0f98af53b320c8244b58d0d8751e28e157949e8e diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py index 2419c1a..91549e0 100644 --- a/osm_nbi/validation.py +++ b/osm_nbi/validation.py @@ -18,7 +18,8 @@ name_schema = {"type": "string", "minLength": 1, "maxLength": 255, "pattern": "^ 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}$"} 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?://[^'\"=]+$"} @@ -35,7 +36,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} @@ -44,52 +46,78 @@ log_level_schema = {"type": "string", "enum": ["DEBUG", "INFO", "WARNING", "ERRO checksum_schema = {"type": "string", "pattern": "^[0-9a-fA-F]{32}$"} size_schema = {"type": "integer", "minimum": 1, "maximum": 100} -schema_version = {"type": "string", "enum": ["1.0"]} -schema_type = {"type": "string"} -vim_new_schema = { - "title": "vims new user input schema", +ns_instantiate = { + "title": "ns action instantiate input schema", + "$schema": "http://json-schema.org/draft-04/schema#", + "type": "object", +} +ns_action = { # TODO for the moment it is only contemplated the vnfd primitive execution + "title": "ns action update input schema", + "$schema": "http://json-schema.org/draft-04/schema#", + "type": "object", + "properties": { + "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": ["primitive", "primitive_params"], # TODO add member_vnf_index + "additionalProperties": False +} + + +schema_version = {"type": "string", "enum": ["1.0"]} +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, @@ -111,7 +139,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 = { @@ -152,12 +180,14 @@ sdn_external_port_schema = { nbi_new_input_schemas = { - "vims": vim_new_schema, - "sdns": sdn_new_schema + "vim_accounts": vim_account_new_schema, + "sdns": sdn_new_schema, + "ns_instantiate": ns_instantiate, + "ns_action": ns_action, } nbi_edit_input_schemas = { - "vims": vim_edit_schema, + "vim_accounts": vim_account_edit_schema, "sdns": sdn_edit_schema } @@ -170,7 +200,7 @@ def validate_input(indata, item, new=True): """ Validates input data agains json schema :param indata: user input data. Should be a dictionary - :param item: can be users, projects, vims, sdns + :param item: can be users, projects, vims, sdns, ns_xxxxx :param new: True if the validation is for creating or False if it is for editing :return: None if ok, raises ValidationError exception otherwise """