def setUp(self):\r
self.client = APIClient()\r
self.grant_result = {\r
- "vimid": 'vimid_1',\r
- "tenant": 'tenantname_1',\r
+ "vimid": 'vim_1',\r
+ "tenant": 'chinamobile',\r
}\r
\r
def tearDown(self):\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 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
r2_apply_grant_result = [0, json.JSONEncoder().encode(self.grant_result), '200']\r
r3_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200']\r
mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result, r3_lcm_notify_result]\r
- mock_call.side_effect = [c1_data_get_tenant_id, c2_data_create_volume, c3_data_get_volume,\r
- c4_data_create_network, c5_data_create_subnet, c6_data_create_port,\r
- c7_data_create_flavor, c8_data_list_image, c9_data_create_vm, c10_data_get_vm]\r
+ mock_call.side_effect = [c1_data_get_tenant_id,\r
+ c2_data_create_volume, c3_data_get_volume,\r
+ c4_data_create_network,\r
+ c5_data_create_subnet,\r
+ c6_data_create_port,\r
+ c7_data_create_flavor,\r
+ c8_data_list_image, c9_data_create_vm, c10_data_get_vm]\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