From: David Garcia <david.garcia@canonical.com>
Date: Fri, 10 Jul 2020 11:12:44 +0000 (+0200)
Subject: Fix 1141: K8s proxy charms fixed
X-Git-Tag: release-v9.0-start~50
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=a27e20a542488a488deec71cda81e2be5b623111;p=osm%2FLCM.git

Fix 1141: K8s proxy charms fixed

Change-Id: If828d5fb0233029a6936aa2ef2d6d62fac66ecaa
Signed-off-by: David Garcia <david.garcia@canonical.com>
---

diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py
index 31c1f6f..0d84119 100644
--- a/osm_lcm/ns.py
+++ b/osm_lcm/ns.py
@@ -56,7 +56,7 @@ class N2VCJujuConnectorLCM(N2VCJujuConnector):
                                            vca_type: str = None) -> (str, dict):
         # admit two new parameters, artifact_path and vca_type
         if vca_type == "k8s_proxy_charm":
-            ee_id = await self.n2vc.install_k8s_proxy_charm(
+            ee_id = await self.install_k8s_proxy_charm(
                 charm_name=artifact_path[artifact_path.rfind("/") + 1:],
                 namespace=namespace,
                 artifact_path=artifact_path,
@@ -1560,7 +1560,8 @@ class NsLcm(LcmBase):
                                           vca_index=vca_index, vca_type=vca_type)
 
             # if SSH access is required, then get execution environment SSH public
-            if vca_type in ("lxc_proxy_charm", "helm"):  # if native charm we have waited already to VM be UP
+            # if native charm we have waited already to VM be UP
+            if vca_type in ("k8s_proxy_charm", "lxc_proxy_charm", "helm"):
                 pub_key = None
                 user = None
                 # self.logger.debug("get ssh key block")