X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fviews%2Finstantiate_vnf_view.py;h=23a979aeef00236a362f64cdac48f12821d12cba;hb=b10195f3df9535641c6a142dfededf770b201ad0;hp=fec85d10d858c9a0f4cd036bd083bd277b479634;hpb=433be1ff21f0a914cde6a45bb7ae431a1670e85f;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/views/instantiate_vnf_view.py b/lcm/lcm/nf/views/instantiate_vnf_view.py
index fec85d10..23a979ae 100644
--- 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.
 
 import logging
-import traceback
 
 from drf_yasg.utils import swagger_auto_schema
 from lcm.nf.biz.instantiate_vnf import InstantiateVnf
@@ -21,11 +20,14 @@ from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-# from lcm.nf.serializers.serializers import InstantiateVnfRequestSerializer, InstOrTeriVnfResponseSerializer
 from lcm.nf.serializers.instantiate_vnf_request import InstantiateVnfRequestSerializer
-from lcm.nf.serializers.inst_or_teri_vnf_response import InstOrTeriVnfResponseSerializer
+from lcm.nf.serializers.job_identifier import JobIdentifierSerializer
 from lcm.pub.exceptions import NFLCMException
+from lcm.pub.exceptions import NFLCMExceptionNotFound
+from lcm.pub.exceptions import NFLCMExceptionConflict
 from lcm.pub.utils.jobutil import JobUtil
+from lcm.pub.database.models import NfInstModel
+from .common import view_safe_call_with_log
 
 logger = logging.getLogger(__name__)
 
@@ -34,31 +36,31 @@ class InstantiateVnfView(APIView):
     @swagger_auto_schema(
         request_body=InstantiateVnfRequestSerializer(),
         responses={
-            status.HTTP_202_ACCEPTED: InstOrTeriVnfResponseSerializer(),
+            status.HTTP_202_ACCEPTED: JobIdentifierSerializer(),
             status.HTTP_500_INTERNAL_SERVER_ERROR: "Internal error"
         }
     )
+    @view_safe_call_with_log(logger=logger)
     def post(self, request, instanceid):
         logger.debug("InstantiateVnf--post::> %s" % request.data)
-        try:
-            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")
-            InstantiateVnf(instantiate_vnf_request_serializer.data, instanceid, job_id).start()
+        instantiate_vnf_request_serializer = InstantiateVnfRequestSerializer(data=request.data)
+        if not instantiate_vnf_request_serializer.is_valid():
+            raise NFLCMException(instantiate_vnf_request_serializer.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)
+        vnf_insts = NfInstModel.objects.filter(nfinstid=instanceid)
+        if not vnf_insts.exists():
+            raise NFLCMExceptionNotFound("VNF instanceid(%s) does not exist." % instanceid)
+        if vnf_insts[0].status == 'INSTANTIATED':
+            raise NFLCMExceptionConflict('VNF(%s) is already INSTANTIATED.' % instanceid)
 
-            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)
-        except Exception as e:
-            logger.error(e.message)
-            logger.error(traceback.format_exc())
-            return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        job_id = JobUtil.create_job('NF', 'INSTANTIATE', instanceid)
+        JobUtil.add_job_status(job_id, 0, "INST_VNF_READY")
+        InstantiateVnf(instantiate_vnf_request_serializer.data, instanceid, job_id).start()
+
+        job_identifier_serializer = JobIdentifierSerializer(data={"jobId": job_id})
+        resp_isvalid = job_identifier_serializer.is_valid()
+        if not resp_isvalid:
+            raise NFLCMException(job_identifier_serializer.errors)
+
+        return Response(data=job_identifier_serializer.data, status=status.HTTP_202_ACCEPTED)