Make vcloud api version compatible for different vCDs

[osm/MON.git] / osm_mon / collector / infra_collectors / base_osinfra.py

diff --git a/osm_mon/collector/infra_collectors/base_osinfra.py b/osm_mon/collector/infra_collectors/base_osinfra.py
index 278cc20..19a21f0 100644 (file)
--- a/osm_mon/collector/infra_collectors/base_osinfra.py
+++ b/osm_mon/collector/infra_collectors/base_osinfra.py
@@ -55,6 +55,9 @@ class BaseOpenStackInfraCollector(BaseVimInfraCollector):
             nsr_id = vnfr['nsr-id-ref']
             vnf_member_index = vnfr['member-vnf-index-ref']
             for vdur in vnfr['vdur']:
+                if 'vim-id' not in vdur:
+                    log.debug("Field vim-id is not present in vdur")
+                    continue
                 resource_uuid = vdur['vim-id']
                 tags = {
                     'vim_account_id': self.vim_account_id,
@@ -67,8 +70,8 @@ class BaseOpenStackInfraCollector(BaseVimInfraCollector):
                     vm = self.nova.servers.get(resource_uuid)
                     vm_status = (1 if vm.status == 'ACTIVE' else 0)
                     vm_status_metric = Metric(tags, 'vm_status', vm_status)
-                except Exception:
-                    log.exception("VM status is not OK!")
+                except Exception as e:
+                    log.warning("VM status is not OK: %s" % e)
                     vm_status_metric = Metric(tags, 'vm_status', 0)
                 metrics.append(vm_status_metric)
 
@@ -76,10 +79,10 @@ class BaseOpenStackInfraCollector(BaseVimInfraCollector):
 
     def is_vim_ok(self) -> bool:
         try:
-            self.keystone.projects.list()
+            self.nova.servers.list()
             return True
-        except Exception:
-            log.exception("VIM status is not OK!")
+        except Exception as e:
+            log.warning("VIM status is not OK: %s" % e)
             return False
 
     def _build_keystone_client(self, vim_account_id) -> keystone_client.Client: