Refactor codes for subscriptions

Change-Id: I046b347903bd37ef647ac5473c367bc26c20c14b
Issue-ID: VFC-1306
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>

diff --git a/lcm/lcm/nf/biz/create_subscription.py b/lcm/lcm/nf/biz/create_subscription.py
index db529a7..6802c22 100644 (file)
--- a/lcm/lcm/nf/biz/create_subscription.py
+++ b/lcm/lcm/nf/biz/create_subscription.py
@@ -25,6 +25,7 @@ from rest_framework import status
 from lcm.nf import const
 from lcm.pub.database.models import SubscriptionModel
 from lcm.pub.exceptions import NFLCMException
+from lcm.pub.exceptions import NFLCMExceptionSeeOther
 from lcm.pub.utils.values import ignore_case_get
 
 logger = logging.getLogger(__name__)
@@ -116,8 +117,8 @@ class CreateSubscription:
             return True
         for subscription in subscriptions:
             if self.check_filter_exists(subscription):
-                raise NFLCMException("Already Subscription exists with the "
-                                     "same callbackUri and filter")
+                raise NFLCMExceptionSeeOther("Already Subscription exists with the "
+                                             "same callbackUri and filter")
         return False
 
     def save_db(self):

diff --git a/lcm/lcm/nf/tests/test_subscribe_notification.py b/lcm/lcm/nf/tests/test_subscribe_notification.py
index 8aeab63..73463ef 100644 (file)
--- a/lcm/lcm/nf/tests/test_subscribe_notification.py
+++ b/lcm/lcm/nf/tests/test_subscribe_notification.py
@@ -95,7 +95,8 @@ class TestSubscription(TestCase):
         mock_requests.return_value.status_code = 204
         mock_requests.get.return_value.status_code = 204
         expected_data = {
-            'error': 'Auth type should be BASIC'
+            'detail': 'Auth type should be BASIC',
+            'status': 500
         }
         response = self.client.post("/api/vnflcm/v1/subscriptions", data=dummy_subscription, format='json')
         self.assertEqual(500, response.status_code)
@@ -118,8 +119,9 @@ class TestSubscription(TestCase):
         mock_requests.return_value.status_code = 204
         mock_requests.get.return_value.status_code = 204
         expected_data = {
-            'error': 'If you are setting operationTypes,then ' +
-            'notificationTypes must be VnfLcmOperationOccurrenceNotification'
+            'detail': 'If you are setting operationTypes,then ' +
+            'notificationTypes must be VnfLcmOperationOccurrenceNotification',
+            'status': 500
         }
         response = self.client.post("/api/vnflcm/v1/subscriptions", data=dummy_subscription, format='json')
         self.assertEqual(500, response.status_code)
@@ -150,7 +152,3 @@ class TestSubscription(TestCase):
         self.assertEqual(temp_uuid, response.data["id"])
         response = self.client.post("/api/vnflcm/v1/subscriptions", data=dummy_subscription, format='json')
         self.assertEqual(303, response.status_code)
-        expected_data = {
-            "error": "Already Subscription exists with the same callbackUri and filter"
-        }
-        self.assertEqual(expected_data, response.data)

diff --git a/lcm/lcm/nf/views/subscriptions_view.py b/lcm/lcm/nf/views/subscriptions_view.py
index 4c013ee..a9ffed9 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
@@ -29,6 +28,7 @@ from lcm.nf.serializers.lccn_subscription import LccnSubscriptionSerializer
 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 .common import view_safe_call_with_log\r
 \r
 logger = logging.getLogger(__name__)\r
 VALID_FILTERS = ["operationTypes", "operationStates", "notificationTypes", "vnfInstanceId"]\r
@@ -53,39 +53,31 @@ class SubscriptionsView(APIView):
             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 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
 \r
     @swagger_auto_schema(\r
         responses={\r
@@ -94,28 +86,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