X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=NG-RO%2Fosm_ng_ro%2Fns_thread.py;h=e65ae3fc4091949dd387d81605c47c22e344dbca;hb=refs%2Fchanges%2F68%2F12068%2F1;hp=106830de3b5902d120c463ea4b7f04e3dad58f0c;hpb=7399321457dedb7ad2c40280cc5ff6f367d9b2ca;p=osm%2FRO.git

diff --git a/NG-RO/osm_ng_ro/ns_thread.py b/NG-RO/osm_ng_ro/ns_thread.py
index 106830de..e65ae3fc 100644
--- a/NG-RO/osm_ng_ro/ns_thread.py
+++ b/NG-RO/osm_ng_ro/ns_thread.py
@@ -32,6 +32,7 @@ import queue
 from shutil import rmtree
 import threading
 import time
+import traceback
 from unittest.mock import Mock
 
 from importlib_metadata import entry_points
@@ -596,6 +597,7 @@ class VimInteractionVdu(VimInteractionBase):
         except (vimconn.VimConnException, NsWorkerException) as e:
             retries += 1
 
+            self.logger.debug(traceback.format_exc())
             if retries < self.max_retries_inject_ssh_key:
                 return (
                     "BUILD",
@@ -813,9 +815,28 @@ class VimInteractionAffinityGroup(VimInteractionBase):
 
         try:
             affinity_group_vim_id = None
+            affinity_group_data = None
 
             if task.get("params"):
-                affinity_group_data = task["params"]["affinity_group_data"]
+                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
                 )