X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fcollector.py;h=64d7c6f7e5ed832ba885e87a3fb5690772fa8b17;hb=51f4486b06781541ee15ea332261247ed3e930f6;hp=ac9408fc5826bfea0bcddc09eeb94de05a8a7561;hpb=0e34244e420bd68e6acb0cf6bb4383fedb662070;p=osm%2FMON.git

diff --git a/osm_mon/collector/collector.py b/osm_mon/collector/collector.py
index ac9408f..64d7c6f 100644
--- a/osm_mon/collector/collector.py
+++ b/osm_mon/collector/collector.py
@@ -27,7 +27,7 @@ import time
 from osm_mon.collector.backends.prometheus import PrometheusBackend
 from osm_mon.collector.collectors.juju import VCACollector
 from osm_mon.collector.collectors.openstack import OpenstackCollector
-from osm_mon.common.common_db_client import CommonDbClient
+from osm_mon.core.common_db import CommonDbClient
 from osm_mon.core.database import DatabaseManager
 from osm_mon.core.settings import Config
 
@@ -36,20 +36,22 @@ log = logging.getLogger(__name__)
 VIM_COLLECTORS = {
     "openstack": OpenstackCollector
 }
+METRIC_BACKENDS = [
+    PrometheusBackend
+]
 
 
 class Collector:
     def __init__(self):
         self.common_db = CommonDbClient()
-        self.producer_timeout = 5
-        self.consumer_timeout = 5
         self.plugins = []
         self.database_manager = DatabaseManager()
         self.database_manager.create_tables()
+        self.queue = multiprocessing.Queue()
 
-    def init_plugins(self):
-        prometheus_plugin = PrometheusBackend()
-        self.plugins.append(prometheus_plugin)
+    def init_backends(self):
+        for backend in METRIC_BACKENDS:
+            self.plugins.append(backend())
 
     def collect_forever(self):
         log.debug('collect_forever')
@@ -61,48 +63,44 @@ class Collector:
             except Exception:
                 log.exception("Error collecting metrics")
 
-    def _get_vim_account_id(self, nsr_id: str, vnf_member_index: int) -> str:
-        vnfr = self.common_db.get_vnfr(nsr_id, vnf_member_index)
-        return vnfr['vim-account-id']
-
-    def _get_vim_type(self, vim_account_id):
-        """Get the vim type that is required by the message."""
-        credentials = self.database_manager.get_credentials(vim_account_id)
-        return credentials.type
-
-    def _init_vim_collector_and_collect(self, vnfr: dict, vim_account_id: str, queue: multiprocessing.Queue):
+    def _collect_vim_metrics(self, vnfr: dict, vim_account_id: str):
         # TODO(diazb) Add support for vrops and aws
-        vim_type = self._get_vim_type(vim_account_id)
+        vim_type = self.database_manager.get_vim_type(vim_account_id)
         if vim_type in VIM_COLLECTORS:
             collector = VIM_COLLECTORS[vim_type](vim_account_id)
-            collector.collect(vnfr, queue)
+            metrics = collector.collect(vnfr)
+            for metric in metrics:
+                self.queue.put(metric)
         else:
             log.debug("vimtype %s is not supported.", vim_type)
 
-    def _init_vca_collector_and_collect(self, vnfr: dict, queue: multiprocessing.Queue):
+    def _collect_vca_metrics(self, vnfr: dict):
+        log.debug('_collect_vca_metrics')
+        log.debug('vnfr: %s', vnfr)
         vca_collector = VCACollector()
-        vca_collector.collect(vnfr, queue)
+        metrics = vca_collector.collect(vnfr)
+        for metric in metrics:
+            self.queue.put(metric)
 
     def collect_metrics(self):
-        queue = multiprocessing.Queue()
         vnfrs = self.common_db.get_vnfrs()
         processes = []
         for vnfr in vnfrs:
             nsr_id = vnfr['nsr-id-ref']
             vnf_member_index = vnfr['member-vnf-index-ref']
-            vim_account_id = self._get_vim_account_id(nsr_id, vnf_member_index)
-            p = multiprocessing.Process(target=self._init_vim_collector_and_collect,
-                                        args=(vnfr, vim_account_id, queue))
+            vim_account_id = self.common_db.get_vim_account_id(nsr_id, vnf_member_index)
+            p = multiprocessing.Process(target=self._collect_vim_metrics,
+                                        args=(vnfr, vim_account_id))
             processes.append(p)
             p.start()
-            p = multiprocessing.Process(target=self._init_vca_collector_and_collect,
-                                        args=(vnfr, queue))
+            p = multiprocessing.Process(target=self._collect_vca_metrics,
+                                        args=(vnfr,))
             processes.append(p)
             p.start()
         for process in processes:
             process.join()
         metrics = []
-        while not queue.empty():
-            metrics.append(queue.get())
+        while not self.queue.empty():
+            metrics.append(self.queue.get())
         for plugin in self.plugins:
             plugin.handle(metrics)