X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fviews%2Focloud_route.py;h=5a2b259b5a48e3923e19904c3a851a76b505666c;hb=84867b76a65efc4e9add52c86eae7e451c4a038d;hp=4237ab4b5e79006f800eb97640a11992945c315e;hpb=5c501cb5e57a1ac3e0e7d38e22a3759e7958777a;p=pti%2Fo2.git diff --git a/o2ims/views/ocloud_route.py b/o2ims/views/ocloud_route.py index 4237ab4..5a2b259 100644 --- a/o2ims/views/ocloud_route.py +++ b/o2ims/views/ocloud_route.py @@ -12,45 +12,45 @@ # See the License for the specific language governing permissions and # limitations under the License. -from flask import jsonify +import uuid from flask_restx import Resource -from o2ims import config -from o2ims.views import ocloud_view +from o2ims.views import ocloud_view, api +from o2common.config import config +from o2ims.domain.ocloud import Subscription 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.route("/") +@api.response(404, 'oCloud not found') class OcloudsListRouter(Resource): """Ocloud get endpoint O2 interface ocloud endpoint """ - ocloud_get = OcloudDTO.ocloud_list + ocloud_get = OcloudDTO.ocloud - @api_ocloud.marshal_list_with(ocloud_get) + @api.marshal_with(ocloud_get) def get(self): - return ocloud_view.oclouds(uow) + res = ocloud_view.oclouds(uow) + if len(res) > 0: + return res[0] + api.abort( + 404, "oCloud doesn't exist") # ---------- ResourceTypes ---------- # -api_rt = ResourceTypeDTO.api - - -@api_rt.route("/resourceTypes") +@api.route("/resourceTypes") class ResourceTypesListRouter(Resource): model = ResourceTypeDTO.resource_type_get - @api_rt.marshal_list_with(model) + @api.marshal_list_with(model) def get(self): return ocloud_view.resource_types(uow) @@ -71,266 +71,166 @@ class ResourceTypesListRouter(Resource): # 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.route("/resourceTypes/") +@api.param('resourceTypeID', 'ID of the resource type') +@api.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.doc('Get resource type') + @api.marshal_with(model) def get(self, resourceTypeID): result = ocloud_view.resource_type_one(resourceTypeID, uow) if result is not None: return result - api_rt.abort( + api.abort( 404, "Resource type {} doesn't exist".format(resourceTypeID)) # ---------- ResourcePools ---------- # -api_rp = ResourcePoolDTO.api - - -@api_rp.route("/resourcePools") +@api.route("/resourcePools") class ResourcePoolsListRouter(Resource): model = ResourcePoolDTO.resource_pool_get - @api_rp.marshal_list_with(model) + @api.marshal_list_with(model) def get(self): return ocloud_view.resource_pools(uow) -@api_rp.route("/resourcePools/") -@api_rp.param('resourcePoolID', 'ID of the resource pool') -@api_rp.response(404, 'Resource pool not found') +@api.route("/resourcePools/") +@api.param('resourcePoolID', 'ID of the resource pool') +@api.response(404, 'Resource pool not found') class ResourcePoolGetRouter(Resource): model = ResourcePoolDTO.resource_pool_get - @api_rp.doc('Get resource pool') + @api.doc('Get resource pool') + @api.marshal_with(model) def get(self, resourcePoolID): result = ocloud_view.resource_pool_one(resourcePoolID, uow) if result is not None: return result - api_rp.abort( + api.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.route("/resourcePools//resources") +@api.param('resourcePoolID', 'ID of the resource pool') class ResourcesListRouter(Resource): model = ResourceDTO.resource_list - @api_res.marshal_list_with(model) + @api.marshal_list_with(model) def get(self, resourcePoolID): return ocloud_view.resources(resourcePoolID, 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.route("/resourcePools//resources/") +@api.param('resourcePoolID', 'ID of the resource pool') +@api.param('resourceID', 'ID of the resource') +@api.response(404, 'Resource not found') class ResourceGetRouter(Resource): model = ResourceDTO.resource_get - @api_res.doc('Get resource') + @api.doc('Get resource') + @api.marshal_with(model) def get(self, resourcePoolID, resourceID): result = ocloud_view.resource_one(resourceID, uow) if result is not None: return result - api_res.abort(404, "Resource {} doesn't exist".format(resourceID)) + api.abort(404, "Resource {} doesn't exist".format(resourceID)) # ---------- DeploymentManagers ---------- # -api_dm = DeploymentManagerDTO.api - - -@api_dm.route("/deploymentManagers") +@api.route("/deploymentManagers") class DeploymentManagersListRouter(Resource): model = DeploymentManagerDTO.deployment_manager_get - @api_dm.marshal_list_with(model) + @api.marshal_list_with(model) def get(self): return ocloud_view.deployment_managers(uow) -@api_dm.route("/deploymentManagers/") -@api_dm.param('deploymentManagerID', 'ID of the deployment manager') -@api_dm.response(404, 'Deployment manager not found') +@api.route("/deploymentManagers/") +@api.param('deploymentManagerID', 'ID of the deployment manager') +@api.response(404, 'Deployment manager not found') class DeploymentManagerGetRouter(Resource): model = DeploymentManagerDTO.deployment_manager_get - @api_dm.doc('Get deployment manager') + @api.doc('Get deployment manager') + @api.marshal_with(model) def get(self, deploymentManagerID): result = ocloud_view.deployment_manager_one( deploymentManagerID, uow) if result is not None: return result - api_dm.abort(404, "Deployment manager {} doesn't exist".format( + api.abort(404, "Deployment manager {} doesn't exist".format( deploymentManagerID)) # ---------- Subscriptions ---------- # -api_sub = SubscriptionDTO.api - - -@api_sub.route("/subscriptions") +@api.route("/subscriptions") class SubscriptionsListRouter(Resource): model = SubscriptionDTO.subscription_get + expect = SubscriptionDTO.subscription + post_resp = SubscriptionDTO.subscription_post_resp - @api_sub.marshal_list_with(model) + @api.doc('List subscriptions') + @api.marshal_list_with(model) def get(self): return ocloud_view.subscriptions(uow) + @api.doc('Create a subscription') + @api.expect(expect) + @api.marshal_with(post_resp, code=201) + def post(self): + data = api.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') -class SubscriptionGetRouter(Resource): +@api.route("/subscriptions/") +@api.param('subscriptionID', 'ID of the subscription') +@api.response(404, 'Subscription not found') +class SubscriptionGetDelRouter(Resource): model = DeploymentManagerDTO.deployment_manager_get - @api_sub.doc('Get subscription by ID') + @api.doc('Get subscription by ID') + @api.marshal_with(model) def get(self, subscriptionID): result = ocloud_view.subscription_one( subscriptionID, uow) if result is not None: return result - api_sub.abort(404, "Subscription {} doesn't exist".format( + api.abort(404, "Subscription {} doesn't exist".format( subscriptionID)) + @api.doc('Delete subscription by ID') + @api.response(204, 'Subscription deleted') + def delete(self, subscriptionID): + with uow: + uow.subscriptions.delete(subscriptionID) + uow.commit() + return '', 204 + def configure_namespace(app, bus): - 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) + api_v1 = api + app.add_namespace(api_v1, path=apibase) # Set global uow global uow uow = bus.uow - - -def configure_routes(app, bus): - - # ---------- OClouds ---------- # - @app.route(apibase, methods=["GET"]) - def oclouds(): - result = ocloud_view.oclouds(bus.uow) - return jsonify(result), 200 - - # ---------- ResourceTypes ---------- # - - @app.route(apibase + "/resourceTypes", methods=["GET"]) - def resource_types(): - result = ocloud_view.resource_types(bus.uow) - return jsonify(result), 200 - - @app.route(apibase + "/resourceTypes", methods=["POST", "PUT", "PATCH", - "DELETE"]) - def resource_types_not_allow(): - return "Method Not Allowed", 405 - - @app.route(apibase + "/resourceTypes/", methods=["GET"]) - def resource_types_one(resourceTypeID): - result = ocloud_view.resource_type_one(resourceTypeID, bus.uow) - if result is None: - return "", 200 - return jsonify(result), 200 - - @app.route(apibase + "/resourceTypes/", - methods=["POST", "PUT", "PATCH", "DELETE"]) - def resource_types_one_not_allow(resourceTypeID): - return "Method Not Allowed", 405 - - # ---------- ResourcePools ---------- # - - @app.route(apibase + "/resourcePools", methods=["GET"]) - def resource_pools(): - result = ocloud_view.resource_pools(bus.uow) - return jsonify(result), 200 - - @app.route(apibase + "/resourcePools", methods=["POST", "PUT", "PATCH", - "DELETE"]) - def resource_pools_not_allow(): - return "Method Not Allowed", 405 - - @app.route(apibase + "/resourcePools/", methods=["GET"]) - def resource_pools_one(resourcePoolID): - result = ocloud_view.resource_pool_one(resourcePoolID, bus.uow) - if result is None: - return "", 200 - return jsonify(result), 200 - - @app.route(apibase + "/resourcePools/", - methods=["POST", "PUT", "PATCH", "DELETE"]) - def resource_pools_one_not_allow(resourcePoolID): - return "Method Not Allowed", 405 - - # ---------- Resources ---------- # - - @app.route(apibase + "/resourcePools//resources", - methods=["GET"]) - def resources(resourcePoolID): - result = ocloud_view.resources(resourcePoolID, bus.uow) - return jsonify(result), 200 - - @app.route(apibase + "/resourcePools//resources", - methods=["POST", "PUT", "PATCH", "DELETE"]) - def resource_not_allow(resourcePoolID): - return "Method Not Allowed", 405 - - @app.route(apibase + - "/resourcePools//resources/", - methods=["GET"]) - def resources_one(resourcePoolID, resourceID): - result = ocloud_view.resource_one(resourceID, bus.uow) - if result is None: - return "", 200 - return jsonify(result), 200 - - @app.route(apibase + - "/resourcePools//resources/", - methods=["POST", "PUT", "PATCH", "DELETE"]) - def resource_one_not_allow(resourcePoolID, resourceID): - return "Method Not Allowed", 405 - - # ---------- DeploymentManagers ---------- # - - @app.route(apibase + "/deploymentManagers", methods=["GET"]) - def deployment_managers(): - result = ocloud_view.deployment_managers(bus.uow) - return jsonify(result), 200 - - @app.route(apibase + "/deploymentManagers", - methods=["POST", "PUT", "PATCH", "DELETE"]) - def deployment_managers_not_allow(): - return "Method Not Allowed", 405 - - @app.route(apibase + "/deploymentManagers/", - methods=["GET"]) - def deployment_manager_one(deploymentManagerID): - result = ocloud_view.deployment_manager_one( - deploymentManagerID, bus.uow) - if result is None: - return "", 200 - return jsonify(result), 200 - - @app.route(apibase + "/deploymentManagers/", - methods=["POST", "PUT", "PATCH", "DELETE"]) - def deployment_manager_one_not_allow(deploymentManagerID): - return "Method Not Allowed", 405