X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fviews%2Focloud_route.py;h=5feb6b8ee3ace488cc8a724eac4e0bcf45e5e894;hb=bd72340e71574c7095e94aa2719df66c3f711545;hp=bb4e63fecde6f5e11698c430f5c365b8ecd2a414;hpb=6bc82510fcc73a6dc2f817caa2ce74b52daa345c;p=pti%2Fo2.git diff --git a/o2ims/views/ocloud_route.py b/o2ims/views/ocloud_route.py index bb4e63f..5feb6b8 100644 --- a/o2ims/views/ocloud_route.py +++ b/o2ims/views/ocloud_route.py @@ -12,17 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -import uuid -from flask_restx import Resource +from flask import request +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 o2common.views.pagination_route import link_header, PAGE_PARAM +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 ---------- # @@ -46,13 +53,25 @@ class OcloudsListRouter(Resource): # ---------- ResourceTypes ---------- # @api_ims_inventory_v1.route("/resourceTypes") +@api_ims_inventory_v1.param(PAGE_PARAM, + 'Page number of the results to fetch.' + + ' Default: 1', + _in='query', default=1) class ResourceTypesListRouter(Resource): model = ResourceTypeDTO.resource_type_get @api_ims_inventory_v1.marshal_list_with(model) def get(self): - return ocloud_view.resource_types(bus.uow) + parser = reqparse.RequestParser() + parser.add_argument(PAGE_PARAM, location='args') + args = parser.parse_args() + kwargs = {} + if args.nextpage_opaque_marker is not None: + kwargs['page'] = args.nextpage_opaque_marker + + ret = ocloud_view.resource_types(bus.uow, **kwargs) + return link_header(request.full_path, ret) @api_ims_inventory_v1.route("/resourceTypes/") @@ -74,13 +93,25 @@ class ResourceTypeGetRouter(Resource): # ---------- ResourcePools ---------- # @api_ims_inventory_v1.route("/resourcePools") +@api_ims_inventory_v1.param(PAGE_PARAM, + 'Page number of the results to fetch.' + + ' Default: 1', + _in='query', default=1) class ResourcePoolsListRouter(Resource): model = ResourcePoolDTO.resource_pool_get @api_ims_inventory_v1.marshal_list_with(model) def get(self): - return ocloud_view.resource_pools(bus.uow) + parser = reqparse.RequestParser() + parser.add_argument(PAGE_PARAM, location='args') + args = parser.parse_args() + kwargs = {} + if args.nextpage_opaque_marker is not None: + kwargs['page'] = args.nextpage_opaque_marker + + ret = ocloud_view.resource_pools(bus.uow, **kwargs) + return link_header(request.full_path, ret) @api_ims_inventory_v1.route("/resourcePools/") @@ -103,13 +134,48 @@ class ResourcePoolGetRouter(Resource): # ---------- Resources ---------- # @api_ims_inventory_v1.route("/resourcePools//resources") @api_ims_inventory_v1.param('resourcePoolID', 'ID of the resource pool') +@api_ims_inventory_v1.param('resourceTypeName', 'filter resource type', + _in='query') +@api_ims_inventory_v1.param('parentId', 'filter parentId', + _in='query') +# @api_ims_inventory_v1.param('sort', 'sort by column name', +# _in='query') +# @api_ims_inventory_v1.param('per_page', 'The number of results per page ' + +# '(max 100). Default: 30', +# _in='query', default=30) +@api_ims_inventory_v1.param(PAGE_PARAM, + 'Page number of the results to fetch.' + + ' Default: 1', + _in='query', default=1) 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') + # parser.add_argument('sort', location='args') + # parser.add_argument('per_page', location='args') + parser.add_argument(PAGE_PARAM, 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 + # if args.per_page is not None: + # kwargs['per_page'] = args.per_page + # base_url = base_url + 'per_page=' + args.per_page + '&' + if args.nextpage_opaque_marker is not None: + kwargs['page'] = args.nextpage_opaque_marker + + ret = ocloud_view.resources(resourcePoolID, bus.uow, **kwargs) + + return link_header(request.full_path, ret) @api_ims_inventory_v1.route( @@ -119,7 +185,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) @@ -133,18 +201,32 @@ class ResourceGetRouter(Resource): # ---------- DeploymentManagers ---------- # @api_ims_inventory_v1.route("/deploymentManagers") +@api_ims_inventory_v1.param(PAGE_PARAM, + 'Page number of the results to fetch.' + + ' Default: 1', + _in='query', default=1) class DeploymentManagersListRouter(Resource): - model = DeploymentManagerDTO.deployment_manager_get + model = DeploymentManagerDTO.deployment_manager_list @api_ims_inventory_v1.marshal_list_with(model) def get(self): - return ocloud_view.deployment_managers(bus.uow) + parser = reqparse.RequestParser() + parser.add_argument(PAGE_PARAM, location='args') + args = parser.parse_args() + kwargs = {} + if args.nextpage_opaque_marker is not None: + kwargs['page'] = args.nextpage_opaque_marker + + ret = ocloud_view.deployment_managers(bus.uow, **kwargs) + return link_header(request.full_path, ret) @api_ims_inventory_v1.route("/deploymentManagers/") @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 +235,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( @@ -173,19 +261,23 @@ class SubscriptionsListRouter(Resource): @api_ims_inventory_v1.doc('List subscriptions') @api_ims_inventory_v1.marshal_list_with(model) def get(self): - return ocloud_view.subscriptions(bus.uow) + parser = reqparse.RequestParser() + parser.add_argument(PAGE_PARAM, location='args') + args = parser.parse_args() + kwargs = {} + if args.nextpage_opaque_marker is not None: + kwargs['page'] = args.nextpage_opaque_marker + + ret = ocloud_view.subscriptions(bus.uow, **kwargs) + return link_header(request.full_path, ret) @api_ims_inventory_v1.doc('Create a subscription') @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 - 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/") @@ -208,16 +300,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