X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fcollector.py;fp=osm_mon%2Fcollector%2Fcollector.py;h=36ce1b04320739fd33b68f33c26e8bf599008878;hb=b525e6c8619d494d4e254def394cf5b62de4df4a;hp=31438828157456c502667cfa9663ebf697e1cd94;hpb=8303862ef038a0db43cbddd5c152c97928af1957;p=osm%2FMON.git

diff --git a/osm_mon/collector/collector.py b/osm_mon/collector/collector.py
index 3143882..36ce1b0 100644
--- a/osm_mon/collector/collector.py
+++ b/osm_mon/collector/collector.py
@@ -27,9 +27,11 @@ import time
 import peewee
 
 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.collector.collectors.vmware import VMwareCollector
+from osm_mon.collector.vnf_collectors.vmware import VMwareCollector
+from osm_mon.collector.infra_collectors.openstack import OpenstackInfraCollector
+from osm_mon.collector.metric import Metric
+from osm_mon.collector.vnf_collectors.juju import VCACollector
+from osm_mon.collector.vnf_collectors.openstack import OpenstackCollector
 from osm_mon.core.common_db import CommonDbClient
 from osm_mon.core.database import DatabaseManager
 from osm_mon.core.settings import Config
@@ -40,6 +42,9 @@ VIM_COLLECTORS = {
     "openstack": OpenstackCollector,
     "vmware": VMwareCollector
 }
+VIM_INFRA_COLLECTORS = {
+    "openstack": OpenstackInfraCollector
+}
 METRIC_BACKENDS = [
     PrometheusBackend
 ]
@@ -69,7 +74,8 @@ class Collector:
 
     def _collect_vim_metrics(self, vnfr: dict, vim_account_id: str):
         # TODO(diazb) Add support for vrops and aws
-        vim_type = self.database_manager.get_vim_type(vim_account_id)
+        database_manager = DatabaseManager()
+        vim_type = database_manager.get_vim_type(vim_account_id)
         if vim_type in VIM_COLLECTORS:
             collector = VIM_COLLECTORS[vim_type](vim_account_id)
             metrics = collector.collect(vnfr)
@@ -78,6 +84,17 @@ class Collector:
         else:
             log.debug("vimtype %s is not supported.", vim_type)
 
+    def _collect_vim_infra_metrics(self, vim_account_id: str):
+        database_manager = DatabaseManager()
+        vim_type = database_manager.get_vim_type(vim_account_id)
+        if vim_type in VIM_INFRA_COLLECTORS:
+            collector = VIM_INFRA_COLLECTORS[vim_type](vim_account_id)
+            status = collector.is_vim_ok()
+            status_metric = Metric({'vim_id': vim_account_id}, 'vim_status', status)
+            self.queue.put(status_metric)
+        else:
+            log.debug("vimtype %s is not supported.", vim_type)
+
     def _collect_vca_metrics(self, vnfr: dict):
         log.debug('_collect_vca_metrics')
         log.debug('vnfr: %s', vnfr)
@@ -101,6 +118,12 @@ class Collector:
                                         args=(vnfr,))
             processes.append(p)
             p.start()
+        vims = self.common_db.get_vim_accounts()
+        for vim in vims:
+            p = multiprocessing.Process(target=self._collect_vim_infra_metrics,
+                                        args=(vim['_id'],))
+            processes.append(p)
+            p.start()
         for process in processes:
             process.join()
         metrics = []