X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=openmano_schemas.py;h=e1fc2bd7c253fbeb9ced68363951b4abec8630f7;hb=ed1be4b1591c258748261f21947dc388c28c6fd9;hp=aad972bb5331461ed50255184cf3fa5da644ad54;hpb=fec35dfc33309772fe8ef344ace2fdcbbb66037f;p=osm%2FRO.git diff --git a/openmano_schemas.py b/openmano_schemas.py index aad972bb..e1fc2bd7 100644 --- a/openmano_schemas.py +++ b/openmano_schemas.py @@ -54,6 +54,7 @@ object_schema={"type":"object"} schema_version_2={"type":"integer","minimum":2,"maximum":2} #schema_version_string={"type":"string","enum": ["0.1", "2", "0.2", "3", "0.3"]} log_level_schema={"type":"string", "enum":["DEBUG", "INFO", "WARNING","ERROR","CRITICAL"]} +checksum_schema={"type":"string", "pattern":"^[0-9a-fA-F]{32}$"} metadata_schema={ "type":"object", @@ -102,8 +103,13 @@ config_schema = { "log_level": log_level_schema, "log_socket_level": log_level_schema, "log_level_db": log_level_schema, - "log_level_vimconn": log_level_schema, + "log_level_vim": log_level_schema, "log_level_nfvo": log_level_schema, + "log_level_http": log_level_schema, + "log_file_db": path_schema, + "log_file_vim": path_schema, + "log_file_nfvo": path_schema, + "log_file_http": path_schema, "log_socket_host": nameshort_schema, "log_socket_port": port_schema, "log_file": path_schema, @@ -290,7 +296,8 @@ dhcp_schema = { "enabled": {"type": "boolean"}, "start-address": ip_schema, "count": integer1_schema - } + }, + "required": ["enabled", "start-address", "count"], } ip_profile_schema = { @@ -301,7 +308,6 @@ ip_profile_schema = { "ip-version": {"type":"string", "enum":["IPv4","IPv6"]}, "subnet-address": ip_prefix_schema, "gateway-address": ip_schema, - "security-group": {"type":"string"}, "dns-address": ip_schema, "dhcp": dhcp_schema }, @@ -358,7 +364,7 @@ internal_connection_element_schema_v02 = { "properties":{ "VNFC": name_schema, "local_iface_name": name_schema, - "ip-address": ip_schema + "ip_address": ip_schema } } @@ -380,11 +386,11 @@ internal_connection_schema_v02 = { "name": name_schema, "description":description_schema, "type": {"type": "string", "enum":["e-line", "e-lan"]}, - "implementation": {"type": "string", "enum":["virtual", "underlay"]}, + "implementation": {"type": "string", "enum":["overlay", "underlay"]}, "ip-profile": ip_profile_schema, "elements": {"type" : "array", "items": internal_connection_element_schema_v02, "minItems":2} }, - "required": ["name", "type", "elements"], + "required": ["name", "type", "implementation", "elements"], "additionalProperties": False } @@ -401,15 +407,19 @@ external_connection_schema = { "additionalProperties": False } +#Not yet used external_connection_schema_v02 = { "type":"object", "properties":{ "name": name_schema, + "mgmt": {"type":"boolean"}, + "type": {"type": "string", "enum":["e-line", "e-lan"]}, + "implementation": {"type": "string", "enum":["overlay", "underlay"]}, "VNFC": name_schema, "local_iface_name": name_schema , "description":description_schema }, - "required": ["name", "VNFC", "local_iface_name"], + "required": ["name", "type", "VNFC", "local_iface_name"], "additionalProperties": False } @@ -452,6 +462,8 @@ devices_schema={ "properties":{ "type":{"type":"string", "enum":["disk","cdrom","xml"] }, "image": path_schema, + "image name": name_schema, + "image checksum": checksum_schema, "image metadata": metadata_schema, "vpci":pci_schema, "xml":xml_text_schema, @@ -484,6 +496,8 @@ vnfc_schema = { "name": name_schema, "description": description_schema, "VNFC image": {"oneOf": [path_schema, http_schema]}, + "image name": name_schema, + "image checksum": checksum_schema, "image metadata": metadata_schema, #"cloud-config": cloud_config_schema, #common for all vnfs in the scenario "processor": { @@ -513,7 +527,11 @@ vnfc_schema = { "devices": devices_schema }, - "required": ["name", "VNFC image"], + "required": ["name"], + "oneOf": [ + {"required": ["VNFC image"]}, + {"required": ["image name"]} + ], "additionalProperties": False } @@ -559,7 +577,7 @@ vnfd_schema_v02 = { "public": {"type" : "boolean"}, "physical": {"type" : "boolean"}, "tenant_id": id_schema, #only valid for admin - "external-connections": {"type" : "array", "items": external_connection_schema_v02, "minItems":1}, + "external-connections": {"type" : "array", "items": external_connection_schema, "minItems":1}, "internal-connections": {"type" : "array", "items": internal_connection_schema_v02, "minItems":1}, # "cloud-config": cloud_config_schema, #common for all vnfcs "VNFC":{"type" : "array", "items": vnfc_schema, "minItems":1} @@ -655,7 +673,7 @@ nsd_schema_v02 = { "$schema": "http://json-schema.org/draft-04/schema#", "type":"object", "properties":{ - "schema_version": {"type": "string", "enum": ["0.2"]}, + "schema_version": schema_version_2, "scenario":{ "type":"object", "properties":{ @@ -717,7 +735,7 @@ nsd_schema_v03 = { "tenant_id": id_schema, #only valid for admin "public": {"type": "boolean"}, "cloud-config": cloud_config_schema, #common for all vnfs in the scenario - #"site": name_schema, + #"datacenter": name_schema, "vnfs": { "type":"object", "patternProperties":{ @@ -727,8 +745,8 @@ nsd_schema_v03 = { "vnf_id": id_schema, "graph": graph_schema, "vnf_name": name_schema, - "cloud-config": cloud_config_schema, #particular for a vnf - #"site": name_schema, + #"cloud-config": cloud_config_schema, #particular for a vnf + #"datacenter": name_schema, "internal-connections": { "type": "object", "patternProperties": { @@ -743,7 +761,7 @@ nsd_schema_v03 = { "properties":{ "VNFC": name_schema, "local_iface_name": name_schema, - "ip-address": ip_schema + "ip_address": ip_schema }, "required": ["VNFC", "local_iface_name"], } @@ -769,15 +787,15 @@ nsd_schema_v03 = { "items":{ "type":"object", "properties":{ - "ip-address": ip_schema + "vnf": name_schema, + "vnf_interface": name_schema, + "ip_address": ip_schema }, - "patternProperties":{ - ".": {"type": "string"} - } + "required": ["vnf", "vnf_interface"], } }, "type": {"type": "string", "enum":["e-line", "e-lan"]}, - "implementation": {"type": "string", "enum":["virtual", "underlay"]}, + "implementation": {"type": "string", "enum":["overlay", "underlay"]}, "external" : {"type": "boolean"}, "graph": graph_schema, "ip-profile": ip_profile_schema @@ -899,7 +917,8 @@ instance_scenario_create_schema_v01 = { "properties":{ "name":name_schema, "description":description_schema, - "site": name_schema, + "datacenter": name_schema, + "scenario" : name_schema, #can be an UUID or name "action":{"enum": ["deploy","reserve","verify" ]}, "connect_mgmt_interfaces": {"oneOf": [{"type":"boolean"}, {"type":"object"}]},# can be true or a dict with datacenter: net_name "cloud-config": cloud_config_schema, #common to all vnfs in the instance scenario @@ -910,10 +929,10 @@ instance_scenario_create_schema_v01 = { "type": "object", "properties":{ "name": name_schema, #override vnf name - "site": name_schema, + "datacenter": name_schema, #"metadata": {"type": "object"}, #"user_data": {"type": "string"} - "cloud-config": cloud_config_schema, #particular for a vnf + #"cloud-config": cloud_config_schema, #particular for a vnf "external-connections": { "type": "object", "patternProperties": { @@ -921,7 +940,7 @@ instance_scenario_create_schema_v01 = { "type": "object", "properties": { "vim-network-name": name_schema, - "ip-address": ip_schema + "ip_address": ip_schema } } } @@ -940,7 +959,7 @@ instance_scenario_create_schema_v01 = { "properties":{ "VNFC": name_schema, "local_iface_name": name_schema, - "ip-address": ip_schema + "ip_address": ip_schema }, "required": ["VNFC", "local_iface_name"], } @@ -965,19 +984,41 @@ instance_scenario_create_schema_v01 = { "items":{ "type":"object", "properties":{ - "ip-address": ip_schema + "ip_address": ip_schema, + "datacenter": name_schema, + "vim-network-name": name_schema }, "patternProperties":{ ".": {"type": "string"} } } }, - "netmap-create": {"oneOf":[name_schema,{"type": "null"}]}, #datacenter network to use. Null if must be created as an internal net - "netmap-use": name_schema, - "name": name_schema, #override network name "ip-profile": ip_profile_schema, - #"site": name_schema, - "vim-network-name": name_schema + #if the network connects VNFs deployed at different sites, you must specify one entry per site that this network connect to + "sites": { + "type":"array", + "minLength":1, + "items":{ + "type":"object", + "properties":{ + # By default for an scenario 'external' network openmano looks for an existing VIM network to map this external scenario network, + # for other networks openamno creates at VIM + # Use netmap-create to force to create an external scenario network + "netmap-create": {"oneOf":[name_schema,{"type": "null"}]}, #datacenter network to use. Null if must be created as an internal net + #netmap-use: Indicates an existing VIM network that must be used for this scenario network. + #Can use both the VIM network name (if it is not ambiguous) or the VIM net UUID + #If both 'netmap-create' and 'netmap-use'are supplied, netmap-use precedes, but if fails openmano follows the netmap-create + #In oder words, it is the same as 'try to map to the VIM network (netmap-use) if exist, and if not create the network (netmap-create) + "netmap-use": name_schema, # + "vim-network-name": name_schema, #override network name + #"ip-profile": ip_profile_schema, + "datacenter": name_schema, + } + } + }, + + + } } },