From 47f211917439e006fa32089e6216dafeb835764d Mon Sep 17 00:00:00 2001 From: fujinhua Date: Sat, 26 Aug 2017 10:03:32 +0800 Subject: Resume test cases relative to redis Node centos7-redis-4c-4g which supports redis is ready now, test cases relative to redis need be resumed. Change-Id: I658048cb420d5b49549279ecfb0a2de2757d1248 Issue-Id: VFC-175 Signed-off-by: fujinhua --- lcm/packages/tests/test_nf.py | 6 +++--- lcm/packages/tests/test_sdc_nf.py | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lcm/packages/tests/test_nf.py b/lcm/packages/tests/test_nf.py index 8e7bad03..2e922d4f 100644 --- a/lcm/packages/tests/test_nf.py +++ b/lcm/packages/tests/test_nf.py @@ -165,7 +165,7 @@ class TestNfPackage(TestCase): "vimIds": ["1"] }, format='json') self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) -""" + @mock.patch.object(restcall, 'call_req') def test_nf_pkg_on_boarding_when_on_boarded(self, mock_call_req): mock_call_req.return_value = [0, json.JSONEncoder().encode({"onBoardState": "onBoarded"}), '200'] @@ -190,7 +190,7 @@ class TestNfPackage(TestCase): @mock.patch.object(restcall, 'call_req') def test_nf_on_boarding_when_nfd_already_exists(self, mock_call_req): mock_vals = { - "/api/catalog/v0/csars/2": + "/api/catalog/v1/csars/2": [0, json.JSONEncoder().encode({ "onBoardState": "onBoardFailed", "processState": "deleteFailed"}), '200'], "/api/catalog/v1/servicetemplates/queryingrawdata": @@ -467,5 +467,5 @@ class TestNfPackage(TestCase): self.assertEqual(1, len(resp.data["csars"])) self.assertEqual("1", resp.data["csars"][0]["csarId"]) self.assertEqual("2", resp.data["csars"][0]["vnfdId"]) -""" + diff --git a/lcm/packages/tests/test_sdc_nf.py b/lcm/packages/tests/test_sdc_nf.py index 1747be01..1ae8e134 100644 --- a/lcm/packages/tests/test_sdc_nf.py +++ b/lcm/packages/tests/test_sdc_nf.py @@ -254,7 +254,7 @@ class TestNfPackage(TestCase): "vimIds": ["1"] }, format='json') self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) - """ + def test_nf_pkg_distribute_when_csar_already_exist(self): NfPackageModel(uuid="1", nfpackageid="1", vnfdid="vcpe_vfw_zte_1_0").save() SdcNfDistributeThread(csar_id="1", @@ -297,7 +297,6 @@ class TestNfPackage(TestCase): lab_vim_id="", job_id="4").run() self.assert_job_result("4", 100, "CSAR(1) distribute successfully.") - """ ############################################################################################################### @@ -305,7 +304,7 @@ class TestNfPackage(TestCase): def test_nf_pkg_delete_normal(self, mock_run): resp = self.client.delete("/api/nslcm/v1/vnfpackage/1") self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) - """ + def test_nf_pkg_normal_delete(self): NfPackageModel(uuid="2", nfpackageid="2", vnfdid="vcpe_vfw_zte_1_0").save() SdcNfPkgDeleteThread(csar_id="2", job_id="2", force_delete=False).run() @@ -322,7 +321,6 @@ class TestNfPackage(TestCase): NfInstModel(nfinstid="3", package_id="3").save() SdcNfPkgDeleteThread(csar_id="3", job_id="2", force_delete=False).run() self.assert_job_result("2", 255, "NfInst by csar(3) exists, cannot delete.") - """ def test_nf_pkg_get_all(self): NfPackageModel(uuid="3", nfpackageid="3", vnfdid="4").save() -- cgit 1.2.3-korg