fix validation error oneOf

[osm/RO.git] / RO / osm_ro / openmano_schemas.py

diff --git a/RO/osm_ro/openmano_schemas.py b/RO/osm_ro/openmano_schemas.py
index dda608f..aa235ec 100644 (file)
--- a/RO/osm_ro/openmano_schemas.py
+++ b/RO/osm_ro/openmano_schemas.py
@@ -106,7 +106,7 @@ config_schema = {
         "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"]}
             ]}
@@ -121,6 +121,7 @@ config_schema = {
         "log_level_console": log_level_schema,
         "log_level_ovim": log_level_schema,
         "log_level_sdn": log_level_schema,
+        "log_level_sdnconn": log_level_schema,
         "log_file_db": path_schema,
         "log_file_vim": path_schema,
         "log_file_wim": path_schema,
@@ -129,6 +130,7 @@ config_schema = {
         "log_file_console": path_schema,
         "log_file_ovim": path_schema,
         "log_file_sdn": path_schema,
+        "log_file_sdnconn": path_schema,
         "log_socket_host": nameshort_schema,
         "log_socket_port": port_schema,
         "log_file": path_schema,
@@ -317,7 +319,7 @@ dhcp_schema = {
     "type": "object",
     "properties":{
         "enabled": boolean_schema,
-        "start-address": {"OneOf": [null_schema, ip_schema]},
+        "start-address": {"oneOf": [null_schema, ip_schema]},
         "count": integer0_schema
     },
     # "required": ["start-address", "count"],
@@ -1229,7 +1231,7 @@ sdn_controller_edit_schema = {
     "additionalProperties": False
 }
 
-sdn_port_mapping_schema  = {
+sdn_port_mapping_schema = {
     "$schema": "http://json-schema.org/draft-04/schema#",
     "title":"sdn port mapping information schema",
     "type": "object",
@@ -1245,8 +1247,10 @@ sdn_port_mapping_schema  = {
                         "items": {
                             "type": "object",
                             "properties": {
-                                "pci": {"OneOf": [null_schema, pci_extended_schema]},       # pci_schema,
+                                "pci": {"oneOf": [null_schema, pci_extended_schema]},       # pci_schema,
                                 "switch_port": nameshort_schema,
+                                "switch_id": nameshort_schema,
+                                "switch_dpid": nameshort_schema,
                                 "switch_mac": mac_schema
                             },
                             "required": ["pci"]