refactor codes for instantiate vnf

Change-Id: I1ccefebd93fdef4299b678f68b4ee7bae6adc1f8
Issue-ID: VFC-1307
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 23a979a..cc17d48 100644 (file)
--- a/lcm/lcm/nf/views/instantiate_vnf_view.py
+++ b/lcm/lcm/nf/views/instantiate_vnf_view.py
@@ -15,19 +15,16 @@
 import logging\r
 \r
 from drf_yasg.utils import swagger_auto_schema\r
-from lcm.nf.biz.instantiate_vnf import InstantiateVnf\r
 from rest_framework import status\r
-from rest_framework.response import Response\r
 from rest_framework.views import APIView\r
 \r
 from lcm.nf.serializers.instantiate_vnf_request import InstantiateVnfRequestSerializer\r
 from lcm.nf.serializers.job_identifier import JobIdentifierSerializer\r
-from lcm.pub.exceptions import NFLCMException\r
-from lcm.pub.exceptions import NFLCMExceptionNotFound\r
-from lcm.pub.exceptions import NFLCMExceptionConflict\r
-from lcm.pub.utils.jobutil import JobUtil\r
-from lcm.pub.database.models import NfInstModel\r
+from lcm.nf.biz.instantiate_vnf import InstantiateVnf\r
+from lcm.nf.const import VNF_STATUS\r
+from lcm.nf.const import OPERATION_TYPE\r
 from .common import view_safe_call_with_log\r
+from .common import deal_vnf_action\r
 \r
 logger = logging.getLogger(__name__)\r
 \r
@@ -42,25 +39,12 @@ class InstantiateVnfView(APIView):
     )\r
     @view_safe_call_with_log(logger=logger)\r
     def post(self, request, instanceid):\r
-        logger.debug("InstantiateVnf--post::> %s" % request.data)\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
-        vnf_insts = NfInstModel.objects.filter(nfinstid=instanceid)\r
-        if not vnf_insts.exists():\r
-            raise NFLCMExceptionNotFound("VNF instanceid(%s) does not exist." % instanceid)\r
-        if vnf_insts[0].status == 'INSTANTIATED':\r
-            raise NFLCMExceptionConflict('VNF(%s) is already INSTANTIATED.' % instanceid)\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
+        return deal_vnf_action(\r
+            logger=logger,\r
+            opt_type=OPERATION_TYPE.INSTANTIATE,\r
+            opt_status=VNF_STATUS.INSTANTIATING,\r
+            instid=instanceid,\r
+            req=request,\r
+            req_serializer=InstantiateVnfRequestSerializer,\r
+            act_task=InstantiateVnf\r
+        )\r