X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fservice.py;h=eecad4df7b13a9cf8b4d242d2270692ddea8c951;hb=2bd1a0ea8fccd4279460e7d543ee240aa38b20c8;hp=c04f5489f38aba6a88c37a69898cfb9eee2a801a;hpb=94fae15efc2cae8102e259ec4a3803eaa6736099;p=osm%2FMON.git

diff --git a/osm_mon/collector/service.py b/osm_mon/collector/service.py
index c04f548..eecad4d 100644
--- a/osm_mon/collector/service.py
+++ b/osm_mon/collector/service.py
@@ -49,7 +49,8 @@ VIM_INFRA_COLLECTORS = {
     "vio": VIOInfraCollector
 }
 SDN_INFRA_COLLECTORS = {
-    "onos": OnosInfraCollector
+    "onosof": OnosInfraCollector,
+    "onos_vpls": OnosInfraCollector
 }
 
 
@@ -127,7 +128,10 @@ class CollectorService:
             processes.append(p)
             p.start()
         for process in processes:
-            process.join(timeout=10)
+            process.join(timeout=20)
+        for process in processes:
+            if process.is_alive():
+                process.terminate()
         metrics = []
         while not self.queue.empty():
             metrics.append(self.queue.get())