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