Feature 5945 Adding WIM to NBI

[osm/NBI.git] / osm_nbi / validation.py

diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py
index 98fd511..bb966e2 100644 (file)
--- a/osm_nbi/validation.py
+++ b/osm_nbi/validation.py
@@ -325,6 +325,7 @@ ns_scale = {   # TODO for the moment it is only VDU-scaling
 
 
 schema_version = {"type": "string", "enum": ["1.0"]}
+schema_type = {"type": "string"}
 vim_account_edit_schema = {
     "title": "vim_account edit input schema",
     "$schema": "http://json-schema.org/draft-04/schema#",
@@ -332,7 +333,7 @@ vim_account_edit_schema = {
     "properties": {
         "name": name_schema,
         "description": description_schema,
-        "type": nameshort_schema,  # currently "openvim" or "openstack", can be enlarged with plugins
+        "type": nameshort_schema,
         "vim": name_schema,
         "datacenter": name_schema,
         "vim_url": description_schema,
@@ -345,7 +346,6 @@ vim_account_edit_schema = {
     },
     "additionalProperties": False
 }
-schema_type = {"type": "string"}
 
 vim_account_new_schema = {
     "title": "vim_account creation input schema",
@@ -371,6 +371,42 @@ vim_account_new_schema = {
     "additionalProperties": False
 }
 
+wim_account_edit_schema = {
+    "title": "wim_account edit input schema",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "type": "object",
+    "properties": {
+        "name": name_schema,
+        "description": description_schema,
+        "type": nameshort_schema,
+        "wim": name_schema,
+        "wim_url": description_schema,
+        "user": nameshort_schema,
+        "password": passwd_schema,
+        "config": {"type": "object"}
+    },
+    "additionalProperties": False
+}
+
+wim_account_new_schema = {
+    "title": "wim_account creation input schema",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "type": "object",
+    "properties": {
+        "schema_version": schema_version,
+        "schema_type": schema_type,
+        "name": name_schema,
+        "description": description_schema,
+        "wim": name_schema,
+        "wim_type": {"enum": ["tapi", "onos", "odl", "dynpac"]},
+        "wim_url": description_schema,
+        "user": nameshort_schema,
+        "password": passwd_schema,
+        "config": {"type": "object"}
+    },
+    "required": ["name", "wim_url", "wim_type"],
+    "additionalProperties": False
+}
 
 sdn_properties = {
     "name": name_schema,
@@ -486,9 +522,9 @@ pdu_edit_schema = {
         "type": nameshort_schema,
         "description": description_schema,
         "shared": bool_schema,
-        "vims": {"oneOff": [array_edition_schema, nameshort_list_schema]},
-        "vim_accounts": {"oneOff": [array_edition_schema, nameshort_list_schema]},
-        "interfaces": {"oneOff": [
+        "vims": {"oneOf": [array_edition_schema, nameshort_list_schema]},
+        "vim_accounts": {"oneOf": [array_edition_schema, nameshort_list_schema]},
+        "interfaces": {"oneOf": [
             array_edition_schema,
             {
                 "type": "array",
@@ -521,7 +557,7 @@ user_edit_schema = {
     "properties": {
         "password": passwd_schema,
         "projects": {
-            "oneOff": [
+            "oneOf": [
                 nameshort_list_schema,
                 array_edition_schema
             ]
@@ -579,7 +615,7 @@ nbi_edit_input_schemas = {
 nsi_slice_instantiate = deepcopy(ns_instantiate)
 nsi_slice_instantiate["title"] = "netslice subnet instantiation params input schema"
 nsi_slice_instantiate["properties"]["id"] = name_schema
-nsi_slice_instantiate["required"].append("id")
+del nsi_slice_instantiate["required"]
 
 nsi_vld_instantiate = {
     "title": "netslice vld instantiation params input schema",
@@ -618,7 +654,7 @@ nsi_instantiate = {
             "items": nsi_vld_instantiate
         },
     },
-    "required": ["nsiName", "nstId", "vimAccountId"], 
+    "required": ["nsiName", "nstId", "vimAccountId"],
     "additionalProperties": False
 }