X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fviews%2Falarm_view.py;h=9f7af042279d8812db60aff85a23155ac6316462;hb=refs%2Fchanges%2F83%2F12783%2F3;hp=1e4c7f9106ab7ffc14b9917d36798fef1961cc6c;hpb=7e4dd62aa6df26c97dc2596bacacedebb16f7e13;p=pti%2Fo2.git diff --git a/o2ims/views/alarm_view.py b/o2ims/views/alarm_view.py index 1e4c7f9..9f7af04 100644 --- a/o2ims/views/alarm_view.py +++ b/o2ims/views/alarm_view.py @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Wind River Systems, Inc. +# Copyright (C) 2021-2024 Wind River Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,13 +12,19 @@ # See the License for the specific language governing permissions and # limitations under the License. +from datetime import datetime import uuid as uuid -from o2common.service import unit_of_work +from o2common.service import unit_of_work, messagebus +from o2common.views.view import gen_filter, check_filter from o2common.views.pagination_view import Pagination -from o2common.views.view import gen_filter +from o2common.views.route_exception import BadRequestException, \ + NotFoundException + +from o2ims.domain import events from o2ims.views.alarm_dto import SubscriptionDTO -from o2ims.domain.alarm_obj import AlarmSubscription, AlarmEventRecord +from o2ims.domain.alarm_obj import AlarmSubscription, AlarmEventRecord, \ + AlarmNotificationEventEnum from o2common.helper import o2logging # from o2common.config import config @@ -27,11 +33,11 @@ logger = o2logging.get_logger(__name__) def alarm_event_records(uow: unit_of_work.AbstractUnitOfWork, **kwargs): pagination = Pagination(**kwargs) - filter_kwargs = pagination.get_filter() + query_kwargs = pagination.get_pagination() args = gen_filter(AlarmEventRecord, kwargs['filter']) if 'filter' in kwargs else [] with uow: - li = uow.alarm_event_records.list_with_count(*args, **filter_kwargs) + li = uow.alarm_event_records.list_with_count(*args, **query_kwargs) return pagination.get_result(li) @@ -42,13 +48,48 @@ def alarm_event_record_one(alarmEventRecordId: str, return first.serialize() if first is not None else None +def alarm_event_record_ack(alarmEventRecordId: str, + uow: unit_of_work.AbstractUnitOfWork): + with uow: + alarm_event_record = uow.alarm_event_records.get(alarmEventRecordId) + if alarm_event_record is None: + return None + elif alarm_event_record.alarmAcknowledged == 'true': + raise BadRequestException( + "Alarm Event Record {} has already been acknowledged." + .format(alarmEventRecordId)) + alarm_event_record.alarmAcknowledged = True + alarm_event_record.alarmAcknowledgeTime = datetime.\ + now().strftime("%Y-%m-%dT%H:%M:%S") + bus = messagebus.MessageBus.get_instance() + alarm_event_record.events.append(events.AlarmEventPurged( + id=alarm_event_record.alarmEventRecordId, + notificationEventType=AlarmNotificationEventEnum.ACKNOWLEDGE, + updatetime=alarm_event_record.alarmAcknowledgeTime)) + + uow.alarm_event_records.update(alarm_event_record) + uow.commit() + + result = alarm_event_record.serialize() + _handle_events(bus) + return result + + +def _handle_events(bus: messagebus.MessageBus): + # handle events + events = bus.uow.collect_new_events() + for event in events: + bus.handle(event) + return True + + def subscriptions(uow: unit_of_work.AbstractUnitOfWork, **kwargs): pagination = Pagination(**kwargs) - filter_kwargs = pagination.get_filter() + query_kwargs = pagination.get_pagination() args = gen_filter(AlarmSubscription, kwargs['filter']) if 'filter' in kwargs else [] with uow: - li = uow.alarm_subscriptions.list_with_count(*args, **filter_kwargs) + li = uow.alarm_subscriptions.list_with_count(*args, **query_kwargs) return pagination.get_result(li) @@ -59,23 +100,40 @@ def subscription_one(subscriptionId: str, return first.serialize() if first is not None else None -def subscription_create(subscriptionDto: SubscriptionDTO.subscription, +def subscription_create(subscriptionDto: SubscriptionDTO.subscription_create, uow: unit_of_work.AbstractUnitOfWork): + filter = subscriptionDto.get('filter', '') + consumer_subs_id = subscriptionDto.get('consumerSubscriptionId', '') + + check_filter(AlarmEventRecord, filter) sub_uuid = str(uuid.uuid4()) subscription = AlarmSubscription( sub_uuid, subscriptionDto['callback'], - subscriptionDto['consumerSubscriptionId'], - subscriptionDto['filter']) + consumer_subs_id, filter) with uow: + args = list() + args.append(getattr(AlarmSubscription, 'callback') + == subscriptionDto['callback']) + args.append(getattr(AlarmSubscription, 'filter') == filter) + args.append(getattr(AlarmSubscription, + 'consumerSubscriptionId') == consumer_subs_id) + count, _ = uow.alarm_subscriptions.list_with_count(*args) + if count > 0: + raise BadRequestException("The value of parameters is duplicated") uow.alarm_subscriptions.add(subscription) uow.commit() - return {"alarmSubscriptionId": sub_uuid} + first = uow.alarm_subscriptions.get(sub_uuid) + return first.serialize() def subscription_delete(subscriptionId: str, uow: unit_of_work.AbstractUnitOfWork): with uow: + first = uow.alarm_subscriptions.get(subscriptionId) + if not first: + raise NotFoundException( + "Alarm Subscription {} not found.".format(subscriptionId)) uow.alarm_subscriptions.delete(subscriptionId) uow.commit() return True