Fix bug 2036

[osm/N2VC.git] / n2vc / k8s_helm_base_conn.py

diff --git a/n2vc/k8s_helm_base_conn.py b/n2vc/k8s_helm_base_conn.py
index 82ae067..2a2e935 100644 (file)
--- a/n2vc/k8s_helm_base_conn.py
+++ b/n2vc/k8s_helm_base_conn.py
@@ -186,22 +186,20 @@ class K8sHelmBaseConnector(K8sConnector):
         )
 
         # sync fs
-        self.fs.reverse_sync(from_path=cluster_uuid)
+        self.fs.reverse_sync(from_path=cluster_id)
 
-    async def repo_update(self, cluster_uuid: str, name: str, repo_type: str = "chart"):
+    async def repo_update(self, cluster_id: str, name: str, repo_type: str = "chart"):
         self.log.debug(
-            "Cluster {}, updating {} repository {}".format(
-                cluster_uuid, repo_type, name
-            )
+            "Cluster {}, updating {} repository {}".format(cluster_id, repo_type, name)
         )
 
         # init_env
         paths, env = self._init_paths_env(
-            cluster_name=cluster_uuid, create_if_not_exist=True
+            cluster_name=cluster_id, create_if_not_exist=True
         )
 
         # sync local dir
-        self.fs.sync(from_path=cluster_uuid)
+        self.fs.sync(from_path=cluster_id)
 
         # helm repo update
         command = "{} repo update {}".format(self._helm_command, name)
@@ -211,7 +209,7 @@ class K8sHelmBaseConnector(K8sConnector):
         )
 
         # sync fs
-        self.fs.reverse_sync(from_path=cluster_uuid)
+        self.fs.reverse_sync(from_path=cluster_id)
 
     async def repo_list(self, cluster_uuid: str) -> list:
         """
@@ -382,7 +380,7 @@ class K8sHelmBaseConnector(K8sConnector):
 
         repo = self._split_repo(kdu_model)
         if repo:
-            self.repo_update(cluster_id, repo)
+            await self.repo_update(cluster_id, repo)
 
         command = self._get_install_command(
             kdu_model,
@@ -492,7 +490,7 @@ class K8sHelmBaseConnector(K8sConnector):
 
         repo = self._split_repo(kdu_model)
         if repo:
-            self.repo_update(cluster_uuid, repo)
+            await self.repo_update(cluster_id, repo)
 
         command = self._get_upgrade_command(
             kdu_model,
@@ -1581,7 +1579,7 @@ class K8sHelmBaseConnector(K8sConnector):
         name = name + get_random_number()
         return name.lower()
 
-    async def _split_repo(self, kdu_model: str) -> str:
+    def _split_repo(self, kdu_model: str) -> str:
         repo_name = None
         idx = kdu_model.find("/")
         if idx >= 0: