X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fadapter%2Focloud_repository.py;h=b26e98a069633c3d70207a7dea7b9214d4bdb325;hb=f7ef52a5b4ead0472b1b5828471b28c88d2a0aea;hp=8b54f53fa6f19e05a5b4d6050bef194c1849665a;hpb=6c304dfab28ffd1bbe69b9ada3d11e8fbbde014b;p=pti%2Fo2.git

diff --git a/o2ims/adapter/ocloud_repository.py b/o2ims/adapter/ocloud_repository.py
index 8b54f53..b26e98a 100644
--- a/o2ims/adapter/ocloud_repository.py
+++ b/o2ims/adapter/ocloud_repository.py
@@ -12,13 +12,12 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from typing import List
+from typing import List, Tuple
 
-from o2ims.domain import ocloud, subscription_obj, configuration_obj
+from o2ims.domain import ocloud, subscription_obj
 from o2ims.domain.ocloud_repo import OcloudRepository, ResourceTypeRepository,\
     ResourcePoolRepository, ResourceRepository, DeploymentManagerRepository
 from o2ims.domain.subscription_repo import SubscriptionRepository
-from o2ims.domain.configuration_repo import ConfigurationRepository
 from o2common.helper import o2logging
 logger = o2logging.get_logger(__name__)
 
@@ -55,8 +54,20 @@ class ResouceTypeSqlAlchemyRepository(ResourceTypeRepository):
         return self.session.query(ocloud.ResourceType).filter_by(
             resourceTypeId=resource_type_id).first()
 
-    def _list(self) -> List[ocloud.ResourceType]:
-        return self.session.query(ocloud.ResourceType)
+    def _get_by_name(self, resource_type_name) -> ocloud.ResourceType:
+        return self.session.query(ocloud.ResourceType).filter_by(
+            name=resource_type_name).first()
+
+    def _list(self, **kwargs) -> Tuple[int, List[ocloud.ResourceType]]:
+        size = kwargs.pop('limit') if 'limit' in kwargs else None
+        offset = kwargs.pop('start') if 'start' in kwargs else 0
+
+        result = self.session.query(ocloud.ResourceType).filter_by(
+            **kwargs).order_by('resourceTypeId')
+        count = result.count()
+        if size is not None and size != -1:
+            return (count, result.limit(size).offset(offset))
+        return (count, result)
 
     def _update(self, resourceType: ocloud.ResourceType):
         self.session.add(resourceType)
@@ -74,8 +85,16 @@ class ResourcePoolSqlAlchemyRepository(ResourcePoolRepository):
         return self.session.query(ocloud.ResourcePool).filter_by(
             resourcePoolId=resource_pool_id).first()
 
-    def _list(self) -> List[ocloud.ResourcePool]:
-        return self.session.query(ocloud.ResourcePool)
+    def _list(self, **kwargs) -> Tuple[int, List[ocloud.ResourcePool]]:
+        size = kwargs.pop('limit') if 'limit' in kwargs else None
+        offset = kwargs.pop('start') if 'start' in kwargs else 0
+
+        result = self.session.query(ocloud.ResourcePool).filter_by(
+            **kwargs).order_by('resourcePoolId')
+        count = result.count()
+        if size is not None and size != -1:
+            return (count, result.limit(size).offset(offset))
+        return (count, result)
 
     def _update(self, resourcePool: ocloud.ResourcePool):
         self.session.add(resourcePool)
@@ -112,9 +131,19 @@ class ResourceSqlAlchemyRepository(ResourceRepository):
             return res
         return recursive(resource_id)
 
-    def _list(self, resourcepool_id) -> List[ocloud.Resource]:
-        return self.session.query(ocloud.Resource).filter_by(
-            resourcePoolId=resourcepool_id)
+    def _list(self, resourcepool_id, **kwargs) -> \
+            Tuple[int, List[ocloud.Resource]]:
+        if 'sort' in kwargs:
+            kwargs.pop('sort')
+        size = kwargs.pop('limit') if 'limit' in kwargs else None
+        offset = kwargs.pop('start') if 'start' in kwargs else 0
+
+        result = self.session.query(ocloud.Resource).filter_by(
+            resourcePoolId=resourcepool_id, **kwargs).order_by('resourceId')
+        count = result.count()
+        if size is not None and size != -1:
+            return (count, result.limit(size).offset(offset))
+        return (count, result)
 
     def _update(self, resource: ocloud.Resource):
         self.session.add(resource)
@@ -132,8 +161,16 @@ class DeploymentManagerSqlAlchemyRepository(DeploymentManagerRepository):
         return self.session.query(ocloud.DeploymentManager).filter_by(
             deploymentManagerId=deployment_manager_id).first()
 
-    def _list(self) -> List[ocloud.DeploymentManager]:
-        return self.session.query(ocloud.DeploymentManager)
+    def _list(self, **kwargs) -> Tuple[int, List[ocloud.DeploymentManager]]:
+        size = kwargs.pop('limit') if 'limit' in kwargs else None
+        offset = kwargs.pop('start') if 'start' in kwargs else 0
+
+        result = self.session.query(ocloud.DeploymentManager).filter_by(
+            **kwargs).order_by('deploymentManagerId')
+        count = result.count()
+        if size is not None and size != -1:
+            return (count, result.limit(size).offset(offset))
+        return (count, result)
 
     def _update(self, deployment_manager: ocloud.DeploymentManager):
         self.session.add(deployment_manager)
@@ -151,8 +188,17 @@ class SubscriptionSqlAlchemyRepository(SubscriptionRepository):
         return self.session.query(subscription_obj.Subscription).filter_by(
             subscriptionId=subscription_id).first()
 
-    def _list(self) -> List[subscription_obj.Subscription]:
-        return self.session.query(subscription_obj.Subscription)
+    def _list(self, **kwargs) -> \
+            Tuple[int, List[subscription_obj.Subscription]]:
+        size = kwargs.pop('limit') if 'limit' in kwargs else None
+        offset = kwargs.pop('start') if 'start' in kwargs else 0
+
+        result = self.session.query(subscription_obj.Subscription).filter_by(
+            **kwargs).order_by('subscriptionId')
+        count = result.count()
+        if size is not None and size != -1:
+            return (count, result.limit(size).offset(offset))
+        return (count, result)
 
     def _update(self, subscription: subscription_obj.Subscription):
         self.session.add(subscription)
@@ -160,26 +206,3 @@ class SubscriptionSqlAlchemyRepository(SubscriptionRepository):
     def _delete(self, subscription_id):
         self.session.query(subscription_obj.Subscription).filter_by(
             subscriptionId=subscription_id).delete()
-
-
-class ConfigurationSqlAlchemyRepository(ConfigurationRepository):
-    def __init__(self, session):
-        super().__init__()
-        self.session = session
-
-    def _add(self, configuration: configuration_obj.Configuration):
-        self.session.add(configuration)
-
-    def _get(self, configuration_id) -> configuration_obj.Configuration:
-        return self.session.query(configuration_obj.Configuration).filter_by(
-            configurationId=configuration_id).first()
-
-    def _list(self) -> List[configuration_obj.Configuration]:
-        return self.session.query(configuration_obj.Configuration)
-
-    def _update(self, configuration: configuration_obj.Configuration):
-        self.session.add(configuration)
-
-    def _delete(self, configuration_id):
-        self.session.query(configuration_obj.Configuration).filter_by(
-            configurationId=configuration_id).delete()