X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=blobdiff_plain;f=NG-RO%2Fosm_ng_ro%2Fns.py;h=35502c283cf90323eb3af6d1f17fa50f7e826d84;hp=ee0463a4db662f802e9c21030e72c4ebd0fe2023;hb=89278b8df3845c0c1fa862ba9be8c635ce3bfa64;hpb=71e66118a83d01540dbd66a7e3c15af68a53f3ca

diff --git a/NG-RO/osm_ng_ro/ns.py b/NG-RO/osm_ng_ro/ns.py
index ee0463a4..35502c28 100644
--- a/NG-RO/osm_ng_ro/ns.py
+++ b/NG-RO/osm_ng_ro/ns.py
@@ -18,6 +18,7 @@
 
 # import yaml
 import logging
+from typing import Any, Dict
 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,6 +386,49 @@ class Ns(object):
 
         return db_content
 
+    @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,
+        }
+
+        if extra_dict:
+            task.update(extra_dict)  # params, find_params, depends_on
+
+        deployment_info["task_index"] = deployment_info.get("task_index", 0) + 1
+
+        return task
+
     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)
@@ -441,37 +485,6 @@ class Ns(object):
 
                     index += 1
 
-            def _create_task(
-                target_id,
-                item,
-                action,
-                target_record,
-                target_record_id,
-                extra_dict=None,
-            ):
-                nonlocal task_index
-                nonlocal action_id
-                nonlocal nsr_id
-
-                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,
-                }
-
-                if extra_dict:
-                    task.update(extra_dict)  # params, find_params, depends_on
-
-                task_index += 1
-
-                return task
-
             def _create_ro_task(target_id, task):
                 nonlocal action_id
                 nonlocal task_index
@@ -917,6 +930,8 @@ class Ns(object):
             ):
                 nonlocal db_new_tasks
                 nonlocal tasks_by_target_record_id
+                nonlocal action_id
+                nonlocal nsr_id
                 nonlocal task_index
 
                 # ensure all the target_list elements has an "id". If not assign the index as id
@@ -956,15 +971,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
@@ -1010,16 +1033,25 @@ class Ns(object):
                             target_item, 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)
 
@@ -1030,6 +1062,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
@@ -1085,14 +1119,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: