diff options
Diffstat (limited to 'lcm/lcm/nf/tests')
-rw-r--r-- | lcm/lcm/nf/tests/const.py | 36 | ||||
-rw-r--r-- | lcm/lcm/nf/tests/test_change_ext_conn.py | 6 | ||||
-rw-r--r-- | lcm/lcm/nf/tests/test_change_flavour.py | 6 | ||||
-rw-r--r-- | lcm/lcm/nf/tests/test_create_vnf.py | 3 | ||||
-rw-r--r-- | lcm/lcm/nf/tests/test_delete_vnf.py | 4 | ||||
-rw-r--r-- | lcm/lcm/nf/tests/test_heal_vnf.py | 8 | ||||
-rw-r--r-- | lcm/lcm/nf/tests/test_instantiate_vnf.py | 6 | ||||
-rw-r--r-- | lcm/lcm/nf/tests/test_operate_vnf.py | 8 | ||||
-rw-r--r-- | lcm/lcm/nf/tests/test_query_vnf.py | 2 | ||||
-rw-r--r-- | lcm/lcm/nf/tests/test_query_vnf_lcm_op.py | 6 | ||||
-rw-r--r-- | lcm/lcm/nf/tests/test_scale_vnf.py | 6 | ||||
-rw-r--r-- | lcm/lcm/nf/tests/test_scale_vnf_to_level.py | 6 | ||||
-rw-r--r-- | lcm/lcm/nf/tests/test_subscribe_notification.py | 7 | ||||
-rw-r--r-- | lcm/lcm/nf/tests/test_terminate_vnf.py | 6 | ||||
-rw-r--r-- | lcm/lcm/nf/tests/test_update_vnf.py | 8 |
15 files changed, 65 insertions, 53 deletions
diff --git a/lcm/lcm/nf/tests/const.py b/lcm/lcm/nf/tests/const.py index 46b608b3..7debe6bc 100644 --- a/lcm/lcm/nf/tests/const.py +++ b/lcm/lcm/nf/tests/const.py @@ -125,17 +125,17 @@ inst_req_data = { vnfd_model_dict = { 'metadata': { - 'vendor': u'zte', + 'vendor': 'zte', 'is_shared': False, 'description': '', - 'domain_type': u'CN', - 'version': u'v4.14.10', + 'domain_type': 'CN', + 'version': 'v4.14.10', 'vmnumber_overquota_alarm': False, 'cross_dc': False, - 'vnf_type': u'SSS', - 'vnfd_version': u'V00000001', - 'id': u'sss-vnf-template', - 'name': u'sss-vnf-template' + 'vnf_type': 'SSS', + 'vnfd_version': 'V00000001', + 'id': 'sss-vnf-template', + 'name': 'sss-vnf-template' }, 'vdus': [ { @@ -182,7 +182,7 @@ vnfd_model_dict = { "inner_hugepage_size": "2048", "action": "add" }, - "image_file": u'sss', + "image_file": 'sss', "local_storages": [ "local_storage_id1", "local_storage_id2" @@ -304,7 +304,7 @@ vnfd_model_dict = { 'targets': { }, - 'policy_id': u'policy_scale_sss-vnf-template', + 'policy_id': 'policy_scale_sss-vnf-template', 'properties': { 'policy_file': '*-vnfd.zip/*-vnf-policy.xml' }, @@ -315,28 +315,28 @@ vnfd_model_dict = { { 'description': '', 'properties': { - 'name': u'opencos_sss_omm_img_release_20150723-1-disk1.vmdk', + 'name': 'opencos_sss_omm_img_release_20150723-1-disk1.vmdk', 'checksum': '', - 'disk_format': u'VMDK', - 'file_url': u'./zte-cn-sss-main-image/OMM/opencos_sss_omm_img_release_20150723-1-disk1.vmdk', + 'disk_format': 'VMDK', + 'file_url': './zte-cn-sss-main-image/OMM/opencos_sss_omm_img_release_20150723-1-disk1.vmdk', 'container_type': 'vm', 'version': '', 'hypervisor_type': 'kvm' }, - 'image_file_id': u'opencos_sss_omm_img_release_20150723-1-disk1' + 'image_file_id': 'opencos_sss_omm_img_release_20150723-1-disk1' }, { 'description': '', 'properties': { - 'name': u'sss.vmdk', + 'name': 'sss.vmdk', 'checksum': '', - 'disk_format': u'VMDK', - 'file_url': u'./zte-cn-sss-main-image/NE/sss.vmdk', + 'disk_format': 'VMDK', + 'file_url': './zte-cn-sss-main-image/NE/sss.vmdk', 'container_type': 'vm', 'version': '', 'hypervisor_type': 'kvm' }, - 'image_file_id': u'sss' + 'image_file_id': 'sss' } ], 'vls': [ @@ -567,7 +567,7 @@ c8_data_list_image = { "status": "active", "id": "5e2757c1-f846-4727-915c-9a872553ed75", "size": 862016, - "name": u'sss.vmdk' + "name": 'sss.vmdk' } ] } diff --git a/lcm/lcm/nf/tests/test_change_ext_conn.py b/lcm/lcm/nf/tests/test_change_ext_conn.py index 7efb416f..2fafc24c 100644 --- a/lcm/lcm/nf/tests/test_change_ext_conn.py +++ b/lcm/lcm/nf/tests/test_change_ext_conn.py @@ -90,21 +90,21 @@ class TestChangeExtConn(TestCase): response = self.client.post(url, data=self.req_data, format='json') - self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code) + self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) def test_change_ext_conn_conflict(self): url = "/api/vnflcm/v1/vnf_instances/12345/change_ext_conn" response = self.client.post(url, data=self.req_data, format='json') - self.failUnlessEqual(status.HTTP_409_CONFLICT, response.status_code) + self.assertEqual(status.HTTP_409_CONFLICT, response.status_code) def test_change_ext_conn_badreq(self): url = "/api/vnflcm/v1/vnf_instances/123/change_ext_conn" response = self.client.post(url, data={}, format='json') - self.failUnlessEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) @mock.patch.object(JobUtil, 'create_job') def test_change_ext_conn_inner_error(self, mock_run): diff --git a/lcm/lcm/nf/tests/test_change_flavour.py b/lcm/lcm/nf/tests/test_change_flavour.py index 15b53f02..442fd8d5 100644 --- a/lcm/lcm/nf/tests/test_change_flavour.py +++ b/lcm/lcm/nf/tests/test_change_flavour.py @@ -54,18 +54,18 @@ class TestFlavour(TestCase): response = self.client.post(url, data=self.req_data, format='json') - self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code) + self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) def test_change_flavour_conflict(self): url = "/api/vnflcm/v1/vnf_instances/12345/change_flavour" response = self.client.post(url, data=self.req_data, format='json') - self.failUnlessEqual(status.HTTP_409_CONFLICT, response.status_code) + self.assertEqual(status.HTTP_409_CONFLICT, response.status_code) def test_change_flavour_badreq(self): url = "/api/vnflcm/v1/vnf_instances/345/change_flavour" response = self.client.post(url, data={}, format='json') - self.failUnlessEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) diff --git a/lcm/lcm/nf/tests/test_create_vnf.py b/lcm/lcm/nf/tests/test_create_vnf.py index 77655346..39640b57 100644 --- a/lcm/lcm/nf/tests/test_create_vnf.py +++ b/lcm/lcm/nf/tests/test_create_vnf.py @@ -71,7 +71,7 @@ class TestNFInstantiate(TestCase): data=data, format='json' ) - self.failUnlessEqual( + self.assertEqual( status.HTTP_500_INTERNAL_SERVER_ERROR, response.status_code ) @@ -108,4 +108,5 @@ class TestNFInstantiate(TestCase): "vnfPkgId": "111", "instantiationState": "NOT_INSTANTIATED" } + self.assertEqual(status.HTTP_201_CREATED, response.status_code) self.assertEqual(expect_data, response.data) diff --git a/lcm/lcm/nf/tests/test_delete_vnf.py b/lcm/lcm/nf/tests/test_delete_vnf.py index 4253ed12..61d173eb 100644 --- a/lcm/lcm/nf/tests/test_delete_vnf.py +++ b/lcm/lcm/nf/tests/test_delete_vnf.py @@ -127,9 +127,9 @@ class TestNFTerminate(TestCase): create_time=now_time() ) response = self.client.delete("/api/vnflcm/v1/vnf_instances/1111") - self.failUnlessEqual(status.HTTP_204_NO_CONTENT, response.status_code) + self.assertEqual(status.HTTP_204_NO_CONTENT, response.status_code) self.assertEqual(None, response.data) def test_delete_vnf_identifier_when_vnf_not_exist(self): response = self.client.delete("/api/vnflcm/v1/vnf_instances/1111") - self.failUnlessEqual(status.HTTP_204_NO_CONTENT, response.status_code) + self.assertEqual(status.HTTP_204_NO_CONTENT, response.status_code) diff --git a/lcm/lcm/nf/tests/test_heal_vnf.py b/lcm/lcm/nf/tests/test_heal_vnf.py index d5c70da0..1bdcd9fc 100644 --- a/lcm/lcm/nf/tests/test_heal_vnf.py +++ b/lcm/lcm/nf/tests/test_heal_vnf.py @@ -52,7 +52,7 @@ class TestNFInstantiate(TestCase): def test_heal_vnf_not_found(self):
req_data = {}
response = self.client.post("/api/vnflcm/v1/vnf_instances/12/heal", data=req_data, format='json')
- self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code)
+ self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code)
def test_heal_vnf_conflict(self):
req_data = {}
@@ -61,7 +61,7 @@ class TestNFInstantiate(TestCase): nf_name='VNF1',
status='NOT_INSTANTIATED').save()
response = self.client.post("/api/vnflcm/v1/vnf_instances/1267/heal", data=req_data, format='json')
- self.failUnlessEqual(status.HTTP_409_CONFLICT, response.status_code)
+ self.assertEqual(status.HTTP_409_CONFLICT, response.status_code)
NfInstModel.objects.filter(nfinstid='1267').delete()
def test_heal_vnf_badreq(self):
@@ -80,7 +80,7 @@ class TestNFInstantiate(TestCase): data={"additionalParams": "1"},
format='json')
NfInstModel.objects.filter(nfinstid='345').delete()
- self.failUnlessEqual(status.HTTP_400_BAD_REQUEST, response.status_code)
+ self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code)
@mock.patch.object(HealVnf, 'run')
def test_heal_vnf_success(self, mock_run):
@@ -97,7 +97,7 @@ class TestNFInstantiate(TestCase): status='INSTANTIATED').save()
response = self.client.post("/api/vnflcm/v1/vnf_instances/12/heal", data=req_data, format='json')
mock_run.re.return_value = None
- self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)
+ self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code)
NfInstModel(nfinstid='12').delete()
@mock.patch.object(restcall, 'call_req')
diff --git a/lcm/lcm/nf/tests/test_instantiate_vnf.py b/lcm/lcm/nf/tests/test_instantiate_vnf.py index c624e05c..16351f98 100644 --- a/lcm/lcm/nf/tests/test_instantiate_vnf.py +++ b/lcm/lcm/nf/tests/test_instantiate_vnf.py @@ -76,7 +76,7 @@ class TestNFInstantiate(TestCase): data=inst_req_data,
format='json'
)
- self.failUnlessEqual(
+ self.assertEqual(
status.HTTP_202_ACCEPTED,
response.status_code
)
@@ -89,7 +89,7 @@ class TestNFInstantiate(TestCase): data=inst_req_data,
format='json'
)
- self.failUnlessEqual(
+ self.assertEqual(
status.HTTP_404_NOT_FOUND,
response.status_code,
response.content
@@ -108,7 +108,7 @@ class TestNFInstantiate(TestCase): data=inst_req_data,
format='json'
)
- self.failUnlessEqual(
+ self.assertEqual(
status.HTTP_409_CONFLICT,
response.status_code,
response.content
diff --git a/lcm/lcm/nf/tests/test_operate_vnf.py b/lcm/lcm/nf/tests/test_operate_vnf.py index cffcf37d..17408c2e 100644 --- a/lcm/lcm/nf/tests/test_operate_vnf.py +++ b/lcm/lcm/nf/tests/test_operate_vnf.py @@ -55,7 +55,7 @@ class TestNFOperate(TestCase): data=req_data,
format='json'
)
- self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code)
+ self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code)
def test_operate_vnf_conflict(self):
req_data = {
@@ -71,7 +71,7 @@ class TestNFOperate(TestCase): data=req_data,
format='json'
)
- self.failUnlessEqual(status.HTTP_409_CONFLICT, response.status_code)
+ self.assertEqual(status.HTTP_409_CONFLICT, response.status_code)
NfInstModel(
nfinstid='12',
nf_name='VNF1',
@@ -98,7 +98,7 @@ class TestNFOperate(TestCase): format='json'
)
NfInstModel.objects.filter(nfinstid='345').delete()
- self.failUnlessEqual(
+ self.assertEqual(
status.HTTP_400_BAD_REQUEST,
response.status_code
)
@@ -119,7 +119,7 @@ class TestNFOperate(TestCase): format='json'
)
mock_run.re.return_value = None
- self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)
+ self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code)
NfInstModel(
nfinstid='12',
nf_name='VNF1',
diff --git a/lcm/lcm/nf/tests/test_query_vnf.py b/lcm/lcm/nf/tests/test_query_vnf.py index e041216c..5d133de3 100644 --- a/lcm/lcm/nf/tests/test_query_vnf.py +++ b/lcm/lcm/nf/tests/test_query_vnf.py @@ -228,7 +228,7 @@ class ResourceTest(TestCase): insttype=1, instid='%s' % i).save() response = self.client.get("/api/vnflcm/v1/vnf_instances", format='json') - self.failUnlessEqual(status.HTTP_200_OK, response.status_code) + self.assertEqual(status.HTTP_200_OK, response.status_code) self.assertEqual(self.test_data_multi_vnf, response.data) def test_get_vnfs_not_exist(self): diff --git a/lcm/lcm/nf/tests/test_query_vnf_lcm_op.py b/lcm/lcm/nf/tests/test_query_vnf_lcm_op.py index 1711ddca..c69859a4 100644 --- a/lcm/lcm/nf/tests/test_query_vnf_lcm_op.py +++ b/lcm/lcm/nf/tests/test_query_vnf_lcm_op.py @@ -33,6 +33,7 @@ class TestVNFLcmOpOccs(TestCase): self.test_vnflcmop_with_exclude_default = vnflcmop_with_exclude_default self.test_multiple_vnf_lcm_op = copy.copy(multiple_vnf_lcm_op) self.test_multiple_vnf_lcm_op.append(self.test_single_vnf_lcm_op) + self.maxdiff = None def tearDown(self): pass @@ -69,6 +70,7 @@ class TestVNFLcmOpOccs(TestCase): response.status_code, status.HTTP_200_OK ) + self.maxDiff = None self.assertEqual( [self.test_single_vnf_lcm_op], response.data @@ -147,9 +149,9 @@ class TestVNFLcmOpOccs(TestCase): response.status_code, status.HTTP_200_OK ) + self.maxDiff = None self.assertEqual( self.test_multiple_vnf_lcm_op, - response.data, response.data ) @@ -211,6 +213,7 @@ class TestVNFLcmOpOccs(TestCase): response.status_code, status.HTTP_200_OK ) + self.maxDiff = None self.assertEqual( self.test_vnflcmop_with_exclude_default, response.data @@ -248,6 +251,7 @@ class TestVNFLcmOpOccs(TestCase): response.status_code, status.HTTP_200_OK ) + self.maxDiff = None self.assertEqual( self.test_single_vnf_lcm_op, response.data diff --git a/lcm/lcm/nf/tests/test_scale_vnf.py b/lcm/lcm/nf/tests/test_scale_vnf.py index a43c475c..bb470fa8 100644 --- a/lcm/lcm/nf/tests/test_scale_vnf.py +++ b/lcm/lcm/nf/tests/test_scale_vnf.py @@ -44,14 +44,14 @@ class TestNfScale(TestCase): response = self.client.post(url, data=self.req_data, format='json') - self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code) + self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) def test_scale_vnf_conflict(self): url = "/api/vnflcm/v1/vnf_instances/12345/scale" response = self.client.post(url, data=self.req_data, format='json') - self.failUnlessEqual(status.HTTP_409_CONFLICT, response.status_code) + self.assertEqual(status.HTTP_409_CONFLICT, response.status_code) def test_scale_vnf_badreq(self): NfInstModel(nfinstid='678', @@ -69,4 +69,4 @@ class TestNfScale(TestCase): data={}, format='json') NfInstModel.objects.filter(nfinstid='678').delete() - self.failUnlessEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) diff --git a/lcm/lcm/nf/tests/test_scale_vnf_to_level.py b/lcm/lcm/nf/tests/test_scale_vnf_to_level.py index 7c7b98d8..0c06694a 100644 --- a/lcm/lcm/nf/tests/test_scale_vnf_to_level.py +++ b/lcm/lcm/nf/tests/test_scale_vnf_to_level.py @@ -44,14 +44,14 @@ class TestNfScaleToLevel(TestCase): response = self.client.post(url, data=self.req_data, format='json') - self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code) + self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) def test_scale_vnf_conflict(self): url = "/api/vnflcm/v1/vnf_instances/98765/scale_to_level" response = self.client.post(url, data=self.req_data, format='json') - self.failUnlessEqual(status.HTTP_409_CONFLICT, response.status_code) + self.assertEqual(status.HTTP_409_CONFLICT, response.status_code) def test_scale_to_level_badreq(self): NfInstModel(nfinstid='678', @@ -69,4 +69,4 @@ class TestNfScaleToLevel(TestCase): data={}, format='json') NfInstModel.objects.filter(nfinstid='678').delete() - self.failUnlessEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) diff --git a/lcm/lcm/nf/tests/test_subscribe_notification.py b/lcm/lcm/nf/tests/test_subscribe_notification.py index 70a309b8..237ef2dc 100644 --- a/lcm/lcm/nf/tests/test_subscribe_notification.py +++ b/lcm/lcm/nf/tests/test_subscribe_notification.py @@ -106,6 +106,13 @@ class TestSubscription(TestCase): def test_invalid_notification_type(self, mock_requests): dummy_subscription = { "callbackUri": "http://aurl.com", + "authentication": { + "authType": ["BASIC"], + "paramsBasic": { + "username": "username", + "password": "password" + } + }, "filter": { "notificationTypes": ["VnfIdentifierDeletionNotification"], "operationTypes": [ diff --git a/lcm/lcm/nf/tests/test_terminate_vnf.py b/lcm/lcm/nf/tests/test_terminate_vnf.py index 4b235c14..79acbc7c 100644 --- a/lcm/lcm/nf/tests/test_terminate_vnf.py +++ b/lcm/lcm/nf/tests/test_terminate_vnf.py @@ -137,7 +137,7 @@ class TestNFTerminate(TestCase): data=req_data,
format='json'
)
- self.failUnlessEqual(
+ self.assertEqual(
status.HTTP_202_ACCEPTED,
response.status_code,
response.content
@@ -155,7 +155,7 @@ class TestNFTerminate(TestCase): data=req_data,
format='json'
)
- self.failUnlessEqual(
+ self.assertEqual(
status.HTTP_404_NOT_FOUND,
response.status_code,
response.content
@@ -185,7 +185,7 @@ class TestNFTerminate(TestCase): data=req_data,
format='json'
)
- self.failUnlessEqual(
+ self.assertEqual(
status.HTTP_409_CONFLICT,
response.status_code,
response.content
diff --git a/lcm/lcm/nf/tests/test_update_vnf.py b/lcm/lcm/nf/tests/test_update_vnf.py index 3c122605..91f451b6 100644 --- a/lcm/lcm/nf/tests/test_update_vnf.py +++ b/lcm/lcm/nf/tests/test_update_vnf.py @@ -40,7 +40,7 @@ class TestNFUpdate(TestCase): response = self.client.patch("/api/vnflcm/v1/vnf_instances/1111", data=self.upd_data, format='json') - self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code) + self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) def test_update_vnf_etag_not_match(self): instanceid = "19" @@ -62,7 +62,7 @@ class TestNFUpdate(TestCase): "If-Match": "test_etag" }) NfInstModel.objects.filter(nfinstid=instanceid).delete() - self.failUnlessEqual(status.HTTP_412_PRECONDITION_FAILED, response.status_code) + self.assertEqual(status.HTTP_412_PRECONDITION_FAILED, response.status_code) @mock.patch.object(UpdateVnf, 'run') def test_update_vnf_etag_match(self, mock_run): @@ -87,7 +87,7 @@ class TestNFUpdate(TestCase): "If-Match": etag }) NfInstModel.objects.filter(nfinstid=instanceid).delete() - self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code) + self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code) @mock.patch.object(restcall, 'call_req') def test_update_vnf_success(self, mock_call_req): @@ -107,4 +107,4 @@ class TestNFUpdate(TestCase): UpdateVnf(self.upd_data, instanceid, job_id).run() name = NfInstModel.objects.filter(nfinstid=instanceid).get().nf_name NfInstModel.objects.filter(nfinstid=instanceid).delete() - self.failUnlessEqual("vnf new name", name) + self.assertEqual("vnf new name", name) |