diff options
| -rw-r--r-- | lcm/lcm/nf/biz/terminate_vnf.py | 16 | ||||
| -rw-r--r-- | lcm/lcm/nf/tests/test_terminate_vnf.py | 6 |
2 files changed, 8 insertions, 14 deletions
diff --git a/lcm/lcm/nf/biz/terminate_vnf.py b/lcm/lcm/nf/biz/terminate_vnf.py index 5d51512f..98edf1ed 100644 --- a/lcm/lcm/nf/biz/terminate_vnf.py +++ b/lcm/lcm/nf/biz/terminate_vnf.py @@ -19,7 +19,7 @@ from threading import Thread from lcm.nf.const import VNF_STATUS, RESOURCE_MAP from lcm.pub.database.models import NfInstModel, VmInstModel, NetworkInstModel, StorageInstModel, \ - PortInstModel, VNFCInstModel, NfvoRegInfoModel, FlavourInstModel, SubNetworkInstModel + 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.utils.jobutil import JobUtil @@ -91,11 +91,9 @@ class TerminateVnf(Thread): content_args['removeResource'].append(res_def) res_index += 1 - vnfmInfo = NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id) - if len(vnfmInfo) == 0: - raise NFLCMException('VnfId(%s) does not exist' % self.nf_inst_id) - content_args['additionalParam']['vnfmid'] = vnfmInfo[0].vnfminstid - content_args['additionalParam']['vimid'] = vnfmInfo[0].apiurl + 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) @@ -179,10 +177,8 @@ class TerminateVnf(Thread): 'affectedVirtualStorage': affected_vs, 'affectedCp': affected_cp} - vnfmInfo = NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id) - if len(vnfmInfo) == 0: - raise NFLCMException('VnfId(%s) does not exist' % self.nf_inst_id) - self.notify_data['VNFMID'] = vnfmInfo[0].vnfminstid + vnfInsts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id) + self.notify_data['VNFMID'] = vnfInsts[0].vnfminstid logger.info('Notify request data=%s' % self.notify_data) def delete_resource(self): diff --git a/lcm/lcm/nf/tests/test_terminate_vnf.py b/lcm/lcm/nf/tests/test_terminate_vnf.py index 0136862a..2179df97 100644 --- a/lcm/lcm/nf/tests/test_terminate_vnf.py +++ b/lcm/lcm/nf/tests/test_terminate_vnf.py @@ -22,7 +22,7 @@ from rest_framework import status from lcm.nf.biz.terminate_vnf import TerminateVnf
from lcm.pub.database.models import NfInstModel, JobStatusModel, VmInstModel, NetworkInstModel, SubNetworkInstModel, \
- PortInstModel, FlavourInstModel, StorageInstModel, NfvoRegInfoModel
+ PortInstModel, FlavourInstModel, StorageInstModel
from lcm.pub.utils import restcall
from lcm.pub.utils.jobutil import JobUtil
from lcm.pub.utils.timeutil import now_time
@@ -78,9 +78,6 @@ class TestNFTerminate(TestCase): vmname="test_01",
is_predefined=1,
operationalstate=1)
- NfvoRegInfoModel.objects.create(nfvoid='1111',
- vnfminstid='11111',
- apiurl='1')
def tearDown(self):
VmInstModel.objects.all().delete()
@@ -121,6 +118,7 @@ class TestNFTerminate(TestCase): def test_terminate_vnf_success(self, mock_call, mock_call_req):
NfInstModel.objects.create(nfinstid='1111',
nf_name='2222',
+ vnfminstid='1',
package_id='todo',
version='',
vendor='',
|