bug 710. Fix session used to delete ns, nsi when terminated

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

diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py
index f81f45c..a6b9421 100644 (file)
--- a/osm_nbi/validation.py
+++ b/osm_nbi/validation.py
@@ -1,7 +1,22 @@
 # -*- coding: utf-8 -*-
 
 # -*- coding: utf-8 -*-
 

+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+

 from jsonschema import validate as js_v, exceptions as js_e
 from http import HTTPStatus
 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"
 
 __author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
 __version__ = "0.1"


@@ -13,7 +28,7 @@ Validator of input data using JSON schemas for those items that not contains an
 
 # Basis schemas
 patern_name = "^[ -~]+$"
 
 # Basis schemas
 patern_name = "^[ -~]+$"

-nameshort_schema = {"type": "string", "minLength": 1, "maxLength": 60, "pattern": "^[^,;()\\.\\$'\"]+$"}
+shortname_schema = {"type": "string", "minLength": 1, "maxLength": 60, "pattern": "^[^,;()\\.\\$'\"]+$"}

 passwd_schema = {"type": "string", "minLength": 1, "maxLength": 60}
 name_schema = {"type": "string", "minLength": 1, "maxLength": 255, "pattern": "^[^,;()'\"]+$"}
 string_schema = {"type": "string", "minLength": 1, "maxLength": 255}
 passwd_schema = {"type": "string", "minLength": 1, "maxLength": 60}
 name_schema = {"type": "string", "minLength": 1, "maxLength": 255, "pattern": "^[^,;()'\"]+$"}
 string_schema = {"type": "string", "minLength": 1, "maxLength": 255}


@@ -55,7 +70,7 @@ size_schema = {"type": "integer", "minimum": 1, "maximum": 100}
 array_edition_schema = {
     "type": "object",
     "patternProperties": {
 array_edition_schema = {
     "type": "object",
     "patternProperties": {

-        "^\\$": "Any"
+        "^\\$": {}

     },
     "additionalProperties": False,
     "minProperties": 1,
     },
     "additionalProperties": False,
     "minProperties": 1,


@@ -63,7 +78,7 @@ array_edition_schema = {
 nameshort_list_schema = {
     "type": "array",
     "minItems": 1,
 nameshort_list_schema = {
     "type": "array",
     "minItems": 1,

-    "items": nameshort_schema,
+    "items": shortname_schema,

 }
 
 
 }
 
 


@@ -164,6 +179,7 @@ ns_instantiate_internal_vld = {
     "properties": {
         "name": name_schema,
         "vim-network-name": name_schema,
     "properties": {
         "name": name_schema,
         "vim-network-name": name_schema,

+        "vim-network-id": name_schema,

         "ip-profile": ip_profile_update_schema,
         "internal-connection-point": {
             "type": "array",
         "ip-profile": ip_profile_update_schema,
         "internal-connection-point": {
             "type": "array",


@@ -186,6 +202,20 @@ ns_instantiate_internal_vld = {
     "additionalProperties": False
 }
 
     "additionalProperties": False
 }
 

+additional_params_for_vnf = {
+    "type": "array",
+    "items": {
+        "type": "object",
+        "properties": {
+            "member-vnf-index": name_schema,
+            "additionalParams": object_schema,
+        },
+        "required": ["member-vnf-index", "additionalParams"],
+        "additionalProperties": False
+    }
+
+}
+

 ns_instantiate = {
     "title": "ns action instantiate input schema",
     "$schema": "http://json-schema.org/draft-04/schema#",
 ns_instantiate = {
     "title": "ns action instantiate input schema",
     "$schema": "http://json-schema.org/draft-04/schema#",


@@ -193,10 +223,14 @@ ns_instantiate = {
     "properties": {
         "lcmOperationType": string_schema,
         "nsInstanceId": id_schema,
     "properties": {
         "lcmOperationType": string_schema,
         "nsInstanceId": id_schema,

+        "netsliceInstanceId": id_schema,

         "nsName": name_schema,
         "nsName": name_schema,

-        "nsDescription": {"oneOf": [description_schema, {"type": "null"}]},
+        "nsDescription": {"oneOf": [description_schema, null_schema]},

         "nsdId": id_schema,
         "vimAccountId": id_schema,
         "nsdId": id_schema,
         "vimAccountId": id_schema,

+        "wimAccountId": {"OneOf": [id_schema, bool_schema, null_schema]},
+        "additionalParamsForNs": object_schema,
+        "additionalParamsForVnf": additional_params_for_vnf,

         "ssh_keys": {"type": "array", "items": {"type": "string"}},
         "nsr_id": id_schema,
         "vduImage": name_schema,
         "ssh_keys": {"type": "array", "items": {"type": "string"}},
         "nsr_id": id_schema,
         "vduImage": name_schema,


@@ -232,6 +266,9 @@ ns_instantiate = {
                 "properties": {
                     "name": string_schema,
                     "vim-network-name": {"OneOf": [string_schema, object_schema]},
                 "properties": {
                     "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": {
                         "type": "array",
                     "ip-profile": object_schema,
                     "vnfd-connection-point-ref": {
                         "type": "array",


@@ -269,6 +306,7 @@ ns_action = {   # TODO for the moment it is only contemplated the vnfd primitive
         "member_vnf_index": name_schema,
         "vnf_member_index": name_schema,  # TODO for backward compatibility. To remove in future
         "vdu_id": name_schema,
         "member_vnf_index": name_schema,
         "vnf_member_index": name_schema,  # TODO for backward compatibility. To remove in future
         "vdu_id": name_schema,

+        "vdu_count_index": integer0_schema,

         "primitive": name_schema,
         "primitive_params": {"type": "object"},
     },
         "primitive": name_schema,
         "primitive_params": {"type": "object"},
     },


@@ -310,6 +348,7 @@ ns_scale = {   # TODO for the moment it is only VDU-scaling
 
 
 schema_version = {"type": "string", "enum": ["1.0"]}
 
 
 schema_version = {"type": "string", "enum": ["1.0"]}

+schema_type = {"type": "string"}

 vim_account_edit_schema = {
     "title": "vim_account edit input schema",
     "$schema": "http://json-schema.org/draft-04/schema#",
 vim_account_edit_schema = {
     "title": "vim_account edit input schema",
     "$schema": "http://json-schema.org/draft-04/schema#",


@@ -317,20 +356,19 @@ vim_account_edit_schema = {
     "properties": {
         "name": name_schema,
         "description": description_schema,
     "properties": {
         "name": name_schema,
         "description": description_schema,

-        "type": nameshort_schema,  # currently "openvim" or "openstack", can be enlarged with plugins
+        "type": shortname_schema,

         "vim": name_schema,
         "datacenter": name_schema,
         "vim_url": description_schema,
         "vim_url_admin": description_schema,
         "vim_tenant": name_schema,
         "vim_tenant_name": name_schema,
         "vim": name_schema,
         "datacenter": name_schema,
         "vim_url": description_schema,
         "vim_url_admin": description_schema,
         "vim_tenant": name_schema,
         "vim_tenant_name": name_schema,

-        "vim_username": nameshort_schema,
+        "vim_username": shortname_schema,

         "vim_password": passwd_schema,
         "config": {"type": "object"}
     },
     "additionalProperties": False
 }
         "vim_password": passwd_schema,
         "config": {"type": "object"}
     },
     "additionalProperties": False
 }

-schema_type = {"type": "string"}

 
 vim_account_new_schema = {
     "title": "vim_account creation input schema",
 
 vim_account_new_schema = {
     "title": "vim_account creation input schema",


@@ -343,12 +381,12 @@ vim_account_new_schema = {
         "description": description_schema,
         "vim": name_schema,
         "datacenter": name_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"]},

         "vim_url": description_schema,
         # "vim_url_admin": description_schema,
         # "vim_tenant": name_schema,
         "vim_tenant_name": name_schema,
         "vim_url": description_schema,
         # "vim_url_admin": description_schema,
         # "vim_tenant": name_schema,
         "vim_tenant_name": name_schema,

-        "vim_user": nameshort_schema,
+        "vim_user": shortname_schema,

         "vim_password": passwd_schema,
         "config": {"type": "object"}
     },
         "vim_password": passwd_schema,
         "config": {"type": "object"}
     },


@@ -356,6 +394,47 @@ vim_account_new_schema = {
     "additionalProperties": False
 }
 
     "additionalProperties": False
 }
 

+wim_account_edit_schema = {
+    "title": "wim_account edit input schema",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "type": "object",
+    "properties": {
+        "name": name_schema,
+        "description": description_schema,
+        "type": shortname_schema,
+        "wim": name_schema,
+        "wim_url": description_schema,
+        "user": shortname_schema,
+        "password": passwd_schema,
+        "config": {"type": "object"}
+    },
+    "additionalProperties": False
+}
+
+wim_account_new_schema = {
+    "title": "wim_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,
+        "wim": name_schema,
+        "wim_type": {"enum": ["tapi", "onos", "odl", "dynpac", "fake"]},
+        "wim_url": description_schema,
+        "user": shortname_schema,
+        "password": passwd_schema,
+        "config": {
+            "type": "object",
+            "patternProperties": {
+                ".": {"not": {"type": "null"}}
+            }
+        }
+    },
+    "required": ["name", "wim_url", "wim_type"],
+    "additionalProperties": False
+}

 
 sdn_properties = {
     "name": name_schema,
 
 sdn_properties = {
     "name": name_schema,


@@ -365,7 +444,7 @@ sdn_properties = {
     "port": port_schema,
     "type": {"type": "string", "enum": ["opendaylight", "floodlight", "onos"]},
     "version": {"type": "string", "minLength": 1, "maxLength": 12},
     "port": port_schema,
     "type": {"type": "string", "enum": ["opendaylight", "floodlight", "onos"]},
     "version": {"type": "string", "minLength": 1, "maxLength": 12},

-    "user": nameshort_schema,
+    "user": shortname_schema,

     "password": passwd_schema
 }
 sdn_new_schema = {
     "password": passwd_schema
 }
 sdn_new_schema = {


@@ -391,14 +470,14 @@ sdn_port_mapping_schema = {
     "items": {
         "type": "object",
         "properties": {
     "items": {
         "type": "object",
         "properties": {

-            "compute_node": nameshort_schema,
+            "compute_node": shortname_schema,

             "ports": {
                 "type": "array",
                 "items": {
                     "type": "object",
                     "properties": {
                         "pci": pci_extended_schema,
             "ports": {
                 "type": "array",
                 "items": {
                     "type": "object",
                     "properties": {
                         "pci": pci_extended_schema,

-                        "switch_port": nameshort_schema,
+                        "switch_port": shortname_schema,

                         "switch_mac": mac_schema
                     },
                     "required": ["pci"]
                         "switch_mac": mac_schema
                     },
                     "required": ["pci"]


@@ -424,18 +503,18 @@ sdn_external_port_schema = {
 pdu_interface = {
     "type": "object",
     "properties": {
 pdu_interface = {
     "type": "object",
     "properties": {

-        "name": nameshort_schema,
+        "name": shortname_schema,

         "mgmt": bool_schema,
         "type": {"enum": ["overlay", 'underlay']},
         "ip-address": ip_schema,
         # TODO, add user, password, ssh-key
         "mac-address": mac_schema,
         "mgmt": bool_schema,
         "type": {"enum": ["overlay", 'underlay']},
         "ip-address": ip_schema,
         # TODO, add user, password, ssh-key
         "mac-address": mac_schema,

-        "vim-network-name": nameshort_schema,  # interface is connected to one vim network, or switch port
-        # TODO "vim-network-id": nameshort_schema,
+        "vim-network-name": shortname_schema,  # interface is connected to one vim network, or switch port
+        "vim-network-id": shortname_schema,

         # # provide this in case SDN assist must deal with this interface
         # "switch-dpid": dpid_Schema,
         # # provide this in case SDN assist must deal with this interface
         # "switch-dpid": dpid_Schema,

-        # "switch-port": nameshort_schema,
-        # "switch-mac": nameshort_schema,
+        # "switch-port": shortname_schema,
+        # "switch-mac": shortname_schema,

         # "switch-vlan": vlan_schema,
     },
     "required": ["name", "mgmt", "ip-address"],
         # "switch-vlan": vlan_schema,
     },
     "required": ["name", "mgmt", "ip-address"],


@@ -446,8 +525,8 @@ pdu_new_schema = {
     "$schema": "http://json-schema.org/draft-04/schema#",
     "type": "object",
     "properties": {
     "$schema": "http://json-schema.org/draft-04/schema#",
     "type": "object",
     "properties": {

-        "name": nameshort_schema,
-        "type": nameshort_schema,
+        "name": shortname_schema,
+        "type": shortname_schema,

         "description": description_schema,
         "shared": bool_schema,
         "vims": nameshort_list_schema,
         "description": description_schema,
         "shared": bool_schema,
         "vims": nameshort_list_schema,


@@ -467,13 +546,13 @@ pdu_edit_schema = {
     "$schema": "http://json-schema.org/draft-04/schema#",
     "type": "object",
     "properties": {
     "$schema": "http://json-schema.org/draft-04/schema#",
     "type": "object",
     "properties": {

-        "name": nameshort_schema,
-        "type": nameshort_schema,
+        "name": shortname_schema,
+        "type": shortname_schema,

         "description": description_schema,
         "shared": bool_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",


@@ -487,16 +566,32 @@ pdu_edit_schema = {
 }
 
 # USERS
 }
 
 # 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",
     "type": "object",
     "properties": {
 user_new_schema = {
     "$schema": "http://json-schema.org/draft-04/schema#",
     "title": "New user schema",
     "type": "object",
     "properties": {

-        "username": nameshort_schema,
+        "username": shortname_schema,

         "password": passwd_schema,
         "projects": nameshort_list_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 = {
     "additionalProperties": False
 }
 user_edit_schema = {


@@ -505,12 +600,18 @@ user_edit_schema = {
     "type": "object",
     "properties": {
         "password": passwd_schema,
     "type": "object",
     "properties": {
         "password": passwd_schema,

+        "username": shortname_schema,     # To allow User Name modification

         "projects": {
         "projects": {

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

                 nameshort_list_schema,
                 array_edition_schema
             ]
         },
                 nameshort_list_schema,
                 array_edition_schema
             ]
         },

+        "project_role_mappings": {
+            "type": "array",
+            "items": project_role_mapping,
+            "minItems": 1
+        },

     },
     "minProperties": 1,
     "additionalProperties": False
     },
     "minProperties": 1,
     "additionalProperties": False


@@ -522,7 +623,7 @@ project_new_schema = {
     "title": "New project schema for administrators",
     "type": "object",
     "properties": {
     "title": "New project schema for administrators",
     "type": "object",
     "properties": {

-        "name": nameshort_schema,
+        "name": shortname_schema,

         "admin": bool_schema,
     },
     "required": ["name"],
         "admin": bool_schema,
     },
     "required": ["name"],


@@ -534,11 +635,36 @@ project_edit_schema = {
     "type": "object",
     "properties": {
         "admin": bool_schema,
     "type": "object",
     "properties": {
         "admin": bool_schema,

+        "name": shortname_schema,     # To allow Project Name modification

     },
     "additionalProperties": False,
     "minProperties": 1
 }
 
     },
     "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,
+    },
+    "required": ["name"],
+    "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,
+    },
+    "required": ["_id", "name"],
+    "additionalProperties": True,
+    "minProperties": 1
+}
+

 # GLOBAL SCHEMAS
 
 nbi_new_input_schemas = {
 # GLOBAL SCHEMAS
 
 nbi_new_input_schemas = {


@@ -560,6 +686,63 @@ nbi_edit_input_schemas = {
     "pdus": pdu_edit_schema,
 }
 
     "pdus": pdu_edit_schema,
 }
 

+# NETSLICE SCHEMAS
+nsi_subnet_instantiate = deepcopy(ns_instantiate)
+nsi_subnet_instantiate["title"] = "netslice subnet instantiation params input schema"
+nsi_subnet_instantiate["properties"]["id"] = name_schema
+del nsi_subnet_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]},
+        "vim-network-id": {"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#",
+    "type": "object",
+    "properties": {
+        "lcmOperationType": string_schema,
+        "nsiInstanceId": id_schema,
+        "nsiName": name_schema,
+        "nsiDescription": {"oneOf": [description_schema, null_schema]},
+        "nstId": string_schema,
+        "vimAccountId": id_schema,
+        "ssh_keys": {"type": "string"},
+        "nsi_id": id_schema,
+        "additionalParamsForNsi": object_schema,
+        "netslice-subnet": {
+            "type": "array",
+            "minItems": 1,
+            "items": nsi_subnet_instantiate
+        },
+        "netslice-vld": {
+            "type": "array",
+            "minItems": 1,
+            "items": nsi_vld_instantiate
+        },
+    },
+    "required": ["nsiName", "nstId", "vimAccountId"],
+    "additionalProperties": False
+}
+
+nsi_action = {
+
+}
+
+nsi_terminate = {
+
+}
+

 
 class ValidationError(Exception):
     def __init__(self, message, http_code=HTTPStatus.UNPROCESSABLE_ENTITY):
 
 class ValidationError(Exception):
     def __init__(self, message, http_code=HTTPStatus.UNPROCESSABLE_ENTITY):


@@ -586,3 +769,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)
         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