diff options
author | ying.yunlong <ying.yunlong@zte.com.cn> | 2017-11-25 10:55:55 +0800 |
---|---|---|
committer | ying.yunlong <ying.yunlong@zte.com.cn> | 2017-11-25 10:55:55 +0800 |
commit | 0005a63e02f4afc36d013ca53feaea7073cd9e00 (patch) | |
tree | 7da21f85556e9a8b0fd65cc38d4a387c120c7722 | |
parent | 321644e68718242586be3677624bea1c649af877 (diff) |
Fix vfc-lcm ns delete bug
Change-Id: I984447d30688b21f5ed9a43573d7fc4a2fbaa4ab
Issue-ID: VFC-596
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
-rw-r--r-- | lcm/ns/ns_delete.py | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/lcm/ns/ns_delete.py b/lcm/ns/ns_delete.py index 2e99f07d..2d251907 100644 --- a/lcm/ns/ns_delete.py +++ b/lcm/ns/ns_delete.py @@ -29,9 +29,9 @@ class DeleteNsService(object): def do_biz(self): try: - self.delete_ns() if REPORT_TO_AAI: self.delete_ns_in_aai() + self.delete_ns() except: logger.error(traceback.format_exc()) @@ -51,29 +51,21 @@ class DeleteNsService(object): def delete_ns_in_aai(self): logger.debug("DeleteNsService::delete_ns_in_aai::delete ns instance[%s] in aai." % self.ns_inst_id) try: - # global_customer_id = "global-customer-id-" + self.ns_inst_id - # - # # query ns instance in aai, get resource_version - # customer_info = query_customer_aai(global_customer_id) - # resource_version = customer_info["resource-version"] - # - # # delete ns instance from aai - # resp_data, resp_status = delete_customer_aai(global_customer_id, resource_version) - ns_insts = NSInstModel.objects.filter(id=self.ns_inst_id) - self.global_customer_id = ns_insts[0].global_customer_id - self.service_type = ns_insts[0].service_type - # query ns instance in aai, get resource_version - logger.debug("self.global_customer_id=[%s], self.service_type=[%s], self.ns_inst_id=[%s]" - % (self.global_customer_id, self.service_type, self.ns_inst_id)) - ns_info = query_ns_aai(self.global_customer_id, self.service_type, self.ns_inst_id) - resource_version = ns_info["resource-version"] + if ns_insts: + self.global_customer_id = ns_insts[0].global_customer_id + self.service_type = ns_insts[0].service_type + # query ns instance in aai, get resource_version + logger.debug("self.global_customer_id=[%s], self.service_type=[%s], self.ns_inst_id=[%s]" + % (self.global_customer_id, self.service_type, self.ns_inst_id)) + ns_info = query_ns_aai(self.global_customer_id, self.service_type, self.ns_inst_id) + resource_version = ns_info["resource-version"] - # delete ns instance from aai - logger.debug("ns instance resource_version=[%s]" % resource_version) - resp_data, resp_status = delete_ns_aai(self.global_customer_id, self.service_type, - self.ns_inst_id, resource_version) - logger.debug("Success to delete ns[%s] from aai, resp_status: [%s]." % (self.ns_inst_id, resp_status)) + # delete ns instance from aai + logger.debug("ns instance resource_version=[%s]" % resource_version) + resp_data, resp_status = delete_ns_aai(self.global_customer_id, self.service_type, + self.ns_inst_id, resource_version) + logger.debug("Success to delete ns[%s] from aai, resp_status: [%s]." % (self.ns_inst_id, resp_status)) except NSLCMException as e: logger.debug("Fail to delete ns[%s] from aai, detail message: %s" % (self.ns_inst_id, e.message)) except: |