From a6c5a8f151b103df19efde03bf71e27344a10874 Mon Sep 17 00:00:00 2001 From: fengyuanxing Date: Thu, 21 Sep 2017 13:34:43 +0800 Subject: Add tests to delete ns instances Change-Id: I0d452c3fd446c6a5b9ea092597d54b84f9f60b5b Issue-Id: VFC-406 Signed-off-by: fengyuanxing --- catalog/packages/tests.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/catalog/packages/tests.py b/catalog/packages/tests.py index b895f114..9588101e 100644 --- a/catalog/packages/tests.py +++ b/catalog/packages/tests.py @@ -179,11 +179,21 @@ class PackageTest(unittest.TestCase): self.assertEqual("Delete CSAR(123) successfully.", response.data["statusDescription"], response.content) self.assert_nsdmodel_result("VCPE_NS", 0) - # def test_nf_package_delete_error(self): - # # Delete it directly - # 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') + @mock.patch.object(nslcm,'get_vnfInstances') + def test_nf_package_delete_error(self, mock_get_vnfInstance, mock_get_vnfd): + # First distribute a VNF + local_file_name = "/url/local/filename" + vnfd = json.JSONEncoder().encode(vnfd_json) + mock_get_vnfd.return_value = vnfd_json,local_file_name,vnfd + NfDistributeThread(str(self.nf_csarId), ["1"], "1", "4").run() + self.assert_nfmodel_result(str(self.nf_csarId), 1) + + # Delete it directly + mock_get_vnfInstance.return_values = [{"csarid":"1"},{"csarid":"2"}] + 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') -- cgit 1.2.3-korg