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

diff --git a/o2ims/views/ocloud_view.py b/o2ims/views/ocloud_view.py
index 9a1a595..0436f3a 100644
--- a/o2ims/views/ocloud_view.py
+++ b/o2ims/views/ocloud_view.py
@@ -12,114 +12,124 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from sqlalchemy import select
+import uuid
 
-from o2ims.adapter.orm import ocloud, resource, resourcetype, \
-    resourcepool, deploymentmanager, subscription
 from o2common.service import unit_of_work
-from o2ims.domain.ocloud import Subscription
+from o2ims.views.ocloud_dto import SubscriptionDTO
+from o2ims.domain.subscription_obj import Subscription
+
+from o2common.helper import o2logging
+logger = o2logging.get_logger(__name__)
 
 
 def oclouds(uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        res = uow.session.execute(select(ocloud))
-    return [dict(r) for r in res]
+        li = uow.oclouds.list()
+    return [r.serialize() for r in li]
 
 
 def ocloud_one(ocloudid: str, uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        res = uow.session.execute(
-            select(ocloud).where(ocloud.c.oCloudId == ocloudid))
-        first = res.first()
-    return None if first is None else dict(first)
+        first = uow.oclouds.get(ocloudid)
+        return first.serialize() if first is not None else None
 
 
 def resource_types(uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        res = uow.session.execute(select(resourcetype))
-    return [dict(r) for r in res]
+        li = uow.resource_types.list()
+    return [r.serialize() for r in li]
 
 
 def resource_type_one(resourceTypeId: str,
                       uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        res = uow.session.execute(select(resourcetype).where(
-            resourcetype.c.resourceTypeId == resourceTypeId))
-        first = res.first()
-    return None if first is None else dict(first)
+        first = uow.resource_types.get(resourceTypeId)
+        return first.serialize() if first is not None else None
 
 
 def resource_pools(uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        res = uow.session.execute(select(resourcepool))
-    return [dict(r) for r in res]
+        li = uow.resource_pools.list()
+    return [r.serialize() for r in li]
 
 
 def resource_pool_one(resourcePoolId: str,
                       uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        res = uow.session.execute(select(resourcepool).where(
-            resourcepool.c.resourcePoolId == resourcePoolId))
-        first = res.first()
-    return None if first is None else dict(first)
-
+        first = uow.resource_pools.get(resourcePoolId)
+        return first.serialize() if first is not None else None
+
+
+def resources(resourcePoolId: str, uow: unit_of_work.AbstractUnitOfWork,
+              **kwargs):
+
+    filter_kwargs = {}  # filter key should be the same with database name
+    if 'resourceTypeName' in kwargs:
+        resource_type_name = kwargs['resourceTypeName']
+        with uow:
+            # res_types = uow.resource_types.list()
+            # restype_ids = [
+            #     restype.resourceTypeId for restype in res_types
+            #     if resourceTypeName == restype.name]
+            # restype_id = '' if len(restype_ids) == 0 else restype_ids[0]
+            res_type = uow.resource_types.get_by_name(resource_type_name)
+            restype_id = '' if res_type is None else res_type.resourceTypeId
+        filter_kwargs['resourceTypeId'] = restype_id
+
+        #     li = uow.resources.list(resourcePoolId)
+        # return [r.serialize() for r in li if r.resourceTypeId == restype_id]
+    if 'parentId' in kwargs:
+        filter_kwargs['parentId'] = kwargs['parentId']
 
-def resources(resourcePoolId: str, uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        res = uow.session.execute(select(resource).where(
-            resource.c.resourcePoolId == resourcePoolId))
-    return [dict(r) for r in res]
+        li = uow.resources.list(resourcePoolId, **filter_kwargs)
+    return [r.serialize() for r in li]
 
 
 def resource_one(resourceId: str, uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        # 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)
+        first = uow.resources.get(resourceId)
+        return first.serialize() if first is not None else None
 
 
 def deployment_managers(uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        res = uow.session.execute(select(deploymentmanager))
-    return [dict(r) for r in res]
+        li = uow.deployment_managers.list()
+    return [r.serialize() for r in li]
 
 
 def deployment_manager_one(deploymentManagerId: str,
                            uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        res = uow.session.execute(select(deploymentmanager).where(
-            deploymentmanager.c.deploymentManagerId == deploymentManagerId))
-        first = res.first()
-    return None if first is None else dict(first)
+        first = uow.deployment_managers.get(deploymentManagerId)
+        return first.serialize() if first is not None else None
 
 
 def subscriptions(uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        res = uow.session.execute(select(subscription))
-    return [dict(r) for r in res]
+        li = uow.subscriptions.list()
+    return [r.serialize() for r in li]
 
 
 def subscription_one(subscriptionId: str,
                      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)
+        first = uow.subscriptions.get(subscriptionId)
+        return first.serialize() if first is not None else None
 
 
-def subscription_create(subscription: Subscription,
+def subscription_create(subscriptionDto: SubscriptionDTO.subscription,
                         uow: unit_of_work.AbstractUnitOfWork):
+
+    sub_uuid = str(uuid.uuid4())
+    subscription = Subscription(
+        sub_uuid, subscriptionDto['callback'],
+        subscriptionDto['consumerSubscriptionId'],
+        subscriptionDto['filter'])
     with uow:
         uow.subscriptions.add(subscription)
         uow.commit()
+    return {"subscriptionId": sub_uuid}
 
 
 def subscription_delete(subscriptionId: str,