Adds support for custom project and user domain names defined in vim config

[osm/MON.git] / osm_mon / collector / service.py

diff --git a/osm_mon/collector/service.py b/osm_mon/collector/service.py
index 0724822..cc4fc1b 100644 (file)
--- a/osm_mon/collector/service.py
+++ b/osm_mon/collector/service.py
@@ -4,8 +4,10 @@ from typing import List
 
 from osm_mon.collector.infra_collectors.onos import OnosInfraCollector
 from osm_mon.collector.infra_collectors.openstack import OpenstackInfraCollector
+from osm_mon.collector.infra_collectors.vmware import VMwareInfraCollector
+from osm_mon.collector.infra_collectors.vio import VIOInfraCollector
 from osm_mon.collector.metric import Metric
-from osm_mon.collector.utils import CollectorUtils
+from osm_mon.collector.utils.collector import CollectorUtils
 from osm_mon.collector.vnf_collectors.juju import VCACollector
 from osm_mon.collector.vnf_collectors.openstack import OpenstackCollector
 from osm_mon.collector.vnf_collectors.vio import VIOCollector
@@ -21,7 +23,9 @@ VIM_COLLECTORS = {
     "vio": VIOCollector
 }
 VIM_INFRA_COLLECTORS = {
-    "openstack": OpenstackInfraCollector
+    "openstack": OpenstackInfraCollector,
+    "vmware": VMwareInfraCollector,
+    "vio": VIOInfraCollector
 }
 SDN_INFRA_COLLECTORS = {
     "onos": OnosInfraCollector