X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Ftests%2Ftest_vnf_create.py;h=aebfdb3be9d7d95a824ea9c595ed7d9b86c9b94b;hb=e4f53709988ef82a4afbb53bc34200755eb4a33b;hp=b6287c523ad0d872b8169db71871eb43b9d14b31;hpb=794bf69b7fd14671e80b1caebaf807e1b5f85073;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 b6287c52..aebfdb3b 100644 --- a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py +++ b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + import json import uuid @@ -18,35 +19,23 @@ import mock from django.test import TestCase, Client from rest_framework import status -from lcm.nf.vnfs.const import vnfd_rawdata +from lcm.nf.vnfs.const import vnfd_rawdata, 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 from lcm.nf.vnfs.vnf_create.inst_vnf import InstVnf -from lcm.pub.database.models import NfInstModel, JobStatusModel, VmInstModel, NetworkInstModel, \ - SubNetworkInstModel, PortInstModel +from lcm.pub.database.models import NfInstModel, JobStatusModel from lcm.pub.utils import restcall from lcm.pub.utils.jobutil import JobUtil from lcm.pub.utils.timeutil import now_time +from lcm.pub.vimapi import api class TestNFInstantiate(TestCase): def setUp(self): self.client = Client() - VmInstModel.objects.create(vmid="1", vimid="1", resouceid="11", insttype=0, instid="1", vmname="test_01", - operationalstate=1) - VmInstModel.objects.create(vmid="2", vimid="2", resouceid="22", insttype=0, instid="2", - vmname="test_02", operationalstate=1) - NetworkInstModel.objects.create(networkid='1', vimid='1', resouceid='1', name='pnet_network', - tenant='admin', insttype=0, instid='1') - SubNetworkInstModel.objects.create(subnetworkid='1', vimid='1', resouceid='1', networkid='1', - name='sub_pnet', tenant='admin', insttype=0, instid='1') - PortInstModel.objects.create(portid='1', networkid='1', subnetworkid='1', vimid='1', resouceid='1', - name='aaa_pnet_cp', tenant='admin', insttype=0, instid='1') def tearDown(self): pass - VmInstModel.objects.all().delete() - NetworkInstModel.objects.all().delete() - SubNetworkInstModel.objects.all().delete() - PortInstModel.objects.all().delete() def assert_job_result(self, job_id, job_progress, job_detail): jobs = JobStatusModel.objects.filter( @@ -56,19 +45,24 @@ class TestNFInstantiate(TestCase): self.assertEqual(1, len(jobs)) def test_swagger_ok(self): - response = self.client.get("/openoapi/vnflcm/v1/swagger.json", format='json') + 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') - def test_create_vnf_identifier(self, mock_call_req): - r1 = [0, json.JSONEncoder().encode({'package_id':'222', 'csar_id':'2222'}), '200'] # get csar_id from nslcm by vnfd_id - r2 = [0, json.JSONEncoder().encode(vnfd_rawdata), '200'] # get rawdata from catalog by csar_id - mock_call_req.side_effect = [r1, r2] + @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] data = { "vnfdId": "111", "vnfInstanceName": "vFW_01", "vnfInstanceDescription": "vFW in Nanjing TIC Edge"} - response = self.client.post("/openoapi/vnflcm/v1/vnf_instances", data=data, format='json') + 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) self.assertTrue(NfInstModel.objects.filter(nfinstid=context['vnfInstanceId']).exists()) @@ -76,13 +70,18 @@ class TestNFInstantiate(TestCase): @mock.patch.object(InstVnf, 'run') def test_instantiate_vnf(self, mock_run): mock_run.re.return_value = None - response = self.client.post("/openoapi/vnflcm/v1/vnf_instances/12/instantiate", data={}, format='json') + response = self.client.post("/api/vnflcm/v1/vnf_instances/12/instantiate", data={}, format='json') self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code) def test_instantiate_vnf_when_inst_id_not_exist(self): 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") + 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.") @@ -92,8 +91,10 @@ class TestNFInstantiate(TestCase): 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 = [1, json.JSONEncoder().encode({'package_id':'222', 'csar_id':'2222'}), '200'] # get csar_id from nslcm by vnfd_id - mock_call_req.side_effect = [r1] + 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") @@ -106,9 +107,11 @@ class TestNFInstantiate(TestCase): 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 = [0, json.JSONEncoder().encode({'package_id':'222', 'csar_id':'2222'}), '200'] # get csar_id from nslcm by vnfd_id - r2 = [1, json.JSONEncoder().encode(vnfd_rawdata), '200'] # get rawdata from catalog by csar_id - mock_call_req.side_effect = [r1, r2] + 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] 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") @@ -121,15 +124,13 @@ class TestNFInstantiate(TestCase): 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 = [0, json.JSONEncoder().encode({'package_id': '222', 'csar_id': '2222'}), '200'] # get csar_id from nslcm by vnfd_id - r2 = [0, json.JSONEncoder().encode(vnfd_rawdata), '200'] # get rawdata from catalog by csar_id - r3 = [1, json.JSONEncoder().encode({"vim": - { - "vimid": '1', - "accessinfo": {"tenant": '2'} - } - }), '200'] # apply_grant_to_nfvo - mock_call_req.side_effect = [r1, r2, r3] + 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] 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") @@ -137,117 +138,48 @@ class TestNFInstantiate(TestCase): InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run() self.assert_job_result(self.job_id, 255, "Nf instancing apply grant exception") + @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] + 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) + 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, "unexpected exception") - - - - - # @mock.patch.object(restcall, 'call_req') - # def test_instantiate_vnf_when_(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 = [0, json.JSONEncoder().encode({'package_id': '222', 'csar_id': '2222'}), - # '200'] # get csar_id from nslcm by vnfd_id - # r2 = [0, json.JSONEncoder().encode(vnfd_rawdata), '200'] # get rawdata from catalog by csar_id - # r3 = [0, json.JSONEncoder().encode({"vim":{"vimid": '1', "accessinfo": {"tenant": '2'}}}), '200'] # apply_grant_to_nfvo - # mock_call_req.side_effect = [r1, r2, r3] - # 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, "Nf instancing apply grant exception") - - - - # @mock.patch.object(restcall, 'call_req') - # # @mock.patch.object(adaptor, 'create_vim_res') - # def test_instantiate_vnf_when_create_res_failed(self, mock_call_req): - # NfvoRegInfoModel.objects.create(nfvoid='nfvo111', vnfminstid='vnfm111', apiurl='http://10.74.44.11', - # nfvouser='root', nfvopassword='root123') - # r1 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200'] - # r2 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200'] - # r3 = [0, json.JSONEncoder().encode('Nf instancing apply grant'), '200'] - # # r4 = [0, json.JSONEncoder().encode('Nf instancing apply resource'), '200'] - # mock_call_req.side_effect = [r1, r2, r3] - # # mock_create_vim_res.re.return_value = None - # create_data = { - # "vnfdId": "111", - # "vnfInstanceName": "vFW_01", - # "vnfInstanceDescription": " vFW in Nanjing TIC Edge"} - # self.nf_inst_id = CreateVnf(create_data).do_biz() - # 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, "Create resource failed") - - # @mock.patch.object(restcall, 'call_req') - # # @mock.patch.object(adaptor, 'create_vim_res') - # def test_instantiate_vnf_success(self, mock_call_req): - # NfvoRegInfoModel.objects.create(nfvoid='nfvo111', vnfminstid='vnfm111', apiurl='http://10.74.44.11', - # nfvouser='root', nfvopassword='root123') - # r1 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200'] - # r2 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200'] - # r3 = [0, json.JSONEncoder().encode('Nf instancing apply grant'), '200'] - # r4 = [0, json.JSONEncoder().encode('None'), '200'] - # mock_call_req.side_effect = [r1, r2, r3, r4] - # # mock_create_vim_res.re.return_value = None - # create_data = { - # "vnfdId": "111", - # "vnfInstanceName": "vFW_01", - # "vnfInstanceDescription": " vFW in Nanjing TIC Edge"} - # self.nf_inst_id = CreateVnf(create_data).do_biz() - # 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, 100, "Instantiate Vnf success.") - -inst_req_data = { - "flavourId": "flavour_1", - "instantiationLevelId": "instantiationLevel_1", - "extVirtualLinks": [ - { - "vlInstanceId": "1", - "vim": { - "vimInfoId": "1", - "vimId": "1", - "interfaceInfo": { - "vimType": "vim", - "apiVersion": "v2", - "protocolType": "http" - }, - "accessInfo": { - "tenant": "tenant_vCPE", - "username": "vCPE", - "password": "vCPE_321" - }, - "interfaceEndpoint": "http://10.43.21.105:80/" - }, - "resourceId": "1246", - "extCps": [ - { - "cpdId": "11", - "addresses": [ - { - "addressType": "MAC", - "l2AddressData": "00:f3:43:20:a2:a3" - }, - { - "addressType": "IP", - "l3AddressData": { - "iPAddressType": "IPv4", - "iPAddress": "192.168.104.2" - } - } - ], - "numDynamicAddresses": 0 - } - ] - } - ], - "localizationLanguage": "en_US", - "additionalParams": {} -} + @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] + 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] + 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, 100, "Instantiate Vnf success.")