Don't write information to resmanagement

[vfc/nfvo/lcm.git] / lcm / ns_vnfs / biz / terminate_nfs.py

diff --git a/lcm/ns_vnfs/biz/terminate_nfs.py b/lcm/ns_vnfs/biz/terminate_nfs.py
index 1dec71d..c663669 100644 (file)
--- 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
@@ -57,7 +57,7 @@ class TerminateVnfs(threading.Thread):
             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()
@@ -140,11 +140,12 @@ class TerminateVnfs(threading.Thread):
 
     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()