X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fviews%2Fsubscriptions_view.py;h=547e0124dad56c3f19bdd8e23a2c76fd3831eee1;hb=c2e150a6c3901b664c963b389ee6e9b9e00ed2ab;hp=4c013ee47bac63e5e8531a1811cb97d7916596b2;hpb=50ad0c42077b5ce1393396b2a3f376a961872124;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/nf/views/subscriptions_view.py b/lcm/lcm/nf/views/subscriptions_view.py index 4c013ee4..547e0124 100644 --- a/lcm/lcm/nf/views/subscriptions_view.py +++ b/lcm/lcm/nf/views/subscriptions_view.py @@ -15,11 +15,8 @@ import ast import json import logging -import traceback from drf_yasg.utils import swagger_auto_schema -from lcm.nf.biz.create_subscription import CreateSubscription -from lcm.nf.biz.query_subscription import QuerySubscription from rest_framework import status from rest_framework.response import Response from rest_framework.views import APIView @@ -28,7 +25,11 @@ from lcm.nf.serializers.lccn_subscription_request import LccnSubscriptionRequest from lcm.nf.serializers.lccn_subscription import LccnSubscriptionSerializer from lcm.nf.serializers.lccn_subscriptions import LccnSubscriptionsSerializer from lcm.nf.serializers.response import ProblemDetailsSerializer -from lcm.pub.exceptions import NFLCMException +from lcm.pub.exceptions import NFLCMException, NFLCMExceptionBadRequest +from lcm.nf.biz.create_subscription import CreateSubscription +from lcm.nf.biz.query_subscription import QuerySubscription +from lcm.nf.biz.delete_subscription import DeleteSubscription +from .common import view_safe_call_with_log logger = logging.getLogger(__name__) VALID_FILTERS = ["operationTypes", "operationStates", "notificationTypes", "vnfInstanceId"] @@ -50,42 +51,35 @@ class SubscriptionsView(APIView): responses={ status.HTTP_201_CREATED: LccnSubscriptionSerializer(), status.HTTP_303_SEE_OTHER: ProblemDetailsSerializer(), + status.HTTP_400_BAD_REQUEST: ProblemDetailsSerializer(), status.HTTP_500_INTERNAL_SERVER_ERROR: ProblemDetailsSerializer() } ) + @view_safe_call_with_log(logger=logger) def post(self, request): logger.debug("SubscribeNotification--post::> %s" % request.data) - try: - lccn_subscription_request_serializer = LccnSubscriptionRequestSerializer(data=request.data) - if not lccn_subscription_request_serializer.is_valid(): - raise NFLCMException(lccn_subscription_request_serializer.errors) - subscription = CreateSubscription( - lccn_subscription_request_serializer.data).do_biz() - lccn_notifications_filter = { - "notificationTypes": ast.literal_eval(subscription.notification_types), - "operationTypes": ast.literal_eval(subscription.operation_types), - "operationStates": ast.literal_eval(subscription.operation_states), - "vnfInstanceSubscriptionFilter": json.loads(subscription.vnf_instance_filter) - } - subscription_data = { - "id": subscription.subscription_id, - "callbackUri": subscription.callback_uri, - "_links": json.loads(subscription.links), - "filter": lccn_notifications_filter - } - sub_resp_serializer = LccnSubscriptionSerializer(data=subscription_data) - if not sub_resp_serializer.is_valid(): - raise NFLCMException(sub_resp_serializer.errors) - return Response(data=sub_resp_serializer.data, status=status.HTTP_201_CREATED) - except NFLCMException as e: - logger.error(e.message) - if "exists" in e.message: - return Response(data={'error': '%s' % e.message}, status=status.HTTP_303_SEE_OTHER) - return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - except Exception as e: - logger.error(e.message) - logger.error(traceback.format_exc()) - return Response(data={'error': e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + lccn_subscription_request_serializer = LccnSubscriptionRequestSerializer(data=request.data) + if not lccn_subscription_request_serializer.is_valid(): + raise NFLCMExceptionBadRequest(lccn_subscription_request_serializer.errors) + subscription = CreateSubscription( + request.data).do_biz() + lccn_notifications_filter = { + "notificationTypes": ast.literal_eval(subscription.notification_types), + "operationTypes": ast.literal_eval(subscription.operation_types), + "operationStates": ast.literal_eval(subscription.operation_states), + "vnfInstanceSubscriptionFilter": json.loads(subscription.vnf_instance_filter) + } + subscription_data = { + "id": subscription.subscription_id, + "callbackUri": subscription.callback_uri, + "_links": json.loads(subscription.links), + "filter": lccn_notifications_filter + } + sub_resp_serializer = LccnSubscriptionSerializer(data=subscription_data) + if not sub_resp_serializer.is_valid(): + raise NFLCMException(sub_resp_serializer.errors) + return Response(data=subscription_data, status=status.HTTP_201_CREATED) @swagger_auto_schema( responses={ @@ -94,28 +88,62 @@ class SubscriptionsView(APIView): status.HTTP_500_INTERNAL_SERVER_ERROR: ProblemDetailsSerializer() } ) + @view_safe_call_with_log(logger=logger) def get(self, request): logger.debug("SubscribeNotification--get::> %s" % request.query_params) - try: - if request.query_params and not set(request.query_params).issubset(set(VALID_FILTERS)): - problem_details_serializer = get_problem_details_serializer(status.HTTP_400_BAD_REQUEST, "Not a valid filter") - return Response(data=problem_details_serializer.data, status=status.HTTP_400_BAD_REQUEST) - resp_data = QuerySubscription(request.query_params).query_multi_subscriptions() - - subscriptions_serializer = LccnSubscriptionsSerializer(data=resp_data) - if not subscriptions_serializer.is_valid(): - raise NFLCMException(subscriptions_serializer.errors) - - logger.debug("SubscribeNotification--get::> Remove default fields if exclude_default" + - " is specified") - return Response(data=subscriptions_serializer.data, status=status.HTTP_200_OK) - except NFLCMException as e: - logger.error(e.message) - problem_details_serializer = get_problem_details_serializer(status.HTTP_500_INTERNAL_SERVER_ERROR, traceback.format_exc()) - return Response(data=problem_details_serializer.data, status=status.HTTP_500_INTERNAL_SERVER_ERROR) - - except Exception as e: - logger.error(e.message) - logger.error(traceback.format_exc()) - problem_details_serializer = get_problem_details_serializer(status.HTTP_500_INTERNAL_SERVER_ERROR, traceback.format_exc()) - return Response(data=problem_details_serializer.data, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + if request.query_params and not set(request.query_params).issubset(set(VALID_FILTERS)): + problem_details_serializer = get_problem_details_serializer( + status.HTTP_400_BAD_REQUEST, + "Not a valid filter" + ) + return Response(data=problem_details_serializer.data, + status=status.HTTP_400_BAD_REQUEST) + resp_data = QuerySubscription(request.query_params).query_multi_subscriptions() + + subscriptions_serializer = LccnSubscriptionsSerializer(data=resp_data) + if not subscriptions_serializer.is_valid(): + raise NFLCMException(subscriptions_serializer.errors) + + logger.debug("SubscribeNotification--get::> Remove default fields") + return Response(data=subscriptions_serializer.data, status=status.HTTP_200_OK) + + +class SubscriptionDetailView(APIView): + @swagger_auto_schema( + responses={ + status.HTTP_200_OK: LccnSubscriptionSerializer(), + status.HTTP_404_NOT_FOUND: ProblemDetailsSerializer(), + status.HTTP_500_INTERNAL_SERVER_ERROR: ProblemDetailsSerializer() + } + ) + @view_safe_call_with_log(logger=logger) + def get(self, request, subscriptionid): + logger.debug("SubscriptionDetailView--get::> %s" % subscriptionid) + + resp_data = QuerySubscription( + subscription_id=subscriptionid + ).query_single_subscription() + + subscription_serializer = LccnSubscriptionSerializer(data=resp_data) + if not subscription_serializer.is_valid(): + raise NFLCMException(subscription_serializer.errors) + + return Response(data=resp_data, status=status.HTTP_200_OK) + + @swagger_auto_schema( + responses={ + status.HTTP_204_NO_CONTENT: "", + status.HTTP_404_NOT_FOUND: ProblemDetailsSerializer(), + status.HTTP_500_INTERNAL_SERVER_ERROR: ProblemDetailsSerializer() + } + ) + @view_safe_call_with_log(logger=logger) + def delete(self, request, subscriptionid): + logger.debug("SubscriptionDetailView--delete::> %s" % subscriptionid) + + DeleteSubscription( + subscription_id=subscriptionid + ).delete_single_subscription() + + return Response(status=status.HTTP_204_NO_CONTENT)