X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fviews%2Falarm_route.py;h=7b0c03e36bded6e375c1bd11dbc3ee8e20b489ce;hb=54ca64640ce149364fcfa91666c01edfe5c02e72;hp=8b0af04b85f08ab83ea1359690505fbe1446436b;hpb=b533c03e9233171cbd114339f98bd428688998a7;p=pti%2Fo2.git

diff --git a/o2ims/views/alarm_route.py b/o2ims/views/alarm_route.py
index 8b0af04..7b0c03e 100644
--- a/o2ims/views/alarm_route.py
+++ b/o2ims/views/alarm_route.py
@@ -19,6 +19,7 @@ from o2common.service.messagebus import MessageBus
 from o2common.views.pagination_route import link_header, PAGE_PARAM
 from o2common.views.route_exception import NotFoundException, \
     BadRequestException
+from o2ims.domain.alarm_obj import PerceivedSeverityEnum
 from o2ims.views import alarm_view
 from o2ims.views.api_ns import api_ims_monitoring as api_monitoring_v1
 from o2ims.views.alarm_dto import AlarmDTO, SubscriptionDTO, \
@@ -130,6 +131,7 @@ class AlarmListRouter(Resource):
 class AlarmGetRouter(Resource):
 
     model = AlarmDTO.alarm_event_record_get
+    patch = AlarmDTO.alarm_event_record_patch
 
     @api_monitoring_v1.doc('Get Alarm Event Record Information')
     @api_monitoring_v1.marshal_with(model)
@@ -141,11 +143,35 @@ class AlarmGetRouter(Resource):
             "Alarm Event Record {} doesn't exist".format(alarmEventRecordId))
 
     @api_monitoring_v1.doc('Patch Alarm Event Record Information')
-    @api_monitoring_v1.marshal_with(model)
+    @api_monitoring_v1.expect(patch)
+    @api_monitoring_v1.marshal_with(patch)
     def patch(self, alarmEventRecordId):
-        result = alarm_view.alarm_event_record_ack(alarmEventRecordId, bus.uow)
-        if result is not None:
-            return result
+        data = api_monitoring_v1.payload
+        ack_action = data.get('alarmAcknowledged', None)
+        clear_action = data.get('perceivedSeverity', None)
+
+        ack_is_none = ack_action is None
+        clear_is_none = clear_action is None
+        if (ack_is_none and clear_is_none) or (not ack_is_none and
+                                               not clear_is_none):
+            raise BadRequestException('Either "alarmAcknowledged" or '
+                                      '"perceivedSeverity" shall be included '
+                                      'in a request, but not both.')
+        if ack_action:
+            result = alarm_view.alarm_event_record_ack(alarmEventRecordId,
+                                                       bus.uow)
+            if result is not None:
+                return result
+        elif clear_action:
+            if clear_action != PerceivedSeverityEnum.CLEARED:
+                raise BadRequestException(
+                    'Only the value "5" for "CLEARED" is permitted of '
+                    '"perceivedSeverity".')
+
+            result = alarm_view.alarm_event_record_clear(alarmEventRecordId,
+                                                         bus.uow)
+            if result is not None:
+                return result
         raise NotFoundException(
             "Alarm Event Record {} doesn't exist".format(alarmEventRecordId))