Add subscription and notification for resource changes; fix a bug while pserver node...

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

diff --git a/o2ims/adapter/ocloud_repository.py b/o2ims/adapter/ocloud_repository.py
index bc3557d..4880fa1 100644 (file)
--- a/o2ims/adapter/ocloud_repository.py
+++ b/o2ims/adapter/ocloud_repository.py
@@ -13,11 +13,11 @@
 #  limitations under the License.
 
 from typing import List
-# from o2ims.adapter import orm
-from o2ims.domain import ocloud
+
+from o2ims.domain import ocloud, subscription_obj
 from o2ims.domain.ocloud_repo import OcloudRepository, ResourceTypeRepository,\
-    ResourcePoolRepository, ResourceRepository, DeploymentManagerRepository,\
-    SubscriptionRepository
+    ResourcePoolRepository, ResourceRepository, DeploymentManagerRepository
+from o2ims.domain.subscription_repo import SubscriptionRepository
 from o2common.helper import o2logging
 logger = o2logging.get_logger(__name__)
 
@@ -36,8 +36,7 @@ class OcloudSqlAlchemyRepository(OcloudRepository):
             oCloudId=ocloud_id).first()
 
     def _list(self) -> List[ocloud.Ocloud]:
-        return self.session.query(ocloud.Ocloud).order_by(
-            ocloud.Ocloud.name).all()
+        return self.session.query(ocloud.Ocloud)
 
     def _update(self, ocloud: ocloud.Ocloud):
         self.session.add(ocloud)
@@ -56,7 +55,7 @@ class ResouceTypeSqlAlchemyRepository(ResourceTypeRepository):
             resourceTypeId=resource_type_id).first()
 
     def _list(self) -> List[ocloud.ResourceType]:
-        return self.session.query()
+        return self.session.query(ocloud.ResourceType)
 
     def _update(self, resourceType: ocloud.ResourceType):
         self.session.add(resourceType)
@@ -75,7 +74,7 @@ class ResourcePoolSqlAlchemyRepository(ResourcePoolRepository):
             resourcePoolId=resource_pool_id).first()
 
     def _list(self) -> List[ocloud.ResourcePool]:
-        return self.session.query()
+        return self.session.query(ocloud.ResourcePool)
 
     def _update(self, resourcePool: ocloud.ResourcePool):
         self.session.add(resourcePool)
@@ -90,11 +89,31 @@ class ResourceSqlAlchemyRepository(ResourceRepository):
         self.session.add(resource)
 
     def _get(self, resource_id) -> ocloud.Resource:
+        # return self.session.query(ocloud.Resource).filter_by(
+        #     resourceId=resource_id).first()
+        # topq = uow.session.query(orm.resource).filter(
+        #     orm.resource.c.resourceId == resourceId).\
+        #     cte('cte', recursive=True)
+        # bootomq = uow.session.query(orm.resource).join(
+        #     topq, orm.resource.c.parentId == topq.c.resourceId)
+        # res = uow.session.query(topq.union(bootomq))
+        def recursive(id):
+            res = self.session.query(ocloud.Resource).filter_by(
+                resourceId=id).first()
+            if res is not None:
+                query = self.session.query(ocloud.Resource).filter_by(
+                    parentId=res.resourceId)
+                children = []
+                for r in query:
+                    child = recursive(r.resourceId)
+                    children.append(child)
+                res.set_children(children)
+            return res
+        return recursive(resource_id)
+
+    def _list(self, resourcepool_id) -> List[ocloud.Resource]:
         return self.session.query(ocloud.Resource).filter_by(
-            resourceId=resource_id).first()
-
-    def _list(self) -> List[ocloud.Resource]:
-        return self.session.query()
+            resourcePoolId=resourcepool_id)
 
     def _update(self, resource: ocloud.Resource):
         self.session.add(resource)
@@ -113,7 +132,7 @@ class DeploymentManagerSqlAlchemyRepository(DeploymentManagerRepository):
             deploymentManagerId=deployment_manager_id).first()
 
     def _list(self) -> List[ocloud.DeploymentManager]:
-        return self.session.query()
+        return self.session.query(ocloud.DeploymentManager)
 
     def _update(self, deployment_manager: ocloud.DeploymentManager):
         self.session.add(deployment_manager)
@@ -124,19 +143,19 @@ class SubscriptionSqlAlchemyRepository(SubscriptionRepository):
         super().__init__()
         self.session = session
 
-    def _add(self, subscription: ocloud.Subscription):
+    def _add(self, subscription: subscription_obj.Subscription):
         self.session.add(subscription)
 
-    def _get(self, subscription_id) -> ocloud.Subscription:
-        return self.session.query(ocloud.Subscription).filter_by(
+    def _get(self, subscription_id) -> subscription_obj.Subscription:
+        return self.session.query(subscription_obj.Subscription).filter_by(
             subscriptionId=subscription_id).first()
 
-    def _list(self) -> List[ocloud.Subscription]:
-        return self.session.query()
+    def _list(self) -> List[subscription_obj.Subscription]:
+        return self.session.query(subscription_obj.Subscription)
 
-    def _update(self, subscription: ocloud.Subscription):
+    def _update(self, subscription: subscription_obj.Subscription):
         self.session.add(subscription)
 
     def _delete(self, subscription_id):
-        self.session.query(ocloud.Subscription).filter_by(
+        self.session.query(subscription_obj.Subscription).filter_by(
             subscriptionId=subscription_id).delete()