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}$"
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]$"}
+pci_extended_schema = {"type": "string", "pattern": "^[0-9a-fA-F.:-\[\]]$"}
+
http_schema={"type":"string", "pattern":"^https?://[^'\"=]+$"}
bandwidth_schema={"type":"string", "pattern" : "^[0-9]+ *([MG]bps)?$"}
memory_schema={"type":"string", "pattern" : "^[0-9]+ *([MG]i?[Bb])?$"}
"http_console_host": nameshort_schema,
"http_console_ports": {
"type": "array",
- "items": {"OneOf" : [
+ "items": {"OneOf": [
port_schema,
- {"type":"object", "properties":{"from": port_schema, "to": port_schema}, "required": ["from","to"]}
+ {"type": "object", "properties": {"from": port_schema, "to": port_schema}, "required": ["from", "to"]}
]}
},
"log_level": log_level_schema,
}
dhcp_schema = {
- "title":"DHCP schema",
+ "title": "DHCP schema",
"$schema": "http://json-schema.org/draft-04/schema#",
- "type":"object",
+ "type": "object",
"properties":{
"enabled": {"type": "boolean"},
- "start-address": ip_schema,
- "count": integer1_schema
+ "start-address": {"OneOf": [{"type": "null"}, ip_schema]},
+ "count": integer0_schema
},
- "required": ["enabled", "start-address", "count"],
+ # "required": ["start-address", "count"],
}
ip_profile_schema = {
- "title":"IP profile schema",
+ "title": "IP profile schema",
"$schema": "http://json-schema.org/draft-04/schema#",
- "type":"object",
- "properties":{
- "ip-version": {"type": "string", "enum": ["IPv4","IPv6"]},
+ "type": "object",
+ "properties": {
+ "ip-version": {"type": "string", "enum": ["IPv4", "IPv6"]},
"subnet-address": ip_prefix_schema,
"gateway-address": ip_schema,
"dns-address": {"oneOf": [ip_schema, # for backward compatibility
"size": size_schema,
"vpci":pci_schema,
"xml":xml_text_schema,
+ "name": name_schema,
},
"additionalProperties": False,
"required": ["type"]
"availability_zone": name_schema,
"VNFC image": {"oneOf": [path_schema, http_schema]},
"image checksum": checksum_schema,
- "image metadata": metadata_schema,
+ "image metadata": metadata_schema,
#"cloud-config": cloud_config_schema, #common for all vnfs in the scenario
"processor": {
"type":"object",
"class": nameshort_schema,
"public": {"type" : "boolean"},
"physical": {"type" : "boolean"},
+ "default_user": name_schema,
"tenant_id": id_schema, #only valid for admin
"external-connections": {"type" : "array", "items": external_connection_schema, "minItems":1},
"internal-connections": {"type" : "array", "items": internal_connection_schema, "minItems":1},
"additionalProperties": False
}
-#VNFD schema for OSM R1
+#VNFD schema for OSM R1
vnfd_schema_v02 = {
"title":"vnfd information schema v0.2",
"$schema": "http://json-schema.org/draft-04/schema#",
"properties":{
"VNFC": name_schema,
"local_iface_name": name_schema,
- "ip_address": ip_schema
+ "ip_address": ip_schema,
},
"required": ["VNFC", "local_iface_name"],
}
#"metadata": {"type": "object"},
#"user_data": {"type": "string"}
#"cloud-config": cloud_config_schema, #particular for a vnf
- "external-connections": {
+ "vdus": {
"type": "object",
"patternProperties": {
".": {
"type": "object",
"properties": {
- "vim-network-name": name_schema,
- "ip_address": ip_schema
- }
+ "name": name_schema, # overrides vdu name schema
+ "devices": {
+ "type": "object",
+ "patternProperties": {
+ ".": {
+ "vim_id": name_schema,
+ }
+ }
+ },
+ "interfaces": {
+ "type": "object",
+ "patternProperties": {
+ ".": {
+ "ip_address": ip_schema,
+ "mac_address": mac_schema,
+ "floating-ip": {"type": "boolean"},
+ }
+ }
+ }
+ }
}
}
},
- "internal-connections": {
+ "networks": {
"type": "object",
"patternProperties": {
".": {
"type": "object",
"properties": {
+ "vim-network-name": name_schema,
"ip-profile": ip_profile_schema,
- "elements": {
- "type" : "array",
- "items":{
- "type":"object",
- "properties":{
- "VNFC": name_schema,
- "local_iface_name": name_schema,
- "ip_address": ip_schema
- },
- "required": ["VNFC", "local_iface_name"],
- }
- }
- }
+ "name": name_schema,
+ }
}
}
- }
+ },
}
}
},
}
instance_scenario_action_schema = {
- "title":"instance scenario action information schema",
+ "title": "instance scenario action information schema",
"$schema": "http://json-schema.org/draft-04/schema#",
- "type":"object",
- "properties":{
- "start":{"type": "null"},
- "pause":{"type": "null"},
- "resume":{"type": "null"},
- "shutoff":{"type": "null"},
- "shutdown":{"type": "null"},
- "forceOff":{"type": "null"},
- "rebuild":{"type": "null"},
- "reboot":{
- "type": ["object","null"],
+ "type": "object",
+ "properties": {
+ "start": {"type": "null"},
+ "pause": {"type": "null"},
+ "resume": {"type": "null"},
+ "shutoff": {"type": "null"},
+ "shutdown": {"type": "null"},
+ "forceOff": {"type": "null"},
+ "rebuild": {"type": "null"},
+ "reboot": {
+ "type": ["object", "null"],
},
+ "add_public_key": description_schema,
"console": {"type": ["string", "null"], "enum": ["novnc", "xvpvnc", "rdp-html5", "spice-html5", None]},
- "vnfs":{"type": "array", "items":{"type":"string"}},
- "vms":{"type": "array", "items":{"type":"string"}}
+ "vdu-scaling": {
+ "type": "array",
+ "items": {
+ "type": "object",
+ "properties": {
+ "vdu-id": id_schema,
+ "osm_vdu_id": name_schema,
+ "member-vnf-index": name_schema,
+ "count": integer1_schema,
+ "type": {"enum": ["create", "delete"]}
+ },
+ "additionalProperties": False,
+ "minProperties": 1,
+ "required": ["type"]
+ }
+ },
+ "vnfs": {"type": "array", "items": {"type": "string"}},
+ "vms": {"type": "array", "items": {"type": "string"}}
},
"minProperties": 1,
#"maxProperties": 1,
"items": {
"type": "object",
"properties": {
- "pci": pci_schema,
+ "pci": pci_extended_schema, # pci_schema,
"switch_port": nameshort_schema,
"switch_mac": mac_schema
},
projects / osm / RO.git / blobdiff