From: diazb <bdiaz@whitestack.com>
Date: Tue, 21 May 2019 18:24:09 +0000 (+0200)
Subject: Merge "Added vio infra collector plugin"
X-Git-Tag: v6.0.0~7
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=bf4f4968106ced34a9f82edf41bc868a5268cb84;hp=e82c062416d75b96cb6981423e1e900f7496653c;p=osm%2FMON.git

Merge "Added vio infra collector plugin"
---

diff --git a/osm_mon/collector/vnf_collectors/openstack.py b/osm_mon/collector/vnf_collectors/openstack.py
index c11f63f..f32fb9d 100644
--- a/osm_mon/collector/vnf_collectors/openstack.py
+++ b/osm_mon/collector/vnf_collectors/openstack.py
@@ -113,10 +113,14 @@ class OpenstackCollector(BaseVimCollector):
                             "Was it recently deleted?",
                             vdur['name'], vnf_member_index, nsr_id)
                         continue
-                    value = self.backend.collect_metric(metric_type, openstack_metric_name, resource_id, interface_name)
-                    if value is not None:
-                        metric = VnfMetric(nsr_id, vnf_member_index, vdur['name'], metric_name, value)
-                        metrics.append(metric)
+                    try:
+                        value = self.backend.collect_metric(metric_type, openstack_metric_name, resource_id,
+                                                            interface_name)
+                        if value is not None:
+                            metric = VnfMetric(nsr_id, vnf_member_index, vdur['name'], metric_name, value)
+                            metrics.append(metric)
+                    except Exception:
+                        log.exception("Error collecting metric %s for vdu %s" % (metric_name, vdur['name']))
         return metrics
 
     def _get_backend(self, vim_account_id: str):