X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=blobdiff_plain;f=NG-RO%2Fosm_ng_ro%2Fns_thread.py;h=ab58a1f290d9be8f975fe5c1c06aaaaff3c049d2;hp=b8b242cab20da6bfba9657e85e5c564b4b5db390;hb=123de18fe672551ac782aec4188150d3fe76c961;hpb=2f4aaaa4f0e721312164252931954dc6db28abe1

diff --git a/NG-RO/osm_ng_ro/ns_thread.py b/NG-RO/osm_ng_ro/ns_thread.py
index b8b242ca..ab58a1f2 100644
--- a/NG-RO/osm_ng_ro/ns_thread.py
+++ b/NG-RO/osm_ng_ro/ns_thread.py
@@ -369,6 +369,23 @@ class VimInteractionVdu(VimInteractionBase):
             if params_copy["flavor_id"].startswith("TASK-"):
                 params_copy["flavor_id"] = task_depends[params_copy["flavor_id"]]
 
+            affinity_group_list = params_copy["affinity_group_list"]
+            for affinity_group in affinity_group_list:
+                # change task_id into affinity_group_id
+                if "affinity_group_id" in affinity_group and affinity_group[
+                    "affinity_group_id"
+                ].startswith("TASK-"):
+                    affinity_group_id = task_depends[
+                        affinity_group["affinity_group_id"]
+                    ]
+
+                    if not affinity_group_id:
+                        raise NsWorkerException(
+                            "found for {}".format(affinity_group["affinity_group_id"])
+                        )
+
+                    affinity_group["affinity_group_id"] = affinity_group_id
+
             vim_vm_id, created_items = target_vim.new_vminstance(**params_copy)
             interfaces = [iface["vim_id"] for iface in params_copy["net_list"]]
 
@@ -744,6 +761,112 @@ class VimInteractionFlavor(VimInteractionBase):
             return "FAILED", ro_vim_item_update
 
 
+class VimInteractionAffinityGroup(VimInteractionBase):
+    def delete(self, ro_task, task_index):
+        task = ro_task["tasks"][task_index]
+        task_id = task["task_id"]
+        affinity_group_vim_id = ro_task["vim_info"]["vim_id"]
+        ro_vim_item_update_ok = {
+            "vim_status": "DELETED",
+            "created": False,
+            "vim_details": "DELETED",
+            "vim_id": None,
+        }
+
+        try:
+            if affinity_group_vim_id:
+                target_vim = self.my_vims[ro_task["target_id"]]
+                target_vim.delete_affinity_group(affinity_group_vim_id)
+        except vimconn.VimConnNotFoundException:
+            ro_vim_item_update_ok["vim_details"] = "already deleted"
+        except vimconn.VimConnException as e:
+            self.logger.error(
+                "ro_task={} vim={} del-affinity-or-anti-affinity-group={}: {}".format(
+                    ro_task["_id"], ro_task["target_id"], affinity_group_vim_id, e
+                )
+            )
+            ro_vim_item_update = {
+                "vim_status": "VIM_ERROR",
+                "vim_details": "Error while deleting: {}".format(e),
+            }
+
+            return "FAILED", ro_vim_item_update
+
+        self.logger.debug(
+            "task={} {} del-affinity-or-anti-affinity-group={} {}".format(
+                task_id,
+                ro_task["target_id"],
+                affinity_group_vim_id,
+                ro_vim_item_update_ok.get("vim_details", ""),
+            )
+        )
+
+        return "DONE", ro_vim_item_update_ok
+
+    def new(self, ro_task, task_index, task_depends):
+        task = ro_task["tasks"][task_index]
+        task_id = task["task_id"]
+        created = False
+        created_items = {}
+        target_vim = self.my_vims[ro_task["target_id"]]
+
+        try:
+            affinity_group_vim_id = None
+            affinity_group_data = None
+
+            if task.get("params"):
+                affinity_group_data = task["params"].get("affinity_group_data")
+
+            if affinity_group_data and affinity_group_data.get("vim-affinity-group-id"):
+                try:
+                    param_affinity_group_id = task["params"]["affinity_group_data"].get(
+                        "vim-affinity-group-id"
+                    )
+                    affinity_group_vim_id = target_vim.get_affinity_group(
+                        param_affinity_group_id
+                    ).get("id")
+                except vimconn.VimConnNotFoundException:
+                    self.logger.error(
+                        "task={} {} new-affinity-or-anti-affinity-group. Provided VIM Affinity Group ID {}"
+                        "could not be found at VIM. Creating a new one.".format(
+                            task_id, ro_task["target_id"], param_affinity_group_id
+                        )
+                    )
+
+            if not affinity_group_vim_id and affinity_group_data:
+                affinity_group_vim_id = target_vim.new_affinity_group(
+                    affinity_group_data
+                )
+                created = True
+
+            ro_vim_item_update = {
+                "vim_id": affinity_group_vim_id,
+                "vim_status": "DONE",
+                "created": created,
+                "created_items": created_items,
+                "vim_details": None,
+            }
+            self.logger.debug(
+                "task={} {} new-affinity-or-anti-affinity-group={} created={}".format(
+                    task_id, ro_task["target_id"], affinity_group_vim_id, created
+                )
+            )
+
+            return "DONE", ro_vim_item_update
+        except (vimconn.VimConnException, NsWorkerException) as e:
+            self.logger.error(
+                "task={} vim={} new-affinity-or-anti-affinity-group:"
+                " {}".format(task_id, ro_task["target_id"], e)
+            )
+            ro_vim_item_update = {
+                "vim_status": "VIM_ERROR",
+                "created": created,
+                "vim_details": str(e),
+            }
+
+            return "FAILED", ro_vim_item_update
+
+
 class VimInteractionSdnNet(VimInteractionBase):
     @staticmethod
     def _match_pci(port_pci, mapping):
@@ -1179,6 +1302,9 @@ class NsWorker(threading.Thread):
             "sdn_net": VimInteractionSdnNet(
                 self.db, self.my_vims, self.db_vims, self.logger
             ),
+            "affinity-or-anti-affinity-group": VimInteractionAffinityGroup(
+                self.db, self.my_vims, self.db_vims, self.logger
+            ),
         }
         self.time_last_task_processed = None
         # lists of tasks to delete because nsrs or vnfrs has been deleted from db