projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Added vio infra collector plugin"
[osm/MON.git]
/
osm_mon
/
collector
/
service.py
diff --git
a/osm_mon/collector/service.py
b/osm_mon/collector/service.py
index
0724822
..
98f3f16
100644
(file)
--- a/
osm_mon/collector/service.py
+++ b/
osm_mon/collector/service.py
@@
-4,6
+4,8
@@
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.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.vnf_collectors.juju import VCACollector
from osm_mon.collector.metric import Metric
from osm_mon.collector.utils import CollectorUtils
from osm_mon.collector.vnf_collectors.juju import VCACollector
@@
-21,7
+23,9
@@
VIM_COLLECTORS = {
"vio": VIOCollector
}
VIM_INFRA_COLLECTORS = {
"vio": VIOCollector
}
VIM_INFRA_COLLECTORS = {
- "openstack": OpenstackInfraCollector
+ "openstack": OpenstackInfraCollector,
+ "vmware": VMwareInfraCollector,
+ "vio": VIOInfraCollector
}
SDN_INFRA_COLLECTORS = {
"onos": OnosInfraCollector
}
SDN_INFRA_COLLECTORS = {
"onos": OnosInfraCollector