From 70bb01f730b2586821d7d231906d1e1f6f090cb8 Mon Sep 17 00:00:00 2001 From: laili Date: Fri, 7 Sep 2018 17:32:51 +0800 Subject: Align grant request with SOL003. -Align grant request. -Rename resouceid to resourceid. Change-Id: I1a933ba6248911984500a06f3fd031fddec06880 Issue-ID: VFC-1101 Signed-off-by: laili --- lcm/lcm/nf/tests/test_operate_vnf.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lcm/lcm/nf/tests/test_operate_vnf.py') diff --git a/lcm/lcm/nf/tests/test_operate_vnf.py b/lcm/lcm/nf/tests/test_operate_vnf.py index 2071472c..625d40a3 100644 --- a/lcm/lcm/nf/tests/test_operate_vnf.py +++ b/lcm/lcm/nf/tests/test_operate_vnf.py @@ -87,7 +87,7 @@ class TestNFOperate(TestCase): VmInstModel.objects.create(vmid="1", vimid="1", - resouceid="11", + resourceid="11", insttype=0, instid="1111", vmname="test_01", @@ -105,7 +105,7 @@ class TestNFOperate(TestCase): self.job_id = JobUtil.create_job('NF', 'OPERATE', self.nf_inst_id) JobUtil.add_job_status(self.job_id, 0, "OPERATE_VNF_READY") OperateVnf(req_data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run() - vm = VmInstModel.objects.filter(vmid="1", vimid="1", resouceid="11") + vm = VmInstModel.objects.filter(vmid="1", vimid="1", resourceid="11") self.assertEqual("ACTIVE", vm[0].operationalstate) self.assert_job_result(self.job_id, 100, "Operate Vnf success.") @@ -130,7 +130,7 @@ class TestNFOperate(TestCase): VmInstModel.objects.create(vmid="1", vimid="1", - resouceid="11", + resourceid="11", insttype=0, instid="1111", vmname="test_01", @@ -148,7 +148,7 @@ class TestNFOperate(TestCase): self.job_id = JobUtil.create_job('NF', 'OPERATE', self.nf_inst_id) JobUtil.add_job_status(self.job_id, 0, "OPERATE_VNF_READY") OperateVnf(req_data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run() - vm = VmInstModel.objects.filter(vmid="1", vimid="1", resouceid="11") + vm = VmInstModel.objects.filter(vmid="1", vimid="1", resourceid="11") self.assertEqual("INACTIVE", vm[0].operationalstate) self.assert_job_result(self.job_id, 100, "Operate Vnf success.") @@ -173,7 +173,7 @@ class TestNFOperate(TestCase): VmInstModel.objects.create(vmid="1", vimid="1", - resouceid="11", + resourceid="11", insttype=0, instid="1111", vmname="test_01", @@ -193,7 +193,7 @@ class TestNFOperate(TestCase): self.job_id = JobUtil.create_job('NF', 'OPERATE', self.nf_inst_id) JobUtil.add_job_status(self.job_id, 0, "OPERATE_VNF_READY") OperateVnf(req_data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run() - vm = VmInstModel.objects.filter(vmid="1", vimid="1", resouceid="11") + vm = VmInstModel.objects.filter(vmid="1", vimid="1", resourceid="11") self.assertEqual("INACTIVE", vm[0].operationalstate) self.assert_job_result(self.job_id, 100, "Operate Vnf success.") @@ -218,7 +218,7 @@ class TestNFOperate(TestCase): VmInstModel.objects.create(vmid="1", vimid="1", - resouceid="11", + resourceid="11", insttype=0, instid="1111", vmname="test_01", @@ -237,6 +237,6 @@ class TestNFOperate(TestCase): self.job_id = JobUtil.create_job('NF', 'OPERATE', self.nf_inst_id) JobUtil.add_job_status(self.job_id, 0, "OPERATE_VNF_READY") OperateVnf(req_data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run() - vm = VmInstModel.objects.filter(vmid="1", vimid="1", resouceid="11") + vm = VmInstModel.objects.filter(vmid="1", vimid="1", resourceid="11") self.assertEqual("INACTIVE", vm[0].operationalstate) self.assert_job_result(self.job_id, 100, "Operate Vnf success.") -- cgit 1.2.3-korg