Refactor codes for inst vnf

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

diff --git a/lcm/lcm/nf/views/instantiate_vnf_view.py b/lcm/lcm/nf/views/instantiate_vnf_view.py
index 3b4a3be..1a7905a 100644 (file)
--- a/lcm/lcm/nf/views/instantiate_vnf_view.py
+++ b/lcm/lcm/nf/views/instantiate_vnf_view.py
@@ -13,7 +13,6 @@
 # limitations under the License.\r
 \r
 import logging\r
-import traceback\r
 \r
 from drf_yasg.utils import swagger_auto_schema\r
 from lcm.nf.biz.instantiate_vnf import InstantiateVnf\r
@@ -39,25 +38,18 @@ class InstantiateVnfView(APIView):
     )\r
     def post(self, request, instanceid):\r
         logger.debug("InstantiateVnf--post::> %s" % request.data)\r
-        try:\r
-            instantiate_vnf_request_serializer = InstantiateVnfRequestSerializer(data=request.data)\r
-            if not instantiate_vnf_request_serializer.is_valid():\r
-                raise NFLCMException(instantiate_vnf_request_serializer.errors)\r
-\r
-            job_id = JobUtil.create_job('NF', 'INSTANTIATE', instanceid)\r
-            JobUtil.add_job_status(job_id, 0, "INST_VNF_READY")\r
-            InstantiateVnf(instantiate_vnf_request_serializer.data, instanceid, job_id).start()\r
-\r
-            job_identifier_serializer = JobIdentifierSerializer(data={"jobId": job_id})\r
-            resp_isvalid = job_identifier_serializer.is_valid()\r
-            if not resp_isvalid:\r
-                raise NFLCMException(job_identifier_serializer.errors)\r
-\r
-            return Response(data=job_identifier_serializer.data, status=status.HTTP_202_ACCEPTED)\r
-        except NFLCMException as e:\r
-            logger.error(e.message)\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': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)\r
+\r
+        instantiate_vnf_request_serializer = InstantiateVnfRequestSerializer(data=request.data)\r
+        if not instantiate_vnf_request_serializer.is_valid():\r
+            raise NFLCMException(instantiate_vnf_request_serializer.errors)\r
+\r
+        job_id = JobUtil.create_job('NF', 'INSTANTIATE', instanceid)\r
+        JobUtil.add_job_status(job_id, 0, "INST_VNF_READY")\r
+        InstantiateVnf(instantiate_vnf_request_serializer.data, instanceid, job_id).start()\r
+\r
+        job_identifier_serializer = JobIdentifierSerializer(data={"jobId": job_id})\r
+        resp_isvalid = job_identifier_serializer.is_valid()\r
+        if not resp_isvalid:\r
+            raise NFLCMException(job_identifier_serializer.errors)\r
+\r
+        return Response(data=job_identifier_serializer.data, status=status.HTTP_202_ACCEPTED)\r