rollback code in vnflcm\lcm\lcm\nf\biz\instantiate_vnf.py

Change-Id: Ib6f3ea19914726dd4ecc2d060b11c5dfdd04465a
Issue-ID: VFC-1429
Signed-off-by: hongyuzhao <zhao.hongyu@zte.com.cn>

diff --git a/lcm/lcm/nf/biz/instantiate_vnf.py b/lcm/lcm/nf/biz/instantiate_vnf.py
index 58ca591..13b29ea 100644 (file)
--- a/lcm/lcm/nf/biz/instantiate_vnf.py
+++ b/lcm/lcm/nf/biz/instantiate_vnf.py
@@ -59,10 +59,10 @@ class InstantiateVnf(Thread):
             operation=OPERATION_TYPE.INSTANTIATE,
             task=OPERATION_TASK.INSTANTIATE
         )
+        self.pre_deal()
 
     def run(self):
         try:
-            self.pre_deal()
             self.inst_pre()
             self.lcm_op_occ.notify_lcm(OPERATION_STATE_TYPE.STARTING)
             self.apply_grant()

diff --git a/lcm/lcm/nf/tests/test_instantiate_vnf.py b/lcm/lcm/nf/tests/test_instantiate_vnf.py
index c243c44..f8dba91 100644 (file)
--- a/lcm/lcm/nf/tests/test_instantiate_vnf.py
+++ b/lcm/lcm/nf/tests/test_instantiate_vnf.py
@@ -428,7 +428,7 @@ class TestNFInstantiate(TestCase):
         self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code)\r
 \r
     @mock.patch.object(restcall, 'call_req')\r
-    def test_instantiate_operating_fail(self, mock_call_req):\r
+    def test_instantiate_operating_conflict(self, mock_call_req):\r
         NfInstModel.objects.create(\r
             nfinstid='1111',\r
             nf_name='vFW_01',\r
@@ -457,13 +457,12 @@ class TestNFInstantiate(TestCase):
                                         id=self.job_id,\r
                                         operation=const.OPERATION_TYPE.INSTANTIATE,\r
                                         operation_state=const.OPERATION_STATE_TYPE.PROCESSING)\r
-        InstantiateVnf(\r
-            inst_req_data,\r
-            nf_inst_id=self.nf_inst_id,\r
-            job_id=self.job_id\r
-        ).run()\r
-        self.assert_job_result(\r
-            self.job_id,\r
-            255,\r
-            'VNF(%s) %s in processing.' % (self.nf_inst_id, const.OPERATION_TYPE.INSTANTIATE)\r
+        response = self.client.post(\r
+            '/api/vnflcm/v1/vnf_instances/1111/instantiate',\r
+            data=inst_req_data,\r
+            format='json'\r
+        )\r
+        self.assertEqual(\r
+            status.HTTP_409_CONFLICT,\r
+            response.status_code\r
         )\r