X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Flcm.py;h=8932d8910664bdbd86c6e4bc3b07f133d140b6af;hb=refs%2Fchanges%2F94%2F12294%2F4;hp=82947e9d73da21304730277e3b5bffd887c17172;hpb=ca7ece02d870a16bdcd47dab7c5ac30c82c58545;p=osm%2FLCM.git

diff --git a/osm_lcm/lcm.py b/osm_lcm/lcm.py
index 82947e9..8932d89 100644
--- a/osm_lcm/lcm.py
+++ b/osm_lcm/lcm.py
@@ -44,6 +44,7 @@ from osm_common.fsbase import FsException
 from osm_common.msgbase import MsgException
 from osm_lcm.data_utils.database.database import Database
 from osm_lcm.data_utils.filesystem.filesystem import Filesystem
+from osm_lcm.lcm_hc import get_health_check_file
 from os import environ, path
 from random import choice as random_choice
 from n2vc import version as n2vc_version
@@ -58,9 +59,6 @@ min_RO_version = "6.0.2"
 min_n2vc_version = "0.0.2"
 
 min_common_version = "0.1.19"
-health_check_file = (
-    path.expanduser("~") + "/time_last_ping"
-)  # TODO find better location for this file
 
 
 class Lcm:
@@ -98,6 +96,7 @@ class Lcm:
         # load configuration
         config = self.read_config_file(config_file)
         self.config = config
+        self.health_check_file = get_health_check_file(self.config)
         self.config["ro_config"] = {
             "ng": config["RO"].get("ng", False),
             "uri": config["RO"].get("uri"),
@@ -345,12 +344,12 @@ class Lcm:
                     return
                 self.pings_not_received = 0
                 try:
-                    with open(health_check_file, "w") as f:
+                    with open(self.health_check_file, "w") as f:
                         f.write(str(time()))
                 except Exception as e:
                     self.logger.error(
                         "Cannot write into '{}' for healthcheck: {}".format(
-                            health_check_file, e
+                            self.health_check_file, e
                         )
                     )
             return
@@ -455,6 +454,16 @@ class Lcm:
                 task = asyncio.ensure_future(self.ns.scale(nsr_id, nslcmop_id))
                 self.lcm_tasks.register("ns", nsr_id, nslcmop_id, "ns_scale", task)
                 return
+            elif command == "heal":
+                # self.logger.debug("Healing NS {}".format(nsr_id))
+                nslcmop = params
+                nslcmop_id = nslcmop["_id"]
+                nsr_id = nslcmop["nsInstanceId"]
+                task = asyncio.ensure_future(self.ns.heal(nsr_id, nslcmop_id))
+                self.lcm_tasks.register(
+                    "ns", nsr_id, nslcmop_id, "ns_heal", task
+                )
+                return
             elif command == "migrate":
                 nslcmop = params
                 nslcmop_id = nslcmop["_id"]
@@ -462,6 +471,15 @@ class Lcm:
                 task = asyncio.ensure_future(self.ns.migrate(nsr_id, nslcmop_id))
                 self.lcm_tasks.register("ns", nsr_id, nslcmop_id, "ns_migrate", task)
                 return
+            elif command == "verticalscale":
+                nslcmop = params
+                nslcmop_id = nslcmop["_id"]
+                nsr_id = nslcmop["nsInstanceId"]
+                task = asyncio.ensure_future(self.ns.vertical_scale(nsr_id, nslcmop_id))
+                self.logger.debug("nsr_id,nslcmop_id,task {},{},{}".format(nsr_id, nslcmop_id, task))
+                self.lcm_tasks.register("ns", nsr_id, nslcmop_id, "ns_verticalscale", task)
+                self.logger.debug("LCM task registered {},{},{} ".format(nsr_id, nslcmop_id, task))
+                return
             elif command == "show":
                 nsr_id = params
                 try:
@@ -486,12 +504,15 @@ class Lcm:
                 return  # TODO cleaning of task just in case should be done
             elif command in (
                 "vnf_terminated",
+                "policy_updated",
                 "terminated",
                 "instantiated",
                 "scaled",
+                "healed",
                 "actioned",
                 "updated",
                 "migrated",
+                "verticalscaled",
             ):  # "scaled-cooldown-time"
                 return
 
@@ -547,6 +568,7 @@ class Lcm:
                 "terminated",
                 "instantiated",
                 "scaled",
+                "healed",
                 "actioned",
             ):  # "scaled-cooldown-time"
                 return
@@ -737,7 +759,7 @@ class Lcm:
         try:
             # read file as yaml format
             with open(config_file) as f:
-                conf = yaml.load(f, Loader=yaml.Loader)
+                conf = yaml.safe_load(f)
             # Ensure all sections are not empty
             for k in (
                 "global",
@@ -855,7 +877,7 @@ if __name__ == "__main__":
             elif o == "--health-check":
                 from osm_lcm.lcm_hc import health_check
 
-                health_check(health_check_file, Lcm.ping_interval_pace)
+                health_check(config_file, Lcm.ping_interval_pace)
             # elif o == "--log-socket-port":
             #     log_socket_port = a
             # elif o == "--log-socket-host":