Rename method of delete ns/nf

Change-Id: Id6c4ce377d578094f4550701c214435d9e49cfe6
Issue-Id: VFC-222
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>

diff --git a/catalog/packages/nf_package.py b/catalog/packages/nf_package.py
index 4626506..1e5dc98 100644 (file)
--- a/catalog/packages/nf_package.py
+++ b/catalog/packages/nf_package.py
@@ -181,6 +181,10 @@ class NfPkgDeleteThread(threading.Thread):
         nfvolcm.delete_nf_inst_mock()
         JobUtil.add_job_status(self.job_id, 50, "Delete CSAR(%s) from Database." % self.csar_id)
 
+        if not NfPackageModel.objects.filter(nfpackageid=self.csar_id):
+            JobUtil.add_job_status(self.job_id, 100, "Error! CSAR(%s) does not exist." % self.csar_id)
+            return
+
         NfPackageModel.objects.filter(nfpackageid=self.csar_id).delete()
 
         JobUtil.add_job_status(self.job_id, 80, "Delete local CSAR(%s) file." % self.csar_id)

diff --git a/catalog/packages/tests.py b/catalog/packages/tests.py
index d520275..9bb5ea0 100644 (file)
--- a/catalog/packages/tests.py
+++ b/catalog/packages/tests.py
@@ -434,11 +434,10 @@ class PackageTest(unittest.TestCase):
         "description": "vcpe_ns"
     }
 }
-
-
     def tearDown(self):
         pass
 
+
     def test_nspackages_get(self):
         response = self.client.get("/api/catalog/v1/nspackages")
         print response
@@ -500,10 +499,13 @@ class PackageTest(unittest.TestCase):
         response = self.client.delete("/api/catalog/v1/nspackages/" + str(self.ns_csarId))
         self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code, response.content)
 
+
     def test_nf_package_delete_error(self):
         # Delete it directly
-        NfPkgDeleteThread("bb", "6", False).run()
         self.assert_nfmodel_result("bb",0)
+        NfPkgDeleteThread("bb", "6", False).run()
+        self.assert_job_result("6", 100, "Error! CSAR(bb) does not exist.")
+
 
     @mock.patch.object(NfDistributeThread, 'get_vnfd')
     def test_nf_package_delete(self,mock_get_vnfd):