X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=fd4e0e580ffea3039a8db4ed4a5c4642267358b0;hp=f6b93a5c4b940dbee23451da307bf31fc1a951ec;hb=refs%2Ftags%2Fv5.0.1;hpb=d125caf630021538f19aadab045b5d17def67cdd

diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py
index f6b93a5..fd4e0e5 100644
--- a/osm_nbi/validation.py
+++ b/osm_nbi/validation.py
@@ -15,6 +15,7 @@
 
 from jsonschema import validate as js_v, exceptions as js_e
 from http import HTTPStatus
+from copy import deepcopy
 
 __author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
 __version__ = "0.1"
@@ -485,9 +486,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",
@@ -520,7 +521,7 @@ user_edit_schema = {
     "properties": {
         "password": passwd_schema,
         "projects": {
-            "oneOff": [
+            "oneOf": [
                 nameshort_list_schema,
                 array_edition_schema
             ]
@@ -575,6 +576,24 @@ nbi_edit_input_schemas = {
 }
 
 # NETSLICE SCHEMAS
+nsi_slice_instantiate = deepcopy(ns_instantiate)
+nsi_slice_instantiate["title"] = "netslice subnet instantiation params input schema"
+nsi_slice_instantiate["properties"]["id"] = name_schema
+del nsi_slice_instantiate["required"]
+
+nsi_vld_instantiate = {
+    "title": "netslice vld instantiation params input schema",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "type": "object",
+    "properties": {
+        "name": string_schema,
+        "vim-network-name": {"OneOf": [string_schema, object_schema]},
+        "ip-profile": object_schema,
+    },
+    "required": ["name"], 
+    "additionalProperties": False
+}
+
 nsi_instantiate = {
     "title": "netslice action instantiate input schema",
     "$schema": "http://json-schema.org/draft-04/schema#",
@@ -584,17 +603,22 @@ nsi_instantiate = {
         "nsiInstanceId": id_schema,
         "nsiName": name_schema,
         "nsiDescription": {"oneOf": [description_schema, {"type": "null"}]},
-        "nstdId": string_schema,
+        "nstId": string_schema,
         "vimAccountId": id_schema,
         "ssh_keys": {"type": "string"},
         "nsi_id": id_schema,
-        "ns": {
+        "netslice-subnet": {
+            "type": "array",
+            "minItems": 1,
+            "items": nsi_slice_instantiate
+        },
+        "netslice-vld": {
             "type": "array",
             "minItems": 1,
-            "items": ns_instantiate
+            "items": nsi_vld_instantiate
         },
     },
-    "required": ["nsiName", "nstdId", "vimAccountId"],
+    "required": ["nsiName", "nstId", "vimAccountId"],
     "additionalProperties": False
 }