X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fdomain%2Focloud_repo.py;h=1c63de87297355b202efbcfae9574ea0542b06bb;hb=955e499773dcfd80e2b5497d3cb1b38c9ae294eb;hp=9fd2965269b8e33417d650098b1320a04d96f4a9;hpb=de778bc19d9329d3c1c3c536bfd702423102277b;p=pti%2Fo2.git

diff --git a/o2ims/domain/ocloud_repo.py b/o2ims/domain/ocloud_repo.py
index 9fd2965..1c63de8 100644
--- a/o2ims/domain/ocloud_repo.py
+++ b/o2ims/domain/ocloud_repo.py
@@ -68,6 +68,12 @@ class ResourceTypeRepository(abc.ABC):
             self.seen.add(resource_type)
         return resource_type
 
+    def get_by_name(self, resource_type_name) -> ocloud.ResourceType:
+        resource_type = self._get_by_name(resource_type_name)
+        if resource_type:
+            self.seen.add(resource_type)
+        return resource_type
+
     def list(self) -> List[ocloud.ResourceType]:
         return self._list()
 
@@ -83,6 +89,10 @@ class ResourceTypeRepository(abc.ABC):
     def _get(self, resource_type_id) -> ocloud.ResourceType:
         raise NotImplementedError
 
+    @abc.abstractmethod
+    def _get_by_name(self, resource_type_name) -> ocloud.ResourceType:
+        raise NotImplementedError
+
     @abc.abstractmethod
     def _update(self, resource_type: ocloud.ResourceType):
         raise NotImplementedError
@@ -136,8 +146,8 @@ class ResourceRepository(abc.ABC):
             self.seen.add(resource)
         return resource
 
-    def list(self) -> List[ocloud.Resource]:
-        return self._list()
+    def list(self, resourcepool_id, **kwargs) -> List[ocloud.Resource]:
+        return self._list(resourcepool_id, **kwargs)
 
     def update(self, resource: ocloud.Resource):
         self._update(resource)
@@ -151,6 +161,10 @@ class ResourceRepository(abc.ABC):
     def _get(self, resource_id) -> ocloud.Resource:
         raise NotImplementedError
 
+    @abc.abstractmethod
+    def _list(self, resourcepool_id, **kwargs) -> ocloud.Resource:
+        raise NotImplementedError
+
     @abc.abstractmethod
     def _update(self, resource: ocloud.Resource):
         raise NotImplementedError
@@ -187,43 +201,3 @@ class DeploymentManagerRepository(abc.ABC):
     @abc.abstractmethod
     def _update(self, deployment_manager: ocloud.DeploymentManager):
         raise NotImplementedError
-
-
-class SubscriptionRepository(abc.ABC):
-    def __init__(self):
-        self.seen = set()  # type: Set[ocloud.Subscription]
-
-    def add(self, subscription: ocloud.Subscription):
-        self._add(subscription)
-        self.seen.add(subscription)
-
-    def get(self, subscription_id) -> ocloud.Subscription:
-        subscription = self._get(subscription_id)
-        if subscription:
-            self.seen.add(subscription)
-        return subscription
-
-    def list(self) -> List[ocloud.Subscription]:
-        return self._list()
-
-    def update(self, subscription: ocloud.Subscription):
-        self._update(subscription)
-
-    def delete(self, subscription_id):
-        self._delete(subscription_id)
-
-    @abc.abstractmethod
-    def _add(self, subscription: ocloud.Subscription):
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def _get(self, subscription_id) -> ocloud.Subscription:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def _update(self, subscription: ocloud.Subscription):
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def _delete(self, subscription_id):
-        raise NotImplementedError