Pagination in request and response; Fix alarm client issue

[pti/o2.git] / o2ims / domain / subscription_repo.py

diff --git a/o2ims/domain/subscription_repo.py b/o2ims/domain/subscription_repo.py
index d12c00d..44d7b0e 100644 (file)
--- a/o2ims/domain/subscription_repo.py
+++ b/o2ims/domain/subscription_repo.py
@@ -13,7 +13,7 @@
 #  limitations under the License.
 
 import abc
-from typing import List, Set
+from typing import List, Set, Tuple
 from o2ims.domain import subscription_obj as subobj
 
 
@@ -31,8 +31,12 @@ class SubscriptionRepository(abc.ABC):
             self.seen.add(subscription)
         return subscription
 
-    def list(self) -> List[subobj.Subscription]:
-        return self._list()
+    def list(self, **kwargs) -> List[subobj.Subscription]:
+        return self._list(**kwargs)[1]
+
+    def list_with_count(self, **kwargs) -> \
+            Tuple[int, List[subobj.Subscription]]:
+        return self._list(**kwargs)
 
     def update(self, subscription: subobj.Subscription):
         self._update(subscription)
@@ -52,6 +56,10 @@ class SubscriptionRepository(abc.ABC):
     def _update(self, subscription: subobj.Subscription):
         raise NotImplementedError
 
+    @abc.abstractmethod
+    def _list(self, **kwargs) -> Tuple[int, List[subobj.Subscription]]:
+        raise NotImplementedError
+
     @abc.abstractmethod
     def _delete(self, subscription_id):
         raise NotImplementedError