import traceback
from lcm.pub.config.config import REPORT_TO_AAI
-from lcm.pub.database.models import NfInstModel, VmInstModel, OOFDataModel
+from lcm.pub.database.models import NfInstModel, VmInstModel, OOFDataModel, PortInstModel
from lcm.pub.exceptions import NSLCMException
from lcm.pub.msapi import resmgr
from lcm.pub.msapi.aai import query_vnf_aai, delete_vnf_aai, query_vserver_aai, delete_vserver_aai
self.check_nf_valid()
self.send_nf_terminate_to_vnfmDriver()
self.wait_vnfm_job_finish()
- self.send_terminate_vnf_to_resMgr()
+ # self.send_terminate_vnf_to_resMgr()
if REPORT_TO_AAI:
self.delete_vserver_in_aai()
self.delete_vnf_in_aai()
vnf_inst_info = self.get_vnf_inst()
if not vnf_inst_info:
self.add_progress(100, "TERM_VNF_NOT_EXIST_SUCCESS", "finished")
+ return None
self.add_progress(2, "GET_VNF_INST_SUCCESS")
self.vnfm_inst_id = vnf_inst_info.vnfm_inst_id
self.vnf_uuid = vnf_inst_info.mnfinstid
def delete_subscription(self):
try:
- SubscriptionDeletion(self.vnfm_inst_id, self.vnf_inst_id).do_biz()
+ SubscriptionDeletion(self.vnfm_inst_id, self.vnf_uuid).do_biz()
except Exception as e:
logger.error("delete_subscription failed: %s", e.args[0])
def delete_data_from_db(self):
+ PortInstModel.objects.filter(instid=self.vnf_inst_id).delete()
NfInstModel.objects.filter(nfinstid=self.vnf_inst_id).delete()
VmInstModel.objects.filter(instid=self.vnf_inst_id).delete()
OOFDataModel.objects.filter(service_resource_id=self.vnf_inst_id).delete()
vim_id = vm_inst_info.vimid
cloud_owner, cloud_region_id = split_vim_to_owner_region(vim_id)
# query vim_info from aai, get tenant
- vim_info = get_vim_by_id(vim_id)
+ vim_info = get_vim_by_id({"cloud_owner": cloud_owner, 'cloud_regionid': cloud_region_id})
tenant_id = vim_info["tenantId"]
# query vserver instance in aai, get resource_version