# See the License for the specific language governing permissions and\r
# limitations under the License.\r
\r
-from sqlalchemy import select\r
+import logging\r
+import uuid\r
+from datetime import datetime\r
\r
-from o2ims.adapter.orm import ocloud, resource, resourcetype, \\r
- resourcepool, deploymentmanager, subscription\r
-from o2ims.adapter import unit_of_work\r
-# from o2ims.domain.ocloud import Ocloud\r
+from o2common.service import unit_of_work, messagebus\r
+from o2ims.domain import events\r
+from o2ims.views.ocloud_dto import RegistrationDTO, SubscriptionDTO\r
+from o2ims.domain.subscription_obj import Registration, 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
+ li = uow.oclouds.list()\r
+ return [r.serialize() for r in li]\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
+ first = uow.oclouds.get(ocloudid)\r
+ return first.serialize() if first is not None else None\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
+ li = uow.resource_types.list()\r
+ return [r.serialize() for r in li]\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
+ first = uow.resource_types.get(resourceTypeId)\r
+ return first.serialize() if first is not None else None\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
+ li = uow.resource_pools.list()\r
+ return [r.serialize() for r in li]\r
\r
\r
def resource_pool_one(resourcePoolId: str,\r
- uow: unit_of_work.SqlAlchemyUnitOfWork):\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
- 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
- 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
- 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
- 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
+ uow: unit_of_work.AbstractUnitOfWork):\r
+ with uow:\r
+ first = uow.resource_pools.get(resourcePoolId)\r
+ return first.serialize() if first is not None else None\r
+\r
+\r
+def resources(resourcePoolId: str, uow: unit_of_work.AbstractUnitOfWork):\r
+ with uow:\r
+ li = uow.resources.list(resourcePoolId)\r
+ return [r.serialize() for r in li]\r
+\r
+\r
+def resource_one(resourceId: str, uow: unit_of_work.AbstractUnitOfWork):\r
+ with uow:\r
+ first = uow.resources.get(resourceId)\r
+ return first.serialize() if first is not None else None\r
+\r
+\r
+def deployment_managers(uow: unit_of_work.AbstractUnitOfWork):\r
+ with uow:\r
+ li = uow.deployment_managers.list()\r
+ return [r.serialize() for r in li]\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
+ first = uow.deployment_managers.get(deploymentManagerId)\r
+ return first.serialize() if first is not None else None\r
\r
\r
-def subscriptions(uow: unit_of_work.SqlAlchemyUnitOfWork):\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
+ li = uow.subscriptions.list()\r
+ return [r.serialize() for r in li]\r
\r
\r
def subscription_one(subscriptionId: str,\r
- uow: unit_of_work.SqlAlchemyUnitOfWork):\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
+ first = uow.subscriptions.get(subscriptionId)\r
+ return first.serialize() if first is not None else None\r
+\r
+\r
+def subscription_create(subscriptionDto: SubscriptionDTO.subscription,\r
+ uow: unit_of_work.AbstractUnitOfWork):\r
+\r
+ sub_uuid = str(uuid.uuid4())\r
+ subscription = Subscription(\r
+ sub_uuid, subscriptionDto['callback'],\r
+ subscriptionDto['consumerSubscriptionId'],\r
+ subscriptionDto['filter'])\r
+ with uow:\r
+ uow.subscriptions.add(subscription)\r
+ uow.commit()\r
+ return {"subscriptionId": sub_uuid}\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
+\r
+\r
+def registrations(uow: unit_of_work.AbstractUnitOfWork):\r
+ with uow:\r
+ li = uow.registrations.list()\r
+ return [r.serialize() for r in li]\r
+\r
+\r
+def registration_one(registrationId: str,\r
+ uow: unit_of_work.AbstractUnitOfWork):\r
+ with uow:\r
+ first = uow.registrations.get(registrationId)\r
+ return first.serialize() if first is not None else None\r
+\r
+\r
+def registration_create(registrationDto: RegistrationDTO.registration,\r
+ bus: messagebus.MessageBus):\r
+\r
+ reg_uuid = str(uuid.uuid4())\r
+ registration = Registration(\r
+ reg_uuid, registrationDto['callback'])\r
+ with bus.uow as uow:\r
+ uow.registrations.add(registration)\r
+ logging.debug('before event length {}'.format(\r
+ len(registration.events)))\r
+ registration.events.append(events.RegistrationChanged(\r
+ reg_uuid,\r
+ datetime.now()))\r
+ logging.debug('after event length {}'.format(len(registration.events)))\r
+ uow.commit()\r
+ _handle_events(bus)\r
+ return {"registrationId": reg_uuid}\r
+\r
+\r
+def registration_delete(registrationId: str,\r
+ uow: unit_of_work.AbstractUnitOfWork):\r
+ with uow:\r
+ uow.registrations.delete(registrationId)\r
+ uow.commit()\r
+ return True\r
+\r
+\r
+def _handle_events(bus: messagebus.MessageBus):\r
+ # handle events\r
+ events = bus.uow.collect_new_events()\r
+ for event in events:\r
+ bus.handle(event)\r
+ return True\r
Code Review / pti / o2.git / blobdiff