Remove vnf pkg force delete param

Change-Id: I9fac756059fbeab427c95c01214f6cf3f5ee7612
Issue--Id: VFC-432
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>

diff --git a/catalog/packages/nf_package.py b/catalog/packages/nf_package.py
index b11288b..f065d36 100644 (file)
--- a/catalog/packages/nf_package.py
+++ b/catalog/packages/nf_package.py
@@ -151,7 +151,7 @@ class NfPkgDeleteThread(threading.Thread):
     Sdc NF Package Deleting
     """
 
-    def __init__(self, csar_id, job_id, force_delete):
+    def __init__(self, csar_id, job_id):
         threading.Thread.__init__(self)
         self.csar_id = csar_id
         self.job_id = job_id

diff --git a/catalog/packages/tests/test_nf.py b/catalog/packages/tests/test_nf.py
index 4b4a86c..8547d04 100644 (file)
--- a/catalog/packages/tests/test_nf.py
+++ b/catalog/packages/tests/test_nf.py
@@ -306,7 +306,7 @@ class TestNfPackage(TestCase):
     
     def test_nf_pkg_normal_delete(self):
         VnfPackageModel(vnfPackageId="2", vnfdId="vcpe_vfw_zte_1_0").save()
-        NfPkgDeleteThread(csar_id="2", job_id="2", force_delete=False).run()
+        NfPkgDeleteThread(csar_id="2", job_id="2").run()
         self.assert_job_result("2", 100, "Delete CSAR(2) successfully.")
 
     def test_nf_pkg_get_all(self):

diff --git a/catalog/packages/views.py b/catalog/packages/views.py
index f0e55d9..174b238 100644 (file)
--- a/catalog/packages/views.py
+++ b/catalog/packages/views.py
@@ -94,11 +94,8 @@ def nf_rd_csar(request, *args, **kwargs):
         ret = nf_package.nf_get_csar(csar_id)
         normal_status = status.HTTP_200_OK
     elif request.method == 'DELETE':
-        force_delete = csar_id.endswith("force")
-        if force_delete:
-            csar_id = csar_id[:-5]
         job_id = str(uuid.uuid4())
-        nf_package.NfPkgDeleteThread(csar_id, job_id, force_delete).start()
+        nf_package.NfPkgDeleteThread(csar_id, job_id).start()
         ret = [0, {"jobId": job_id}]
         normal_status = status.HTTP_202_ACCEPTED
     logger.info("Leave %s, Return value is %s", fun_name(), ret)