From: Fu Jinhua Date: Thu, 16 Aug 2018 02:24:59 +0000 (+0000) Subject: Merge "Deal with gvnfm adapter stuffs." X-Git-Tag: 1.2.0~29 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=bd2d965471ca2a5a05c9b61fc4379e63c2a43547;hp=754d374a28624e609bbb65aec69ebf417cfcf404;p=vfc%2Fgvnfm%2Fvnflcm.git Merge "Deal with gvnfm adapter stuffs." --- diff --git a/lcm/lcm/nf/biz/grant_vnf.py b/lcm/lcm/nf/biz/grant_vnf.py new file mode 100644 index 00000000..cbfa88b0 --- /dev/null +++ b/lcm/lcm/nf/biz/grant_vnf.py @@ -0,0 +1,52 @@ +# Copyright 2018 ZTE Corporation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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 logging + +from lcm.pub.database.models import NfInstModel, VmInstModel +from lcm.pub.msapi.gvnfmdriver import apply_grant_to_nfvo + +logger = logging.getLogger(__name__) + + +def grant_resource(nf_inst_id, job_id): + logger.info("Grant resource begin") + content_args = { + 'vnfInstanceId': nf_inst_id, + 'vnfDescriptorId': '', + 'lifecycleOperation': 'Terminate', + 'vnfLcmOpOccId': job_id, + 'addResource': [], + 'removeResource': [], + 'placementConstraint': [], + 'additionalParam': {} + } + + vdus = VmInstModel.objects.filter(instid=nf_inst_id, is_predefined=1) + res_index = 1 + for vdu in vdus: + res_def = { + 'type': 'VDU', + 'resDefId': str(res_index), + 'resDesId': vdu.resouceid} + content_args['removeResource'].append(res_def) + res_index += 1 + + vnfInsts = NfInstModel.objects.filter(nfinstid=nf_inst_id) + content_args['additionalParam']['vnfmid'] = vnfInsts[0].vnfminstid + content_args['additionalParam']['vimid'] = vdus[0].vimid + logger.info('Grant request data=%s' % content_args) + apply_result = apply_grant_to_nfvo(json.dumps(content_args)) + logger.info("Grant resource end, response: %s" % apply_result) diff --git a/lcm/lcm/nf/biz/terminate_vnf.py b/lcm/lcm/nf/biz/terminate_vnf.py index 01945152..3327660e 100644 --- a/lcm/lcm/nf/biz/terminate_vnf.py +++ b/lcm/lcm/nf/biz/terminate_vnf.py @@ -21,11 +21,12 @@ from lcm.nf.const import VNF_STATUS, RESOURCE_MAP from lcm.pub.database.models import NfInstModel, VmInstModel, NetworkInstModel, StorageInstModel, \ PortInstModel, VNFCInstModel, FlavourInstModel, SubNetworkInstModel from lcm.pub.exceptions import NFLCMException -from lcm.pub.msapi.gvnfmdriver import apply_grant_to_nfvo, notify_lcm_to_nfvo +from lcm.pub.msapi.gvnfmdriver import notify_lcm_to_nfvo from lcm.pub.utils.jobutil import JobUtil from lcm.pub.utils.timeutil import now_time from lcm.pub.utils.values import ignore_case_get from lcm.pub.vimapi import adaptor +from lcm.nf.biz.grant_vnf import grant_resource logger = logging.getLogger(__name__) @@ -43,7 +44,8 @@ class TerminateVnf(Thread): def run(self): try: if self.term_pre(): - self.grant_resource() + grant_resource(nf_inst_id=self.nf_inst_id, job_id=self.job_id) + JobUtil.add_job_status(self.job_id, 20, 'Nf terminating grant_resource finish') self.query_inst_resource() self.query_notify_data() self.delete_resource() @@ -68,37 +70,6 @@ class TerminateVnf(Thread): logger.info("Nf terminating pre-check finish") return True - def grant_resource(self): - logger.info("Grant resource begin") - content_args = { - 'vnfInstanceId': self.nf_inst_id, - 'vnfDescriptorId': '', - 'lifecycleOperation': 'Terminate', - 'jobId': self.job_id, - 'addResource': [], - 'removeResource': [], - 'placementConstraint': [], - 'additionalParam': {} - } - - vdus = VmInstModel.objects.filter(instid=self.nf_inst_id, is_predefined=1) - res_index = 1 - for vdu in vdus: - res_def = { - 'type': 'VDU', - 'resDefId': str(res_index), - 'resDesId': vdu.resouceid} - content_args['removeResource'].append(res_def) - res_index += 1 - - vnfInsts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id) - content_args['additionalParam']['vnfmid'] = vnfInsts[0].vnfminstid - content_args['additionalParam']['vimid'] = vdus[0].vimid - logger.info('Grant request data=%s' % content_args) - self.apply_result = apply_grant_to_nfvo(json.dumps(content_args)) - logger.info("Grant resource end, response: %s" % self.apply_result) - JobUtil.add_job_status(self.job_id, 20, 'Nf terminating grant_resource finish') - def query_inst_resource(self): logger.info('Query resource begin') for resource_type in RESOURCE_MAP.keys(): diff --git a/lcm/lcm/nf/tests/test_terminate_vnf.py b/lcm/lcm/nf/tests/test_terminate_vnf.py index 2179df97..23b246d7 100644 --- a/lcm/lcm/nf/tests/test_terminate_vnf.py +++ b/lcm/lcm/nf/tests/test_terminate_vnf.py @@ -133,8 +133,15 @@ class TestNFTerminate(TestCase): create_time=now_time()) t1_apply_grant_result = [0, json.JSONEncoder().encode( { - "vimid": 'vimid_1', - "tenant": 'tenantname_1' + "id": "1", + "vnfInstanceId": "1", + "vnfLcmOpOccId": "2", + "vimConnections": [ + { + "id": "1", + "vimId": "1" + } + ] }), '200'] t2_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200'] t3_delete_flavor = [0, json.JSONEncoder().encode({"vim_id": "vimid_1"}), '200'] diff --git a/lcm/lcm/pub/utils/tests.py b/lcm/lcm/pub/utils/tests.py new file mode 100644 index 00000000..d7d628e0 --- /dev/null +++ b/lcm/lcm/pub/utils/tests.py @@ -0,0 +1,223 @@ +# Copyright 2018 ZTE Corporation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# 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 unittest +import mock +import enumutil +import fileutil +import urllib2 +import syscomm +import timeutil +import values + +from lcm.pub.database.models import JobStatusModel, JobModel +from lcm.pub.utils.jobutil import JobUtil + + +class MockReq(): + def read(self): + return "1" + + def close(self): + pass + + +class UtilsTest(unittest.TestCase): + def setUp(self): + pass + + def tearDown(self): + pass + + def test_enum(self): + MY_TYPE = enumutil.enum(SAMLL=0, LARGE=1) + self.assertEqual(0, MY_TYPE.SAMLL) + self.assertEqual(1, MY_TYPE.LARGE) + + def test_create_and_delete_dir(self): + dirs = "abc/def/hij" + fileutil.make_dirs(dirs) + fileutil.make_dirs(dirs) + fileutil.delete_dirs(dirs) + + @mock.patch.object(urllib2, 'urlopen') + def test_download_file_from_http(self, mock_urlopen): + mock_urlopen.return_value = MockReq() + fileutil.delete_dirs("abc") + is_ok, f_name = fileutil.download_file_from_http("1", "abc", "1.txt") + self.assertTrue(is_ok) + self.assertTrue(f_name.endswith("abc/1.txt")) + fileutil.delete_dirs("abc") + + def test_query_job_status(self): + job_id = "1" + JobStatusModel.objects.filter().delete() + JobStatusModel( + indexid=1, + jobid=job_id, + status="success", + progress=10 + ).save() + JobStatusModel( + indexid=2, + jobid=job_id, + status="success", + progress=50 + ).save() + JobStatusModel( + indexid=3, + jobid=job_id, + status="success", + progress=100 + ).save() + jobs = JobUtil.query_job_status(job_id) + self.assertEqual(1, len(jobs)) + self.assertEqual(3, jobs[0].indexid) + jobs = JobUtil.query_job_status(job_id, 1) + self.assertEqual(2, len(jobs)) + self.assertEqual(3, jobs[0].indexid) + self.assertEqual(2, jobs[1].indexid) + JobStatusModel.objects.filter().delete() + + def test_is_job_exists(self): + job_id = "1" + JobModel.objects.filter().delete() + JobModel( + jobid=job_id, + jobtype="1", + jobaction="2", + resid="3", + status=0 + ).save() + self.assertTrue(JobUtil.is_job_exists(job_id)) + JobModel.objects.filter().delete() + + def test_create_job(self): + job_id = "5" + JobModel.objects.filter().delete() + JobUtil.create_job( + inst_type="1", + jobaction="2", + inst_id="3", + user="4", + job_id=5, + res_name="6") + self.assertEqual(1, len(JobModel.objects.filter(jobid=job_id))) + JobModel.objects.filter().delete() + + def test_clear_job(self): + job_id = "1" + JobModel.objects.filter().delete() + JobModel( + jobid=job_id, + jobtype="1", + jobaction="2", + resid="3", + status=0 + ).save() + JobUtil.clear_job(job_id) + self.assertEqual(0, len(JobModel.objects.filter(jobid=job_id))) + + def test_add_job_status_when_job_is_not_created(self): + JobModel.objects.filter().delete() + self.assertRaises( + Exception, + JobUtil.add_job_status, + job_id="1", + progress=1, + status_decs="2", + error_code="0" + ) + + def test_add_job_status_normal(self): + job_id = "1" + JobModel.objects.filter().delete() + JobStatusModel.objects.filter().delete() + JobModel( + jobid=job_id, + jobtype="1", + jobaction="2", + resid="3", + status=0 + ).save() + JobUtil.add_job_status( + job_id="1", + progress=1, + status_decs="2", + error_code="0" + ) + self.assertEqual(1, len(JobStatusModel.objects.filter(jobid=job_id))) + JobStatusModel.objects.filter().delete() + JobModel.objects.filter().delete() + + def test_clear_job_status(self): + job_id = "1" + JobStatusModel.objects.filter().delete() + JobStatusModel( + indexid=1, + jobid=job_id, + status="success", + progress=10 + ).save() + JobUtil.clear_job_status(job_id) + self.assertEqual(0, len(JobStatusModel.objects.filter(jobid=job_id))) + + def test_get_unfinished_jobs(self): + JobModel.objects.filter().delete() + JobModel( + jobid="11", + jobtype="InstVnf", + jobaction="2", + resid="3", + status=0 + ).save() + JobModel( + jobid="22", + jobtype="InstVnf", + jobaction="2", + resid="3", + status=0 + ).save() + JobModel( + jobid="33", + jobtype="InstVnf", + jobaction="2", + resid="3", + status=0 + ).save() + progresses = JobUtil.get_unfinished_jobs( + url_prefix="/vnfinst", + inst_id="3", + inst_type="InstVnf" + ) + expect_progresses = ['/vnfinst/11', '/vnfinst/22', '/vnfinst/33'] + self.assertEqual(expect_progresses, progresses) + JobModel.objects.filter().delete() + + def test_fun_name(self): + self.assertEqual("test_fun_name", syscomm.fun_name()) + + def test_now_time(self): + self.assertIn(":", timeutil.now_time()) + self.assertIn("-", timeutil.now_time()) + + def test_ignore_case_get(self): + data = { + "Abc": "def", + "HIG": "klm" + } + self.assertEqual("def", values.ignore_case_get(data, 'ABC')) + self.assertEqual("def", values.ignore_case_get(data, 'abc')) + self.assertEqual("klm", values.ignore_case_get(data, 'hig')) + self.assertEqual("bbb", values.ignore_case_get(data, 'aaa', 'bbb'))