improve code coverage rate after vfclcm upgraded from python2 to python3

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / tests / test_instantiate_vnf.py

diff --git a/lcm/lcm/nf/tests/test_instantiate_vnf.py b/lcm/lcm/nf/tests/test_instantiate_vnf.py
index 16351f9..c243c44 100644 (file)
--- 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\r
 from .const import instantiate_grant_result\r
 \r
-from lcm.pub.database.models import NfInstModel\r
+from lcm.pub.database.models import NfInstModel, VNFLcmOpOccModel\r
 from lcm.pub.database.models import JobStatusModel\r
 from lcm.pub.database.models import SubscriptionModel\r
 from lcm.pub.utils import restcall\r
@@ -45,6 +45,7 @@ from lcm.pub.vimapi import api
 from lcm.pub.exceptions import NFLCMException\r
 \r
 from lcm.nf.biz.instantiate_vnf import InstantiateVnf\r
+from lcm.nf import const\r
 \r
 \r
 class TestNFInstantiate(TestCase):\r
@@ -390,6 +391,11 @@ class TestNFInstantiate(TestCase):
             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
+            100,\r
+            'Instantiate Vnf success.'\r
+        )\r
 \r
     @mock.patch.object(JobUtil, 'create_job')\r
     def test_instantiate_inner_error(self, mock_run):\r
@@ -420,3 +426,44 @@ class TestNFInstantiate(TestCase):
         )\r
         NfInstModel.objects.filter(nfinstid='144').delete()\r
         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
+        NfInstModel.objects.create(\r
+            nfinstid='1111',\r
+            nf_name='vFW_01',\r
+            package_id='222',\r
+            version='',\r
+            vendor='',\r
+            netype='',\r
+            vnfd_model='',\r
+            status='NOT_INSTANTIATED',\r
+            nf_desc='vFW in Nanjing TIC Edge',\r
+            vnfdid='111',\r
+            create_time=now_time()\r
+        )\r
+        r1_get_vnfpackage_by_vnfdid = [\r
+            0,\r
+            json.JSONEncoder().encode(vnfpackage_info),\r
+            '200'\r
+        ]\r
+        mock_call_req.side_effect = [\r
+            r1_get_vnfpackage_by_vnfdid\r
+        ]\r
+        self.nf_inst_id = '1111'\r
+        self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)\r
+        JobUtil.add_job_status(self.job_id, 0, 'INST_VNF_READY')\r
+        VNFLcmOpOccModel.objects.create(vnf_instance_id=self.nf_inst_id,\r
+                                        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
+        )\r