Fix for test_remove_vnf failing in Heal VDU

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

diff --git a/osm_lcm/vim_sdn.py b/osm_lcm/vim_sdn.py
index 1641e96..c81969a 100644 (file)
--- a/osm_lcm/vim_sdn.py
+++ b/osm_lcm/vim_sdn.py
@@ -774,7 +774,7 @@ class WimLcm(LcmBase):
                         raise
             else:
                 # nothing to delete
-                self.logger.error(logging_text + "Nohing to remove at RO")
+                self.logger.error(logging_text + "Nothing to remove at RO")
             self.db.del_one("wim_accounts", {"_id": wim_id})
             db_wim = None
             self.logger.debug(logging_text + "Exit Ok")
@@ -1155,7 +1155,14 @@ class K8sClusterLcm(LcmBase):
             task2name = {}
             init_target = deep_get(db_k8scluster, ("_admin", "init"))
             step = "Launching k8scluster init tasks"
-            for task_name in ("helm-chart", "juju-bundle", "helm-chart-v3"):
+
+            k8s_deploy_methods = db_k8scluster.get("deployment_methods", {})
+            # for backwards compatibility and all-false case
+            if not any(k8s_deploy_methods.values()):
+                k8s_deploy_methods = {"helm-chart": True, "juju-bundle": True, "helm-chart-v3": True}
+            deploy_methods = tuple(filter(k8s_deploy_methods.get, k8s_deploy_methods))
+
+            for task_name in deploy_methods:
                 if init_target and task_name not in init_target:
                     continue
                 task = asyncio.ensure_future(