Merge "Improve the ssl connection handle log message. Fix auth header exception handl...

[pti/o2.git] / o2ims / views / alarm_view.py

diff --git a/o2ims/views/alarm_view.py b/o2ims/views/alarm_view.py
index 1e4c7f9..b3a9e4a 100644 (file)
--- a/o2ims/views/alarm_view.py
+++ b/o2ims/views/alarm_view.py
@@ -27,11 +27,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)
 
 
@@ -44,11 +44,11 @@ def alarm_event_record_one(alarmEventRecordId: str,
 
 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,7 +59,7 @@ 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):
 
     sub_uuid = str(uuid.uuid4())
@@ -70,7 +70,8 @@ def subscription_create(subscriptionDto: SubscriptionDTO.subscription,
     with uow:
         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,