X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=openmano_schemas.py;h=e1fc2bd7c253fbeb9ced68363951b4abec8630f7;hb=8ed3c73ef2ea968a5530d0128a7b3ed819fb8606;hp=3d95dc7d088f101fb5b65ee9fcd8b03bd4544c5a;hpb=9f8456e62b915ecad8424a2ccfd734db8e777fc9;p=osm%2FRO.git

diff --git a/openmano_schemas.py b/openmano_schemas.py
index 3d95dc7d..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,
@@ -456,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,
@@ -488,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": {
@@ -517,7 +527,11 @@ vnfc_schema = {
         "devices": devices_schema
         
     },
-    "required": ["name", "VNFC image"],
+    "required": ["name"],
+    "oneOf": [
+        {"required": ["VNFC image"]},
+        {"required": ["image name"]}
+    ],
     "additionalProperties": False
 }