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=a42946d2ddf5424b7577e0d015457a41c04e01d7;hpb=8be81dfad35b08c4de77168e885bb18253069771;p=pti%2Fo2.git

diff --git a/o2ims/views/ocloud_view.py b/o2ims/views/ocloud_view.py
index a42946d..0436f3a 100644
--- a/o2ims/views/ocloud_view.py
+++ b/o2ims/views/ocloud_view.py
@@ -12,25 +12,129 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from o2ims.service import unit_of_work
+import uuid
+
+from o2common.service import unit_of_work
+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:
+        li = uow.oclouds.list()
+    return [r.serialize() for r in li]
 
 
 def ocloud_one(ocloudid: str, uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        results = uow.session.execute(
-            """
-            SELECT oCloudId, name FROM ocloud WHERE oCloudId = :ocloudid
-            """,
-            dict(ocloudid=ocloudid),
-        )
-    return dict(results[0]) if len(results) > 0 else None
+        first = uow.oclouds.get(ocloudid)
+        return first.serialize() if first is not None else None
 
 
-def oclouds(uow: unit_of_work.AbstractUnitOfWork):
+def resource_types(uow: unit_of_work.AbstractUnitOfWork):
+    with uow:
+        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:
+        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:
+        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:
+        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']
+
+    with uow:
+        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:
+        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:
+        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:
+        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:
+        li = uow.subscriptions.list()
+    return [r.serialize() for r in li]
+
+
+def subscription_one(subscriptionId: str,
+                     uow: unit_of_work.AbstractUnitOfWork):
+    with uow:
+        first = uow.subscriptions.get(subscriptionId)
+        return first.serialize() if first is not None else None
+
+
+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,
+                        uow: unit_of_work.AbstractUnitOfWork):
     with uow:
-        results = uow.session.execute(
-            """
-            SELECT oCloudId, name FROM ocloud
-            """,
-        )
-    return [dict(r) for r in results]
+        uow.subscriptions.delete(subscriptionId)
+        uow.commit()
+    return True