X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fadapter%2Focloud_repository.py;h=8b54f53fa6f19e05a5b4d6050bef194c1849665a;hb=209f349b35b0919ac133bc2264f25753a73e5b8f;hp=5fa9b7e05863229af30a1927265b804c455f97d3;hpb=38646c684a13536146ecf16a35e6e33d614b29e9;p=pti%2Fo2.git

diff --git a/o2ims/adapter/ocloud_repository.py b/o2ims/adapter/ocloud_repository.py
index 5fa9b7e..8b54f53 100644
--- a/o2ims/adapter/ocloud_repository.py
+++ b/o2ims/adapter/ocloud_repository.py
@@ -13,10 +13,14 @@
 #  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, configuration_obj
 from o2ims.domain.ocloud_repo import OcloudRepository, ResourceTypeRepository,\
-    ResourcePoolRepository, ResourceRepository
+    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__)
 
 
 class OcloudSqlAlchemyRepository(OcloudRepository):
@@ -33,8 +37,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)
@@ -53,7 +56,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)
@@ -72,7 +75,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)
@@ -87,11 +90,96 @@ 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)
+
+
+class DeploymentManagerSqlAlchemyRepository(DeploymentManagerRepository):
+    def __init__(self, session):
+        super().__init__()
+        self.session = session
+
+    def _add(self, deployment_manager: ocloud.DeploymentManager):
+        self.session.add(deployment_manager)
+
+    def _get(self, deployment_manager_id) -> ocloud.DeploymentManager:
+        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 _update(self, deployment_manager: ocloud.DeploymentManager):
+        self.session.add(deployment_manager)
+
+
+class SubscriptionSqlAlchemyRepository(SubscriptionRepository):
+    def __init__(self, session):
+        super().__init__()
+        self.session = session
+
+    def _add(self, subscription: subscription_obj.Subscription):
+        self.session.add(subscription)
+
+    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[subscription_obj.Subscription]:
+        return self.session.query(subscription_obj.Subscription)
+
+    def _update(self, subscription: subscription_obj.Subscription):
+        self.session.add(subscription)
+
+    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()