Bug 2067 fixed

[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 d446b9b..dd2116c 100644 (file)
--- a/n2vc/k8s_helm_base_conn.py
+++ b/n2vc/k8s_helm_base_conn.py
@@ -371,6 +371,9 @@ class K8sHelmBaseConnector(K8sConnector):
 
         return True
 
+    def _is_helm_chart_a_file(self, chart_name: str):
+        return chart_name.count("/") > 1
+
     async def _install_impl(
         self,
         cluster_id: str,
@@ -642,10 +645,6 @@ class K8sHelmBaseConnector(K8sConnector):
         kdu_model, version = self._split_version(kdu_model)
 
         repo_url = await self._find_repo(kdu_model, cluster_uuid)
-        if not repo_url:
-            raise K8sException(
-                "Repository not found for kdu_model {}".format(kdu_model)
-            )
 
         _, replica_str = await self._get_replica_count_url(
             kdu_model, repo_url, resource_name
@@ -732,7 +731,7 @@ class K8sHelmBaseConnector(K8sConnector):
             cluster_uuid: The UUID of the cluster
             resource_name: Resource name
             kdu_instance: KDU instance name
-            kdu_model: The name or path of a bundle
+            kdu_model: The name or path of an Helm Chart
             kwargs: Additional parameters
 
         Returns:
@@ -754,19 +753,19 @@ class K8sHelmBaseConnector(K8sConnector):
         )
 
         replicas = await self._get_replica_count_instance(
-            kdu_instance, instance_info["namespace"], paths["kube_config"]
+            kdu_instance=kdu_instance,
+            namespace=instance_info["namespace"],
+            kubeconfig=paths["kube_config"],
+            resource_name=resource_name,
         )
 
         # Get default value if scale count is not found from provided values
         if not replicas:
-            repo_url = await self._find_repo(kdu_model, cluster_uuid)
-            if not repo_url:
-                raise K8sException(
-                    "Repository not found for kdu_model {}".format(kdu_model)
-                )
-
+            repo_url = await self._find_repo(
+                kdu_model=kdu_model, cluster_uuid=cluster_uuid
+            )
             replicas, _ = await self._get_replica_count_url(
-                kdu_model, repo_url, resource_name
+                kdu_model=kdu_model, repo_url=repo_url, resource_name=resource_name
             )
 
         if not replicas:
@@ -1132,6 +1131,15 @@ class K8sHelmBaseConnector(K8sConnector):
         )
 
     async def values_kdu(self, kdu_model: str, repo_url: str = None) -> str:
+        """Method to obtain the Helm Chart package's values
+
+        Args:
+            kdu_model: The name or path of an Helm Chart
+            repo_url: Helm Chart repository url
+
+        Returns:
+            str: the values of the Helm Chart package
+        """
 
         self.log.debug(
             "inspect kdu_model values {} from (optional) repo: {}".format(
@@ -1352,8 +1360,17 @@ class K8sHelmBaseConnector(K8sConnector):
     def _get_inspect_command(
         self, show_command: str, kdu_model: str, repo_str: str, version: str
     ):
-        """
-        Obtain command to be executed to obtain information about the kdu
+        """Generates the command to obtain the information about an Helm Chart package
+            (´helm show ...´ command)
+
+        Args:
+            show_command: the second part of the command (`helm show <show_command>`)
+            kdu_model: The name or path of an Helm Chart
+            repo_url: Helm Chart repository url
+            version: constraint with specific version of the Chart to use
+
+        Returns:
+            str: the generated Helm Chart command
         """
 
     @abc.abstractmethod
@@ -1681,7 +1698,16 @@ class K8sHelmBaseConnector(K8sConnector):
     async def _exec_inspect_command(
         self, inspect_command: str, kdu_model: str, repo_url: str = None
     ):
-        """Obtains information about a kdu, no cluster (no env)."""
+        """Obtains information about an Helm Chart package (´helm show´ command)
+
+        Args:
+            inspect_command: the Helm sub command (`helm show <inspect_command> ...`)
+            kdu_model: The name or path of an Helm Chart
+            repo_url: Helm Chart repository url
+
+        Returns:
+            str: the requested info about the Helm Chart package
+        """
 
         repo_str = ""
         if repo_url:
@@ -1709,13 +1735,13 @@ class K8sHelmBaseConnector(K8sConnector):
     async def _get_replica_count_url(
         self,
         kdu_model: str,
-        repo_url: str,
+        repo_url: str = None,
         resource_name: str = None,
     ):
         """Get the replica count value in the Helm Chart Values.
 
         Args:
-            kdu_model: The name or path of a bundle
+            kdu_model: The name or path of an Helm Chart
             repo_url: Helm Chart repository url
             resource_name: Resource name
 
@@ -1724,7 +1750,8 @@ class K8sHelmBaseConnector(K8sConnector):
         """
 
         kdu_values = yaml.load(
-            await self.values_kdu(kdu_model, repo_url), Loader=yaml.SafeLoader
+            await self.values_kdu(kdu_model=kdu_model, repo_url=repo_url),
+            Loader=yaml.SafeLoader,
         )
 
         if not kdu_values:
@@ -1954,7 +1981,7 @@ class K8sHelmBaseConnector(K8sConnector):
 
     def _split_version(self, kdu_model: str) -> (str, str):
         version = None
-        if ":" in kdu_model:
+        if not self._is_helm_chart_a_file(kdu_model) and ":" in kdu_model:
             parts = kdu_model.split(sep=":")
             if len(parts) == 2:
                 version = str(parts[1])
@@ -1969,6 +1996,16 @@ class K8sHelmBaseConnector(K8sConnector):
         return repo_name
 
     async def _find_repo(self, kdu_model: str, cluster_uuid: str) -> str:
+        """Obtain the Helm repository for an Helm Chart
+
+        Args:
+            kdu_model (str): the KDU model associated with the Helm Chart instantiation
+            cluster_uuid (str): The cluster UUID associated with the Helm Chart instantiation
+
+        Returns:
+            str: the repository URL; if Helm Chart is a local one, the function returns None
+        """
+
         repo_url = None
         idx = kdu_model.find("/")
         if idx >= 0: