X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fviews%2Focloud_view.py;h=9a1a595b8cd1662fe128fda736ac4e74c9ec5237;hb=84867b76a65efc4e9add52c86eae7e451c4a038d;hp=513e9e002da6fb1b0df735898626bb660bdc56ec;hpb=5c501cb5e57a1ac3e0e7d38e22a3759e7958777a;p=pti%2Fo2.git

diff --git a/o2ims/views/ocloud_view.py b/o2ims/views/ocloud_view.py
index 513e9e0..9a1a595 100644
--- a/o2ims/views/ocloud_view.py
+++ b/o2ims/views/ocloud_view.py
@@ -16,169 +16,115 @@ from sqlalchemy import select
 
 from o2ims.adapter.orm import ocloud, resource, resourcetype, \
     resourcepool, deploymentmanager, subscription
-from o2ims.adapter import unit_of_work
-# from o2ims.domain.ocloud import Ocloud
+from o2common.service import unit_of_work
+from o2ims.domain.ocloud import Subscription
 
 
-def oclouds(uow: unit_of_work.SqlAlchemyUnitOfWork):
+def oclouds(uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        # res = uow.session.execute(
-        #     """
-        #     SELECT "oCloudId", "name" FROM ocloud
-        #     """,
-        # )
-
         res = uow.session.execute(select(ocloud))
     return [dict(r) for r in res]
 
 
 def ocloud_one(ocloudid: str, uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        # res = uow.session.execute(
-        #     """
-        #     SELECT "oCloudId", "name" FROM ocloud
-        #     WHERE "oCloudId" = :oCloudId
-        #     """,
-        #     dict(oCloudId=ocloudid),
-        # )
         res = uow.session.execute(
             select(ocloud).where(ocloud.c.oCloudId == ocloudid))
         first = res.first()
     return None if first is None else dict(first)
 
 
-def resource_types(uow: unit_of_work.SqlAlchemyUnitOfWork):
+def resource_types(uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        # res = uow.session.execute(
-        #     """
-        #     SELECT "resourceTypeId", "oCloudId", "name" FROM resourcetype
-        #     """,
-        # )
         res = uow.session.execute(select(resourcetype))
     return [dict(r) for r in res]
 
 
 def resource_type_one(resourceTypeId: str,
-                      uow: unit_of_work.SqlAlchemyUnitOfWork):
+                      uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        # res = uow.session.execute(
-        #     """
-        #     SELECT "resourceTypeId", "oCloudId", "name"
-        #     FROM resourcetype WHERE "resourceTypeId" = :resourceTypeId
-        #     """,
-        #     dict(resourceTypeId=resourceTypeId),
-        # )
         res = uow.session.execute(select(resourcetype).where(
             resourcetype.c.resourceTypeId == resourceTypeId))
         first = res.first()
     return None if first is None else dict(first)
 
 
-def resource_pools(uow: unit_of_work.SqlAlchemyUnitOfWork):
+def resource_pools(uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        # res = uow.session.execute(
-        #     """
-        #     SELECT "resourcePoolId", "oCloudId", "location", "name"
-        #     FROM resourcepool
-        #     """,
-        # )
         res = uow.session.execute(select(resourcepool))
     return [dict(r) for r in res]
 
 
 def resource_pool_one(resourcePoolId: str,
-                      uow: unit_of_work.SqlAlchemyUnitOfWork):
+                      uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        # res = uow.session.execute(
-        #     """
-        #     SELECT "resourcePoolId", "oCloudId", "location", "name"
-        #     FROM resourcepool
-        #     WHERE "resourcePoolId" = :resourcePoolId
-        #     """,
-        #     dict(resourcePoolId=resourcePoolId),
-        # )
         res = uow.session.execute(select(resourcepool).where(
             resourcepool.c.resourcePoolId == resourcePoolId))
         first = res.first()
     return None if first is None else dict(first)
 
 
-def resources(resourcePoolId: str, uow: unit_of_work.SqlAlchemyUnitOfWork):
+def resources(resourcePoolId: str, uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        # res = uow.session.execute(
-        #     """
-        #     SELECT "resourceId", "parentId", "resourceTypeId",
-        #           "resourcePoolId", "oCloudId"
-        #     FROM resource
-        #     WHERE "resourcePoolId" = :resourcePoolId
-        #     """,
-        #     dict(resourcePoolId=resourcePoolId),
-        # )
         res = uow.session.execute(select(resource).where(
             resource.c.resourcePoolId == resourcePoolId))
     return [dict(r) for r in res]
 
 
-def resource_one(resourceId: str, uow: unit_of_work.SqlAlchemyUnitOfWork):
+def resource_one(resourceId: str, uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        # res = uow.session.execute(
-        #     """
-        #     SELECT "resourceId", "parentId", "resourceTypeId",
-        #           "resourcePoolId", "oCloudId"
-        #     FROM resource
-        #     WHERE "resourceId" = :resourceId
-        #     """,
-        #     # AND "resourcePoolId" = :resourcePoolId
-        #     # dict(resourcePoolId=resourcePoolId,
-        #     dict(resourceId=resourceId),
-        # )
+        # topq = uow.session.query(resource).filter(
+        #     resource.c.resourceId == resourceId).cte('cte', recursive=True)
+        # bootomq = uow.session.query(resource).join(
+        #     topq, resource.c.parentId == topq.c.resourceId)
+        # res = uow.session.query(topq.union(bootomq))
+        # print(res)
         res = uow.session.execute(select(resource).where(
             resource.c.resourceId == resourceId))
         first = res.first()
     return None if first is None else dict(first)
 
 
-def deployment_managers(uow: unit_of_work.SqlAlchemyUnitOfWork):
+def deployment_managers(uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        # res = uow.session.execute(
-        #     """
-        #     SELECT "deploymentManagerId", "oCloudId",
-        #           "deploymentManagementServiceEndpoint", "name"
-        #     FROM deploymentmanager
-        #     """,
-        # )
         res = uow.session.execute(select(deploymentmanager))
     return [dict(r) for r in res]
 
 
 def deployment_manager_one(deploymentManagerId: str,
-                           uow: unit_of_work.SqlAlchemyUnitOfWork):
+                           uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        # res = uow.session.execute(
-        #     """
-        #     SELECT "deploymentManagerId", "oCloudId",
-        #           "deploymentManagementServiceEndpoint", "name"
-        #     FROM deploymentmanager
-        #     WHERE "deploymentManagerId" = :deploymentManagerId
-        #     """,
-        #     dict(deploymentManagerId=deploymentManagerId),
-        # )
         res = uow.session.execute(select(deploymentmanager).where(
             deploymentmanager.c.deploymentManagerId == deploymentManagerId))
         first = res.first()
     return None if first is None else dict(first)
 
 
-def subscriptions(uow: unit_of_work.SqlAlchemyUnitOfWork):
+def subscriptions(uow: unit_of_work.AbstractUnitOfWork):
     with uow:
         res = uow.session.execute(select(subscription))
     return [dict(r) for r in res]
 
 
 def subscription_one(subscriptionId: str,
-                     uow: unit_of_work.SqlAlchemyUnitOfWork):
+                     uow: unit_of_work.AbstractUnitOfWork):
     with uow:
         res = uow.session.execute(select(subscription).where(
             subscription.c.subscriptionId == subscriptionId))
         first = res.first()
     return None if first is None else dict(first)
+
+
+def subscription_create(subscription: Subscription,
+                        uow: unit_of_work.AbstractUnitOfWork):
+    with uow:
+        uow.subscriptions.add(subscription)
+        uow.commit()
+
+
+def subscription_delete(subscriptionId: str,
+                        uow: unit_of_work.AbstractUnitOfWork):
+    with uow:
+        uow.subscriptions.delete(subscriptionId)
+        uow.commit()
+    return True