X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=openmano_schemas.py;h=013234f5ff6c061c1c45dc158b0bcf01a0d09873;hb=refs%2Fchanges%2F66%2F866%2F2;hp=e1fc2bd7c253fbeb9ced68363951b4abec8630f7;hpb=b69fa9f026b1b5839799cc5dc48af625981cbc3a;p=osm%2FRO.git diff --git a/openmano_schemas.py b/openmano_schemas.py index e1fc2bd7..013234f5 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", @@ -275,10 +276,11 @@ datacenter_associate_schema={ "datacenter":{ "type":"object", "properties":{ - "vim_tenant": id_schema, - "vim_tenant_name": nameshort_schema, + "vim_tenant": name_schema, + "vim_tenant_name": name_schema, "vim_username": nameshort_schema, "vim_password": nameshort_schema, + "config": {"type": "object"} }, # "required": ["vim_tenant"], "additionalProperties": True @@ -464,7 +466,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, },