X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fviews%2Focloud_route.py;h=6d5e8e38bcb14b62c46609e245381939bd230014;hb=f73c8e3b01b8f5b7438ba544870e06d8f30cdea0;hp=92cfd1caabbe355e659483dd67f7f8c50d3d91a1;hpb=de778bc19d9329d3c1c3c536bfd702423102277b;p=pti%2Fo2.git diff --git a/o2ims/views/ocloud_route.py b/o2ims/views/ocloud_route.py index 92cfd1c..6d5e8e3 100644 --- a/o2ims/views/ocloud_route.py +++ b/o2ims/views/ocloud_route.py @@ -12,27 +12,20 @@ # See the License for the specific language governing permissions and # limitations under the License. -# from operator import sub -import uuid -# from re import sub from flask_restx import Resource -from o2ims import config -from o2ims.views import ocloud_view -from o2ims.domain.ocloud import Subscription +from o2ims.views import ocloud_view, api_ims_inventory_v1 +from o2common.config import config from o2ims.views.ocloud_dto import OcloudDTO, ResourceTypeDTO,\ ResourcePoolDTO, ResourceDTO, DeploymentManagerDTO, SubscriptionDTO + apibase = config.get_o2ims_api_base() -# api = Namespace("O2IMS", description='IMS') # ---------- OClouds ---------- # -api_ocloud = OcloudDTO.api - - -@api_ocloud.route("/") -@api_ocloud.response(404, 'oCloud not found') +@api_ims_inventory_v1.route("/") +@api_ims_inventory_v1.response(404, 'oCloud not found') class OcloudsListRouter(Resource): """Ocloud get endpoint O2 interface ocloud endpoint @@ -40,221 +33,183 @@ class OcloudsListRouter(Resource): ocloud_get = OcloudDTO.ocloud - @api_ocloud.marshal_with(ocloud_get) + @api_ims_inventory_v1.marshal_with(ocloud_get) def get(self): - res = ocloud_view.oclouds(uow) + res = ocloud_view.oclouds(bus.uow) if len(res) > 0: return res[0] - api_rt.abort( + api_ims_inventory_v1.abort( 404, "oCloud doesn't exist") # ---------- ResourceTypes ---------- # -api_rt = ResourceTypeDTO.api - - -@api_rt.route("/resourceTypes") +@api_ims_inventory_v1.route("/resourceTypes") class ResourceTypesListRouter(Resource): model = ResourceTypeDTO.resource_type_get - @api_rt.marshal_list_with(model) + @api_ims_inventory_v1.marshal_list_with(model) def get(self): - return ocloud_view.resource_types(uow) - - # @api.doc(response={405: 'Method Not Allowed'}) - # def post(self): - # api.abort(405) + return ocloud_view.resource_types(bus.uow) - # @api.doc(response={405: 'Method Not Allowed'}) - # def put(self): - # api.abort(405) - # @api.doc(response={405: 'Method Not Allowed'}) - # def patch(self): - # api.abort(405) - - # @api.doc(response={405: 'Method Not Allowed'}) - # def delete(self): - # api.abort(405) - - -@api_rt.route("/resourceTypes/") -@api_rt.param('resourceTypeID', 'ID of the resource type') -@api_rt.response(404, 'Resource type not found') +@api_ims_inventory_v1.route("/resourceTypes/") +@api_ims_inventory_v1.param('resourceTypeID', 'ID of the resource type') +@api_ims_inventory_v1.response(404, 'Resource type not found') class ResourceTypeGetRouter(Resource): model = ResourceTypeDTO.resource_type_get - @api_rt.doc('Get resource type') - @api_rt.marshal_with(model) + @api_ims_inventory_v1.doc('Get resource type') + @api_ims_inventory_v1.marshal_with(model) def get(self, resourceTypeID): - result = ocloud_view.resource_type_one(resourceTypeID, uow) + result = ocloud_view.resource_type_one(resourceTypeID, bus.uow) if result is not None: return result - api_rt.abort( + api_ims_inventory_v1.abort( 404, "Resource type {} doesn't exist".format(resourceTypeID)) # ---------- ResourcePools ---------- # -api_rp = ResourcePoolDTO.api - - -@api_rp.route("/resourcePools") +@api_ims_inventory_v1.route("/resourcePools") class ResourcePoolsListRouter(Resource): model = ResourcePoolDTO.resource_pool_get - @api_rp.marshal_list_with(model) + @api_ims_inventory_v1.marshal_list_with(model) def get(self): - return ocloud_view.resource_pools(uow) + return ocloud_view.resource_pools(bus.uow) -@api_rp.route("/resourcePools/") -@api_rp.param('resourcePoolID', 'ID of the resource pool') -@api_rp.response(404, 'Resource pool not found') +@api_ims_inventory_v1.route("/resourcePools/") +@api_ims_inventory_v1.param('resourcePoolID', 'ID of the resource pool') +@api_ims_inventory_v1.response(404, 'Resource pool not found') class ResourcePoolGetRouter(Resource): model = ResourcePoolDTO.resource_pool_get - @api_rp.doc('Get resource pool') - @api_rp.marshal_with(model) + @api_ims_inventory_v1.doc('Get resource pool') + @api_ims_inventory_v1.marshal_with(model) def get(self, resourcePoolID): - result = ocloud_view.resource_pool_one(resourcePoolID, uow) + result = ocloud_view.resource_pool_one(resourcePoolID, bus.uow) if result is not None: return result - api_rp.abort( + api_ims_inventory_v1.abort( 404, "Resource pool {} doesn't exist".format(resourcePoolID)) # ---------- Resources ---------- # -api_res = ResourceDTO.api - - -@api_res.route("/resourcePools//resources") -@api_res.param('resourcePoolID', 'ID of the resource pool') +@api_ims_inventory_v1.route("/resourcePools//resources") +@api_ims_inventory_v1.param('resourcePoolID', 'ID of the resource pool') class ResourcesListRouter(Resource): model = ResourceDTO.resource_list - @api_res.marshal_list_with(model) + @api_ims_inventory_v1.marshal_list_with(model) def get(self, resourcePoolID): - return ocloud_view.resources(resourcePoolID, uow) + return ocloud_view.resources(resourcePoolID, bus.uow) -@api_res.route("/resourcePools//resources/") -@api_res.param('resourcePoolID', 'ID of the resource pool') -@api_res.param('resourceID', 'ID of the resource') -@api_res.response(404, 'Resource not found') +@api_ims_inventory_v1.route( + "/resourcePools//resources/") +@api_ims_inventory_v1.param('resourcePoolID', 'ID of the resource pool') +@api_ims_inventory_v1.param('resourceID', 'ID of the resource') +@api_ims_inventory_v1.response(404, 'Resource not found') class ResourceGetRouter(Resource): model = ResourceDTO.resource_get - @api_res.doc('Get resource') - @api_res.marshal_with(model) + @api_ims_inventory_v1.doc('Get resource') + @api_ims_inventory_v1.marshal_with(model) def get(self, resourcePoolID, resourceID): - result = ocloud_view.resource_one(resourceID, uow) + result = ocloud_view.resource_one(resourceID, bus.uow) if result is not None: return result - api_res.abort(404, "Resource {} doesn't exist".format(resourceID)) + api_ims_inventory_v1.abort( + 404, "Resource {} doesn't exist".format(resourceID)) # ---------- DeploymentManagers ---------- # -api_dm = DeploymentManagerDTO.api - - -@api_dm.route("/deploymentManagers") +@api_ims_inventory_v1.route("/deploymentManagers") class DeploymentManagersListRouter(Resource): model = DeploymentManagerDTO.deployment_manager_get - @api_dm.marshal_list_with(model) + @api_ims_inventory_v1.marshal_list_with(model) def get(self): - return ocloud_view.deployment_managers(uow) + return ocloud_view.deployment_managers(bus.uow) -@api_dm.route("/deploymentManagers/") -@api_dm.param('deploymentManagerID', 'ID of the deployment manager') -@api_dm.response(404, 'Deployment manager not found') +@api_ims_inventory_v1.route("/deploymentManagers/") +@api_ims_inventory_v1.param('deploymentManagerID', + 'ID of the deployment manager') +@api_ims_inventory_v1.response(404, 'Deployment manager not found') class DeploymentManagerGetRouter(Resource): model = DeploymentManagerDTO.deployment_manager_get - @api_dm.doc('Get deployment manager') - @api_dm.marshal_with(model) + @api_ims_inventory_v1.doc('Get deployment manager') + @api_ims_inventory_v1.marshal_with(model) def get(self, deploymentManagerID): result = ocloud_view.deployment_manager_one( - deploymentManagerID, uow) + deploymentManagerID, bus.uow) if result is not None: return result - api_dm.abort(404, "Deployment manager {} doesn't exist".format( - deploymentManagerID)) + api_ims_inventory_v1.abort( + 404, + "Deployment manager {} doesn't exist".format(deploymentManagerID)) # ---------- Subscriptions ---------- # -api_sub = SubscriptionDTO.api - - -@api_sub.route("/subscriptions") +@api_ims_inventory_v1.route("/subscriptions") class SubscriptionsListRouter(Resource): model = SubscriptionDTO.subscription_get expect = SubscriptionDTO.subscription post_resp = SubscriptionDTO.subscription_post_resp - @api_sub.doc('List subscriptions') - @api_sub.marshal_list_with(model) + @api_ims_inventory_v1.doc('List subscriptions') + @api_ims_inventory_v1.marshal_list_with(model) def get(self): - return ocloud_view.subscriptions(uow) + return ocloud_view.subscriptions(bus.uow) - @api_sub.doc('Create a subscription') - @api_sub.expect(expect) - @api_sub.marshal_with(post_resp, code=201) + @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_sub.payload - sub_uuid = str(uuid.uuid4()) - subscription = Subscription( - sub_uuid, data['callback'], data['consumerSubscriptionId'], - data['filter']) - ocloud_view.subscription_create(subscription, uow) - return {"subscriptionId": sub_uuid}, 201 - - -@api_sub.route("/subscriptions/") -@api_sub.param('subscriptionID', 'ID of the subscription') -@api_sub.response(404, 'Subscription not found') + data = api_ims_inventory_v1.payload + result = ocloud_view.subscription_create(data, bus.uow) + return result, 201 + + +@api_ims_inventory_v1.route("/subscriptions/") +@api_ims_inventory_v1.param('subscriptionID', 'ID of the subscription') +@api_ims_inventory_v1.response(404, 'Subscription not found') class SubscriptionGetDelRouter(Resource): - model = DeploymentManagerDTO.deployment_manager_get + model = SubscriptionDTO.subscription_get - @api_sub.doc('Get subscription by ID') - @api_sub.marshal_with(model) + @api_ims_inventory_v1.doc('Get subscription by ID') + @api_ims_inventory_v1.marshal_with(model) def get(self, subscriptionID): result = ocloud_view.subscription_one( - subscriptionID, uow) + subscriptionID, bus.uow) if result is not None: return result - api_sub.abort(404, "Subscription {} doesn't exist".format( + api_ims_inventory_v1.abort(404, "Subscription {} doesn't exist".format( subscriptionID)) - @api_sub.doc('Delete subscription by ID') - @api_sub.response(204, 'Subscription deleted') + @api_ims_inventory_v1.doc('Delete subscription by ID') + @api_ims_inventory_v1.response(204, 'Subscription deleted') def delete(self, subscriptionID): - with uow: - uow.subscriptions.delete(subscriptionID) - uow.commit() - return '', 204 + result = ocloud_view.subscription_delete(subscriptionID, bus.uow) + return result, 204 -def configure_namespace(app, bus): +def configure_namespace(app, bus_new): - app.add_namespace(api_ocloud, path=apibase) - app.add_namespace(api_rt, path=apibase) - app.add_namespace(api_rp, path=apibase) - app.add_namespace(api_res, path=apibase) - app.add_namespace(api_dm, path=apibase) - app.add_namespace(api_sub, path=apibase) + # Set global bus for resource + global bus + bus = bus_new - # Set global uow - global uow - uow = bus.uow + app.add_namespace(api_ims_inventory_v1, path=apibase)