X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Ftests%2Ftest_vnf_create.py;h=e323f6044115e9de7c27a67158bcf9e6424c2c34;hb=f979f5a1b5021fd0f264239933f5c5cd916b69ec;hp=9243b3ea9da74591b749cdf4cc0109deffef687e;hpb=c3cedf44ee2dbe7af49515bb12932c02a90d8f5d;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 9243b3ea..e323f604 100644 --- a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py +++ b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py @@ -18,6 +18,7 @@ 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.vnf_create.inst_vnf import InstVnf from lcm.pub.database.models import NfInstModel, JobStatusModel, VmInstModel, NetworkInstModel, \ SubNetworkInstModel, PortInstModel @@ -61,7 +62,7 @@ class TestNFInstantiate(TestCase): @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_model_dict), '200'] + r2 = [0, json.JSONEncoder().encode(vnfd_rawdata), '200'] # get rawdata from catalog by csar_id mock_call_req.side_effect = [r1, r2] data = { "vnfdId": "111", @@ -88,7 +89,7 @@ class TestNFInstantiate(TestCase): @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='todo', + 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 @@ -102,11 +103,11 @@ class TestNFInstantiate(TestCase): @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='todo', + 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(''), '200'] + r2 = [1, json.JSONEncoder().encode(vnfd_rawdata), '200'] # get rawdata from catalog by csar_id mock_call_req.side_effect = [r1, r2] self.nf_inst_id = '1111' self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id) @@ -115,57 +116,50 @@ 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, "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): + 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] + 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') - # 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'] + # 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] - # 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, "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): @@ -256,321 +250,3 @@ inst_req_data = { "localizationLanguage": "en_US", "additionalParams": {} } - -vnfd_model_dict = { - 'local_storages': [], - 'vdus': [ - { - 'volumn_storages': [], - 'nfv_compute': { - 'mem_size': '', - 'num_cpus': u'2'}, - 'local_storages': [], - 'vdu_id': u'vdu_omm.001', - 'image_file': u'opencos_sss_omm_img_release_20150723-1-disk1', - 'dependencies': [], - 'vls': [], - 'cps': [], - 'properties': { - 'key_vdu': '', - 'support_scaling': False, - 'vdu_type': '', - 'name': '', - 'storage_policy': '', - 'location_info': { - 'vimId': '', - 'availability_zone': '', - 'region': '', - 'dc': '', - 'host': '', - 'tenant': ''}, - 'inject_data_list': [], - 'watchdog': { - 'action': '', - 'enabledelay': ''}, - 'local_affinity_antiaffinity_rule': {}, - 'template_id': u'omm.001', - 'manual_scale_select_vim': False}, - 'description': u'singleommvm'}, - { - 'volumn_storages': [], - 'nfv_compute': { - 'mem_size': '', - 'num_cpus': u'4'}, - 'local_storages': [], - 'vdu_id': u'vdu_1', - 'image_file': u'sss', - 'dependencies': [], - 'vls': [], - 'cps': [], - 'properties': { - 'key_vdu': '', - 'support_scaling': False, - 'vdu_type': '', - 'name': '', - 'storage_policy': '', - 'location_info': { - 'vimId': '', - 'availability_zone': '', - 'region': '', - 'dc': '', - 'host': '', - 'tenant': ''}, - 'inject_data_list': [], - 'watchdog': { - 'action': '', - 'enabledelay': ''}, - 'local_affinity_antiaffinity_rule': {}, - 'template_id': u'1', - 'manual_scale_select_vim': False}, - 'description': u'ompvm'}, - { - 'volumn_storages': [], - 'nfv_compute': { - 'mem_size': '', - 'num_cpus': u'14'}, - 'local_storages': [], - 'vdu_id': u'vdu_2', - 'image_file': u'sss', - 'dependencies': [], - 'vls': [], - 'cps': [], - 'properties': { - 'key_vdu': '', - 'support_scaling': False, - 'vdu_type': '', - 'name': '', - 'storage_policy': '', - 'location_info': { - 'vimId': '', - 'availability_zone': '', - 'region': '', - 'dc': '', - 'host': '', - 'tenant': ''}, - 'inject_data_list': [], - 'watchdog': { - 'action': '', - 'enabledelay': ''}, - 'local_affinity_antiaffinity_rule': {}, - 'template_id': u'2', - 'manual_scale_select_vim': False}, - 'description': u'ompvm'}, - { - 'volumn_storages': [], - 'nfv_compute': { - 'mem_size': '', - 'num_cpus': u'14'}, - 'local_storages': [], - 'vdu_id': u'vdu_3', - 'image_file': u'sss', - 'dependencies': [], - 'vls': [], - 'cps': [], - 'properties': { - 'key_vdu': '', - 'support_scaling': False, - 'vdu_type': '', - 'name': '', - 'storage_policy': '', - 'location_info': { - 'vimId': '', - 'availability_zone': '', - 'region': '', - 'dc': '', - 'host': '', - 'tenant': ''}, - 'inject_data_list': [], - 'watchdog': { - 'action': '', - 'enabledelay': ''}, - 'local_affinity_antiaffinity_rule': {}, - 'template_id': u'3', - 'manual_scale_select_vim': False}, - 'description': u'ompvm'}, - { - 'volumn_storages': [], - 'nfv_compute': { - 'mem_size': '', - 'num_cpus': u'4'}, - 'local_storages': [], - 'vdu_id': u'vdu_10', - 'image_file': u'sss', - 'dependencies': [], - 'vls': [], - 'cps': [], - 'properties': { - 'key_vdu': '', - 'support_scaling': False, - 'vdu_type': '', - 'name': '', - 'storage_policy': '', - 'location_info': { - 'vimId': '', - 'availability_zone': '', - 'region': '', - 'dc': '', - 'host': '', - 'tenant': ''}, - 'inject_data_list': [], - 'watchdog': { - 'action': '', - 'enabledelay': ''}, - 'local_affinity_antiaffinity_rule': {}, - 'template_id': u'10', - 'manual_scale_select_vim': False}, - 'description': u'ppvm'}, - { - 'volumn_storages': [], - 'nfv_compute': { - 'mem_size': '', - 'num_cpus': u'14'}, - 'local_storages': [], - 'vdu_id': u'vdu_11', - 'image_file': u'sss', - 'dependencies': [], - 'vls': [], - 'cps': [], - 'properties': { - 'key_vdu': '', - 'support_scaling': False, - 'vdu_type': '', - 'name': '', - 'storage_policy': '', - 'location_info': { - 'vimId': '', - 'availability_zone': '', - 'region': '', - 'dc': '', - 'host': '', - 'tenant': ''}, - 'inject_data_list': [], - 'watchdog': { - 'action': '', - 'enabledelay': ''}, - 'local_affinity_antiaffinity_rule': {}, - 'template_id': u'11', - 'manual_scale_select_vim': False}, - 'description': u'ppvm'}, - { - 'volumn_storages': [], - 'nfv_compute': { - 'mem_size': '', - 'num_cpus': u'14'}, - 'local_storages': [], - 'vdu_id': u'vdu_12', - 'image_file': u'sss', - 'dependencies': [], - 'vls': [], - 'cps': [], - 'properties': { - 'key_vdu': '', - 'support_scaling': False, - 'vdu_type': '', - 'name': '', - 'storage_policy': '', - 'location_info': { - 'vimId': '', - 'availability_zone': '', - 'region': '', - 'dc': '', - 'host': '', - 'tenant': ''}, - 'inject_data_list': [], - 'watchdog': { - 'action': '', - 'enabledelay': ''}, - 'local_affinity_antiaffinity_rule': {}, - 'template_id': u'12', - 'manual_scale_select_vim': False}, - 'description': u'ppvm'}], - 'volumn_storages': [], - 'policies': { - 'scaling': { - 'targets': {}, - 'policy_id': u'policy_scale_sss-vnf-template', - 'properties': { - 'policy_file': '*-vnfd.zip/*-vnf-policy.xml'}, - 'description': ''}}, - 'image_files': [ - { - 'description': '', - 'properties': { - 'name': u'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', - 'container_type': 'vm', - 'version': '', - 'hypervisor_type': 'kvm'}, - 'image_file_id': u'opencos_sss_omm_img_release_20150723-1-disk1'}, - { - 'description': '', - 'properties': { - 'name': u'sss.vmdk', - 'checksum': '', - 'disk_format': u'VMDK', - 'file_url': u'./zte-cn-sss-main-image/NE/sss.vmdk', - 'container_type': 'vm', - 'version': '', - 'hypervisor_type': 'kvm'}, - 'image_file_id': u'sss'}], - 'vls': [], - 'cps': [], - 'metadata': { - 'vendor': u'zte', - 'is_shared': False, - 'description': '', - 'domain_type': u'CN', - 'version': u'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'}, - "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": {} -}