X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Ftests%2Ftest_vnf_create.py;h=7070c3885d54ad7a71ccfb1b197fa180403d89e3;hb=34806616c3a2ad5a7d627dfdd44e7db0cabff863;hp=e74250f82b41dafcc31c08ed57a78efd717fa192;hpb=e5e171227da8bced170a6ad97a9deb0ce4457e20;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 e74250f8..7070c388 100644 --- a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py +++ b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py @@ -18,15 +18,15 @@ import mock from django.test import TestCase, Client from rest_framework import status -from lcm.nf.vnfs.vnf_create.create_vnf_identifier import CreateVnf from lcm.nf.vnfs.vnf_create.inst_vnf import InstVnf -from lcm.pub.database.models import NfInstModel, JobStatusModel, NfvoRegInfoModel, VmInstModel, NetworkInstModel, \ +from lcm.pub.database.models import NfInstModel, JobStatusModel, VmInstModel, NetworkInstModel, \ SubNetworkInstModel, PortInstModel from lcm.pub.utils import restcall from lcm.pub.utils.jobutil import JobUtil +from lcm.pub.utils.timeutil import now_time -class TestNsInstantiate(TestCase): +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", @@ -60,12 +60,13 @@ class TestNsInstantiate(TestCase): @mock.patch.object(restcall, 'call_req') def test_create_vnf_identifier(self, mock_call_req): - r1 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200'] - mock_call_req.side_effect = [r1] + 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_raw_data), '200'] + mock_call_req.side_effect = [r1, r2] data = { "vnfdId": "111", "vnfInstanceName": "vFW_01", - "vnfInstanceDescription": " vFW in Nanjing TIC Edge"} + "vnfInstanceDescription": "vFW in Nanjing TIC Edge"} response = self.client.post("/openoapi/vnflcm/v1/vnf_instances", data=data, format='json') self.failUnlessEqual(status.HTTP_201_CREATED, response.status_code) context = json.loads(response.content) @@ -86,55 +87,99 @@ class TestNsInstantiate(TestCase): 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_input_para_not_define_in_vnfd(self, mock_call_req): - r1 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200'] - r2 = [0, json.JSONEncoder().encode(''), '200'] - mock_call_req.side_effect = [r1, r2] - create_data = { - "vnfdId": "111", - "vnfInstanceName": "vFW_01", - "vnfInstanceDescription": " vFW in Nanjing TIC Edge"} - self.nf_inst_id = CreateVnf(create_data).do_biz() + 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 = [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] + 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, "Input parameter is not defined in vnfd_info.") + 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_nfvo_config_failed(self, mock_call_req): - r1 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200'] - r2 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200'] + 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 = [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_raw_data), '200'] mock_call_req.side_effect = [r1, r2] - create_data = { - "vnfdId": "111", - "vnfInstanceName": "vFW_01", - "vnfInstanceDescription": " vFW in Nanjing TIC Edge"} - self.nf_inst_id = CreateVnf(create_data).do_biz() + 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, "Nfvo was not registered") + self.assert_job_result(self.job_id, 255, "Failed to query rawdata of CSAR(2222) from catalog.") - @mock.patch.object(restcall, 'call_req') - def test_instantiate_vnf_when_applay_grant_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 = [1, json.JSONEncoder().encode(''), '200'] - mock_call_req.side_effect = [r1, r2, r3] - 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, "Nf instancing apply grant exception") + # @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 = [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_raw_data), '200'] + # mock_call_req.side_effect = [r1, r2] + # 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.") + + # @mock.patch.object(restcall, 'call_req') + # def test_instantiate_vnf_when_input_para_not_define_in_vnfd(self, mock_call_req): + # r1 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200'] + # r2 = [0, json.JSONEncoder().encode(''), '200'] + # mock_call_req.side_effect = [r1, r2] + # 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, "Input parameter is not defined in vnfd_info.") + # + # @mock.patch.object(restcall, 'call_req') + # def test_instantiate_vnf_when_get_nfvo_config_failed(self, mock_call_req): + # r1 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200'] + # r2 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200'] + # mock_call_req.side_effect = [r1, r2] + # 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, "Nfvo was not registered") + # + # @mock.patch.object(restcall, 'call_req') + # def test_instantiate_vnf_when_applay_grant_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 = [1, json.JSONEncoder().encode(''), '200'] + # mock_call_req.side_effect = [r1, r2, r3] + # 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, "Nf instancing apply grant exception") # @mock.patch.object(restcall, 'call_req') # # @mock.patch.object(adaptor, 'create_vim_res') @@ -158,27 +203,27 @@ class TestNsInstantiate(TestCase): # 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.") + # @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", @@ -544,3 +589,115 @@ vnfd_model_dict = { "localizationLanguage": "en_US", "additionalParams": {} } + +vnfd_raw_data = { + "rawData": { + "instance": { + "metadata": { + "is_shared": False, + "plugin_info": "vbrasplugin_1.0", + "vendor": "zte", + "request_reclassification": False, + "name": "vbras", + "version": 1, + "vnf_type": "vbras", + "cross_dc": False, + "vnfd_version": "1.0.0", + "id": "zte_vbras_1.0", + "nsh_aware": True + }, + "nodes": [ + { + "id": "aaa_dnet_cp_0xu2j5sbigxc8h1ega3if0ld1", + "type_name": "tosca.nodes.nfv.ext.zte.CP", + "template_name": "aaa_dnet_cp", + "properties": { + "bandwidth": { + "type_name": "integer", + "value": 0 + }, + "direction": { + "type_name": "string", + "value": "bidirectional" + }, + "vnic_type": { + "type_name": "string", + "value": "normal" + }, + "sfc_encapsulation": { + "type_name": "string", + "value": "mac" + }, + "order": { + "type_name": "integer", + "value": 2 + } + }, + "relationships": [ + { + "name": "guest_os", + "source_requirement_index": 0, + "target_node_id": "AAA_image_d8aseebr120nbm7bo1ohkj194", + "target_capability_name": "feature" + } + ] + }, + { + "id": "LB_Image_oj5l2ay8l2g6vcq6fsswzduha", + "type_name": "tosca.nodes.nfv.ext.ImageFile", + "template_name": "LB_Image", + "properties": { + "disk_format": { + "type_name": "string", + "value": "qcow2" + }, + "file_url": { + "type_name": "string", + "value": "/SoftwareImages/image-lb" + }, + "name": { + "type_name": "string", + "value": "image-lb" + } + } + } + ] + }, + "model": { + "metadata": { + "is_shared": False, + "plugin_info": "vbrasplugin_1.0", + "vendor": "zte", + "request_reclassification": False, + "name": "vbras", + "version": 1, + "vnf_type": "vbras", + "cross_dc": False, + "vnfd_version": "1.0.0", + "id": "zte_vbras_1.0", + "nsh_aware": True + }, + "node_templates": [ + { + "name": "aaa_dnet_cp", + "type_name": "tosca.nodes.nfv.ext.zte.CP", + "default_instances": 1, + "min_instances": 0, + "properties": { + "bandwidth": { + "type_name": "integer", + "value": 0 + } + }, + "requirement_templates": [ + { + "name": "virtualbinding", + "target_node_template_name": "AAA", + "target_capability_name": "virtualbinding" + } + ] + } + ] + } + } +}