X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Finfra_collectors%2Fbase_osinfra.py;h=050e5254bb2a6ae15bc2447298355d27f6f7b3a1;hb=ef8ee1eca6ac4b9aa4f04e96cf11fdfa56dcdfcf;hp=37b929333d7a2be7a38fb97b9f2160792d0ab542;hpb=cee3b8656b4eef1c9dda980191a3463a5fdb2a67;p=osm%2FMON.git

diff --git a/osm_mon/collector/infra_collectors/base_osinfra.py b/osm_mon/collector/infra_collectors/base_osinfra.py
index 37b9293..050e525 100644
--- a/osm_mon/collector/infra_collectors/base_osinfra.py
+++ b/osm_mon/collector/infra_collectors/base_osinfra.py
@@ -49,7 +49,7 @@ class BaseOpenStackInfraCollector(BaseVimInfraCollector):
         if self.vim_account['_admin']['projects_read']:
             vim_project_id = self.vim_account['_admin']['projects_read'][0]
         else:
-            vim_project_id = None
+            vim_project_id = ''
         vim_tags = {
             'vim_account_id': self.vim_account['_id'],
             'project_id': vim_project_id
@@ -64,7 +64,7 @@ class BaseOpenStackInfraCollector(BaseVimInfraCollector):
             if vnfr['_admin']['projects_read']:
                 vnfr_project_id = vnfr['_admin']['projects_read'][0]
             else:
-                vnfr_project_id = None
+                vnfr_project_id = ''
             for vdur in vnfr['vdur']:
                 if 'vim-id' not in vdur:
                     log.debug("Field vim-id is not present in vdur")
@@ -100,8 +100,8 @@ class BaseOpenStackInfraCollector(BaseVimInfraCollector):
 
     def _build_keystone_client(self, vim_account: dict) -> keystone_client.Client:
         sess = OpenstackUtils.get_session(vim_account)
-        return keystone_client.Client(session=sess)
+        return keystone_client.Client(session=sess, timeout=10)
 
     def _build_nova_client(self, vim_account: dict) -> nova_client.Client:
         sess = OpenstackUtils.get_session(vim_account)
-        return nova_client.Client("2", session=sess)
+        return nova_client.Client("2", session=sess, timeout=10)