From: yunlong ying <ying.yunlong@zte.com.cn>
Date: Mon, 8 Apr 2019 01:38:31 +0000 (+0000)
Subject: Merge "Add vnf exist check for inst vnf"
X-Git-Tag: 1.3.0~73
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=55ecb6040972af207bed99ad55bfb0ee29e601ae;hp=8f09fb9cf1574253117957bf3f780ce21bf17a67;p=vfc%2Fgvnfm%2Fvnflcm.git

Merge "Add vnf exist check for inst vnf"
---

diff --git a/lcm/lcm/nf/views/instantiate_vnf_view.py b/lcm/lcm/nf/views/instantiate_vnf_view.py
index b285cc8c..80529b2d 100644
--- a/lcm/lcm/nf/views/instantiate_vnf_view.py
+++ b/lcm/lcm/nf/views/instantiate_vnf_view.py
@@ -23,7 +23,9 @@ from rest_framework.views import APIView
 from lcm.nf.serializers.instantiate_vnf_request import InstantiateVnfRequestSerializer
 from lcm.nf.serializers.job_identifier import JobIdentifierSerializer
 from lcm.pub.exceptions import NFLCMException
+from lcm.pub.exceptions import NFLCMExceptionNotFound
 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__)
@@ -45,6 +47,10 @@ class InstantiateVnfView(APIView):
         if not instantiate_vnf_request_serializer.is_valid():
             raise NFLCMException(instantiate_vnf_request_serializer.errors)
 
+        vnf_insts = NfInstModel.objects.filter(nfinstid=instanceid)
+        if not vnf_insts.exists():
+            raise NFLCMExceptionNotFound("VNF instanceid(%s) does not exist." % instanceid)
+
         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()