Fix 1141: K8s proxy charms fixed

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

diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py
index 6af20dd..0d84119 100644 (file)
--- 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")
@@ -1824,9 +1825,6 @@ class NsLcm(LcmBase):
         logging_text = "Task ns={} instantiate={} ".format(nsr_id, nslcmop_id)
         self.logger.debug(logging_text + "Enter")
 
-        # Sync from FSMongo
-        self.fs.sync()
-
         # get all needed from database
 
         # database nsrs record
@@ -1852,8 +1850,11 @@ class NsLcm(LcmBase):
             # wait for any previous tasks in process
             await self.lcm_tasks.waitfor_related_HA('ns', 'nslcmops', nslcmop_id)
 
+            stage[1] = "Sync filesystem from database"
+            self.fs.sync()  # TODO, make use of partial sync, only for the needed packages
+
             # STEP 0: Reading database (nslcmops, nsrs, nsds, vnfrs, vnfds)
-            stage[1] = "Reading from database,"
+            stage[1] = "Reading from database"
             # nsState="BUILDING", currentOperation="INSTANTIATING", currentOperationID=nslcmop_id
             db_nsr_update["detailed-status"] = "creating"
             db_nsr_update["operational-status"] = "init"