Heal: Await heal operation in RO before N2VC part to avoid errors

[osm/LCM.git] / osm_lcm / ns.py

diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py
index e54ec56..0b69062 100644 (file)
--- a/osm_lcm/ns.py
+++ b/osm_lcm/ns.py
@@ -5236,12 +5236,17 @@ class NsLcm(LcmBase):
                         parts = kdu_model.split(sep=":")
                         if len(parts) == 2:
                             kdu_model = parts[0]
+                    if desc_params.get("kdu_atomic_upgrade"):
+                        atomic_upgrade = desc_params.get("kdu_atomic_upgrade").lower() in ("yes", "true", "1")
+                        del desc_params["kdu_atomic_upgrade"]
+                    else:
+                        atomic_upgrade = True
 
                     detailed_status = await asyncio.wait_for(
                         self.k8scluster_map[kdu["k8scluster-type"]].upgrade(
                             cluster_uuid=kdu.get("k8scluster-uuid"),
                             kdu_instance=kdu.get("kdu-instance"),
-                            atomic=True,
+                            atomic=atomic_upgrade,
                             kdu_model=kdu_model,
                             params=desc_params,
                             db_dict=db_dict,
@@ -7518,17 +7523,22 @@ class NsLcm(LcmBase):
             self.update_db_2("nsrs", nsr_id, db_nsr_update)
 
             step = "Sending heal order to VIM"
-            task_ro = asyncio.ensure_future(
-                self.heal_RO(
+            #task_ro = asyncio.ensure_future(
+            #    self.heal_RO(
+            #        logging_text=logging_text,
+            #        nsr_id=nsr_id,
+            #        db_nslcmop=db_nslcmop,
+            #        stage=stage,
+            #    )
+            #)
+            #self.lcm_tasks.register("ns", nsr_id, nslcmop_id, "heal_RO", task_ro)
+            #tasks_dict_info[task_ro] = "Healing at VIM"
+            await self.heal_RO(
                     logging_text=logging_text,
                     nsr_id=nsr_id,
                     db_nslcmop=db_nslcmop,
                     stage=stage,
                 )
-            )
-            self.lcm_tasks.register("ns", nsr_id, nslcmop_id, "heal_RO", task_ro)
-            tasks_dict_info[task_ro] = "Healing at VIM"
-
             # VCA tasks
             # read from db: nsd
             stage[1] = "Getting nsd={} from db.".format(db_nsr["nsd-id"])