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=a9ffed9b87f542586efc33a5025b712882581c45;hpb=8f09fb9cf1574253117957bf3f780ce21bf17a67;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/views/subscriptions_view.py b/lcm/lcm/nf/views/subscriptions_view.py
index a9ffed9b..547e0124 100644
--- a/lcm/lcm/nf/views/subscriptions_view.py
+++ b/lcm/lcm/nf/views/subscriptions_view.py
@@ -17,8 +17,6 @@ import json
 import logging
 
 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
@@ -27,7 +25,10 @@ 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__)
@@ -50,6 +51,7 @@ 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()
         }
     )
@@ -59,9 +61,9 @@ class SubscriptionsView(APIView):
 
         lccn_subscription_request_serializer = LccnSubscriptionRequestSerializer(data=request.data)
         if not lccn_subscription_request_serializer.is_valid():
-            raise NFLCMException(lccn_subscription_request_serializer.errors)
+            raise NFLCMExceptionBadRequest(lccn_subscription_request_serializer.errors)
         subscription = CreateSubscription(
-            lccn_subscription_request_serializer.data).do_biz()
+            request.data).do_biz()
         lccn_notifications_filter = {
             "notificationTypes": ast.literal_eval(subscription.notification_types),
             "operationTypes": ast.literal_eval(subscription.operation_types),
@@ -77,7 +79,7 @@ class SubscriptionsView(APIView):
         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)
+        return Response(data=subscription_data, status=status.HTTP_201_CREATED)
 
     @swagger_auto_schema(
         responses={
@@ -105,3 +107,43 @@ class SubscriptionsView(APIView):
 
         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)