X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fvnfs%2Fvnf_cancel%2Fdelete_vnf_identifier.py;h=d24cc081b6cf5448423da56b2df72f3285e2050d;hb=358310fd8c7c0863800de3b22a5a9d8ce2fb3b7e;hp=c2afe07db33eb090331a25f4b1092a68cff24b55;hpb=56317b07f492c7e7a47ef3f39866291b0d2df6c2;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 c2afe07d..d24cc081 100644
--- a/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py
+++ b/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py
@@ -11,7 +11,9 @@
 # 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.database.models import NfInstModel, NfvoRegInfoModel
 from lcm.pub.exceptions import NFLCMException
@@ -25,12 +27,25 @@ class DeleteVnf:
         self.nf_inst_id = instanceid
 
     def do_biz(self):
+        try:
+            self.check_parameter()
+            self.delete_info_from_db()
+        except NFLCMException as e:
+            logger.debug('Delete VNF instance[%s] failed: %s', self.nf_inst_id, e.message)
+        except Exception as e:
+            logger.error(e.message)
+            logger.error(traceback.format_exc())
+            logger.debug('Delete VNF instance[%s] failed' % self.nf_inst_id)
+
+    def check_parameter(self):
         vnf_insts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id)
         if not vnf_insts.exists():
             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)
+            # sel_vnf = vnf_insts[0]
+            # if sel_vnf.status != 'NOT_INSTANTIATED':
+            #    raise NFLCMException("Don't allow to delete vnf(status:[%s])" % sel_vnf.status)
+
+    def delete_info_from_db(self):
         NfInstModel.objects.filter(nfinstid=self.nf_inst_id).delete()
         NfvoRegInfoModel.objects.filter(nfvoid=self.nf_inst_id).delete()