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 b285cc8..80529b2 100644 (file)
--- 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\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.utils.jobutil import JobUtil\r
+from lcm.pub.database.models import NfInstModel\r
 from .common import view_safe_call_with_log\r
 \r
 logger = logging.getLogger(__name__)\r
@@ -45,6 +47,10 @@ class InstantiateVnfView(APIView):
         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
+\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