LCM Creates health check file according to configuration storage path

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

diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py
index 6aed304..2b0f56e 100644 (file)
--- a/osm_lcm/ns.py
+++ b/osm_lcm/ns.py
@@ -225,6 +225,8 @@ class NsLcm(LcmBase):
             "termination": self.RO.status,
             "migrate": self.RO.status,
             "healing": self.RO.recreate_status,
+            "verticalscale": self.RO.status,
+            "start_stop_rebuild": self.RO.status,
         }
 
     @staticmethod
@@ -291,7 +293,6 @@ class NsLcm(LcmBase):
             # vcaStatus
             db_dict = dict()
             db_dict["vcaStatus"] = status_dict
-            await self.n2vc.update_vca_status(db_dict["vcaStatus"], vca_id=vca_id)
 
             # update configurationStatus for this VCA
             try:
@@ -399,15 +400,6 @@ class NsLcm(LcmBase):
             db_dict = dict()
             db_dict["vcaStatus"] = {nsr_id: vca_status}
 
-            if cluster_type in ("juju-bundle", "juju"):
-                # TODO -> this should be done in a more uniform way, I think in N2VC, in order to update the K8s VCA
-                #  status in a similar way between Juju Bundles and Helm Charts on this side
-                await self.k8sclusterjuju.update_vca_status(
-                    db_dict["vcaStatus"],
-                    kdu_instance,
-                    vca_id=vca_id,
-                )
-
             self.logger.debug(
                 f"Obtained VCA status for cluster type '{cluster_type}': {vca_status}"
             )
@@ -7319,7 +7311,8 @@ class NsLcm(LcmBase):
             self.logger.info("response from RO: {}".format(result_dict))
             action_id = result_dict["action_id"]
             await self._wait_ng_ro(
-                nsr_id, action_id, nslcmop_id, start_deploy, self.timeout_operate
+                nsr_id, action_id, nslcmop_id, start_deploy,
+                self.timeout_operate, None, "start_stop_rebuild",
             )
             return "COMPLETED", "Done"
         except (ROclient.ROClientException, DbException, LcmException) as e:
@@ -8421,7 +8414,8 @@ class NsLcm(LcmBase):
             self.logger.debug("RO return > {}".format(desc))
             action_id = desc["action_id"]
             await self._wait_ng_ro(
-                nsr_id, action_id, nslcmop_id, start_deploy, self.timeout_verticalscale
+                nsr_id, action_id, nslcmop_id, start_deploy, self.timeout_verticalscale,
+                operation="verticalscale"
             )
         except (ROclient.ROClientException, DbException, LcmException) as e:
             self.logger.error("Exit Exception {}".format(e))