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 82df377..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)
@@ -53,45 +57,9 @@ class SubscriptionRepository(abc.ABC):
         raise NotImplementedError
 
     @abc.abstractmethod
-    def _delete(self, subscription_id):
+    def _list(self, **kwargs) -> Tuple[int, List[subobj.Subscription]]:
         raise NotImplementedError
 
-
-class RegistrationRepository(abc.ABC):
-    def __init__(self):
-        self.seen = set()  # type: Set[subobj.Subscription]
-
-    def add(self, registration: subobj.Registration):
-        self._add(registration)
-        self.seen.add(registration)
-
-    def get(self, registration_id) -> subobj.Registration:
-        registration = self._get(registration_id)
-        if registration:
-            self.seen.add(registration)
-        return registration
-
-    def list(self) -> List[subobj.Registration]:
-        return self._list()
-
-    def update(self, registration: subobj.Registration):
-        self._update(registration)
-
-    def delete(self, registration_id):
-        self._delete(registration_id)
-
     @abc.abstractmethod
-    def _add(self, registration: subobj.Registration):
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def _get(self, registration_id) -> subobj.Registration:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def _update(self, registration: subobj.Registration):
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def _delete(self, registration_id):
+    def _delete(self, subscription_id):
         raise NotImplementedError