Refactor vfc-vnflcm views file

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

diff --git a/lcm/lcm/nf/vnfs/views.py b/lcm/lcm/nf/vnfs/views.py
index 9f385a0..9f2b1fe 100644 (file)
--- a/lcm/lcm/nf/vnfs/views.py
+++ b/lcm/lcm/nf/vnfs/views.py
@@ -21,7 +21,7 @@ from rest_framework.response import Response
 from rest_framework.views import APIView
 
 from lcm.nf.vnfs.serializers import CreateVnfReqSerializer, CreateVnfRespSerializer, VnfsInfoSerializer, \
-    InstantiateVnfResponseSerializer, InstantiateVnfRequestSerializer, VnfInfoSerializer
+    InstOrTeriVnfResponseSerializer, InstantiateVnfRequestSerializer, VnfInfoSerializer, TerminateVnfRequestSerializer
 from lcm.nf.vnfs.vnf_cancel.delete_vnf_identifier import DeleteVnf
 from lcm.nf.vnfs.vnf_cancel.term_vnf import TermVnf
 from lcm.nf.vnfs.vnf_create.create_vnf_identifier import CreateVnf
@@ -45,12 +45,11 @@ class CreateVnfAndQueryVnfs(APIView):
         try:
             resp_data = QueryVnf(request.data).query_multi_vnf()
 
-            vnfsInfoSerializer = VnfsInfoSerializer(data=resp_data)
-            resp_isValid = vnfsInfoSerializer.is_valid()
-            if not resp_isValid:
-                raise NFLCMException(vnfsInfoSerializer.errors)
+            vnfs_info_serializer = VnfsInfoSerializer(data=resp_data)
+            if not vnfs_info_serializer.is_valid():
+                raise NFLCMException(vnfs_info_serializer.errors)
 
-            return Response(data=vnfsInfoSerializer.data, status=status.HTTP_200_OK)
+            return Response(data=vnfs_info_serializer.data, status=status.HTTP_200_OK)
         except NFLCMException as e:
             logger.error(e.message)
             return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
@@ -68,19 +67,17 @@ class CreateVnfAndQueryVnfs(APIView):
     )
     def post(self, request):
         logger.debug("CreateVnfIdentifier--post::> %s" % request.data)
-        req_serializer = CreateVnfReqSerializer(data=request.data)
-        req_isValid = req_serializer.is_valid()
         try:
-            if not req_isValid:
+            req_serializer = CreateVnfReqSerializer(data=request.data)
+            if not req_serializer.is_valid():
                 raise NFLCMException(req_serializer.errors)
 
             nf_inst_id = CreateVnf(req_serializer.data).do_biz()
 
-            resp_serializer = CreateVnfRespSerializer(data={"vnfInstanceId": nf_inst_id})
-            resp_isValid = resp_serializer.is_valid()
-            if not resp_isValid:
-                raise NFLCMException(resp_serializer.errors)
-            return Response(data=resp_serializer.data, status=status.HTTP_201_CREATED)
+            create_vnf_resp_serializer = CreateVnfRespSerializer(data={"vnfInstanceId": nf_inst_id})
+            if not create_vnf_resp_serializer.is_valid():
+                raise NFLCMException(create_vnf_resp_serializer.errors)
+            return Response(data=create_vnf_resp_serializer.data, status=status.HTTP_201_CREATED)
         except NFLCMException as e:
             logger.error(e.message)
             return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
@@ -94,28 +91,27 @@ class InstantiateVnf(APIView):
     @swagger_auto_schema(
         request_body=InstantiateVnfRequestSerializer(),
         responses={
-            status.HTTP_202_ACCEPTED: InstantiateVnfResponseSerializer(),
+            status.HTTP_202_ACCEPTED: InstOrTeriVnfResponseSerializer(),
             status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"
         }
     )
     def post(self, request, instanceid):
         logger.debug("InstantiateVnf--post::> %s" % request.data)
-        instantiateVnfRequestSerializer = InstantiateVnfRequestSerializer(data=request.data)
-        req_isValid = instantiateVnfRequestSerializer.is_valid()
         try:
-            if not req_isValid:
-                raise NFLCMException(instantiateVnfRequestSerializer.errors)
+            instantiate_vnf_request_serializer = InstantiateVnfRequestSerializer(data=request.data)
+            if not instantiate_vnf_request_serializer.is_valid():
+                raise NFLCMException(instantiate_vnf_request_serializer.errors)
 
             job_id = JobUtil.create_job('NF', 'INSTANTIATE', instanceid)
             JobUtil.add_job_status(job_id, 0, "INST_VNF_READY")
-            InstVnf(instantiateVnfRequestSerializer.data, instanceid, job_id).start()
+            InstVnf(instantiate_vnf_request_serializer.data, instanceid, job_id).start()
 
-            instantiateVnfResponseSerializer = InstantiateVnfResponseSerializer(data={"jobId": job_id})
-            resp_isValid = instantiateVnfResponseSerializer.is_valid()
-            if not resp_isValid:
-                raise NFLCMException(instantiateVnfResponseSerializer.errors)
+            instantiate_vnf_response_serializer = InstOrTeriVnfResponseSerializer(data={"jobId": job_id})
+            resp_isvalid = instantiate_vnf_response_serializer.is_valid()
+            if not resp_isvalid:
+                raise NFLCMException(instantiate_vnf_response_serializer.errors)
 
-            return Response(data=instantiateVnfResponseSerializer.data, status=status.HTTP_202_ACCEPTED)
+            return Response(data=instantiate_vnf_response_serializer.data, status=status.HTTP_202_ACCEPTED)
         except NFLCMException as e:
             logger.error(e.message)
             return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
@@ -137,12 +133,11 @@ class DeleteVnfAndQueryVnf(APIView):
         try:
             resp_data = QueryVnf(request.data, instanceid).query_single_vnf()
 
-            vnfInfoSerializer = VnfInfoSerializer(data=resp_data)
-            resp_isValid = vnfInfoSerializer.is_valid()
-            if not resp_isValid:
-                raise NFLCMException(vnfInfoSerializer.errors)
+            vnf_info_serializer = VnfInfoSerializer(data=resp_data)
+            if not vnf_info_serializer.is_valid():
+                raise NFLCMException(vnf_info_serializer.errors)
 
-            return Response(data=vnfInfoSerializer.data, status=status.HTTP_200_OK)
+            return Response(data=vnf_info_serializer.data, status=status.HTTP_200_OK)
         except NFLCMException as e:
             logger.error(e.message)
             return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
@@ -174,12 +169,26 @@ class DeleteVnfAndQueryVnf(APIView):
 
 
 class TerminateVnf(APIView):
+    @swagger_auto_schema(
+        request_body=TerminateVnfRequestSerializer(),
+        responses={
+            status.HTTP_202_ACCEPTED: InstOrTeriVnfResponseSerializer(),
+            status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"
+        }
+    )
     def post(self, request, instanceid):
         logger.debug("TerminateVnf--post::> %s" % request.data)
         try:
             job_id = JobUtil.create_job('NF', 'TERMINATE', instanceid)
             JobUtil.add_job_status(job_id, 0, "TERM_VNF_READY")
             TermVnf(request.data, instanceid, job_id).start()
+
+            terminate_vnf_response_serializer = InstOrTeriVnfResponseSerializer(data={"jobId": job_id})
+            resp_isvalid = terminate_vnf_response_serializer.is_valid()
+            if not resp_isvalid:
+                raise NFLCMException(terminate_vnf_response_serializer.errors)
+
+            return Response(data=terminate_vnf_response_serializer.data, status=status.HTTP_202_ACCEPTED)
         except NFLCMException as e:
             logger.error(e.message)
             return Response(data={'error': '%s' % e.message}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
@@ -187,7 +196,3 @@ class TerminateVnf(APIView):
             logger.error(e.message)
             logger.error(traceback.format_exc())
             return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-        rsp = {
-            "jobId": job_id
-        }
-        return Response(data=rsp, status=status.HTTP_202_ACCEPTED)