diff options
Diffstat (limited to 'lcm/lcm/nf/tests')
| -rw-r--r-- | lcm/lcm/nf/tests/test_delete_vnf.py | 12 | ||||
| -rw-r--r-- | lcm/lcm/nf/tests/test_operate_vnf.py | 16 | ||||
| -rw-r--r-- | lcm/lcm/nf/tests/test_query_vnf.py | 4 | ||||
| -rw-r--r-- | lcm/lcm/nf/tests/test_terminate_vnf.py | 12 |
4 files changed, 22 insertions, 22 deletions
diff --git a/lcm/lcm/nf/tests/test_delete_vnf.py b/lcm/lcm/nf/tests/test_delete_vnf.py index 26679231..62ed0dfd 100644 --- a/lcm/lcm/nf/tests/test_delete_vnf.py +++ b/lcm/lcm/nf/tests/test_delete_vnf.py @@ -26,13 +26,13 @@ class TestNFTerminate(TestCase): self.client = Client() StorageInstModel.objects.create(storageid="1", vimid="1", - resouceid="11", + resourceid="11", insttype=0, instid="1111", is_predefined=1) NetworkInstModel.objects.create(networkid='1', vimid='1', - resouceid='1', + resourceid='1', name='pnet_network', is_predefined=1, tenant='admin', @@ -40,7 +40,7 @@ class TestNFTerminate(TestCase): instid='1111') SubNetworkInstModel.objects.create(subnetworkid='1', vimid='1', - resouceid='1', + resourceid='1', networkid='1', is_predefined=1, name='sub_pnet', @@ -51,7 +51,7 @@ class TestNFTerminate(TestCase): networkid='1', subnetworkid='1', vimid='1', - resouceid='1', + resourceid='1', is_predefined=1, name='aaa_pnet_cp', tenant='admin', @@ -59,12 +59,12 @@ class TestNFTerminate(TestCase): instid='1111') FlavourInstModel.objects.create(flavourid="1", vimid="1", - resouceid="11", + resourceid="11", instid="1111", is_predefined=1) VmInstModel.objects.create(vmid="1", vimid="1", - resouceid="11", + resourceid="11", insttype=0, instid="1111", vmname="test_01", 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.")
diff --git a/lcm/lcm/nf/tests/test_query_vnf.py b/lcm/lcm/nf/tests/test_query_vnf.py index 95f387b9..e0ecddb5 100644 --- a/lcm/lcm/nf/tests/test_query_vnf.py +++ b/lcm/lcm/nf/tests/test_query_vnf.py @@ -116,7 +116,7 @@ class ResourceTest(TestCase): NfInstModel(nfinstid=vnf_inst_id, nf_name='VNF1', status='INSTANTIATED').save() StorageInstModel(storageid='s02', vimid='vim01', - resouceid='resource01', + resourceid='resource01', insttype=1, instid=vnf_inst_id).save() response = self.client.get("/api/vnflcm/v1/vnf_instances/%s" % vnf_inst_id, format='json') @@ -161,7 +161,7 @@ class ResourceTest(TestCase): status='INSTANTIATED').save() StorageInstModel(storageid='s0%s' % i, vimid='vim0%s' % i, - resouceid='resource0%s' % i, + resourceid='resource0%s' % i, insttype=1, instid='%s' % i).save() response = self.client.get("/api/vnflcm/v1/vnf_instances", format='json') diff --git a/lcm/lcm/nf/tests/test_terminate_vnf.py b/lcm/lcm/nf/tests/test_terminate_vnf.py index 23b246d7..97330b6c 100644 --- a/lcm/lcm/nf/tests/test_terminate_vnf.py +++ b/lcm/lcm/nf/tests/test_terminate_vnf.py @@ -34,13 +34,13 @@ class TestNFTerminate(TestCase): self.client = Client()
StorageInstModel.objects.create(storageid="1",
vimid="1",
- resouceid="11",
+ resourceid="11",
insttype=0,
instid="1111",
is_predefined=1)
NetworkInstModel.objects.create(networkid='1',
vimid='1',
- resouceid='1',
+ resourceid='1',
name='pnet_network',
is_predefined=1,
tenant='admin',
@@ -48,7 +48,7 @@ class TestNFTerminate(TestCase): instid='1111')
SubNetworkInstModel.objects.create(subnetworkid='1',
vimid='1',
- resouceid='1',
+ resourceid='1',
networkid='1',
is_predefined=1,
name='sub_pnet',
@@ -59,7 +59,7 @@ class TestNFTerminate(TestCase): networkid='1',
subnetworkid='1',
vimid='1',
- resouceid='1',
+ resourceid='1',
is_predefined=1,
name='aaa_pnet_cp',
tenant='admin',
@@ -67,12 +67,12 @@ class TestNFTerminate(TestCase): instid='1111')
FlavourInstModel.objects.create(flavourid="1",
vimid="1",
- resouceid="11",
+ resourceid="11",
instid="1111",
is_predefined=1)
VmInstModel.objects.create(vmid="1",
vimid="1",
- resouceid="11",
+ resourceid="11",
insttype=0,
instid="1111",
vmname="test_01",
|