X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=a244ac11e17238cfb653391065e028d6d602f667;hp=b20be4aaff747ca46a502c2624df0c0d20089355;hb=126af57f9b2b09f1ab72c6a7f6dfce4e79d0480f;hpb=c061f56a0218c562315f563b001a72fbdfa550c6

diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py
index b20be4a..a244ac1 100644
--- a/osm_nbi/validation.py
+++ b/osm_nbi/validation.py
@@ -381,7 +381,7 @@ vim_account_new_schema = {
         "description": description_schema,
         "vim": name_schema,
         "datacenter": name_schema,
-        "vim_type": {"enum": ["openstack", "openvim", "vmware", "opennebula", "aws"]},
+        "vim_type": {"enum": ["openstack", "openvim", "vmware", "opennebula", "aws", "azure", "fos"]},
         "vim_url": description_schema,
         # "vim_url_admin": description_schema,
         # "vim_tenant": name_schema,
@@ -421,7 +421,7 @@ wim_account_new_schema = {
         "name": name_schema,
         "description": description_schema,
         "wim": name_schema,
-        "wim_type": {"enum": ["tapi", "onos", "odl", "dynpac"]},
+        "wim_type": {"enum": ["tapi", "onos", "odl", "dynpac", "fake"]},
         "wim_url": description_schema,
         "user": shortname_schema,
         "password": passwd_schema,
@@ -648,22 +648,20 @@ roles_new_schema = {
     "type": "object",
     "properties": {
         "name": shortname_schema,
-        "definition": object_schema,
+        "root": bool_schema,
     },
-    "required": ["name"],
-    "additionalProperties": False
+    "required": ["name", "root"],
+    "additionalProperties": True
 }
 roles_edit_schema = {
     "$schema": "http://json-schema.org/draft-04/schema#",
     "title": "Roles edit schema for administrators",
     "type": "object",
     "properties": {
-        "_id": id_schema,
-        "name": shortname_schema,
-        "definition": object_schema,
+        "root": bool_schema,
     },
-    "required": ["_id", "name", "definition"],
-    "additionalProperties": False,
+    "required": ["root"],
+    "additionalProperties": True,
     "minProperties": 1
 }
 
@@ -714,7 +712,7 @@ nsi_instantiate = {
     "type": "object",
     "properties": {
         "lcmOperationType": string_schema,
-        "nsiInstanceId": id_schema,
+        "netsliceInstanceId": id_schema,
         "nsiName": name_schema,
         "nsiDescription": {"oneOf": [description_schema, null_schema]},
         "nstId": string_schema,