X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Flcm_utils.py;h=a05e5acb4e4db0b792911d0ff31e637df3394276;hb=a7cb70b362dd95528deb64ab21ebad953009add6;hp=dcea3c0b7420e752e33488f547d834c18d7d65e1;hpb=fa076c3067d3fffe36c0b5dcf00327523b400f81;p=osm%2FLCM.git diff --git a/osm_lcm/lcm_utils.py b/osm_lcm/lcm_utils.py index dcea3c0..a05e5ac 100644 --- a/osm_lcm/lcm_utils.py +++ b/osm_lcm/lcm_utils.py @@ -19,6 +19,9 @@ import asyncio from collections import OrderedDict from time import time +from osm_lcm.data_utils.database.database import Database +from osm_lcm.data_utils.filesystem.filesystem import Filesystem + # from osm_common.dbbase import DbException __author__ = "Alfonso Tierno" @@ -95,14 +98,14 @@ def populate_dict(target_dict, key_list, value): class LcmBase: - def __init__(self, db, msg, fs, logger): + def __init__(self, msg, logger): """ :param db: database connection """ - self.db = db + self.db = Database().instance.db self.msg = msg - self.fs = fs + self.fs = Filesystem().instance.fs self.logger = logger def update_db_2(self, item, _id, _desc): @@ -160,7 +163,7 @@ class TaskRegistry(LcmBase): 'k8scluster': 'k8sclusters', 'k8srepo': 'k8srepos'} - def __init__(self, worker_id=None, db=None, logger=None): + def __init__(self, worker_id=None, logger=None): self.task_registry = { "ns": {}, "nsi": {}, @@ -171,7 +174,7 @@ class TaskRegistry(LcmBase): "k8srepo": {}, } self.worker_id = worker_id - self.db = db + self.db = Database().instance.db self.logger = logger def register(self, topic, _id, op_id, task_name, task):