Bug 643 - Unable to rename a Project in OSM

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

diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py
index 7707a75..b20be4a 100644 (file)
--- a/osm_nbi/validation.py
+++ b/osm_nbi/validation.py
@@ -16,6 +16,7 @@
 from jsonschema import validate as js_v, exceptions as js_e
 from http import HTTPStatus
 from copy import deepcopy
+from uuid import UUID   # To test for valid UUID
 
 __author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
 __version__ = "0.1"
@@ -266,6 +267,7 @@ ns_instantiate = {
                     "name": string_schema,
                     "vim-network-name": {"OneOf": [string_schema, object_schema]},
                     "vim-network-id": {"OneOf": [string_schema, object_schema]},
+                    "ns-net": object_schema,
                     "wimAccountId": {"OneOf": [id_schema, bool_schema, null_schema]},
                     "ip-profile": object_schema,
                     "vnfd-connection-point-ref": {
@@ -564,6 +566,17 @@ pdu_edit_schema = {
 }
 
 # USERS
+project_role_mapping = {
+    "title": "",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "type": "object",
+    "properties": {
+        "project": shortname_schema,
+        "role": shortname_schema
+    },
+    "required": ["project", "role"],
+    "additionalProperties": False
+}
 user_new_schema = {
     "$schema": "http://json-schema.org/draft-04/schema#",
     "title": "New user schema",
@@ -572,8 +585,13 @@ user_new_schema = {
         "username": shortname_schema,
         "password": passwd_schema,
         "projects": nameshort_list_schema,
+        "project_role_mappings": {
+            "type": "array",
+            "items": project_role_mapping,
+            "minItems": 1
+        },
     },
-    "required": ["username", "password", "projects"],
+    "required": ["username", "password"],
     "additionalProperties": False
 }
 user_edit_schema = {
@@ -582,12 +600,18 @@ user_edit_schema = {
     "type": "object",
     "properties": {
         "password": passwd_schema,
+        "username": shortname_schema,     # To allow User Name modification
         "projects": {
             "oneOf": [
                 nameshort_list_schema,
                 array_edition_schema
             ]
         },
+        "project_role_mappings": {
+            "type": "array",
+            "items": project_role_mapping,
+            "minItems": 1
+        },
     },
     "minProperties": 1,
     "additionalProperties": False
@@ -611,7 +635,34 @@ project_edit_schema = {
     "type": "object",
     "properties": {
         "admin": bool_schema,
+        "name": shortname_schema,     # To allow Project Name modification
+    },
+    "additionalProperties": False,
+    "minProperties": 1
+}
+
+# ROLES
+roles_new_schema = {
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "title": "New role schema for administrators",
+    "type": "object",
+    "properties": {
+        "name": shortname_schema,
+        "definition": object_schema,
+    },
+    "required": ["name"],
+    "additionalProperties": False
+}
+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,
     },
+    "required": ["_id", "name", "definition"],
     "additionalProperties": False,
     "minProperties": 1
 }
@@ -653,7 +704,7 @@ nsi_vld_instantiate = {
         "vim-network-id": {"OneOf": [string_schema, object_schema]},
         "ip-profile": object_schema,
     },
-    "required": ["name"], 
+    "required": ["name"],
     "additionalProperties": False
 }
 
@@ -691,7 +742,7 @@ nsi_action = {
 }
 
 nsi_terminate = {
-    
+
 }
 
 
@@ -720,3 +771,16 @@ def validate_input(indata, schema_to_use):
         raise ValidationError("Format error {} '{}' ".format(error_pos, e.message))
     except js_e.SchemaError:
         raise ValidationError("Bad json schema {}".format(schema_to_use), http_code=HTTPStatus.INTERNAL_SERVER_ERROR)
+
+
+def is_valid_uuid(x):
+    """
+    Test for a valid UUID
+    :param x: string to test
+    :return: True if x is a valid uuid, False otherwise
+    """
+    try:
+        if UUID(x):
+            return True
+    except (TypeError, ValueError):
+        return False