Supporting VLDs for Netslice

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

diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py
index 98fd511..fd4e0e5 100644 (file)
--- a/osm_nbi/validation.py
+++ b/osm_nbi/validation.py
@@ -486,9 +486,9 @@ pdu_edit_schema = {
         "type": nameshort_schema,
         "description": description_schema,
         "shared": bool_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",
             array_edition_schema,
             {
                 "type": "array",


@@ -521,7 +521,7 @@ user_edit_schema = {
     "properties": {
         "password": passwd_schema,
         "projects": {
     "properties": {
         "password": passwd_schema,
         "projects": {

-            "oneOff": [
+            "oneOf": [

                 nameshort_list_schema,
                 array_edition_schema
             ]
                 nameshort_list_schema,
                 array_edition_schema
             ]


@@ -579,7 +579,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 = 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",
 
 nsi_vld_instantiate = {
     "title": "netslice vld instantiation params input schema",


@@ -618,7 +618,7 @@ nsi_instantiate = {
             "items": nsi_vld_instantiate
         },
     },
             "items": nsi_vld_instantiate
         },
     },

-    "required": ["nsiName", "nstId", "vimAccountId"], 
+    "required": ["nsiName", "nstId", "vimAccountId"],

     "additionalProperties": False
 }
 
     "additionalProperties": False
 }