Modify vnf instantiation related stuffs.

[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 7cf2646..7ec2240 100644 (file)
--- a/lcm/lcm/nf/tests/test_instantiate_vnf.py
+++ b/lcm/lcm/nf/tests/test_instantiate_vnf.py
@@ -36,7 +36,7 @@ class TestNFInstantiate(TestCase):
         self.client = APIClient()\r
         self.grant_result = {\r
             "vimid": 'vimid_1',\r
-            "tenant": 'tenantname_1'\r
+            "tenant": 'tenantname_1',\r
         }\r
 \r
     def tearDown(self):\r
@@ -50,7 +50,7 @@ class TestNFInstantiate(TestCase):
 \r
     @mock.patch.object(InstantiateVnf, 'run')\r
     def test_instantiate_vnf(self, mock_run):\r
-        NfInstModel(nfinstid='12', nf_name='VNF1').save()\r
+        NfInstModel(nfinstid='12', nf_name='VNF1', status="UN_INSTANTIATED").save()\r
         mock_run.re.return_value = None\r
         response = self.client.post("/api/vnflcm/v1/vnf_instances/12/instantiate", data=inst_req_data, format='json')\r
         self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)\r
@@ -67,6 +67,29 @@ class TestNFInstantiate(TestCase):
         InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
         self.assert_job_result(self.job_id, 255, "VNF nf_inst_id is not exist.")\r
 \r
+    def test_instantiate_vnf_when_already_instantiated(self):\r
+        NfInstModel.objects.create(nfinstid='1111',\r
+                                   nf_name='vFW_01',\r
+                                   package_id='222',\r
+                                   version='',\r
+                                   vendor='',\r
+                                   netype='',\r
+                                   vnfd_model='',\r
+                                   status='INSTANTIATED',\r
+                                   nf_desc='vFW in Nanjing TIC Edge',\r
+                                   vnfdid='111',\r
+                                   create_time=now_time())\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
+        jobs = JobStatusModel.objects.filter(jobid=self.job_id,\r
+                                             progress=0,\r
+                                             descp="INST_VNF_READY")\r
+        self.assertEqual(1, len(jobs))\r
+        data = inst_req_data\r
+        InstantiateVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()\r
+        self.assert_job_result(self.job_id, 255, "VNF instantiationState is not NOT_INSTANTIATED.")\r
+\r
     @mock.patch.object(restcall, 'call_req')\r
     def test_instantiate_vnf_when_get_packageinfo_by_csarid_failed(self, mock_call_req):\r
         NfInstModel.objects.create(nfinstid='1111',\r