commit 927a5845cb804605c28fa8079aba19515b72bbf3
author Atul Agarwal <atul.agarwal@altran.com> Thu Mar 18 07:54:40 2021 +0000
committer palsus <subhankar.pal@aricent.com> Mon May 31 18:49:06 2021 +0200
tree 522745fed7c9baf8b2cbdefe2d178b630e3b885e
parent 90938904e566366535283e518b0bcc1dd9f8e366

Feature 10339 - Enhanced Alarm Mgmt. (SOL005 FM Interface)

Change-Id: Iea141198dbde8ec2485f868511d803e65f3276f6
Signed-off-by: Atul Agarwal <atul.agarwal@altran.com>

osm_mon/evaluator/evaluator.py

diff --git a/osm_mon/evaluator/evaluator.py b/osm_mon/evaluator/evaluator.py
index 2d319c9..732f8ac 100644
--- a/osm_mon/evaluator/evaluator.py
+++ b/osm_mon/evaluator/evaluator.py
@@ -72,6 +72,9 @@
         self.loop.run_until_complete(
             self.msg_bus.aiowrite("alarm_response", "notify_alarm", resp_message)
         )
+        evaluator_service = EvaluatorService(self.conf)
+        evaluator_service.update_alarm_status(status.value, alarm.uuid)
+        return
 
     def _build_alarm_response(self, alarm: Alarm, status: AlarmStatus):
         log.debug("_build_alarm_response")

osm_mon/evaluator/service.py

diff --git a/osm_mon/evaluator/service.py b/osm_mon/evaluator/service.py
index 2ba0625..9049d95 100644
--- a/osm_mon/evaluator/service.py
+++ b/osm_mon/evaluator/service.py
@@ -39,6 +39,7 @@
     ALARM = "alarm"
     OK = "ok"
     INSUFFICIENT = "insufficient-data"
+    DISABLED = "disabled"
 
 
 class EvaluatorService:
@@ -55,20 +56,27 @@
     def _evaluate_metric(self, alarm: Alarm):
         log.debug("_evaluate_metric")
         metric_value = self._get_metric_value(alarm.metric, alarm.tags)
-        if metric_value is None:
-            log.warning("No metric result for alarm %s", alarm.uuid)
-            self.queue.put((alarm, AlarmStatus.INSUFFICIENT))
-        else:
-            if alarm.operation.upper() == "GT":
-                if metric_value > alarm.threshold:
-                    self.queue.put((alarm, AlarmStatus.ALARM))
-                else:
-                    self.queue.put((alarm, AlarmStatus.OK))
-            elif alarm.operation.upper() == "LT":
-                if metric_value < alarm.threshold:
-                    self.queue.put((alarm, AlarmStatus.ALARM))
-                else:
-                    self.queue.put((alarm, AlarmStatus.OK))
+        if alarm.alarm_status.upper() != AlarmStatus.DISABLED.value.upper():
+            if metric_value is None:
+                log.warning("No metric result for alarm %s", alarm.uuid)
+                self.queue.put((alarm, AlarmStatus.INSUFFICIENT))
+            else:
+                if alarm.operation.upper() == "GT":
+                    if metric_value > alarm.threshold:
+                        self.queue.put((alarm, AlarmStatus.ALARM))
+                    else:
+                        self.queue.put((alarm, AlarmStatus.OK))
+                elif alarm.operation.upper() == "LT":
+                    if metric_value < alarm.threshold:
+                        self.queue.put((alarm, AlarmStatus.ALARM))
+                    else:
+                        self.queue.put((alarm, AlarmStatus.OK))
+
+    def update_alarm_status(self, alarm_state, uuid):
+        alarm_data = self.common_db.get_alarm_by_uuid(uuid)
+        if alarm_data.get("alarm_status").upper() != AlarmStatus.DISABLED.value.upper():
+            self.common_db.update_alarm_status(alarm_state, uuid)
+        return
 
     def evaluate_alarms(self) -> List[Tuple[Alarm, AlarmStatus]]:
         log.debug("evaluate_alarms")