adding additionalParams for netslice

Change-Id: I86ce0d05c65ec9f549fd2243f6260ffd9bc907a8
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py
index 28e3386..36b6a42 100644 (file)
--- a/osm_nbi/instance_topics.py
+++ b/osm_nbi/instance_topics.py
@@ -771,6 +771,7 @@ class NsiTopic(BaseTopic):
 
     def __init__(self, db, fs, msg):
         BaseTopic.__init__(self, db, fs, msg)
 
     def __init__(self, db, fs, msg):
         BaseTopic.__init__(self, db, fs, msg)

+        self.nsrTopic = NsrTopic(db, fs, msg)

 
     @staticmethod
     def _format_ns_request(ns_request):
 
     @staticmethod
     def _format_ns_request(ns_request):


@@ -779,16 +780,23 @@ class NsiTopic(BaseTopic):
         return formated_request
 
     @staticmethod
         return formated_request
 
     @staticmethod

-    def _format_addional_params(ns_request, member_vnf_index=None, descriptor=None):
+    def _format_addional_params(slice_request):

         """
         Get and format user additional params for NS or VNF
         """
         Get and format user additional params for NS or VNF

-        :param ns_request: User instantiation additional parameters
-        :param member_vnf_index: None for extract NS params, or member_vnf_index to extract VNF params
-        :param descriptor: If not None it check that needed parameters of descriptor are supplied
-        :return: a formated copy of additional params or None if not supplied
+        :param slice_request: User instantiation additional parameters
+        :return: a formatted copy of additional params or None if not supplied

         """
         """

-        additional_params = None
-        # TODO: Check aditional params
+        additional_params = copy(slice_request.get("additionalParamsForNsi"))
+        if additional_params:
+            for k, v in additional_params.items():
+                if not isinstance(k, str):
+                    raise EngineException("Invalid param at additionalParamsForNsi:{}. Only string keys are allowed".
+                                          format(k))
+                if "." in k or "$" in k:
+                    raise EngineException("Invalid param at additionalParamsForNsi:{}. Keys must not contain dots or $".
+                                          format(k))
+                if isinstance(v, (dict, tuple, list)):
+                    additional_params[k] = "!!yaml " + safe_dump(v)

         return additional_params
 
     def _check_descriptor_dependencies(self, session, descriptor):
         return additional_params
 
     def _check_descriptor_dependencies(self, session, descriptor):


@@ -846,7 +854,7 @@ class NsiTopic(BaseTopic):
             _filter = {"_id": id_item}
             nslcmop = self.db.get_one("nslcmops", _filter)
             nsr_id = nslcmop["operationParams"]["nsr_id"]
             _filter = {"_id": id_item}
             nslcmop = self.db.get_one("nslcmops", _filter)
             nsr_id = nslcmop["operationParams"]["nsr_id"]

-            NsrTopic.delete(self, session, nsr_id, force=False, dry_run=False)
+            self.nsrTopic.delete(session, nsr_id, force=False, dry_run=False)

         self._send_msg("deleted", {"_id": _id})
         return v
 
         self._send_msg("deleted", {"_id": _id})
         return v
 


@@ -892,6 +900,7 @@ class NsiTopic(BaseTopic):
                 "nsr-ref-list": [],
                 "vlr-list": [],
                 "_id": nsi_id,
                 "nsr-ref-list": [],
                 "vlr-list": [],
                 "_id": nsi_id,

+                "additionalParamsForNsi": self._format_addional_params(slice_request)

             }
 
             step = "creating nsi at database"
             }
 
             step = "creating nsi at database"


@@ -966,6 +975,16 @@ class NsiTopic(BaseTopic):
                 step = "filling nsir nsd-id='{}' constituent-nsd='{}' from database".format(
                     member_ns["nsd-ref"], member_ns["id"])
 
                 step = "filling nsir nsd-id='{}' constituent-nsd='{}' from database".format(
                     member_ns["nsd-ref"], member_ns["id"])
 

+            # check additionalParamsForSubnet contains a valid id
+            if slice_request.get("additionalParamsForSubnet"):
+                for additional_params_subnet in get_iterable(slice_request.get("additionalParamsForSubnet")):
+                    for service in services:
+                        if additional_params_subnet["id"] == service["id"]:
+                            break
+                    else:
+                        raise EngineException("Error at additionalParamsForSubnet:id='{}' not match any "
+                                              "netslice-subnet:id".format(additional_params_subnet["id"]))
+

             # creates Network Services records (NSRs)
             step = "creating nsrs at database using NsrTopic.new()"
             ns_params = slice_request.get("netslice-subnet")
             # creates Network Services records (NSRs)
             step = "creating nsrs at database using NsrTopic.new()"
             ns_params = slice_request.get("netslice-subnet")


@@ -979,6 +998,13 @@ class NsiTopic(BaseTopic):
                 indata_ns["vimAccountId"] = slice_request.get("vimAccountId")
                 indata_ns["nsDescription"] = service["description"]
                 indata_ns["key-pair-ref"] = None
                 indata_ns["vimAccountId"] = slice_request.get("vimAccountId")
                 indata_ns["nsDescription"] = service["description"]
                 indata_ns["key-pair-ref"] = None

+                for additional_params_subnet in get_iterable(slice_request.get("additionalParamsForSubnet")):
+                    if additional_params_subnet["id"] == service["id"]:
+                        if additional_params_subnet.get("additionalParamsForNs"):
+                            indata_ns["additionalParamsForNs"] = additional_params_subnet["additionalParamsForNs"]
+                        if additional_params_subnet.get("additionalParamsForVnf"):
+                            indata_ns["additionalParamsForVnf"] = additional_params_subnet["additionalParamsForVnf"]
+                        break

 
                 # NsrTopic(rollback, session, indata_ns, kwargs, headers, force)
                 # Overwriting ns_params filtering by nsName == netslice-subnet.id
 
                 # NsrTopic(rollback, session, indata_ns, kwargs, headers, force)
                 # Overwriting ns_params filtering by nsName == netslice-subnet.id


@@ -1023,7 +1049,7 @@ class NsiTopic(BaseTopic):
                         indata_ns["vld"] = indata_ns_list
 
                 # Creates Nsr objects
                         indata_ns["vld"] = indata_ns_list
 
                 # Creates Nsr objects

-                _id_nsr = NsrTopic.new(self, rollback, session, indata_ns, kwargs, headers, force)
+                _id_nsr = self.nsrTopic.new(rollback, session, indata_ns, kwargs, headers, force)

                 nsrs_item = {"nsrId": _id_nsr}
                 nsrs_list.append(nsrs_item)
                 nsi_netslice_subnet.append(indata_ns)
                 nsrs_item = {"nsrId": _id_nsr}
                 nsrs_list.append(nsrs_item)
                 nsi_netslice_subnet.append(indata_ns)

diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py
index 7d03d90..0ec8304 100644 (file)
--- a/osm_nbi/validation.py
+++ b/osm_nbi/validation.py
@@ -27,7 +27,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}


@@ -69,7 +69,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,


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

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

 }
 
 
 }
 
 


@@ -201,6 +201,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#",


@@ -214,17 +228,7 @@ ns_instantiate = {
         "nsdId": id_schema,
         "vimAccountId": id_schema,
         "additionalParamsForNs": object_schema,
         "nsdId": id_schema,
         "vimAccountId": id_schema,
         "additionalParamsForNs": object_schema,

-        "additionalParamsForVnf": {
-            "type": "array",
-            "items": {
-                "type": "object",
-                "properties": {
-                    "member-vnf-index": name_schema,
-                    "additionalParams": object_schema,
-                },
-                "required": ["member-vnf-index", "additionalParams"]
-            }
-        },
+        "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,


@@ -347,14 +351,14 @@ vim_account_edit_schema = {
     "properties": {
         "name": name_schema,
         "description": description_schema,
     "properties": {
         "name": name_schema,
         "description": description_schema,

-        "type": nameshort_schema,
+        "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"}
     },
         "vim_password": passwd_schema,
         "config": {"type": "object"}
     },


@@ -377,7 +381,7 @@ vim_account_new_schema = {
         # "vim_url_admin": description_schema,
         # "vim_tenant": name_schema,
         "vim_tenant_name": name_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"}
     },


@@ -392,10 +396,10 @@ wim_account_edit_schema = {
     "properties": {
         "name": name_schema,
         "description": description_schema,
     "properties": {
         "name": name_schema,
         "description": description_schema,

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

         "wim": name_schema,
         "wim_url": description_schema,
         "wim": name_schema,
         "wim_url": description_schema,

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

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


@@ -414,7 +418,7 @@ wim_account_new_schema = {
         "wim": name_schema,
         "wim_type": {"enum": ["tapi", "onos", "odl", "dynpac"]},
         "wim_url": description_schema,
         "wim": name_schema,
         "wim_type": {"enum": ["tapi", "onos", "odl", "dynpac"]},
         "wim_url": description_schema,

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

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


@@ -430,7 +434,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 = {


@@ -456,14 +460,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"]


@@ -489,18 +493,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
-        "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"],


@@ -511,8 +515,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,


@@ -532,8 +536,8 @@ 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,
         "vims": {"oneOf": [array_edition_schema, nameshort_list_schema]},
         "description": description_schema,
         "shared": bool_schema,
         "vims": {"oneOf": [array_edition_schema, nameshort_list_schema]},


@@ -557,7 +561,7 @@ user_new_schema = {
     "title": "New user schema",
     "type": "object",
     "properties": {
     "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,
     },


@@ -587,7 +591,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"],


@@ -629,7 +633,23 @@ nbi_edit_input_schemas = {
 nsi_slice_instantiate = deepcopy(ns_instantiate)
 nsi_slice_instantiate["title"] = "netslice subnet instantiation params input schema"
 nsi_slice_instantiate["properties"]["id"] = name_schema
 nsi_slice_instantiate = deepcopy(ns_instantiate)
 nsi_slice_instantiate["title"] = "netslice subnet instantiation params input schema"
 nsi_slice_instantiate["properties"]["id"] = name_schema

+nsi_slice_instantiate["properties"]["additionalParamsForNsi"] = object_schema
+nsi_slice_instantiate["properties"]["additionalParamsForSubnet"] = {
+    "type": "array",
+    "items": {
+        "type": "object",
+        "properties": {
+            "id": name_schema,
+            "additionalParamsForNs": object_schema,
+            "additionalParamsForVnf": additional_params_for_vnf
+        },
+        "required": ["id"],
+        "additionalProperties": False
+    }
+}

 del nsi_slice_instantiate["required"]
 del nsi_slice_instantiate["required"]

+del nsi_slice_instantiate["properties"]["additionalParamsForNs"]
+del nsi_slice_instantiate["properties"]["additionalParamsForVnf"]

 
 nsi_vld_instantiate = {
     "title": "netslice vld instantiation params input schema",
 
 nsi_vld_instantiate = {
     "title": "netslice vld instantiation params input schema",