X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Flcm.py;h=67e0534f0cc5d4cecbe417de523e513ccc2c36e7;hb=refs%2Ftags%2Fv7.0.0;hp=d8ac91f9597a25d23ba64b0ab14f916e6cf6fc0e;hpb=9f9c6f2e8b8e978deaa4fb6e1482c0656ce4bd45;p=osm%2FLCM.git diff --git a/osm_lcm/lcm.py b/osm_lcm/lcm.py index d8ac91f..67e0534 100644 --- a/osm_lcm/lcm.py +++ b/osm_lcm/lcm.py @@ -36,9 +36,9 @@ from osm_lcm import ROclient from time import time, sleep from osm_lcm.lcm_utils import versiontuple, LcmException, TaskRegistry, LcmExceptionExit -from osm_lcm import version as lcm_version, version_date as lcm_version_date +from osm_lcm import version as _lcm_version, version_date as lcm_version_date -from osm_common import dbmemory, dbmongo, fslocal, msglocal, msgkafka +from osm_common import dbmemory, dbmongo, fslocal, fsmongo, msglocal, msgkafka from osm_common import version as common_version from osm_common.dbbase import DbException from osm_common.fsbase import FsException @@ -56,9 +56,7 @@ min_RO_version = "6.0.2" min_n2vc_version = "0.0.2" min_common_version = "0.1.19" -# uncomment if LCM is installed as library and installed, and get them from __init__.py -# lcm_version = '0.1.41' -# lcm_version_date = '2019-06-19' +lcm_version = _lcm_version health_check_file = path.expanduser("~") + "/time_last_ping" # TODO find better location for this file @@ -73,7 +71,7 @@ class Lcm: :param config: two level dictionary with configuration. Top level should contain 'database', 'storage', :return: None """ - + global lcm_version self.db = None self.msg = None self.msg_admin = None @@ -158,6 +156,9 @@ class Lcm: if config["storage"]["driver"] == "local": self.fs = fslocal.FsLocal() self.fs.fs_connect(config["storage"]) + elif config["storage"]["driver"] == "mongo": + self.fs = fsmongo.FsMongo() + self.fs.fs_connect(config["storage"]) else: raise LcmException("Invalid configuration param '{}' at '[storage]':'driver'".format( config["storage"]["driver"])) @@ -223,6 +224,7 @@ class Lcm: self.logger.debug("Starting/Ending test task: {}".format(param)) async def kafka_ping(self): + global lcm_version self.logger.debug("Task kafka_ping Enter") consecutive_errors = 0 first_start = True @@ -400,7 +402,7 @@ class Lcm: return elif topic == "vim_account": vim_id = params["_id"] - if command == "create" or command == "created": + if command in ("create", "created"): task = asyncio.ensure_future(self.vim.create(params, order_id)) self.lcm_tasks.register("vim_account", vim_id, order_id, "vim_create", task) return @@ -413,13 +415,15 @@ class Lcm: print("not implemented show with vim_account") sys.stdout.flush() return - elif command == "edit" or command == "edited": + elif command in ("edit", "edited"): task = asyncio.ensure_future(self.vim.edit(params, order_id)) self.lcm_tasks.register("vim_account", vim_id, order_id, "vim_edit", task) return + elif command == "deleted": + return # TODO cleaning of task just in case should be done elif topic == "wim_account": wim_id = params["_id"] - if command == "create" or command == "created": + if command in ("create", "created"): task = asyncio.ensure_future(self.wim.create(params, order_id)) self.lcm_tasks.register("wim_account", wim_id, order_id, "wim_create", task) return @@ -432,13 +436,15 @@ class Lcm: print("not implemented show with wim_account") sys.stdout.flush() return - elif command == "edit" or command == "edited": + elif command in ("edit", "edited"): task = asyncio.ensure_future(self.wim.edit(params, order_id)) self.lcm_tasks.register("wim_account", wim_id, order_id, "wim_edit", task) return + elif command == "deleted": + return # TODO cleaning of task just in case should be done elif topic == "sdn": _sdn_id = params["_id"] - if command == "create" or command == "created": + if command in ("create", "created"): task = asyncio.ensure_future(self.sdn.create(params, order_id)) self.lcm_tasks.register("sdn", _sdn_id, order_id, "sdn_create", task) return @@ -447,10 +453,12 @@ class Lcm: task = asyncio.ensure_future(self.sdn.delete(params, order_id)) self.lcm_tasks.register("sdn", _sdn_id, order_id, "sdn_delete", task) return - elif command == "edit" or command == "edited": + elif command in ("edit", "edited"): task = asyncio.ensure_future(self.sdn.edit(params, order_id)) self.lcm_tasks.register("sdn", _sdn_id, order_id, "sdn_edit", task) return + elif command == "deleted": + return # TODO cleaning of task just in case should be done self.logger.critical("unknown topic {} and command '{}'".format(topic, command)) async def kafka_read(self): @@ -520,7 +528,7 @@ class Lcm: # and not parse integer or boolean try: with open(config_file) as f: - conf = yaml.load(f) + conf = yaml.load(f, Loader=yaml.Loader) for k, v in environ.items(): if not k.startswith("OSMLCM_"): continue @@ -567,6 +575,18 @@ class Lcm: return ''.join(random_choice("0123456789abcdef") for _ in range(12)) +def _get_version(): + """ + Try to get version from package using pkg_resources (available with setuptools) + """ + global lcm_version + try: + from pkg_resources import get_distribution + lcm_version = get_distribution("osm_lcm").version + except Exception: + pass + + def usage(): print("""Usage: {} [options] -c|--config [configuration_file]: loads the configuration file (default: ./lcm.cfg) @@ -597,6 +617,7 @@ def health_check(): if __name__ == '__main__': try: + print("SYS.PATH='{}'".format(sys.path)) # load parameters and configuration # -h # -c value @@ -634,6 +655,8 @@ if __name__ == '__main__': else: print("No configuration file 'lcm.cfg' found neither at local folder nor at /etc/osm/", file=sys.stderr) exit(1) + # get version from package and upate global lcm_version + _get_version() lcm = Lcm(config_file) lcm.start() except (LcmException, getopt.GetoptError) as e: