Changes way metrics are collected, removing the use of mon-proxy

[osm/MON.git] / osm_mon / common / common_db_client.py

diff --git a/osm_mon/common/common_db_client.py b/osm_mon/common/common_db_client.py
index c6237ee..71d1306 100644 (file)
--- a/osm_mon/common/common_db_client.py
+++ b/osm_mon/common/common_db_client.py
@@ -39,12 +39,12 @@ class CommonDbClient:
                                       {"nsr-id-ref": nsr_id, "member-vnf-index-ref": str(member_index)})
         return vnfr
 
-    def get_vnfrs(self, nsr_id: str):
-        return [self.get_vnfr(nsr_id, member['member-vnf-index']) for member in
-                self.get_nsr(nsr_id)['nsd']['constituent-vnfd']]
-
-    def get_vnfrs(self):
-        return self.common_db.get_list('vnfrs')
+    def get_vnfrs(self, nsr_id: str = None):
+        if nsr_id:
+            return [self.get_vnfr(nsr_id, member['member-vnf-index']) for member in
+                    self.get_nsr(nsr_id)['nsd']['constituent-vnfd']]
+        else:
+            return self.common_db.get_list('vnfrs')
 
     def get_vnfd(self, vnfd_id: str):
         vnfr = self.common_db.get_one("vnfds",