from osm_lcm import netslice
from osm_lcm import ROclient
-from time import time, sleep
+from time import time
from osm_lcm.lcm_utils import versiontuple, LcmException, TaskRegistry, LcmExceptionExit
from osm_lcm import version as lcm_version, version_date as lcm_version_date
self.lcm_tasks.register("k8srepo", k8srepo_id, order_id, "k8srepo_delete", task)
return
elif topic == "ns":
- if command == "instantiate" or command == "instantiated":
+ if command == "instantiate":
# self.logger.debug("Deploying NS {}".format(nsr_id))
nslcmop = params
nslcmop_id = nslcmop["_id"]
task = asyncio.ensure_future(self.ns.instantiate(nsr_id, nslcmop_id))
self.lcm_tasks.register("ns", nsr_id, nslcmop_id, "ns_instantiate", task)
return
- elif command == "terminate" or command == "terminated":
+ elif command == "terminate":
# self.logger.debug("Deleting NS {}".format(nsr_id))
nslcmop = params
nslcmop_id = nslcmop["_id"]
elif command in ("terminated", "instantiated", "scaled", "actioned"): # "scaled-cooldown-time"
return
elif topic == "nsi": # netslice LCM processes (instantiate, terminate, etc)
- if command == "instantiate" or command == "instantiated":
+ if command == "instantiate":
# self.logger.debug("Instantiating Network Slice {}".format(nsilcmop["netsliceInstanceId"]))
nsilcmop = params
nsilcmop_id = nsilcmop["_id"] # slice operation id
task = asyncio.ensure_future(self.netslice.instantiate(nsir_id, nsilcmop_id))
self.lcm_tasks.register("nsi", nsir_id, nsilcmop_id, "nsi_instantiate", task)
return
- elif command == "terminate" or command == "terminated":
+ elif command == "terminate":
# self.logger.debug("Terminating Network Slice NS {}".format(nsilcmop["netsliceInstanceId"]))
nsilcmop = params
nsilcmop_id = nsilcmop["_id"] # slice operation id
# --log-socket-port PORT: send logs using this port (default: 9022)")
-def health_check():
- retry = 2
- while retry:
- retry -= 1
- try:
- with open(health_check_file, "r") as f:
- last_received_ping = f.read()
-
- if time() - float(last_received_ping) < Lcm.ping_interval_pace + 10:
- exit(0)
- except Exception:
- pass
- if retry:
- sleep(6)
- exit(1)
-
-
if __name__ == '__main__':
try:
- print("SYS.PATH='{}'".format(sys.path))
+ # print("SYS.PATH='{}'".format(sys.path))
# load parameters and configuration
# -h
# -c value
elif o in ("-c", "--config"):
config_file = a
elif o == "--health-check":
- health_check()
+ from osm_lcm.lcm_hc import health_check
+ health_check(health_check_file, Lcm.ping_interval_pace)
# elif o == "--log-socket-port":
# log_socket_port = a
# elif o == "--log-socket-host":