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

diff --git a/osm_mon/collector/service.py b/osm_mon/collector/service.py
index f329918..7673aed 100644
--- a/osm_mon/collector/service.py
+++ b/osm_mon/collector/service.py
@@ -127,7 +127,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.kill()
         metrics = []
         while not self.queue.empty():
             metrics.append(self.queue.get())
@@ -139,4 +142,6 @@ class CollectorService:
         vim_type = vim_account['vim_type']
         if 'config' in vim_account and 'vim_type' in vim_account['config']:
             vim_type = vim_account['config']['vim_type'].lower()
+            if vim_type == 'vio' and 'vrops_site' not in vim_account['config']:
+                vim_type = 'openstack'
         return vim_type