X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fdomain%2Focloud_repo.py;h=cf2d97999cc9b169c8f9496515a2f026ec745f32;hb=cd999dd33a2449fd8480fd641678360a749e5498;hp=b224a68123cc07f60c7a7e264a3375e47e7369ab;hpb=44f01a560347914798d8f913696d0e495ee076f8;p=pti%2Fo2.git

diff --git a/o2ims/domain/ocloud_repo.py b/o2ims/domain/ocloud_repo.py
index b224a68..cf2d979 100644
--- a/o2ims/domain/ocloud_repo.py
+++ b/o2ims/domain/ocloud_repo.py
@@ -1,229 +1,236 @@
-# Copyright (C) 2021 Wind River Systems, Inc.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-import abc
-from typing import List, Set
-from o2ims.domain import ocloud
-
-
-class OcloudRepository(abc.ABC):
-    def __init__(self):
-        self.seen = set()  # type: Set[ocloud.Ocloud]
-
-    def add(self, ocloud: ocloud.Ocloud):
-        self._add(ocloud)
-        self.seen.add(ocloud)
-
-    def get(self, ocloud_id) -> ocloud.Ocloud:
-        ocloud = self._get(ocloud_id)
-        if ocloud:
-            self.seen.add(ocloud)
-        return ocloud
-
-    def list(self) -> List[ocloud.Ocloud]:
-        return self._list()
-
-    def update(self, ocloud: ocloud.Ocloud):
-        self._update(ocloud)
-        self.seen.add(ocloud)
-
-    # def update_fields(self, ocloudid: str, updatefields: dict):
-    #     self._update(ocloudid, updatefields)
-
-    @abc.abstractmethod
-    def _add(self, ocloud: ocloud.Ocloud):
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def _get(self, ocloud_id) -> ocloud.Ocloud:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def _update(self, ocloud: ocloud.Ocloud):
-        raise NotImplementedError
-
-
-class ResourceTypeRepository(abc.ABC):
-    def __init__(self):
-        self.seen = set()  # type: Set[ocloud.ResourceType]
-
-    def add(self, resource_type: ocloud.ResourceType):
-        self._add(resource_type)
-        self.seen.add(resource_type)
-
-    def get(self, resource_type_id) -> ocloud.ResourceType:
-        resource_type = self._get(resource_type_id)
-        if resource_type:
-            self.seen.add(resource_type)
-        return resource_type
-
-    def list(self) -> List[ocloud.ResourceType]:
-        return self._list()
-
-    def update(self, resource_type: ocloud.ResourceType):
-        self._update(resource_type)
-        self.seen.add(resource_type)
-
-    @abc.abstractmethod
-    def _add(self, resource_type: ocloud.ResourceType):
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def _get(self, resource_type_id) -> ocloud.ResourceType:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def _update(self, resource_type: ocloud.ResourceType):
-        raise NotImplementedError
-
-
-class ResourcePoolRepository(abc.ABC):
-    def __init__(self):
-        self.seen = set()  # type: Set[ocloud.ResourcePool]
-
-    def add(self, resource_pool: ocloud.ResourcePool):
-        self._add(resource_pool)
-        self.seen.add(resource_pool)
-
-    def get(self, resource_pool_id) -> ocloud.ResourcePool:
-        resource_pool = self._get(resource_pool_id)
-        if resource_pool:
-            self.seen.add(resource_pool)
-        return resource_pool
-
-    def list(self) -> List[ocloud.ResourcePool]:
-        return self._list()
-
-    def update(self, resource_pool: ocloud.ResourcePool):
-        self._update(resource_pool)
-        self.seen.add(resource_pool)
-
-    @abc.abstractmethod
-    def _add(self, resource_pool: ocloud.ResourcePool):
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def _get(self, resource_pool_id) -> ocloud.ResourcePool:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def _update(self, resource_pool: ocloud.ResourcePool):
-        raise NotImplementedError
-
-
-class ResourceRepository(abc.ABC):
-    def __init__(self):
-        self.seen = set()  # type: Set[ocloud.Resource]
-
-    def add(self, resource: ocloud.Resource):
-        self._add(resource)
-        self.seen.add(resource)
-
-    def get(self, resource_id) -> ocloud.Resource:
-        resource = self._get(resource_id)
-        if resource:
-            self.seen.add(resource)
-        return resource
-
-    def list(self, resourcepool_id) -> List[ocloud.Resource]:
-        return self._list(resourcepool_id)
-
-    def update(self, resource: ocloud.Resource):
-        self._update(resource)
-        self.seen.add(resource)
-
-    @abc.abstractmethod
-    def _add(self, resource: ocloud.Resource):
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def _get(self, resource_id) -> ocloud.Resource:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def _update(self, resource: ocloud.Resource):
-        raise NotImplementedError
-
-
-class DeploymentManagerRepository(abc.ABC):
-    def __init__(self):
-        self.seen = set()  # type: Set[ocloud.DeploymentManager]
-
-    def add(self, deployment_manager: ocloud.DeploymentManager):
-        self._add(deployment_manager)
-        self.seen.add(deployment_manager)
-
-    def get(self, deployment_manager_id) -> ocloud.DeploymentManager:
-        deployment_manager = self._get(deployment_manager_id)
-        if deployment_manager:
-            self.seen.add(deployment_manager)
-        return deployment_manager
-
-    def list(self) -> List[ocloud.DeploymentManager]:
-        return self._list()
-
-    def update(self, deployment_manager: ocloud.DeploymentManager):
-        self._update(deployment_manager)
-
-    @abc.abstractmethod
-    def _add(self, deployment_manager: ocloud.DeploymentManager):
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def _get(self, deployment_manager_id) -> ocloud.DeploymentManager:
-        raise NotImplementedError
-
-    @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
+# Copyright (C) 2021 Wind River Systems, Inc.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+import abc
+from typing import List, Set, Tuple
+from o2ims.domain import ocloud
+
+
+class OcloudRepository(abc.ABC):
+    def __init__(self):
+        self.seen = set()  # type: Set[ocloud.Ocloud]
+
+    def add(self, ocloud: ocloud.Ocloud):
+        self._add(ocloud)
+        self.seen.add(ocloud)
+
+    def get(self, ocloud_id) -> ocloud.Ocloud:
+        ocloud = self._get(ocloud_id)
+        if ocloud:
+            self.seen.add(ocloud)
+        return ocloud
+
+    def list(self, *args) -> List[ocloud.Ocloud]:
+        return self._list(*args)
+
+    def update(self, ocloud: ocloud.Ocloud):
+        self._update(ocloud)
+        self.seen.add(ocloud)
+
+    # def update_fields(self, ocloudid: str, updatefields: dict):
+    #     self._update(ocloudid, updatefields)
+
+    @abc.abstractmethod
+    def _add(self, ocloud: ocloud.Ocloud):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def _get(self, ocloud_id) -> ocloud.Ocloud:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def _list(self, *args) -> List[ocloud.Ocloud]:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def _update(self, ocloud: ocloud.Ocloud):
+        raise NotImplementedError
+
+
+class ResourceTypeRepository(abc.ABC):
+    def __init__(self):
+        self.seen = set()  # type: Set[ocloud.ResourceType]
+
+    def add(self, resource_type: ocloud.ResourceType):
+        self._add(resource_type)
+        self.seen.add(resource_type)
+
+    def get(self, resource_type_id) -> ocloud.ResourceType:
+        resource_type = self._get(resource_type_id)
+        if resource_type:
+            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, *args) -> List[ocloud.ResourceType]:
+        return self._list(*args)[1]
+
+    def list_with_count(self, *args, **kwargs) -> \
+            Tuple[int, List[ocloud.ResourceType]]:
+        return self._list(*args, **kwargs)
+
+    def update(self, resource_type: ocloud.ResourceType):
+        self._update(resource_type)
+        self.seen.add(resource_type)
+
+    @abc.abstractmethod
+    def _add(self, resource_type: ocloud.ResourceType):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    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 _list(self, **kwargs) -> Tuple[int, List[ocloud.ResourceType]]:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def _update(self, resource_type: ocloud.ResourceType):
+        raise NotImplementedError
+
+
+class ResourcePoolRepository(abc.ABC):
+    def __init__(self):
+        self.seen = set()  # type: Set[ocloud.ResourcePool]
+
+    def add(self, resource_pool: ocloud.ResourcePool):
+        self._add(resource_pool)
+        self.seen.add(resource_pool)
+
+    def get(self, resource_pool_id) -> ocloud.ResourcePool:
+        resource_pool = self._get(resource_pool_id)
+        if resource_pool:
+            self.seen.add(resource_pool)
+        return resource_pool
+
+    def list(self, *args) -> List[ocloud.ResourcePool]:
+        return self._list(*args)[1]
+
+    def list_with_count(self, *args, **kwargs) -> \
+            Tuple[int, List[ocloud.ResourcePool]]:
+        return self._list(*args, **kwargs)
+
+    def update(self, resource_pool: ocloud.ResourcePool):
+        self._update(resource_pool)
+        self.seen.add(resource_pool)
+
+    @abc.abstractmethod
+    def _add(self, resource_pool: ocloud.ResourcePool):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def _get(self, resource_pool_id) -> ocloud.ResourcePool:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def _list(self, **kwargs) -> Tuple[int, List[ocloud.ResourcePool]]:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def _update(self, resource_pool: ocloud.ResourcePool):
+        raise NotImplementedError
+
+
+class ResourceRepository(abc.ABC):
+    def __init__(self):
+        self.seen = set()  # type: Set[ocloud.Resource]
+
+    def add(self, resource: ocloud.Resource):
+        self._add(resource)
+        self.seen.add(resource)
+
+    def get(self, resource_id) -> ocloud.Resource:
+        resource = self._get(resource_id)
+        if resource:
+            self.seen.add(resource)
+        return resource
+
+    def list(self, resourcepool_id, *args) -> List[ocloud.Resource]:
+        return self._list(resourcepool_id, *args)[1]
+
+    def list_with_count(self, resourcepool_id, *args, **kwargs) -> \
+            Tuple[int, List[ocloud.Resource]]:
+        return self._list(resourcepool_id, *args, **kwargs)
+
+    def update(self, resource: ocloud.Resource):
+        self._update(resource)
+        self.seen.add(resource)
+
+    @abc.abstractmethod
+    def _add(self, resource: ocloud.Resource):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def _get(self, resource_id) -> ocloud.Resource:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def _list(self, resourcepool_id, **kwargs) -> \
+            Tuple[int, List[ocloud.Resource]]:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def _update(self, resource: ocloud.Resource):
+        raise NotImplementedError
+
+
+class DeploymentManagerRepository(abc.ABC):
+    def __init__(self):
+        self.seen = set()  # type: Set[ocloud.DeploymentManager]
+
+    def add(self, deployment_manager: ocloud.DeploymentManager):
+        self._add(deployment_manager)
+        self.seen.add(deployment_manager)
+
+    def get(self, deployment_manager_id) -> ocloud.DeploymentManager:
+        deployment_manager = self._get(deployment_manager_id)
+        if deployment_manager:
+            self.seen.add(deployment_manager)
+        return deployment_manager
+
+    def list(self, *args) -> List[ocloud.DeploymentManager]:
+        return self._list(*args)[1]
+
+    def list_with_count(self, *args, **kwargs) -> \
+            Tuple[int, List[ocloud.DeploymentManager]]:
+        return self._list(*args, **kwargs)
+
+    def update(self, deployment_manager: ocloud.DeploymentManager):
+        self._update(deployment_manager)
+
+    @abc.abstractmethod
+    def _add(self, deployment_manager: ocloud.DeploymentManager):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def _get(self, deployment_manager_id) -> ocloud.DeploymentManager:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def _list(self, **kwargs) -> Tuple[int, List[ocloud.DeploymentManager]]:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def _update(self, deployment_manager: ocloud.DeploymentManager):
+        raise NotImplementedError