X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=openmano_schemas.py;h=ffbacd3adb68428bf143d227f9e6f295b8bbbea2;hb=ae65a48b753c92a91ff7f8267625f8af6400b79f;hp=8af4682618bea493f51b95d1e702d51794665c64;hpb=4dba7abed342277b08ebe1e903a9a87284c433ab;p=osm%2FRO.git

diff --git a/openmano_schemas.py b/openmano_schemas.py
index 8af46826..ffbacd3a 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",
@@ -274,10 +275,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
@@ -461,6 +463,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,
@@ -493,6 +497,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": {
@@ -522,7 +528,11 @@ vnfc_schema = {
         "devices": devices_schema
         
     },
-    "required": ["name", "VNFC image"],
+    "required": ["name"],
+    "oneOf": [
+        {"required": ["VNFC image"]},
+        {"required": ["image name"]}
+    ],
     "additionalProperties": False
 }