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

diff --git a/osm_mon/collector/service.py b/osm_mon/collector/service.py
index 7673aed..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
 }
 
 
@@ -130,7 +131,7 @@ class CollectorService:
             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())