X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=osm_mon%2Fcore%2Fcommon_db.py;h=9cc9c06b85759c7f3b8e8acf712b23c65db9c653;hb=b525e6c8619d494d4e254def394cf5b62de4df4a;hp=075f9d518a7ee7bec5895e1096d95ecf9f6a350d;hpb=2fa92533799dcac2fbb47db2e06579e951294e6a;p=osm%2FMON.git diff --git a/osm_mon/core/common_db.py b/osm_mon/core/common_db.py index 075f9d5..9cc9c06 100644 --- a/osm_mon/core/common_db.py +++ b/osm_mon/core/common_db.py @@ -30,7 +30,7 @@ class CommonDbClient: def __init__(self): cfg = Config.instance() self.common_db = dbmongo.DbMongo() - self.common_db.db_connect({'uri': cfg.MONGO_URI.split, + self.common_db.db_connect({'uri': cfg.MONGO_URI, 'name': 'osm', 'commonkey': cfg.OSMMON_DATABASE_COMMONKEY}) @@ -61,13 +61,13 @@ class CommonDbClient: {"_id": nslcmop_id}) return nslcmop - def get_vdur(self, nsr_id, member_index, vdu_name): + def get_vdur(self, nsr_id, member_index, vdur_name): vnfr = self.get_vnfr(nsr_id, member_index) for vdur in vnfr['vdur']: - if vdur['name'] == vdu_name: + if vdur['name'] == vdur_name: return vdur - raise ValueError('vdur not found for nsr-id %s, member_index %s and vdu_name %s', nsr_id, member_index, - vdu_name) + raise ValueError('vdur not found for nsr-id %s, member_index %s and vdur_name %s', nsr_id, member_index, + vdur_name) def decrypt_vim_password(self, vim_password: str, schema_version: str, vim_id: str): return self.common_db.decrypt(vim_password, schema_version, vim_id) @@ -75,3 +75,6 @@ class CommonDbClient: def get_vim_account_id(self, nsr_id: str, vnf_member_index: int) -> str: vnfr = self.get_vnfr(nsr_id, vnf_member_index) return vnfr['vim-account-id'] + + def get_vim_accounts(self): + return self.common_db.get_list('vim_accounts')