projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 1402: sdn infra collector names changed to match RO names
[osm/MON.git]
/
osm_mon
/
collector
/
service.py
diff --git
a/osm_mon/collector/service.py
b/osm_mon/collector/service.py
index
7673aed
..
eecad4d
100644
(file)
--- a/
osm_mon/collector/service.py
+++ b/
osm_mon/collector/service.py
@@
-49,7
+49,8
@@
VIM_INFRA_COLLECTORS = {
"vio": VIOInfraCollector
}
SDN_INFRA_COLLECTORS = {
"vio": VIOInfraCollector
}
SDN_INFRA_COLLECTORS = {
- "onos": OnosInfraCollector
+ "onosof": OnosInfraCollector,
+ "onos_vpls": OnosInfraCollector
}
}
@@
-130,7
+131,7
@@
class CollectorService:
process.join(timeout=20)
for process in processes:
if process.is_alive():
process.join(timeout=20)
for process in processes:
if process.is_alive():
- process.
kill
()
+ process.
terminate
()
metrics = []
while not self.queue.empty():
metrics.append(self.queue.get())
metrics = []
while not self.queue.empty():
metrics.append(self.queue.get())