Extracting Ns._process_net_params() and creating unit test
[osm/RO.git] / NG-RO / osm_ng_ro / ns.py
index 9841852..b95667f 100644 (file)
@@ -18,6 +18,7 @@
 
 # import yaml
 import logging
+from typing import Any, Dict, Tuple
 from traceback import format_exc as traceback_format_exc
 from osm_ng_ro.ns_thread import NsWorker, NsWorkerException, deep_get
 from osm_ng_ro.validation import validate_input, deploy_schema
@@ -385,378 +386,547 @@ class Ns(object):
 
         return db_content
 
-    def deploy(self, session, indata, version, nsr_id, *args, **kwargs):
-        self.logger.debug("ns.deploy nsr_id={} indata={}".format(nsr_id, indata))
-        validate_input(indata, deploy_schema)
-        action_id = indata.get("action_id", str(uuid4()))
-        task_index = 0
-        # get current deployment
-        db_nsr_update = {}  # update operation on nsrs
-        db_vnfrs_update = {}
-        db_vnfrs = {}  # vnf's info indexed by _id
-        nb_ro_tasks = 0  # for logging
-        vdu2cloud_init = indata.get("cloud_init_content") or {}
-        step = ""
-        logging_text = "Task deploy nsr_id={} action_id={} ".format(nsr_id, action_id)
-        self.logger.debug(logging_text + "Enter")
+    @staticmethod
+    def _create_task(
+        deployment_info: Dict[str, Any],
+        target_id: str,
+        item: str,
+        action: str,
+        target_record: str,
+        target_record_id: str,
+        extra_dict: Dict[str, Any] = None,
+    ) -> Dict[str, Any]:
+        """Function to create task dict from deployment information.
+
+        Args:
+            deployment_info (Dict[str, Any]): [description]
+            target_id (str): [description]
+            item (str): [description]
+            action (str): [description]
+            target_record (str): [description]
+            target_record_id (str): [description]
+            extra_dict (Dict[str, Any], optional): [description]. Defaults to None.
+
+        Returns:
+            Dict[str, Any]: [description]
+        """
+        task = {
+            "target_id": target_id,  # it will be removed before pushing at database
+            "action_id": deployment_info.get("action_id"),
+            "nsr_id": deployment_info.get("nsr_id"),
+            "task_id": f"{deployment_info.get('action_id')}:{deployment_info.get('task_index')}",
+            "status": "SCHEDULED",
+            "action": action,
+            "item": item,
+            "target_record": target_record,
+            "target_record_id": target_record_id,
+        }
 
-        try:
-            step = "Getting ns and vnfr record from db"
-            db_nsr = self.db.get_one("nsrs", {"_id": nsr_id})
-            db_new_tasks = []
-            tasks_by_target_record_id = {}
-            # read from db: vnf's of this ns
-            step = "Getting vnfrs from db"
-            db_vnfrs_list = self.db.get_list("vnfrs", {"nsr-id-ref": nsr_id})
+        if extra_dict:
+            task.update(extra_dict)  # params, find_params, depends_on
 
-            if not db_vnfrs_list:
-                raise NsException("Cannot obtain associated VNF for ns")
+        deployment_info["task_index"] = deployment_info.get("task_index", 0) + 1
 
-            for vnfr in db_vnfrs_list:
-                db_vnfrs[vnfr["_id"]] = vnfr
-                db_vnfrs_update[vnfr["_id"]] = {}
+        return task
 
-            now = time()
-            db_ro_nsr = self.db.get_one("ro_nsrs", {"_id": nsr_id}, fail_on_empty=False)
+    @staticmethod
+    def _create_ro_task(
+        target_id: str,
+        task: Dict[str, Any],
+    ) -> Dict[str, Any]:
+        """Function to create an RO task from task information.
 
-            if not db_ro_nsr:
-                db_ro_nsr = self._create_db_ro_nsrs(nsr_id, now)
+        Args:
+            target_id (str): [description]
+            task (Dict[str, Any]): [description]
 
-            ro_nsr_public_key = db_ro_nsr["public_key"]
+        Returns:
+            Dict[str, Any]: [description]
+        """
+        now = time()
+
+        _id = task.get("task_id")
+        db_ro_task = {
+            "_id": _id,
+            "locked_by": None,
+            "locked_at": 0.0,
+            "target_id": target_id,
+            "vim_info": {
+                "created": False,
+                "created_items": None,
+                "vim_id": None,
+                "vim_name": None,
+                "vim_status": None,
+                "vim_details": None,
+                "refresh_at": None,
+            },
+            "modified_at": now,
+            "created_at": now,
+            "to_check_at": now,
+            "tasks": [task],
+        }
 
-            # check that action_id is not in the list of actions. Suffixed with :index
-            if action_id in db_ro_nsr["actions"]:
-                index = 1
+        return db_ro_task
+
+    @staticmethod
+    def _process_image_params(
+        target_image: Dict[str, Any],
+        indata: Dict[str, Any],
+        vim_info: Dict[str, Any],
+        target_record_id: str,
+    ) -> Dict[str, Any]:
+        """Function to process VDU image parameters.
+
+        Args:
+            target_image (Dict[str, Any]): [description]
+            indata (Dict[str, Any]): [description]
+            vim_info (Dict[str, Any]): [description]
+            target_record_id (str): [description]
+
+        Returns:
+            Dict[str, Any]: [description]
+        """
+        find_params = {}
 
-                while True:
-                    new_action_id = "{}:{}".format(action_id, index)
+        if target_image.get("image"):
+            find_params["filter_dict"] = {"name": target_image.get("image")}
 
-                    if new_action_id not in db_ro_nsr["actions"]:
-                        action_id = new_action_id
-                        self.logger.debug(
-                            logging_text
-                            + "Changing action_id in use to {}".format(action_id)
-                        )
-                        break
+        if target_image.get("vim_image_id"):
+            find_params["filter_dict"] = {"id": target_image.get("vim_image_id")}
 
-                    index += 1
+        if target_image.get("image_checksum"):
+            find_params["filter_dict"] = {
+                "checksum": target_image.get("image_checksum")
+            }
 
-            def _create_task(
-                target_id,
-                item,
-                action,
-                target_record,
-                target_record_id,
-                extra_dict=None,
-            ):
-                nonlocal task_index
-                nonlocal action_id
-                nonlocal nsr_id
+        return {"find_params": find_params}
 
-                task = {
-                    "target_id": target_id,  # it will be removed before pushing at database
-                    "action_id": action_id,
-                    "nsr_id": nsr_id,
-                    "task_id": "{}:{}".format(action_id, task_index),
-                    "status": "SCHEDULED",
-                    "action": action,
-                    "item": item,
-                    "target_record": target_record,
-                    "target_record_id": target_record_id,
-                }
+    @staticmethod
+    def _get_resource_allocation_params(
+        quota_descriptor: Dict[str, Any],
+    ) -> Dict[str, Any]:
+        """Read the quota_descriptor from vnfd and fetch the resource allocation properties from the
+        descriptor object.
 
-                if extra_dict:
-                    task.update(extra_dict)  # params, find_params, depends_on
+        Args:
+            quota_descriptor (Dict[str, Any]): cpu/mem/vif/disk-io quota descriptor
 
-                task_index += 1
+        Returns:
+            Dict[str, Any]: quota params for limit, reserve, shares from the descriptor object
+        """
+        quota = {}
 
-                return task
+        if quota_descriptor.get("limit"):
+            quota["limit"] = int(quota_descriptor["limit"])
 
-            def _create_ro_task(target_id, task):
-                nonlocal action_id
-                nonlocal task_index
-                nonlocal now
-
-                _id = task["task_id"]
-                db_ro_task = {
-                    "_id": _id,
-                    "locked_by": None,
-                    "locked_at": 0.0,
-                    "target_id": target_id,
-                    "vim_info": {
-                        "created": False,
-                        "created_items": None,
-                        "vim_id": None,
-                        "vim_name": None,
-                        "vim_status": None,
-                        "vim_details": None,
-                        "refresh_at": None,
-                    },
-                    "modified_at": now,
-                    "created_at": now,
-                    "to_check_at": now,
-                    "tasks": [task],
-                }
+        if quota_descriptor.get("reserve"):
+            quota["reserve"] = int(quota_descriptor["reserve"])
 
-                return db_ro_task
+        if quota_descriptor.get("shares"):
+            quota["shares"] = int(quota_descriptor["shares"])
 
-            def _process_image_params(target_image, vim_info, target_record_id):
-                find_params = {}
+        return quota
 
-                if target_image.get("image"):
-                    find_params["filter_dict"] = {"name": target_image.get("image")}
+    @staticmethod
+    def _process_guest_epa_quota_params(
+        guest_epa_quota: Dict[str, Any],
+        epa_vcpu_set: bool,
+    ) -> Dict[str, Any]:
+        """Function to extract the guest epa quota parameters.
 
-                if target_image.get("vim_image_id"):
-                    find_params["filter_dict"] = {
-                        "id": target_image.get("vim_image_id")
-                    }
+        Args:
+            guest_epa_quota (Dict[str, Any]): [description]
+            epa_vcpu_set (bool): [description]
 
-                if target_image.get("image_checksum"):
-                    find_params["filter_dict"] = {
-                        "checksum": target_image.get("image_checksum")
-                    }
+        Returns:
+            Dict[str, Any]: [description]
+        """
+        result = {}
 
-                return {"find_params": find_params}
+        if guest_epa_quota.get("cpu-quota") and not epa_vcpu_set:
+            cpuquota = Ns._get_resource_allocation_params(
+                guest_epa_quota.get("cpu-quota")
+            )
 
-            def _process_flavor_params(target_flavor, vim_info, target_record_id):
-                def _get_resource_allocation_params(quota_descriptor):
-                    """
-                    read the quota_descriptor from vnfd and fetch the resource allocation properties from the
-                     descriptor object
-                    :param quota_descriptor: cpu/mem/vif/disk-io quota descriptor
-                    :return: quota params for limit, reserve, shares from the descriptor object
-                    """
-                    quota = {}
+            if cpuquota:
+                result["cpu-quota"] = cpuquota
 
-                    if quota_descriptor.get("limit"):
-                        quota["limit"] = int(quota_descriptor["limit"])
+        if guest_epa_quota.get("mem-quota"):
+            vduquota = Ns._get_resource_allocation_params(
+                guest_epa_quota.get("mem-quota")
+            )
 
-                    if quota_descriptor.get("reserve"):
-                        quota["reserve"] = int(quota_descriptor["reserve"])
+            if vduquota:
+                result["mem-quota"] = vduquota
 
-                    if quota_descriptor.get("shares"):
-                        quota["shares"] = int(quota_descriptor["shares"])
+        if guest_epa_quota.get("disk-io-quota"):
+            diskioquota = Ns._get_resource_allocation_params(
+                guest_epa_quota.get("disk-io-quota")
+            )
 
-                    return quota
+            if diskioquota:
+                result["disk-io-quota"] = diskioquota
 
-                flavor_data = {
-                    "disk": int(target_flavor["storage-gb"]),
-                    "ram": int(target_flavor["memory-mb"]),
-                    "vcpus": int(target_flavor["vcpu-count"]),
-                }
-                numa = {}
-                extended = {}
+        if guest_epa_quota.get("vif-quota"):
+            vifquota = Ns._get_resource_allocation_params(
+                guest_epa_quota.get("vif-quota")
+            )
 
-                if target_flavor.get("guest-epa"):
-                    extended = {}
-                    epa_vcpu_set = False
+            if vifquota:
+                result["vif-quota"] = vifquota
 
-                    if target_flavor["guest-epa"].get("numa-node-policy"):
-                        numa_node_policy = target_flavor["guest-epa"].get(
-                            "numa-node-policy"
-                        )
+        return result
 
-                        if numa_node_policy.get("node"):
-                            numa_node = numa_node_policy["node"][0]
-
-                            if numa_node.get("num-cores"):
-                                numa["cores"] = numa_node["num-cores"]
-                                epa_vcpu_set = True
-
-                            if numa_node.get("paired-threads"):
-                                if numa_node["paired-threads"].get(
-                                    "num-paired-threads"
-                                ):
-                                    numa["paired-threads"] = int(
-                                        numa_node["paired-threads"][
-                                            "num-paired-threads"
-                                        ]
-                                    )
-                                    epa_vcpu_set = True
-
-                                if len(
-                                    numa_node["paired-threads"].get("paired-thread-ids")
-                                ):
-                                    numa["paired-threads-id"] = []
-
-                                    for pair in numa_node["paired-threads"][
-                                        "paired-thread-ids"
-                                    ]:
-                                        numa["paired-threads-id"].append(
-                                            (
-                                                str(pair["thread-a"]),
-                                                str(pair["thread-b"]),
-                                            )
-                                        )
-
-                            if numa_node.get("num-threads"):
-                                numa["threads"] = int(numa_node["num-threads"])
-                                epa_vcpu_set = True
-
-                            if numa_node.get("memory-mb"):
-                                numa["memory"] = max(
-                                    int(numa_node["memory-mb"] / 1024), 1
-                                )
+    @staticmethod
+    def _process_guest_epa_numa_params(
+        guest_epa_quota: Dict[str, Any],
+    ) -> Tuple[Dict[str, Any], bool]:
+        """[summary]
 
-                    if target_flavor["guest-epa"].get("mempage-size"):
-                        extended["mempage-size"] = target_flavor["guest-epa"].get(
-                            "mempage-size"
-                        )
+        Args:
+            guest_epa_quota (Dict[str, Any]): [description]
 
-                    if (
-                        target_flavor["guest-epa"].get("cpu-pinning-policy")
-                        and not epa_vcpu_set
-                    ):
-                        if (
-                            target_flavor["guest-epa"]["cpu-pinning-policy"]
-                            == "DEDICATED"
-                        ):
-                            if (
-                                target_flavor["guest-epa"].get(
-                                    "cpu-thread-pinning-policy"
-                                )
-                                and target_flavor["guest-epa"][
-                                    "cpu-thread-pinning-policy"
-                                ]
-                                != "PREFER"
-                            ):
-                                numa["cores"] = max(flavor_data["vcpus"], 1)
-                            else:
-                                numa["threads"] = max(flavor_data["vcpus"], 1)
-
-                            epa_vcpu_set = True
-
-                    if target_flavor["guest-epa"].get("cpu-quota") and not epa_vcpu_set:
-                        cpuquota = _get_resource_allocation_params(
-                            target_flavor["guest-epa"].get("cpu-quota")
-                        )
+        Returns:
+            Tuple[Dict[str, Any], bool]: [description]
+        """
+        numa = {}
+        epa_vcpu_set = False
 
-                        if cpuquota:
-                            extended["cpu-quota"] = cpuquota
+        if guest_epa_quota.get("numa-node-policy"):
+            numa_node_policy = guest_epa_quota.get("numa-node-policy")
 
-                    if target_flavor["guest-epa"].get("mem-quota"):
-                        vduquota = _get_resource_allocation_params(
-                            target_flavor["guest-epa"].get("mem-quota")
-                        )
+            if numa_node_policy.get("node"):
+                numa_node = numa_node_policy["node"][0]
 
-                        if vduquota:
-                            extended["mem-quota"] = vduquota
+                if numa_node.get("num-cores"):
+                    numa["cores"] = numa_node["num-cores"]
+                    epa_vcpu_set = True
 
-                    if target_flavor["guest-epa"].get("disk-io-quota"):
-                        diskioquota = _get_resource_allocation_params(
-                            target_flavor["guest-epa"].get("disk-io-quota")
-                        )
+                paired_threads = numa_node.get("paired-threads", {})
+                if paired_threads.get("num-paired-threads"):
+                    numa["paired-threads"] = int(
+                        numa_node["paired-threads"]["num-paired-threads"]
+                    )
+                    epa_vcpu_set = True
 
-                        if diskioquota:
-                            extended["disk-io-quota"] = diskioquota
+                if paired_threads.get("paired-thread-ids"):
+                    numa["paired-threads-id"] = []
 
-                    if target_flavor["guest-epa"].get("vif-quota"):
-                        vifquota = _get_resource_allocation_params(
-                            target_flavor["guest-epa"].get("vif-quota")
+                    for pair in paired_threads["paired-thread-ids"]:
+                        numa["paired-threads-id"].append(
+                            (
+                                str(pair["thread-a"]),
+                                str(pair["thread-b"]),
+                            )
                         )
 
-                        if vifquota:
-                            extended["vif-quota"] = vifquota
+                if numa_node.get("num-threads"):
+                    numa["threads"] = int(numa_node["num-threads"])
+                    epa_vcpu_set = True
 
-                if numa:
-                    extended["numas"] = [numa]
+                if numa_node.get("memory-mb"):
+                    numa["memory"] = max(int(int(numa_node["memory-mb"]) / 1024), 1)
 
-                if extended:
-                    flavor_data["extended"] = extended
+        return numa, epa_vcpu_set
 
-                extra_dict = {"find_params": {"flavor_data": flavor_data}}
-                flavor_data_name = flavor_data.copy()
-                flavor_data_name["name"] = target_flavor["name"]
-                extra_dict["params"] = {"flavor_data": flavor_data_name}
+    @staticmethod
+    def _process_guest_epa_cpu_pinning_params(
+        guest_epa_quota: Dict[str, Any],
+        vcpu_count: int,
+        epa_vcpu_set: bool,
+    ) -> Tuple[Dict[str, Any], bool]:
+        """[summary]
 
-                return extra_dict
+        Args:
+            guest_epa_quota (Dict[str, Any]): [description]
+            vcpu_count (int): [description]
+            epa_vcpu_set (bool): [description]
 
-            def _ip_profile_2_ro(ip_profile):
-                if not ip_profile:
-                    return None
-
-                ro_ip_profile = {
-                    "ip_version": "IPv4"
-                    if "v4" in ip_profile.get("ip-version", "ipv4")
-                    else "IPv6",
-                    "subnet_address": ip_profile.get("subnet-address"),
-                    "gateway_address": ip_profile.get("gateway-address"),
-                    "dhcp_enabled": ip_profile.get("dhcp-params", {}).get(
-                        "enabled", False
-                    ),
-                    "dhcp_start_address": ip_profile.get("dhcp-params", {}).get(
-                        "start-address", None
-                    ),
-                    "dhcp_count": ip_profile.get("dhcp-params", {}).get("count", None),
-                }
+        Returns:
+            Tuple[Dict[str, Any], bool]: [description]
+        """
+        numa = {}
+        local_epa_vcpu_set = epa_vcpu_set
+
+        if (
+            guest_epa_quota.get("cpu-pinning-policy") == "DEDICATED"
+            and not epa_vcpu_set
+        ):
+            numa[
+                "cores"
+                if guest_epa_quota.get("cpu-thread-pinning-policy") != "PREFER"
+                else "threads"
+            ] = max(vcpu_count, 1)
+            local_epa_vcpu_set = True
+
+        return numa, local_epa_vcpu_set
+
+    @staticmethod
+    def _process_epa_params(
+        target_flavor: Dict[str, Any],
+    ) -> Dict[str, Any]:
+        """[summary]
+
+        Args:
+            target_flavor (Dict[str, Any]): [description]
+
+        Returns:
+            Dict[str, Any]: [description]
+        """
+        extended = {}
+        numa = {}
 
-                if ip_profile.get("dns-server"):
-                    ro_ip_profile["dns_address"] = ";".join(
-                        [v["address"] for v in ip_profile["dns-server"]]
-                    )
+        if target_flavor.get("guest-epa"):
+            guest_epa = target_flavor["guest-epa"]
 
-                if ip_profile.get("security-group"):
-                    ro_ip_profile["security_group"] = ip_profile["security-group"]
+            numa, epa_vcpu_set = Ns._process_guest_epa_numa_params(
+                guest_epa_quota=guest_epa
+            )
 
-                return ro_ip_profile
+            if guest_epa.get("mempage-size"):
+                extended["mempage-size"] = guest_epa.get("mempage-size")
 
-            def _process_net_params(target_vld, vim_info, target_record_id):
-                nonlocal indata
-                extra_dict = {}
-
-                if vim_info.get("sdn"):
-                    # vnf_preffix = "vnfrs:{}".format(vnfr_id)
-                    # ns_preffix = "nsrs:{}".format(nsr_id)
-                    # remove the ending ".sdn
-                    vld_target_record_id, _, _ = target_record_id.rpartition(".")
-                    extra_dict["params"] = {
-                        k: vim_info[k]
-                        for k in ("sdn-ports", "target_vim", "vlds", "type")
-                        if vim_info.get(k)
-                    }
+            tmp_numa, epa_vcpu_set = Ns._process_guest_epa_cpu_pinning_params(
+                guest_epa_quota=guest_epa,
+                vcpu_count=int(target_flavor.get("vcpu-count", 1)),
+                epa_vcpu_set=epa_vcpu_set,
+            )
+            numa.update(tmp_numa)
 
-                    # TODO needed to add target_id in the dependency.
-                    if vim_info.get("target_vim"):
-                        extra_dict["depends_on"] = [
-                            vim_info.get("target_vim") + " " + vld_target_record_id
-                        ]
+            extended.update(
+                Ns._process_guest_epa_quota_params(
+                    guest_epa_quota=guest_epa,
+                    epa_vcpu_set=epa_vcpu_set,
+                )
+            )
 
-                    return extra_dict
+        if numa:
+            extended["numas"] = [numa]
 
-                if vim_info.get("vim_network_name"):
-                    extra_dict["find_params"] = {
-                        "filter_dict": {"name": vim_info.get("vim_network_name")}
-                    }
-                elif vim_info.get("vim_network_id"):
-                    extra_dict["find_params"] = {
-                        "filter_dict": {"id": vim_info.get("vim_network_id")}
-                    }
-                elif target_vld.get("mgmt-network"):
-                    extra_dict["find_params"] = {"mgmt": True, "name": target_vld["id"]}
-                else:
-                    # create
-                    extra_dict["params"] = {
-                        "net_name": "{}-{}".format(
-                            indata["name"][:16],
-                            target_vld.get("name", target_vld["id"])[:16],
-                        ),
-                        "ip_profile": _ip_profile_2_ro(vim_info.get("ip_profile")),
-                        "provider_network_profile": vim_info.get("provider_network"),
-                    }
+        return extended
 
-                    if not target_vld.get("underlay"):
-                        extra_dict["params"]["net_type"] = "bridge"
-                    else:
-                        extra_dict["params"]["net_type"] = (
-                            "ptp" if target_vld.get("type") == "ELINE" else "data"
+    @staticmethod
+    def _process_flavor_params(
+        target_flavor: Dict[str, Any],
+        indata: Dict[str, Any],
+        vim_info: Dict[str, Any],
+        target_record_id: str,
+    ) -> Dict[str, Any]:
+        """[summary]
+
+        Args:
+            target_flavor (Dict[str, Any]): [description]
+            indata (Dict[str, Any]): [description]
+            vim_info (Dict[str, Any]): [description]
+            target_record_id (str): [description]
+
+        Returns:
+            Dict[str, Any]: [description]
+        """
+        flavor_data = {
+            "disk": int(target_flavor["storage-gb"]),
+            "ram": int(target_flavor["memory-mb"]),
+            "vcpus": int(target_flavor["vcpu-count"]),
+        }
+
+        target_vdur = {}
+        for vnf in indata.get("vnf", []):
+            for vdur in vnf.get("vdur", []):
+                if vdur.get("ns-flavor-id") == target_flavor["id"]:
+                    target_vdur = vdur
+
+        for storage in target_vdur.get("virtual-storages", []):
+            if (
+                storage.get("type-of-storage")
+                == "etsi-nfv-descriptors:ephemeral-storage"
+            ):
+                flavor_data["ephemeral"] = int(storage.get("size-of-storage", 0))
+            elif storage.get("type-of-storage") == "etsi-nfv-descriptors:swap-storage":
+                flavor_data["swap"] = int(storage.get("size-of-storage", 0))
+
+        extended = Ns._process_epa_params(target_flavor)
+        if extended:
+            flavor_data["extended"] = extended
+
+        extra_dict = {"find_params": {"flavor_data": flavor_data}}
+        flavor_data_name = flavor_data.copy()
+        flavor_data_name["name"] = target_flavor["name"]
+        extra_dict["params"] = {"flavor_data": flavor_data_name}
+
+        return extra_dict
+
+    @staticmethod
+    def _ip_profile_to_ro(
+        ip_profile: Dict[str, Any],
+    ) -> Dict[str, Any]:
+        """[summary]
+
+        Args:
+            ip_profile (Dict[str, Any]): [description]
+
+        Returns:
+            Dict[str, Any]: [description]
+        """
+        if not ip_profile:
+            return None
+
+        ro_ip_profile = {
+            "ip_version": "IPv4"
+            if "v4" in ip_profile.get("ip-version", "ipv4")
+            else "IPv6",
+            "subnet_address": ip_profile.get("subnet-address"),
+            "gateway_address": ip_profile.get("gateway-address"),
+            "dhcp_enabled": ip_profile.get("dhcp-params", {}).get("enabled", False),
+            "dhcp_start_address": ip_profile.get("dhcp-params", {}).get(
+                "start-address", None
+            ),
+            "dhcp_count": ip_profile.get("dhcp-params", {}).get("count", None),
+        }
+
+        if ip_profile.get("dns-server"):
+            ro_ip_profile["dns_address"] = ";".join(
+                [v["address"] for v in ip_profile["dns-server"] if v.get("address")]
+            )
+
+        if ip_profile.get("security-group"):
+            ro_ip_profile["security_group"] = ip_profile["security-group"]
+
+        return ro_ip_profile
+
+    @staticmethod
+    def _process_net_params(
+        target_vld: Dict[str, Any],
+        indata: Dict[str, Any],
+        vim_info: Dict[str, Any],
+        target_record_id: str,
+    ) -> Dict[str, Any]:
+        """Function to process network parameters.
+
+        Args:
+            target_vld (Dict[str, Any]): [description]
+            indata (Dict[str, Any]): [description]
+            vim_info (Dict[str, Any]): [description]
+            target_record_id (str): [description]
+
+        Returns:
+            Dict[str, Any]: [description]
+        """
+        extra_dict = {}
+
+        if vim_info.get("sdn"):
+            # vnf_preffix = "vnfrs:{}".format(vnfr_id)
+            # ns_preffix = "nsrs:{}".format(nsr_id)
+            # remove the ending ".sdn
+            vld_target_record_id, _, _ = target_record_id.rpartition(".")
+            extra_dict["params"] = {
+                k: vim_info[k]
+                for k in ("sdn-ports", "target_vim", "vlds", "type")
+                if vim_info.get(k)
+            }
+
+            # TODO needed to add target_id in the dependency.
+            if vim_info.get("target_vim"):
+                extra_dict["depends_on"] = [
+                    f"{vim_info.get('target_vim')} {vld_target_record_id}"
+                ]
+
+            return extra_dict
+
+        if vim_info.get("vim_network_name"):
+            extra_dict["find_params"] = {
+                "filter_dict": {
+                    "name": vim_info.get("vim_network_name"),
+                },
+            }
+        elif vim_info.get("vim_network_id"):
+            extra_dict["find_params"] = {
+                "filter_dict": {
+                    "id": vim_info.get("vim_network_id"),
+                },
+            }
+        elif target_vld.get("mgmt-network"):
+            extra_dict["find_params"] = {
+                "mgmt": True,
+                "name": target_vld["id"],
+            }
+        else:
+            # create
+            extra_dict["params"] = {
+                "net_name": (
+                    f"{indata.get('name')[:16]}-{target_vld.get('name', target_vld.get('id'))[:16]}"
+                ),
+                "ip_profile": Ns._ip_profile_to_ro(vim_info.get("ip_profile")),
+                "provider_network_profile": vim_info.get("provider_network"),
+            }
+
+            if not target_vld.get("underlay"):
+                extra_dict["params"]["net_type"] = "bridge"
+            else:
+                extra_dict["params"]["net_type"] = (
+                    "ptp" if target_vld.get("type") == "ELINE" else "data"
+                )
+
+        return extra_dict
+
+    def deploy(self, session, indata, version, nsr_id, *args, **kwargs):
+        self.logger.debug("ns.deploy nsr_id={} indata={}".format(nsr_id, indata))
+        validate_input(indata, deploy_schema)
+        action_id = indata.get("action_id", str(uuid4()))
+        task_index = 0
+        # get current deployment
+        db_nsr_update = {}  # update operation on nsrs
+        db_vnfrs_update = {}
+        db_vnfrs = {}  # vnf's info indexed by _id
+        nb_ro_tasks = 0  # for logging
+        vdu2cloud_init = indata.get("cloud_init_content") or {}
+        step = ""
+        logging_text = "Task deploy nsr_id={} action_id={} ".format(nsr_id, action_id)
+        self.logger.debug(logging_text + "Enter")
+
+        try:
+            step = "Getting ns and vnfr record from db"
+            db_nsr = self.db.get_one("nsrs", {"_id": nsr_id})
+            db_new_tasks = []
+            tasks_by_target_record_id = {}
+            # read from db: vnf's of this ns
+            step = "Getting vnfrs from db"
+            db_vnfrs_list = self.db.get_list("vnfrs", {"nsr-id-ref": nsr_id})
+
+            if not db_vnfrs_list:
+                raise NsException("Cannot obtain associated VNF for ns")
+
+            for vnfr in db_vnfrs_list:
+                db_vnfrs[vnfr["_id"]] = vnfr
+                db_vnfrs_update[vnfr["_id"]] = {}
+
+            now = time()
+            db_ro_nsr = self.db.get_one("ro_nsrs", {"_id": nsr_id}, fail_on_empty=False)
+
+            if not db_ro_nsr:
+                db_ro_nsr = self._create_db_ro_nsrs(nsr_id, now)
+
+            ro_nsr_public_key = db_ro_nsr["public_key"]
+
+            # check that action_id is not in the list of actions. Suffixed with :index
+            if action_id in db_ro_nsr["actions"]:
+                index = 1
+
+                while True:
+                    new_action_id = "{}:{}".format(action_id, index)
+
+                    if new_action_id not in db_ro_nsr["actions"]:
+                        action_id = new_action_id
+                        self.logger.debug(
+                            logging_text
+                            + "Changing action_id in use to {}".format(action_id)
                         )
+                        break
 
-                return extra_dict
+                    index += 1
 
-            def _process_vdu_params(target_vdu, vim_info, target_record_id):
+            def _process_vdu_params(target_vdu, indata, vim_info, target_record_id):
                 nonlocal vnfr_id
                 nonlocal nsr_id
-                nonlocal indata
                 nonlocal vnfr
                 nonlocal vdu2cloud_init
                 nonlocal tasks_by_target_record_id
@@ -877,6 +1047,15 @@ class Ns(object):
                 if ssh_keys:
                     cloud_config["key-pairs"] = ssh_keys
 
+                disk_list = None
+                if target_vdu.get("virtual-storages"):
+                    disk_list = [
+                        {"size": disk["size-of-storage"]}
+                        for disk in target_vdu["virtual-storages"]
+                        if disk.get("type-of-storage")
+                        == "persistent-storage:persistent-storage"
+                    ]
+
                 extra_dict["params"] = {
                     "name": "{}-{}-{}-{}".format(
                         indata["name"][:16],
@@ -890,7 +1069,7 @@ class Ns(object):
                     "flavor_id": "TASK-" + flavor_text,
                     "net_list": net_list,
                     "cloud_config": cloud_config or None,
-                    "disk_list": None,  # TODO
+                    "disk_list": disk_list,
                     "availability_zone_index": None,  # TODO
                     "availability_zone_list": None,  # TODO
                 }
@@ -908,7 +1087,10 @@ class Ns(object):
             ):
                 nonlocal db_new_tasks
                 nonlocal tasks_by_target_record_id
+                nonlocal action_id
+                nonlocal nsr_id
                 nonlocal task_index
+                nonlocal indata
 
                 # ensure all the target_list elements has an "id". If not assign the index as id
                 for target_index, tl in enumerate(target_list):
@@ -947,15 +1129,23 @@ class Ns(object):
                                 item_ = "sdn_net"
                                 target_record_id += ".sdn"
 
-                            task = _create_task(
-                                target_vim,
-                                item_,
-                                "DELETE",
-                                target_record="{}.{}.vim_info.{}".format(
-                                    db_record, item_index, target_vim
-                                ),
+                            deployment_info = {
+                                "action_id": action_id,
+                                "nsr_id": nsr_id,
+                                "task_index": task_index,
+                            }
+
+                            task = Ns._create_task(
+                                deployment_info=deployment_info,
+                                target_id=target_vim,
+                                item=item_,
+                                action="DELETE",
+                                target_record=f"{db_record}.{item_index}.vim_info.{target_vim}",
                                 target_record_id=target_record_id,
                             )
+
+                            task_index = deployment_info.get("task_index")
+
                             tasks_by_target_record_id[target_record_id] = task
                             db_new_tasks.append(task)
                             # TODO delete
@@ -998,19 +1188,28 @@ class Ns(object):
                             target_record_id += ".sdn"
 
                         extra_dict = process_params(
-                            target_item, target_viminfo, target_record_id
+                            target_item, indata, target_viminfo, target_record_id
                         )
                         self._assign_vim(target_vim)
-                        task = _create_task(
-                            target_vim,
-                            item_,
-                            "CREATE",
-                            target_record="{}.{}.vim_info.{}".format(
-                                db_record, item_index, target_vim
-                            ),
+
+                        deployment_info = {
+                            "action_id": action_id,
+                            "nsr_id": nsr_id,
+                            "task_index": task_index,
+                        }
+
+                        task = Ns._create_task(
+                            deployment_info=deployment_info,
+                            target_id=target_vim,
+                            item=item_,
+                            action="CREATE",
+                            target_record=f"{db_record}.{item_index}.vim_info.{target_vim}",
                             target_record_id=target_record_id,
                             extra_dict=extra_dict,
                         )
+
+                        task_index = deployment_info.get("task_index")
+
                         tasks_by_target_record_id[target_record_id] = task
                         db_new_tasks.append(task)
 
@@ -1021,6 +1220,8 @@ class Ns(object):
 
             def _process_action(indata):
                 nonlocal db_new_tasks
+                nonlocal action_id
+                nonlocal nsr_id
                 nonlocal task_index
                 nonlocal db_vnfrs
                 nonlocal db_ro_nsr
@@ -1076,14 +1277,25 @@ class Ns(object):
                                     ],
                                 },
                             }
-                            task = _create_task(
-                                target_vim,
-                                "vdu",
-                                "EXEC",
+
+                            deployment_info = {
+                                "action_id": action_id,
+                                "nsr_id": nsr_id,
+                                "task_index": task_index,
+                            }
+
+                            task = Ns._create_task(
+                                deployment_info=deployment_info,
+                                target_id=target_vim,
+                                item="vdu",
+                                action="EXEC",
                                 target_record=target_record,
                                 target_record_id=None,
                                 extra_dict=extra_dict,
                             )
+
+                            task_index = deployment_info.get("task_index")
+
                             db_new_tasks.append(task)
 
             with self.write_lock:
@@ -1100,7 +1312,7 @@ class Ns(object):
                         db_update=db_nsr_update,
                         db_path="vld",
                         item="net",
-                        process_params=_process_net_params,
+                        process_params=Ns._process_net_params,
                     )
 
                     step = "process NS images"
@@ -1111,7 +1323,7 @@ class Ns(object):
                         db_update=db_nsr_update,
                         db_path="image",
                         item="image",
-                        process_params=_process_image_params,
+                        process_params=Ns._process_image_params,
                     )
 
                     step = "process NS flavors"
@@ -1122,7 +1334,7 @@ class Ns(object):
                         db_update=db_nsr_update,
                         db_path="flavor",
                         item="flavor",
-                        process_params=_process_flavor_params,
+                        process_params=Ns._process_flavor_params,
                     )
 
                     # VNF.vld
@@ -1145,7 +1357,7 @@ class Ns(object):
                             db_update=db_vnfrs_update[vnfr["_id"]],
                             db_path="vld",
                             item="net",
-                            process_params=_process_net_params,
+                            process_params=Ns._process_net_params,
                         )
 
                         target_list = target_vnf.get("vdur") if target_vnf else None
@@ -1190,7 +1402,7 @@ class Ns(object):
                     ):
                         # Create a ro_task
                         step = "Updating database, Creating ro_tasks"
-                        db_ro_task = _create_ro_task(target_id, db_task)
+                        db_ro_task = Ns._create_ro_task(target_id, db_task)
                         nb_ro_tasks += 1
                         self.db.create("ro_tasks", db_ro_task)