Fix inventory subscription filter with 'neq'; fix CloudInfo notification

[pti/o2.git] / o2ims / adapter / ocloud_repository.py

diff --git a/o2ims/adapter/ocloud_repository.py b/o2ims/adapter/ocloud_repository.py
index ff1cd27..a026629 100644 (file)
--- 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__)
 
@@ -36,8 +35,9 @@ class OcloudSqlAlchemyRepository(OcloudRepository):
         return self.session.query(ocloud.Ocloud).filter_by(
             oCloudId=ocloud_id).first()
 
-    def _list(self) -> List[ocloud.Ocloud]:
-        return self.session.query(ocloud.Ocloud)
+    def _list(self, *args) -> List[ocloud.Ocloud]:
+        return self.session.query(ocloud.Ocloud).filter(*args).order_by(
+            'oCloudId')
 
     def _update(self, ocloud: ocloud.Ocloud):
         self.session.add(ocloud)
@@ -59,8 +59,16 @@ class ResouceTypeSqlAlchemyRepository(ResourceTypeRepository):
         return self.session.query(ocloud.ResourceType).filter_by(
             name=resource_type_name).first()
 
-    def _list(self) -> List[ocloud.ResourceType]:
-        return self.session.query(ocloud.ResourceType)
+    def _list(self, *args, **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(
+            *args).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)
@@ -78,8 +86,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, *args, **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(
+            *args).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)
@@ -116,9 +132,20 @@ class ResourceSqlAlchemyRepository(ResourceRepository):
             return res
         return recursive(resource_id)
 
-    def _list(self, resourcepool_id, **kwargs) -> List[ocloud.Resource]:
-        return self.session.query(ocloud.Resource).filter_by(
-            resourcePoolId=resourcepool_id, **kwargs)
+    def _list(self, resourcepool_id, *args, **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
+
+        args1 = args + (ocloud.Resource.resourcePoolId == resourcepool_id,)
+        result = self.session.query(ocloud.Resource).filter(
+            *args1).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)
@@ -136,8 +163,17 @@ 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, *args, **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(
+            *args).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)
@@ -155,8 +191,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, *args, **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(
+            *args).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)
@@ -164,26 +209,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()