X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=c1141f1dffc75c2ed283f3e1f713c8c706a699bf;hp=2419c1ade0753ab60b43dc3a6ad06c282134ec13;hb=2102560198959215f59e9f0ab1d11b0f69b8bb75;hpb=0f98af53b320c8244b58d0d8751e28e157949e8e

diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py
index 2419c1a..c1141f1 100644
--- a/osm_nbi/validation.py
+++ b/osm_nbi/validation.py
@@ -44,46 +44,70 @@ log_level_schema = {"type": "string", "enum": ["DEBUG", "INFO", "WARNING", "ERRO
 checksum_schema = {"type": "string", "pattern": "^[0-9a-fA-F]{32}$"}
 size_schema = {"type": "integer", "minimum": 1, "maximum": 100}
 
-schema_version = {"type": "string", "enum": ["1.0"]}
-schema_type = {"type": "string"}
 
-vim_new_schema = {
-    "title": "vims new user input schema",
+ns_instantiate = {
+    "title": "ns action instantiate input schema",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "type": "object",
+}
+ns_action = {   # TODO for the moment it is only contemplated the vnfd primitive execution
+    "title": "ns action update input schema",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "type": "object",
+    "properties": {
+        "vnf_member_index": name_schema,
+        "primitive": name_schema,
+        "primitive_params": {"type": "object"},
+    },
+    "required": ["vnf_member_index", "primitive", "primitive_params"],
+    "additionalProperties": False
+}
+
+
+schema_version = {"type": "string", "enum": ["1.0"]}
+vim_account_edit_schema = {
+    "title": "vim_account edit 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,
-        "vim_type": {"enum": ["openstack", "openvim", "vmware", "opennebula", "aws"]},
+        "type": nameshort_schema,  # currently "openvim" or "openstack", can be enlarged with plugins
+        "vim": name_schema,
+        "datacenter": name_schema,
         "vim_url": description_schema,
-        # "vim_url_admin": description_schema,
-        # "vim_tenant": name_schema,
+        "vim_url_admin": description_schema,
+        "vim_tenant": name_schema,
         "vim_tenant_name": name_schema,
-        "vim_user": nameshort_schema,
+        "vim_username": nameshort_schema,
         "vim_password": nameshort_schema,
         "config": {"type": "object"}
     },
-    "required": ["name", "vim_url", "vim_type", "vim_user", "vim_password", "vim_tenant_name"],
     "additionalProperties": False
 }
-vim_edit_schema = {
-    "title": "datacenter edit nformation schema",
+schema_type = {"type": "string"}
+
+vim_account_new_schema = {
+    "title": "vim_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,
-        "type": nameshort_schema,  # currently "openvim" or "openstack", can be enlarged with plugins
+        "vim": name_schema,
+        "datacenter": name_schema,
+        "vim_type": {"enum": ["openstack", "openvim", "vmware", "opennebula", "aws"]},
         "vim_url": description_schema,
-        "vim_url_admin": description_schema,
-        "vim_tenant": name_schema,
+        # "vim_url_admin": description_schema,
+        # "vim_tenant": name_schema,
         "vim_tenant_name": name_schema,
-        "vim_username": nameshort_schema,
+        "vim_user": nameshort_schema,
         "vim_password": nameshort_schema,
         "config": {"type": "object"}
     },
+    "required": ["name", "vim_url", "vim_type", "vim_user", "vim_password", "vim_tenant_name"],
     "additionalProperties": False
 }
 
@@ -152,12 +176,14 @@ sdn_external_port_schema = {
 
 
 nbi_new_input_schemas = {
-    "vims": vim_new_schema,
-    "sdns": sdn_new_schema
+    "vim_accounts": vim_account_new_schema,
+    "sdns": sdn_new_schema,
+    "ns_instantiate": ns_instantiate,
+    "ns_action": ns_action,
 }
 
 nbi_edit_input_schemas = {
-    "vims": vim_edit_schema,
+    "vim_accounts": vim_account_edit_schema,
     "sdns": sdn_edit_schema
 }
 
@@ -170,7 +196,7 @@ def validate_input(indata, item, new=True):
     """
     Validates input data agains json schema
     :param indata: user input data. Should be a dictionary
-    :param item: can be users, projects, vims, sdns
+    :param item: can be users, projects, vims, sdns, ns_xxxxx
     :param new: True if the validation is for creating or False if it is for editing
     :return: None if ok, raises ValidationError exception otherwise
     """