inject_user_key routine fixes

[osm/RO.git] / osm_ro / wim / schemas.py

diff --git a/osm_ro/wim/schemas.py b/osm_ro/wim/schemas.py
index fb65fdd..101bcb1 100644 (file)
--- a/osm_ro/wim/schemas.py
+++ b/osm_ro/wim/schemas.py
@@ -39,7 +39,7 @@ from ..openmano_schemas import (
 )
 
 # WIM -------------------------------------------------------------------------
-wim_types = ["tapi", "onos", "odl", "dynpac"]
+wim_types = ["tapi", "onos", "odl", "dynpac", "fake"]
 
 dpid_type = {
     "type": "string",
@@ -83,7 +83,7 @@ wim_port_mapping_desc = {
                             "required": ["mapping_type"]
                         }
                     },
-                    "oneOf": [
+                    "anyOf": [
                         {
                             "required": [
                                 "pop_switch_dpid",
@@ -111,7 +111,7 @@ wim_schema_properties = {
     "description": description_schema,
     "type": {
         "type": "string",
-        "enum": ["tapi", "onos", "odl", "dynpac"]
+        "enum": ["tapi", "onos", "odl", "dynpac", "fake"]
     },
     "wim_url": description_schema,
     "config": {
@@ -131,11 +131,9 @@ wim_schema = {
             "type": "object",
             "properties": wim_schema_properties,
             "required": ["name", "type", "wim_url"],
-            "additionalProperties": True
         }
     },
     "required": ["wim"],
-    "additionalProperties": False
 }
 
 wim_edit_schema = {
@@ -146,11 +144,9 @@ wim_edit_schema = {
         "wim": {
             "type": "object",
             "properties": wim_schema_properties,
-            "additionalProperties": False
         }
     },
     "required": ["wim"],
-    "additionalProperties": False
 }
 
 wim_account_schema = {
@@ -166,11 +162,9 @@ wim_account_schema = {
                 "password": nameshort_schema,
                 "config": {"type": "object"}
             },
-            "additionalProperties": True
         }
     },
     "required": ["wim_account"],
-    "additionalProperties": False
 }
 
 wim_port_mapping_schema = {