fix(sapd): sapd used to specify exposed connections at NS level. Fixes Bug 1321

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

diff --git a/osm_lcm/lcm_utils.py b/osm_lcm/lcm_utils.py
index dcea3c0..a05e5ac 100644 (file)
--- 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):