X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fvnf_cancel%2Fdelete_vnf_identifier.py;h=33eb7ded637334f4e9388c71a7475a19162c0434;hb=ebfb00fb5e70cdc919b910d91650446542088cea;hp=b7b352ff98b49972cce6d9ef726ada8f43ff6a52;hpb=4b5a517fcf4fc8f47247959b94ef35e00e769d43;p=vfc%2Fgvnfm%2Fvnflcm.git

diff --git a/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py b/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py
index b7b352ff..33eb7ded 100644
--- a/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py
+++ b/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py
@@ -13,8 +13,9 @@
 # limitations under the License.
 import logging
 
-from lcm.pub.database.models import NfInstModel
-from lcm.pub.exceptions import NFLCMException
+from lcm.pub.aaiapi.aai import call_aai
+from lcm.pub.config.config import AAI_BASE_URL
+from lcm.pub.database.models import NfInstModel, NfvoRegInfoModel
 
 logger = logging.getLogger(__name__)
 
@@ -27,8 +28,15 @@ class DeleteVnf:
     def do_biz(self):
         vnf_insts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id)
         if not vnf_insts.exists():
-            raise NFLCMException('VnfInst(%s) does not exist' % self.nf_inst_id)
-        sel_vnf = vnf_insts[0]
-        if sel_vnf.instantiationState != 'VNF_INSTANTIATED':
-            raise NFLCMException("No instantiated vnf")
+            logger.warn('VnfInst(%s) does not exist' % self.nf_inst_id)
+            return
+        #sel_vnf = vnf_insts[0]
+        #if sel_vnf.status != 'NOT_INSTANTIATED':
+        #    raise NFLCMException("Don't allow to delete vnf(status:[%s])" % sel_vnf.status)
         NfInstModel.objects.filter(nfinstid=self.nf_inst_id).delete()
+        NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id).delete()
+
+    def delete_data_from_aai(self, req_data):
+        full_url = AAI_BASE_URL + "api/aai-service-design-and-creation/v1/%s" % self.nf_inst_id
+        del_result = call_aai(full_url, "DELETE", req_data)
+        pass
\ No newline at end of file