X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Ftests%2Ftest_vnf_create.py;h=3d3e9ad136a1e3e724a329c96e733a22686c4ead;hb=f18464b1f38ff751a7c12447fb8cf8d8c7b0c473;hp=aebfdb3be9d7d95a824ea9c595ed7d9b86c9b94b;hpb=e4f53709988ef82a4afbb53bc34200755eb4a33b;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py index aebfdb3b..3d3e9ad1 100644 --- a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py +++ b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py @@ -19,9 +19,9 @@ import mock from django.test import TestCase, Client from rest_framework import status -from lcm.nf.vnfs.const import vnfd_rawdata, c1_data_get_tenant_id, c4_data_create_network, c2_data_create_volume, \ +from lcm.nf.vnfs.const import c1_data_get_tenant_id, c4_data_create_network, c2_data_create_volume, \ c5_data_create_subnet, c3_data_get_volume, c6_data_create_port, c7_data_create_flavor, c8_data_list_image, \ - c9_data_create_vm, c10_data_get_vm, inst_req_data + c9_data_create_vm, c10_data_get_vm, inst_req_data, vnfpackage_info from lcm.nf.vnfs.vnf_create.inst_vnf import InstVnf from lcm.pub.database.models import NfInstModel, JobStatusModel from lcm.pub.utils import restcall @@ -33,35 +33,33 @@ from lcm.pub.vimapi import api class TestNFInstantiate(TestCase): def setUp(self): self.client = Client() + self.grant_result = { + "vim": { + "vimid": 'vimid_1', + "accessinfo": { + "tenant": 'tenantname_1' + } + } + } def tearDown(self): pass def assert_job_result(self, job_id, job_progress, job_detail): - jobs = JobStatusModel.objects.filter( - jobid=job_id, - progress=job_progress, - descp=job_detail) + jobs = JobStatusModel.objects.filter(jobid=job_id, + progress=job_progress, + descp=job_detail) self.assertEqual(1, len(jobs)) - def test_swagger_ok(self): - response = self.client.get("/api/vnflcm/v1/swagger.json", format='json') - self.assertEqual(response.status_code, status.HTTP_200_OK) - @mock.patch.object(restcall, 'call_req') - @mock.patch.object(restcall, 'call_req_aai') - def test_create_vnf_identifier(self, mock_call_req_aai, mock_call_req): - r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode({'csars':[{'package_id': '222', - 'csarId': '2222', - 'vnfdId': '111'}]}), '200'] - r2_get_rawdata_from_catalog = [0, json.JSONEncoder().encode(vnfd_rawdata), '200'] - r3_create_vnf_to_aai = [0, json.JSONEncoder().encode({}), '200'] - mock_call_req.side_effect = [r1_get_csarid_by_vnfdid, r2_get_rawdata_from_catalog] - mock_call_req_aai.side_effect = [r3_create_vnf_to_aai] + def test_create_vnf_identifier(self, mock_call_req): + r2_get_vnfpackage_from_catalog = [0, json.JSONEncoder().encode(vnfpackage_info), '200'] + mock_call_req.side_effect = [r2_get_vnfpackage_from_catalog] data = { "vnfdId": "111", "vnfInstanceName": "vFW_01", - "vnfInstanceDescription": "vFW in Nanjing TIC Edge"} + "vnfInstanceDescription": "vFW in Nanjing TIC Edge" + } response = self.client.post("/api/vnflcm/v1/vnf_instances", data=data, format='json') self.failUnlessEqual(status.HTTP_201_CREATED, response.status_code) context = json.loads(response.content) @@ -77,60 +75,52 @@ class TestNFInstantiate(TestCase): self.nf_inst_id = str(uuid.uuid4()) self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id) JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY") - jobs = JobStatusModel.objects.filter( - jobid=self.job_id, - progress=0, - descp="INST_VNF_READY") + jobs = JobStatusModel.objects.filter(jobid=self.job_id, + progress=0, + descp="INST_VNF_READY") self.assertEqual(1, len(jobs)) data = inst_req_data InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run() self.assert_job_result(self.job_id, 255, "VNF nf_inst_id is not exist.") - @mock.patch.object(restcall, 'call_req') - def test_instantiate_vnf_when_get_package_info_by_vnfdid_failed(self, mock_call_req): - NfInstModel.objects.create(nfinstid='1111', nf_name='vFW_01', package_id='222', - version='', vendor='', netype='', vnfd_model='', status='NOT_INSTANTIATED', - nf_desc='vFW in Nanjing TIC Edge', vnfdid='111', create_time=now_time()) - r1_get_csarid_by_vnfdid = [1, json.JSONEncoder().encode({'csars':[{'package_id': '222', - 'csarId': '2222', - 'vnfdId': '111'}]}), '200'] - mock_call_req.side_effect = [r1_get_csarid_by_vnfdid] - self.nf_inst_id = '1111' - self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id) - JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY") - data = inst_req_data - InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run() - self.assert_job_result(self.job_id, 255, "Failed to query package_info of vnfdid(111) from nslcm.") - @mock.patch.object(restcall, 'call_req') def test_instantiate_vnf_when_get_rawdata_by_csarid_failed(self, mock_call_req): - NfInstModel.objects.create(nfinstid='1111', nf_name='vFW_01', package_id='222', - version='', vendor='', netype='', vnfd_model='', status='NOT_INSTANTIATED', - nf_desc='vFW in Nanjing TIC Edge', vnfdid='111', create_time=now_time()) - r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode({'csars':[{'package_id': '222', - 'csarId': '2222', - 'vnfdId': '111'}]}), '200'] - r2_get_rawdata_from_catalog = [1, json.JSONEncoder().encode(vnfd_rawdata), '200'] - mock_call_req.side_effect = [r1_get_csarid_by_vnfdid, r2_get_rawdata_from_catalog] + NfInstModel.objects.create(nfinstid='1111', + nf_name='vFW_01', + package_id='222', + version='', + vendor='', + netype='', + vnfd_model='', + status='NOT_INSTANTIATED', + nf_desc='vFW in Nanjing TIC Edge', + vnfdid='111', + create_time=now_time()) + r1_get_vnfpackage_by_vnfdid = [1, json.JSONEncoder().encode(vnfpackage_info), '200'] + mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid] self.nf_inst_id = '1111' self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id) JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY") data = inst_req_data InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run() - self.assert_job_result(self.job_id, 255, "Failed to query rawdata of CSAR(2222) from catalog.") + self.assert_job_result(self.job_id, 255, "Failed to query vnf CSAR(111) from catalog.") @mock.patch.object(restcall, 'call_req') def test_instantiate_vnf_when_applay_grant_failed(self, mock_call_req): - NfInstModel.objects.create(nfinstid='1111', nf_name='vFW_01', package_id='222', - version='', vendor='', netype='', vnfd_model='', status='NOT_INSTANTIATED', - nf_desc='vFW in Nanjing TIC Edge', vnfdid='111', create_time=now_time()) - r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode({'csars':[{'package_id': '222', - 'csarId': '2222', - 'vnfdId': '111'}]}), '200'] - r2_get_rawdata_from_catalog = [0, json.JSONEncoder().encode(vnfd_rawdata), '200'] - r3_apply_grant_result = [1, json.JSONEncoder().encode( - {"vim": {"vimid": 'vimid_1', "accessinfo": {"tenant": 'tenantname_1'}}}), '200'] - mock_call_req.side_effect = [r1_get_csarid_by_vnfdid, r2_get_rawdata_from_catalog, r3_apply_grant_result] + NfInstModel.objects.create(nfinstid='1111', + nf_name='vFW_01', + package_id='222', + version='', + vendor='', + netype='', + vnfd_model='', + status='NOT_INSTANTIATED', + nf_desc='vFW in Nanjing TIC Edge', + vnfdid='111', + create_time=now_time()) + r1_get_vnfpackage_by_vnfdid = [0, json.JSONEncoder().encode(vnfpackage_info), '200'] + r2_apply_grant_result = [1, json.JSONEncoder().encode(self.grant_result), '200'] + mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result] self.nf_inst_id = '1111' self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id) JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY") @@ -141,16 +131,20 @@ class TestNFInstantiate(TestCase): @mock.patch.object(restcall, 'call_req') @mock.patch.object(api, 'call') def test_instantiate_vnf_when_unexpected_exception(self, mock_call, mock_call_req): - NfInstModel.objects.create(nfinstid='1111', nf_name='vFW_01', package_id='222', - version='', vendor='', netype='', vnfd_model='', status='NOT_INSTANTIATED', - nf_desc='vFW in Nanjing TIC Edge', vnfdid='111', create_time=now_time()) - r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode({'csars':[{'package_id': '222', - 'csarId': '2222', - 'vnfdId': '111'}]}), '200'] - r2_get_rawdata_from_catalog = [0, json.JSONEncoder().encode(vnfd_rawdata), '200'] - r3_apply_grant_result = [0, json.JSONEncoder().encode( - {"vim": {"vimid": 'vimid_1', "accessinfo": {"tenant": 'tenantname_1'}}}), '200'] - mock_call_req.side_effect = [r1_get_csarid_by_vnfdid, r2_get_rawdata_from_catalog, r3_apply_grant_result] + NfInstModel.objects.create(nfinstid='1111', + nf_name='vFW_01', + package_id='222', + version='', + vendor='', + netype='', + vnfd_model='', + status='NOT_INSTANTIATED', + nf_desc='vFW in Nanjing TIC Edge', + vnfdid='111', + create_time=now_time()) + r1_get_vnfpackage_by_vnfdid = [0, json.JSONEncoder().encode(vnfpackage_info), '200'] + r2_apply_grant_result = [0, json.JSONEncoder().encode(self.grant_result), '200'] + mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result] mock_call.side_effect = [c1_data_get_tenant_id, c2_data_create_volume, c3_data_get_volume] self.nf_inst_id = '1111' self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id) @@ -162,18 +156,21 @@ class TestNFInstantiate(TestCase): @mock.patch.object(restcall, 'call_req') @mock.patch.object(api, 'call') def test_instantiate_vnf_success(self, mock_call, mock_call_req): - NfInstModel.objects.create(nfinstid='1111', nf_name='vFW_01', package_id='222', - version='', vendor='', netype='', vnfd_model='', status='NOT_INSTANTIATED', - nf_desc='vFW in Nanjing TIC Edge', vnfdid='111', create_time=now_time()) - r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode({'csars':[{'package_id': '222', - 'csarId': '2222', - 'vnfdId': '111'}]}), '200'] - r2_get_rawdata_from_catalog = [0, json.JSONEncoder().encode(vnfd_rawdata), '200'] - r3_apply_grant_result = [0, json.JSONEncoder().encode( - {"vim": {"vimid": 'vimid_1', "accessinfo": {"tenant": 'tenantname_1'}}}), '200'] - r4_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200'] - mock_call_req.side_effect = [r1_get_csarid_by_vnfdid, r2_get_rawdata_from_catalog, - r3_apply_grant_result, r4_lcm_notify_result] + NfInstModel.objects.create(nfinstid='1111', + nf_name='vFW_01', + package_id='222', + version='', + vendor='', + netype='', + vnfd_model='', + status='NOT_INSTANTIATED', + nf_desc='vFW in Nanjing TIC Edge', + vnfdid='111', + create_time=now_time()) + r1_get_vnfpackage_by_vnfdid = [0, json.JSONEncoder().encode(vnfpackage_info), '200'] + r2_apply_grant_result = [0, json.JSONEncoder().encode(self.grant_result), '200'] + r3_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200'] + mock_call_req.side_effect = [r1_get_vnfpackage_by_vnfdid, r2_apply_grant_result, r3_lcm_notify_result] mock_call.side_effect = [c1_data_get_tenant_id, c2_data_create_volume, c3_data_get_volume, c4_data_create_network, c5_data_create_subnet, c6_data_create_port, c7_data_create_flavor, c8_data_list_image, c9_data_create_vm, c10_data_get_vm]