X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fcollector.py;h=f4ffba4853ad9f2a2d0ea0d01c2624ee95a3e098;hb=refs%2Fchanges%2F83%2F7283%2F1;hp=5074308600fb9be4ae381104c424098523f91b79;hpb=c0da257ff744282c178594bab0b50ee3a0f3416e;p=osm%2FMON.git

diff --git a/osm_mon/collector/collector.py b/osm_mon/collector/collector.py
index 5074308..f4ffba4 100644
--- a/osm_mon/collector/collector.py
+++ b/osm_mon/collector/collector.py
@@ -27,6 +27,7 @@ import time
 import peewee
 
 from osm_mon.collector.backends.prometheus import PrometheusBackend
+from osm_mon.collector.infra_collectors.onos import OnosInfraCollector
 from osm_mon.collector.infra_collectors.openstack import OpenstackInfraCollector
 from osm_mon.collector.vnf_collectors.juju import VCACollector
 from osm_mon.collector.vnf_collectors.openstack import OpenstackCollector
@@ -46,6 +47,9 @@ VIM_COLLECTORS = {
 VIM_INFRA_COLLECTORS = {
     "openstack": OpenstackInfraCollector
 }
+SDN_INFRA_COLLECTORS = {
+    "onos": OnosInfraCollector
+}
 METRIC_BACKENDS = [
     PrometheusBackend
 ]
@@ -96,6 +100,17 @@ class Collector:
         else:
             log.debug("vimtype %s is not supported.", vim_type)
 
+    def _collect_sdnc_infra_metrics(self, sdnc_id: str):
+        common_db = CommonDbClient(self.conf)
+        sdn_type = common_db.get_sdnc(sdnc_id)['type']
+        if sdn_type in SDN_INFRA_COLLECTORS:
+            collector = SDN_INFRA_COLLECTORS[sdn_type](self.conf, sdnc_id)
+            metrics = collector.collect()
+            for metric in metrics:
+                self.queue.put(metric)
+        else:
+            log.debug("sdn_type %s is not supported.", sdn_type)
+
     def _collect_vca_metrics(self, vnfr: dict):
         log.debug('_collect_vca_metrics')
         log.debug('vnfr: %s', vnfr)
@@ -125,6 +140,12 @@ class Collector:
                                         args=(vim['_id'],))
             processes.append(p)
             p.start()
+        sdncs = self.common_db.get_sdncs()
+        for sdnc in sdncs:
+            p = multiprocessing.Process(target=self._collect_sdnc_infra_metrics,
+                                        args=(sdnc['_id'],))
+            processes.append(p)
+            p.start()
         for process in processes:
             process.join(timeout=10)
         metrics = []