X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Fns%2Fns_delete.py;h=2d251907cc2dd11869494e83c101f7a303f9b2cc;hb=3fd5514dc33968ff2a88b99a607a4f3eb9a0036a;hp=dde89d1ad7626a572b6d195205e329554e372b65;hpb=5d90f52c5a7326507cfbe289eb48e7c6c9301912;p=vfc%2Fnfvo%2Flcm.git

diff --git a/lcm/ns/ns_delete.py b/lcm/ns/ns_delete.py
index dde89d1a..2d251907 100644
--- a/lcm/ns/ns_delete.py
+++ b/lcm/ns/ns_delete.py
@@ -11,15 +11,14 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-
 import logging
 import traceback
 
 from lcm.pub.config.config import REPORT_TO_AAI
 from lcm.pub.database.models import DefPkgMappingModel, InputParamMappingModel, ServiceBaseInfoModel
 from lcm.pub.database.models import NSInstModel
-from lcm.pub.msapi.aai import delete_customer_aai, query_customer_aai
+from lcm.pub.exceptions import NSLCMException
+from lcm.pub.msapi.aai import query_ns_aai, delete_ns_aai
 
 logger = logging.getLogger(__name__)
 
@@ -30,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,16 +50,23 @@ 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)
-        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"]
+        try:
+            ns_insts = NSInstModel.objects.filter(id=self.ns_inst_id)
+            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
-        resp_data, resp_status = delete_customer_aai(global_customer_id, resource_version)
-        if resp_data:
-            logger.debug("Fail to delete ns instance[%s] from aai, resp_status: [%s]." % (self.ns_inst_id, resp_status))
-        else:
-            logger.debug("Success to delete ns instance[%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:
+            logger.error(traceback.format_exc())