X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcore%2Fcommon_db.py;h=33eff02fa7d697f6639d9dc0d72cc9c7ea5915ea;hb=616fde7e4671be3da07ea59765c311c26bfe2e16;hp=59222903a09b24ed2fade2069ac3801ca4d8035f;hpb=5ac7c081ca13495185ecf6bdf302c16c25a4b759;p=osm%2FMON.git diff --git a/osm_mon/core/common_db.py b/osm_mon/core/common_db.py index 5922290..33eff02 100644 --- a/osm_mon/core/common_db.py +++ b/osm_mon/core/common_db.py @@ -41,12 +41,18 @@ class CommonDbClient: {"nsr-id-ref": nsr_id, "member-vnf-index-ref": str(member_index)}) return vnfr - def get_vnfrs(self, nsr_id: str = None): + def get_vnfrs(self, nsr_id: str = None, vim_account_id: str = None): + if nsr_id and vim_account_id: + raise NotImplementedError("Only one filter is currently supported") if nsr_id: - return [self.get_vnfr(nsr_id, member['member-vnf-index']) for member in - self.get_nsr(nsr_id)['nsd']['constituent-vnfd']] + vnfrs = [self.get_vnfr(nsr_id, member['member-vnf-index']) for member in + self.get_nsr(nsr_id)['nsd']['constituent-vnfd']] + elif vim_account_id: + vnfrs = self.common_db.get_list("vnfrs", + {"vim-account-id": vim_account_id}) else: - return self.common_db.get_list('vnfrs') + vnfrs = self.common_db.get_list('vnfrs') + return vnfrs def get_vnfd(self, vnfd_id: str): vnfr = self.common_db.get_one("vnfds",