X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Ftests%2Ftest_instantiate_vnf.py;h=f8dba91edafa3c07cfce5ff2b559118a7956dd53;hb=0457e5473e7eb27a21e7ec811ea38b23f2fba690;hp=c624e05ccd92306620841509d3aa0d2d8a572cc0;hpb=37b1ae2386c365293249421595f0722c25bc8e8d;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/tests/test_instantiate_vnf.py b/lcm/lcm/nf/tests/test_instantiate_vnf.py
index c624e05c..f8dba91e 100644
--- a/lcm/lcm/nf/tests/test_instantiate_vnf.py
+++ b/lcm/lcm/nf/tests/test_instantiate_vnf.py
@@ -34,7 +34,7 @@ from .const import inst_req_data
 from .const import vnfpackage_info
 from .const import instantiate_grant_result
 
-from lcm.pub.database.models import NfInstModel
+from lcm.pub.database.models import NfInstModel, VNFLcmOpOccModel
 from lcm.pub.database.models import JobStatusModel
 from lcm.pub.database.models import SubscriptionModel
 from lcm.pub.utils import restcall
@@ -45,6 +45,7 @@ from lcm.pub.vimapi import api
 from lcm.pub.exceptions import NFLCMException
 
 from lcm.nf.biz.instantiate_vnf import InstantiateVnf
+from lcm.nf import const
 
 
 class TestNFInstantiate(TestCase):
@@ -76,7 +77,7 @@ class TestNFInstantiate(TestCase):
             data=inst_req_data,
             format='json'
         )
-        self.failUnlessEqual(
+        self.assertEqual(
             status.HTTP_202_ACCEPTED,
             response.status_code
         )
@@ -89,7 +90,7 @@ class TestNFInstantiate(TestCase):
             data=inst_req_data,
             format='json'
         )
-        self.failUnlessEqual(
+        self.assertEqual(
             status.HTTP_404_NOT_FOUND,
             response.status_code,
             response.content
@@ -108,7 +109,7 @@ class TestNFInstantiate(TestCase):
             data=inst_req_data,
             format='json'
         )
-        self.failUnlessEqual(
+        self.assertEqual(
             status.HTTP_409_CONFLICT,
             response.status_code,
             response.content
@@ -390,6 +391,11 @@ class TestNFInstantiate(TestCase):
             nf_inst_id=self.nf_inst_id,
             job_id=self.job_id
         ).run()
+        self.assert_job_result(
+            self.job_id,
+            100,
+            'Instantiate Vnf success.'
+        )
 
     @mock.patch.object(JobUtil, 'create_job')
     def test_instantiate_inner_error(self, mock_run):
@@ -420,3 +426,43 @@ class TestNFInstantiate(TestCase):
         )
         NfInstModel.objects.filter(nfinstid='144').delete()
         self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code)
+
+    @mock.patch.object(restcall, 'call_req')
+    def test_instantiate_operating_conflict(self, mock_call_req):
+        NfInstModel.objects.create(
+            nfinstid='1111',
+            nf_name='vFW_01',
+            package_id='222',
+            version='',
+            vendor='',
+            netype='',
+            vnfd_model='',
+            status='NOT_INSTANTIATED',
+            nf_desc='vFW in Nanjing TIC Edge',
+            vnfdid='111',
+            create_time=now_time()
+        )
+        r1_get_vnfpackage_by_vnfdid = [
+            0,
+            json.JSONEncoder().encode(vnfpackage_info),
+            '200'
+        ]
+        mock_call_req.side_effect = [
+            r1_get_vnfpackage_by_vnfdid
+        ]
+        self.nf_inst_id = '1111'
+        self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
+        JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')
+        VNFLcmOpOccModel.objects.create(vnf_instance_id=self.nf_inst_id,
+                                        id=self.job_id,
+                                        operation=const.OPERATION_TYPE.INSTANTIATE,
+                                        operation_state=const.OPERATION_STATE_TYPE.PROCESSING)
+        response = self.client.post(
+            '/api/vnflcm/v1/vnf_instances/1111/instantiate',
+            data=inst_req_data,
+            format='json'
+        )
+        self.assertEqual(
+            status.HTTP_409_CONFLICT,
+            response.status_code
+        )