X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=o2ims%2Fviews%2Focloud_route.py;h=6b6a3fc36388d80b89464ad68177d48c6730935a;hb=refs%2Fchanges%2F13%2F8813%2F2;hp=bb4e63fecde6f5e11698c430f5c365b8ecd2a414;hpb=6bc82510fcc73a6dc2f817caa2ce74b52daa345c;p=pti%2Fo2.git

diff --git a/o2ims/views/ocloud_route.py b/o2ims/views/ocloud_route.py
index bb4e63f..6b6a3fc 100644
--- a/o2ims/views/ocloud_route.py
+++ b/o2ims/views/ocloud_route.py
@@ -12,17 +12,22 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-import uuid
-from flask_restx import Resource
+from flask_restx import Resource, reqparse
 
-from o2ims.views import ocloud_view, api_ims_inventory_v1
-from o2common.config import config
-from o2ims.domain.ocloud import Subscription
+from o2common.service.messagebus import MessageBus
+from o2ims.views import ocloud_view
+from o2ims.views.api_ns import api_ims_inventory_v1
 from o2ims.views.ocloud_dto import OcloudDTO, ResourceTypeDTO,\
     ResourcePoolDTO, ResourceDTO, DeploymentManagerDTO, SubscriptionDTO
 
+from o2common.helper import o2logging
+logger = o2logging.get_logger(__name__)
 
-apibase = config.get_o2ims_api_base()
+
+def configure_api_route():
+    # Set global bus for resource
+    global bus
+    bus = MessageBus.get_instance()
 
 
 # ----------  OClouds ---------- #
@@ -103,13 +108,29 @@ class ResourcePoolGetRouter(Resource):
 # ----------  Resources ---------- #
 @api_ims_inventory_v1.route("/resourcePools/<resourcePoolID>/resources")
 @api_ims_inventory_v1.param('resourcePoolID', 'ID of the resource pool')
+@api_ims_inventory_v1.param('resourceTypeName', 'filter resource type',
+                            location='args')
+@api_ims_inventory_v1.param('parentId', 'filter parentId',
+                            location='args')
 class ResourcesListRouter(Resource):
 
     model = ResourceDTO.resource_list
 
     @api_ims_inventory_v1.marshal_list_with(model)
     def get(self, resourcePoolID):
-        return ocloud_view.resources(resourcePoolID, bus.uow)
+        parser = reqparse.RequestParser()
+        parser.add_argument('resourceTypeName', location='args')
+        parser.add_argument('parentId', location='args')
+        args = parser.parse_args()
+        kwargs = {}
+        if args.resourceTypeName is not None:
+            kwargs['resourceTypeName'] = args.resourceTypeName
+        if args.parentId is not None:
+            kwargs['parentId'] = args.parentId
+            if args.parentId.lower() == 'null':
+                kwargs['parentId'] = None
+
+        return ocloud_view.resources(resourcePoolID, bus.uow, **kwargs)
 
 
 @api_ims_inventory_v1.route(
@@ -119,7 +140,9 @@ class ResourcesListRouter(Resource):
 @api_ims_inventory_v1.response(404, 'Resource not found')
 class ResourceGetRouter(Resource):
 
-    model = ResourceDTO.resource_get
+    # dto = ResourceDTO()
+    # model = dto.get_resource_get()
+    model = ResourceDTO.recursive_resource_mapping()
 
     @api_ims_inventory_v1.doc('Get resource')
     @api_ims_inventory_v1.marshal_with(model)
@@ -135,7 +158,7 @@ class ResourceGetRouter(Resource):
 @api_ims_inventory_v1.route("/deploymentManagers")
 class DeploymentManagersListRouter(Resource):
 
-    model = DeploymentManagerDTO.deployment_manager_get
+    model = DeploymentManagerDTO.deployment_manager_list
 
     @api_ims_inventory_v1.marshal_list_with(model)
     def get(self):
@@ -145,6 +168,8 @@ class DeploymentManagersListRouter(Resource):
 @api_ims_inventory_v1.route("/deploymentManagers/<deploymentManagerID>")
 @api_ims_inventory_v1.param('deploymentManagerID',
                             'ID of the deployment manager')
+@api_ims_inventory_v1.param('profile', 'DMS profile: value supports "sol018"',
+                            _in='query')
 @api_ims_inventory_v1.response(404, 'Deployment manager not found')
 class DeploymentManagerGetRouter(Resource):
 
@@ -153,8 +178,14 @@ class DeploymentManagerGetRouter(Resource):
     @api_ims_inventory_v1.doc('Get deployment manager')
     @api_ims_inventory_v1.marshal_with(model)
     def get(self, deploymentManagerID):
+        parser = reqparse.RequestParser()
+        parser.add_argument('profile', location='args')
+        args = parser.parse_args()
+        profile = (
+            args.profile if args.profile is not None and args.profile != ''
+            else 'default')
         result = ocloud_view.deployment_manager_one(
-            deploymentManagerID, bus.uow)
+            deploymentManagerID, bus.uow, profile)
         if result is not None:
             return result
         api_ims_inventory_v1.abort(
@@ -180,12 +211,8 @@ class SubscriptionsListRouter(Resource):
     @api_ims_inventory_v1.marshal_with(post_resp, code=201)
     def post(self):
         data = api_ims_inventory_v1.payload
-        sub_uuid = str(uuid.uuid4())
-        subscription = Subscription(
-            sub_uuid, data['callback'], data['consumerSubscriptionId'],
-            data['filter'])
-        ocloud_view.subscription_create(subscription, bus.uow)
-        return {"subscriptionId": sub_uuid}, 201
+        result = ocloud_view.subscription_create(data, bus.uow)
+        return result, 201
 
 
 @api_ims_inventory_v1.route("/subscriptions/<subscriptionID>")
@@ -208,16 +235,5 @@ class SubscriptionGetDelRouter(Resource):
     @api_ims_inventory_v1.doc('Delete subscription by ID')
     @api_ims_inventory_v1.response(204, 'Subscription deleted')
     def delete(self, subscriptionID):
-        with bus.uow:
-            bus.uow.subscriptions.delete(subscriptionID)
-            bus.uow.commit()
-        return '', 204
-
-
-def configure_namespace(app, bus_new):
-
-    # Set global bus for resource
-    global bus
-    bus = bus_new
-
-    app.add_namespace(api_ims_inventory_v1, path=apibase)
+        result = ocloud_view.subscription_delete(subscriptionID, bus.uow)
+        return result, 204