From: yangyan Date: Wed, 20 May 2020 07:38:39 +0000 (+0800) Subject: Rm port inst data from db when terminate vnf X-Git-Tag: 1.4.0~10 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vfc%2Fnfvo%2Flcm.git;a=commitdiff_plain;h=b9d6ee2444e2d4cc8a32fc723a4d8b4c1d009259 Rm port inst data from db when terminate vnf Change-Id: I3e3361d391fb645924d2b0c3e5507fb2a5ec7b7c Issue-ID: VFC-1657 Signed-off-by: yangyan --- diff --git a/lcm/ns_vnfs/biz/terminate_nfs.py b/lcm/ns_vnfs/biz/terminate_nfs.py index 0205535b..397460ea 100644 --- a/lcm/ns_vnfs/biz/terminate_nfs.py +++ b/lcm/ns_vnfs/biz/terminate_nfs.py @@ -18,7 +18,7 @@ import threading 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 @@ -145,6 +145,7 @@ class TerminateVnfs(threading.Thread): 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()