X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fviews%2Focloud_view.py;fp=o2ims%2Fviews%2Focloud_view.py;h=b1b6e5dee7c618fe391d55bbe86e9def50440624;hb=38646c684a13536146ecf16a35e6e33d614b29e9;hp=a42946d2ddf5424b7577e0d015457a41c04e01d7;hpb=cbe50abd06ae2160acd8b48e39d8c6b96325f3c1;p=pti%2Fo2.git

diff --git a/o2ims/views/ocloud_view.py b/o2ims/views/ocloud_view.py
index a42946d..b1b6e5d 100644
--- a/o2ims/views/ocloud_view.py
+++ b/o2ims/views/ocloud_view.py
@@ -12,25 +12,158 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from o2ims.service import unit_of_work
+from sqlalchemy import select
+
+from o2ims.adapter.orm import ocloud, resource, \
+    resourcetype, resourcepool, deploymentmanager
+from o2ims.adapter import unit_of_work
+# from o2ims.domain.ocloud import Ocloud
+
+
+def oclouds(uow: unit_of_work.SqlAlchemyUnitOfWork):
+    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:
-        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
+        # 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):
+    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):
+    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):
+    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):
+    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):
+    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):
+    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),
+        # )
+        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):
+    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 oclouds(uow: unit_of_work.AbstractUnitOfWork):
+def deployment_manager_one(deploymentManagerId: str,
+                           uow: unit_of_work.SqlAlchemyUnitOfWork):
     with uow:
-        results = uow.session.execute(
-            """
-            SELECT oCloudId, name FROM ocloud
-            """,
-        )
-    return [dict(r) for r in results]
+        # 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)