Fix minor issue in LCMHelmConn

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

diff --git a/osm_lcm/lcm_helm_conn.py b/osm_lcm/lcm_helm_conn.py
index 27c330f..34e4915 100644 (file)
--- a/osm_lcm/lcm_helm_conn.py
+++ b/osm_lcm/lcm_helm_conn.py
@@ -233,17 +233,27 @@ class LCMHelmConn(N2VCConnector, LcmBase):
 
             self.log.debug("install helm chart: {}".format(full_path))
             if vca_type == "helm":
-                helm_id = await self._k8sclusterhelm2.install(system_cluster_uuid, kdu_model=full_path,
-                                                              namespace=self._KUBECTL_OSM_NAMESPACE,
-                                                              params=config,
-                                                              db_dict=db_dict,
-                                                              timeout=progress_timeout)
+                helm_id = self._k8sclusterhelm2.generate_kdu_instance_name(
+                    db_dict=db_dict,
+                    kdu_model=full_path,
+                )
+                await self._k8sclusterhelm2.install(system_cluster_uuid, kdu_model=full_path,
+                                                    kdu_instance=helm_id,
+                                                    namespace=self._KUBECTL_OSM_NAMESPACE,
+                                                    params=config,
+                                                    db_dict=db_dict,
+                                                    timeout=progress_timeout)
             else:
-                helm_id = await self._k8sclusterhelm3.install(system_cluster_uuid, kdu_model=full_path,
-                                                              namespace=self._KUBECTL_OSM_NAMESPACE,
-                                                              params=config,
-                                                              db_dict=db_dict,
-                                                              timeout=progress_timeout)
+                helm_id = self._k8sclusterhelm2.generate_kdu_instance_name(
+                    db_dict=db_dict,
+                    kdu_model=full_path,
+                )
+                await self._k8sclusterhelm3.install(system_cluster_uuid, kdu_model=full_path,
+                                                    kdu_instance=helm_id,
+                                                    namespace=self._KUBECTL_OSM_NAMESPACE,
+                                                    params=config,
+                                                    db_dict=db_dict,
+                                                    timeout=progress_timeout)
 
             ee_id = "{}:{}.{}".format(vca_type, self._KUBECTL_OSM_NAMESPACE, helm_id)
             return ee_id, None
@@ -424,7 +434,13 @@ class LCMHelmConn(N2VCConnector, LcmBase):
         # nothing to be done
         pass
 
-    async def delete_execution_environment(self, ee_id: str, db_dict: dict = None, total_timeout: float = None):
+    async def delete_execution_environment(
+        self,
+        ee_id: str,
+        db_dict: dict = None,
+        total_timeout: float = None,
+        **kwargs,
+    ):
         """
         Delete an execution environment
         :param str ee_id: id of the execution environment to delete, included namespace.helm_id