Changes insufficient data validation in alarms to account for metric results 0.0

[osm/MON.git] / osm_mon / evaluator / service.py

diff --git a/osm_mon/evaluator/service.py b/osm_mon/evaluator/service.py
index 0868e32..20bb0ad 100644 (file)
--- a/osm_mon/evaluator/service.py
+++ b/osm_mon/evaluator/service.py
@@ -55,21 +55,23 @@ class EvaluatorService:
 
     def _get_metric_value(self,
                           nsr_id: str,
-                          vnf_member_index: int,
+                          vnf_member_index: str,
                           vdur_name: str,
                           metric_name: str):
-        return BACKENDS[self.conf.get('evaluator', 'backend')]().get_metric_value(metric_name, nsr_id, vdur_name,
-                                                                                  vnf_member_index)
+        return BACKENDS[self.conf.get('evaluator', 'backend')](self.conf).get_metric_value(metric_name,
+                                                                                           nsr_id,
+                                                                                           vdur_name,
+                                                                                           vnf_member_index)
 
     def _evaluate_metric(self,
                          nsr_id: str,
-                         vnf_member_index: int,
+                         vnf_member_index: str,
                          vdur_name: str,
                          metric_name: str,
                          alarm: Alarm):
         log.debug("_evaluate_metric")
         metric_value = self._get_metric_value(nsr_id, vnf_member_index, vdur_name, metric_name)
-        if not metric_value:
+        if metric_value is None:
             log.warning("No metric result for alarm %s", alarm.id)
             self.queue.put((alarm, AlarmStatus.INSUFFICIENT))
         else: