X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=openmano_schemas.py;h=a8c92a0f911922b9676b3934404498a4a6bcd86c;hb=refs%2Fchanges%2F33%2F933%2F1;hp=ffbacd3adb68428bf143d227f9e6f295b8bbbea2;hpb=8008c3ab56d80d73568226a4503f0f5933c23df9;p=osm%2FRO.git diff --git a/openmano_schemas.py b/openmano_schemas.py index ffbacd3a..a8c92a0f 100644 --- a/openmano_schemas.py +++ b/openmano_schemas.py @@ -24,7 +24,7 @@ ''' JSON schemas used by openmano httpserver.py module to parse the different files and messages sent through the API ''' -__author__="Alfonso Tierno, Gerardo Garcia" +__author__="Alfonso Tierno, Gerardo Garcia, Pablo Montes" __date__ ="$09-oct-2014 09:09:48$" #Basis schemas @@ -55,6 +55,7 @@ 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}$"} +size_schema={"type":"integer","minimum":1,"maximum":100} metadata_schema={ "type":"object", @@ -449,7 +450,9 @@ bridge_interfaces_schema={ "bandwidth":bandwidth_schema, "vpci":pci_schema, "mac_address": mac_schema, - "model": {"type":"string", "enum":["virtio","e1000","ne2k_pci","pcnet","rtl8139"]} + "model": {"type":"string", "enum":["virtio","e1000","ne2k_pci","pcnet","rtl8139"]}, + "port-security": {"type" : "boolean"}, + "floating-ip": {"type" : "boolean"} }, "additionalProperties": False, "required": ["name"] @@ -465,7 +468,8 @@ devices_schema={ "image": path_schema, "image name": name_schema, "image checksum": checksum_schema, - "image metadata": metadata_schema, + "image metadata": metadata_schema, + "size": size_schema, "vpci":pci_schema, "xml":xml_text_schema, },