projects
/
osm
/
LCM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 1525
[osm/LCM.git]
/
osm_lcm
/
lcm_utils.py
diff --git
a/osm_lcm/lcm_utils.py
b/osm_lcm/lcm_utils.py
index
dcea3c0
..
a1569c1
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
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"
# from osm_common.dbbase import DbException
__author__ = "Alfonso Tierno"
@@
-95,14
+98,14
@@
def populate_dict(target_dict, key_list, value):
class LcmBase:
class LcmBase:
- def __init__(self,
db, msg, fs
, logger):
+ def __init__(self,
msg
, logger):
"""
:param db: database connection
"""
"""
:param db: database connection
"""
- self.db = db
+ self.db =
Database().instance.
db
self.msg = msg
self.msg = msg
- self.fs = fs
+ self.fs =
Filesystem().instance.
fs
self.logger = logger
def update_db_2(self, item, _id, _desc):
self.logger = logger
def update_db_2(self, item, _id, _desc):
@@
-143,7
+146,7
@@
class TaskRegistry(LcmBase):
# NS/NSI: "services" VIM/WIM/SDN: "accounts"
topic_service_list = ['ns', 'nsi']
# NS/NSI: "services" VIM/WIM/SDN: "accounts"
topic_service_list = ['ns', 'nsi']
- topic_account_list = ['vim', 'wim', 'sdn', 'k8scluster', 'k8srepo']
+ topic_account_list = ['vim', 'wim', 'sdn', 'k8scluster', '
vca', '
k8srepo']
# Map topic to InstanceID
topic2instid_dict = {
# Map topic to InstanceID
topic2instid_dict = {
@@
-158,9
+161,10
@@
class TaskRegistry(LcmBase):
'wim': 'wim_accounts',
'sdn': 'sdns',
'k8scluster': 'k8sclusters',
'wim': 'wim_accounts',
'sdn': 'sdns',
'k8scluster': 'k8sclusters',
+ 'vca': 'vca',
'k8srepo': 'k8srepos'}
'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": {},
self.task_registry = {
"ns": {},
"nsi": {},
@@
-168,10
+172,11
@@
class TaskRegistry(LcmBase):
"wim_account": {},
"sdn": {},
"k8scluster": {},
"wim_account": {},
"sdn": {},
"k8scluster": {},
+ "vca": {},
"k8srepo": {},
}
self.worker_id = worker_id
"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):
self.logger = logger
def register(self, topic, _id, op_id, task_name, task):