X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fviews%2Focloud_route.py;h=00fe520c1dad08e8d20e7dfa6657f700fb3c9b3b;hb=91c02b447f2035ffbb11891ece162242c8f5a44f;hp=99adb5f064c5c7c10bcbc198b5c50d0194aac8e7;hpb=3da89330f3837ac6cffd2cad4c4018c9f8c3327d;p=pti%2Fo2.git

diff --git a/o2ims/views/ocloud_route.py b/o2ims/views/ocloud_route.py
index 99adb5f..00fe520 100644
--- a/o2ims/views/ocloud_route.py
+++ b/o2ims/views/ocloud_route.py
@@ -13,15 +13,22 @@
 #  limitations under the License.
 
 from flask_restx import Resource
+from flask_restx import reqparse
 
-from o2ims.views import ocloud_view, api_ims_inventory_v1
-from o2common.config import config
+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,\
-    RegistrationDTO
+    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 ---------- #
@@ -102,13 +109,26 @@ 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
+        return ocloud_view.resources(resourcePoolID, bus.uow, **kwargs)
 
 
 @api_ims_inventory_v1.route(
@@ -207,58 +227,3 @@ class SubscriptionGetDelRouter(Resource):
     def delete(self, subscriptionID):
         result = ocloud_view.subscription_delete(subscriptionID, bus.uow)
         return result, 204
-
-
-# ----------  Registration ---------- #
-@api_ims_inventory_v1.route("/registrations")
-class RegistrationListRouter(Resource):
-
-    model = RegistrationDTO.registration_get
-    expect = RegistrationDTO.registration
-    post_resp = RegistrationDTO.registration_post_resp
-
-    @api_ims_inventory_v1.doc('List registrations')
-    @api_ims_inventory_v1.marshal_list_with(model)
-    def get(self):
-        return ocloud_view.registrations(bus.uow)
-
-    @api_ims_inventory_v1.doc('Create a registration')
-    @api_ims_inventory_v1.expect(expect)
-    @api_ims_inventory_v1.marshal_with(post_resp, code=201)
-    def post(self):
-        data = api_ims_inventory_v1.payload
-        result = ocloud_view.registration_create(data, bus)
-        return result, 201
-
-
-@api_ims_inventory_v1.route("/registrations/<registrationID>")
-@api_ims_inventory_v1.param('registrationID', 'ID of the registration')
-@api_ims_inventory_v1.response(404, 'Registration not found')
-class RegistrationGetDelRouter(Resource):
-
-    model = RegistrationDTO.registration_get
-
-    @api_ims_inventory_v1.doc('Get registration by ID')
-    @api_ims_inventory_v1.marshal_with(model)
-    def get(self, registrationID):
-        result = ocloud_view.registration_one(
-            registrationID, bus.uow)
-        if result is not None:
-            return result
-        api_ims_inventory_v1.abort(404, "Registration {} doesn't exist".format(
-            registrationID))
-
-    @api_ims_inventory_v1.doc('Delete registration by ID')
-    @api_ims_inventory_v1.response(204, 'Registration deleted')
-    def delete(self, registrationID):
-        result = ocloud_view.registration_delete(registrationID, bus.uow)
-        return result, 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)