Fix bug for status code when subscription post request body invalid what client inputs.

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / views / subscriptions_view.py

diff --git a/lcm/lcm/nf/views/subscriptions_view.py b/lcm/lcm/nf/views/subscriptions_view.py
index 4c013ee..c549627 100644 (file)
--- a/lcm/lcm/nf/views/subscriptions_view.py
+++ b/lcm/lcm/nf/views/subscriptions_view.py
@@ -15,7 +15,6 @@
 import ast\r
 import json\r
 import logging\r
-import traceback\r
 \r
 from drf_yasg.utils import swagger_auto_schema\r
 from lcm.nf.biz.create_subscription import CreateSubscription\r
@@ -28,7 +27,8 @@ from lcm.nf.serializers.lccn_subscription_request import LccnSubscriptionRequest
 from lcm.nf.serializers.lccn_subscription import LccnSubscriptionSerializer\r
 from lcm.nf.serializers.lccn_subscriptions import LccnSubscriptionsSerializer\r
 from lcm.nf.serializers.response import ProblemDetailsSerializer\r
-from lcm.pub.exceptions import NFLCMException\r
+from lcm.pub.exceptions import NFLCMException, NFLCMExceptionBadRequest\r
+from .common import view_safe_call_with_log\r
 \r
 logger = logging.getLogger(__name__)\r
 VALID_FILTERS = ["operationTypes", "operationStates", "notificationTypes", "vnfInstanceId"]\r
@@ -50,42 +50,35 @@ class SubscriptionsView(APIView):
         responses={\r
             status.HTTP_201_CREATED: LccnSubscriptionSerializer(),\r
             status.HTTP_303_SEE_OTHER: ProblemDetailsSerializer(),\r
+            status.HTTP_400_BAD_REQUEST: ProblemDetailsSerializer(),\r
             status.HTTP_500_INTERNAL_SERVER_ERROR: ProblemDetailsSerializer()\r
         }\r
     )\r
+    @view_safe_call_with_log(logger=logger)\r
     def post(self, request):\r
         logger.debug("SubscribeNotification--post::> %s" % request.data)\r
-        try:\r
-            lccn_subscription_request_serializer = LccnSubscriptionRequestSerializer(data=request.data)\r
-            if not lccn_subscription_request_serializer.is_valid():\r
-                raise NFLCMException(lccn_subscription_request_serializer.errors)\r
-            subscription = CreateSubscription(\r
-                lccn_subscription_request_serializer.data).do_biz()\r
-            lccn_notifications_filter = {\r
-                "notificationTypes": ast.literal_eval(subscription.notification_types),\r
-                "operationTypes": ast.literal_eval(subscription.operation_types),\r
-                "operationStates": ast.literal_eval(subscription.operation_states),\r
-                "vnfInstanceSubscriptionFilter": json.loads(subscription.vnf_instance_filter)\r
-            }\r
-            subscription_data = {\r
-                "id": subscription.subscription_id,\r
-                "callbackUri": subscription.callback_uri,\r
-                "_links": json.loads(subscription.links),\r
-                "filter": lccn_notifications_filter\r
-            }\r
-            sub_resp_serializer = LccnSubscriptionSerializer(data=subscription_data)\r
-            if not sub_resp_serializer.is_valid():\r
-                raise NFLCMException(sub_resp_serializer.errors)\r
-            return Response(data=sub_resp_serializer.data, status=status.HTTP_201_CREATED)\r
-        except NFLCMException as e:\r
-            logger.error(e.message)\r
-            if "exists" in e.message:\r
-                return Response(data={'error': '%s' % e.message}, status=status.HTTP_303_SEE_OTHER)\r
-            return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)\r
-        except Exception as e:\r
-            logger.error(e.message)\r
-            logger.error(traceback.format_exc())\r
-            return Response(data={'error': e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)\r
+\r
+        lccn_subscription_request_serializer = LccnSubscriptionRequestSerializer(data=request.data)\r
+        if not lccn_subscription_request_serializer.is_valid():\r
+            raise NFLCMExceptionBadRequest(lccn_subscription_request_serializer.errors)\r
+        subscription = CreateSubscription(\r
+            lccn_subscription_request_serializer.data).do_biz()\r
+        lccn_notifications_filter = {\r
+            "notificationTypes": ast.literal_eval(subscription.notification_types),\r
+            "operationTypes": ast.literal_eval(subscription.operation_types),\r
+            "operationStates": ast.literal_eval(subscription.operation_states),\r
+            "vnfInstanceSubscriptionFilter": json.loads(subscription.vnf_instance_filter)\r
+        }\r
+        subscription_data = {\r
+            "id": subscription.subscription_id,\r
+            "callbackUri": subscription.callback_uri,\r
+            "_links": json.loads(subscription.links),\r
+            "filter": lccn_notifications_filter\r
+        }\r
+        sub_resp_serializer = LccnSubscriptionSerializer(data=subscription_data)\r
+        if not sub_resp_serializer.is_valid():\r
+            raise NFLCMException(sub_resp_serializer.errors)\r
+        return Response(data=sub_resp_serializer.data, status=status.HTTP_201_CREATED)\r
 \r
     @swagger_auto_schema(\r
         responses={\r
@@ -94,28 +87,22 @@ class SubscriptionsView(APIView):
             status.HTTP_500_INTERNAL_SERVER_ERROR: ProblemDetailsSerializer()\r
         }\r
     )\r
+    @view_safe_call_with_log(logger=logger)\r
     def get(self, request):\r
         logger.debug("SubscribeNotification--get::> %s" % request.query_params)\r
-        try:\r
-            if request.query_params and not set(request.query_params).issubset(set(VALID_FILTERS)):\r
-                problem_details_serializer = get_problem_details_serializer(status.HTTP_400_BAD_REQUEST, "Not a valid filter")\r
-                return Response(data=problem_details_serializer.data, status=status.HTTP_400_BAD_REQUEST)\r
-            resp_data = QuerySubscription(request.query_params).query_multi_subscriptions()\r
 \r
-            subscriptions_serializer = LccnSubscriptionsSerializer(data=resp_data)\r
-            if not subscriptions_serializer.is_valid():\r
-                raise NFLCMException(subscriptions_serializer.errors)\r
+        if request.query_params and not set(request.query_params).issubset(set(VALID_FILTERS)):\r
+            problem_details_serializer = get_problem_details_serializer(\r
+                status.HTTP_400_BAD_REQUEST,\r
+                "Not a valid filter"\r
+            )\r
+            return Response(data=problem_details_serializer.data,\r
+                            status=status.HTTP_400_BAD_REQUEST)\r
+        resp_data = QuerySubscription(request.query_params).query_multi_subscriptions()\r
 \r
-            logger.debug("SubscribeNotification--get::> Remove default fields if exclude_default" +\r
-                         " is specified")\r
-            return Response(data=subscriptions_serializer.data, status=status.HTTP_200_OK)\r
-        except NFLCMException as e:\r
-            logger.error(e.message)\r
-            problem_details_serializer = get_problem_details_serializer(status.HTTP_500_INTERNAL_SERVER_ERROR, traceback.format_exc())\r
-            return Response(data=problem_details_serializer.data, status=status.HTTP_500_INTERNAL_SERVER_ERROR)\r
+        subscriptions_serializer = LccnSubscriptionsSerializer(data=resp_data)\r
+        if not subscriptions_serializer.is_valid():\r
+            raise NFLCMException(subscriptions_serializer.errors)\r
 \r
-        except Exception as e:\r
-            logger.error(e.message)\r
-            logger.error(traceback.format_exc())\r
-            problem_details_serializer = get_problem_details_serializer(status.HTTP_500_INTERNAL_SERVER_ERROR, traceback.format_exc())\r
-            return Response(data=problem_details_serializer.data, status=status.HTTP_500_INTERNAL_SERVER_ERROR)\r
+        logger.debug("SubscribeNotification--get::> Remove default fields")\r
+        return Response(data=subscriptions_serializer.data, status=status.HTTP_200_OK)\r