X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fadapter%2Falarm_repository.py;h=e16c6ca07308fd974ab8e3065d9a3411a6648818;hb=fc187854ad8ae6b38f8f01d9db4a902489801435;hp=ef7ae26e02cbecc9f400c18acf61908fe0236a53;hpb=f7ef52a5b4ead0472b1b5828471b28c88d2a0aea;p=pti%2Fo2.git diff --git a/o2ims/adapter/alarm_repository.py b/o2ims/adapter/alarm_repository.py index ef7ae26..e16c6ca 100644 --- a/o2ims/adapter/alarm_repository.py +++ b/o2ims/adapter/alarm_repository.py @@ -34,12 +34,13 @@ class AlarmEventRecordSqlAlchemyRepository(AlarmEventRecordRepository): return self.session.query(alarm_obj.AlarmEventRecord).filter_by( alarmEventRecordId=alarm_event_record_id).first() - def _list(self, **kwargs) -> Tuple[int, List[alarm_obj.AlarmEventRecord]]: + def _list(self, *args, **kwargs) -> Tuple[ + int, List[alarm_obj.AlarmEventRecord]]: size = kwargs.pop('limit') if 'limit' in kwargs else None offset = kwargs.pop('start') if 'start' in kwargs else 0 - result = self.session.query(alarm_obj.AlarmEventRecord).filter_by( - **kwargs).order_by('alarmEventRecordId') + result = self.session.query(alarm_obj.AlarmEventRecord).filter( + *args).order_by('alarmEventRecordId') count = result.count() if size is not None and size != -1: return (count, result.limit(size).offset(offset)) @@ -88,12 +89,13 @@ class AlarmSubscriptionSqlAlchemyRepository(AlarmSubscriptionRepository): return self.session.query(alarm_obj.AlarmSubscription).filter_by( alarmSubscriptionId=subscription_id).first() - def _list(self, **kwargs) -> Tuple[int, List[alarm_obj.AlarmSubscription]]: + def _list(self, *args, **kwargs) -> Tuple[ + int, List[alarm_obj.AlarmSubscription]]: size = kwargs.pop('limit') if 'limit' in kwargs else None offset = kwargs.pop('start') if 'start' in kwargs else 0 - result = self.session.query(alarm_obj.AlarmSubscription).filter_by( - **kwargs).order_by('alarmSubscriptionId') + result = self.session.query(alarm_obj.AlarmSubscription).filter( + *args).order_by('alarmSubscriptionId') count = result.count() if size is not None and size != -1: return (count, result.limit(size).offset(offset))