From: ying.yunlong Date: Thu, 28 Sep 2017 07:15:56 +0000 (+0800) Subject: Fix vfc-lcm/packages/tests pep8 issue X-Git-Tag: v1.0.0~13 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d4d9f19a30092bdf1df6aabe5b66855b000dbc66;p=vfc%2Fnfvo%2Flcm.git Fix vfc-lcm/packages/tests pep8 issue Change-Id: Ia845e3703b0f8971aa2c4581cd39a227dedb5319 Issue-ID: VFC-456 Signed-off-by: ying.yunlong --- diff --git a/lcm/packages/tests/test_sdc_nf.py b/lcm/packages/tests/test_sdc_nf.py index 1ae8e134..ae5b3d89 100644 --- a/lcm/packages/tests/test_sdc_nf.py +++ b/lcm/packages/tests/test_sdc_nf.py @@ -12,18 +12,18 @@ # See the License for the specific language governing permissions and # limitations under the License. import json + import mock -from rest_framework import status -from django.test import TestCase from django.test import Client +from django.test import TestCase +from rest_framework import status -from lcm.pub.utils import restcall, toscaparser -from lcm.pub.utils import fileutil -from lcm.pub.database.models import NfPackageModel, NfInstModel -from lcm.pub.database.models import JobStatusModel, JobModel from lcm.packages.sdc_nf_package import SdcNfDistributeThread, SdcNfPkgDeleteThread -from lcm.packages import sdc_nf_package +from lcm.pub.database.models import JobStatusModel, JobModel +from lcm.pub.database.models import NfPackageModel, NfInstModel from lcm.pub.msapi import sdc +from lcm.pub.utils import restcall, toscaparser + class TestNfPackage(TestCase): def setUp(self): @@ -249,53 +249,40 @@ class TestNfPackage(TestCase): @mock.patch.object(SdcNfDistributeThread, 'run') def test_nf_pkg_distribute_normal(self, mock_run): - resp = self.client.post("/api/nslcm/v1/vnfpackage", { - "csarId": "1", - "vimIds": ["1"] - }, format='json') + resp = self.client.post("/api/nslcm/v1/vnfpackage", {"csarId": "1", "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", - vim_ids=["1"], - lab_vim_id="", - job_id="2").run() + SdcNfDistributeThread(csar_id="1", vim_ids=["1"], lab_vim_id="", job_id="2").run() self.assert_job_result("2", 255, "NF CSAR(1) already exists.") @mock.patch.object(restcall, 'call_req') @mock.patch.object(sdc, 'download_artifacts') @mock.patch.object(toscaparser, 'parse_vnfd') - def test_nf_pkg_distribute_when_vnfd_already_exist(self, - mock_parse_vnfd, mock_download_artifacts, mock_call_req): - mock_parse_vnfd.return_value = json.JSONEncoder().encode(self.vnfd_data) + def test_nf_pkg_distribute_when_vnfd_already_exist(self, mock_parse_vnfd, mock_download_artifacts, + mock_call_req): + mock_parse_vnfd.return_value = json.JSONEncoder().encode(self.vnfd_data) mock_download_artifacts.return_value = "/home/hss.csar" mock_call_req.return_value = [0, json.JSONEncoder().encode([{ "uuid": "1", "toscaModelURL": "https://127.0.0.1:1234/sdc/v1/hss.csar" - }]), '200'] + }]), '200'] NfPackageModel(uuid="2", nfpackageid="2", vnfdid="zte-hss-1.0").save() - SdcNfDistributeThread(csar_id="1", - vim_ids=["1"], - lab_vim_id="", - job_id="2").run() + SdcNfDistributeThread(csar_id="1", vim_ids=["1"], lab_vim_id="", job_id="2").run() self.assert_job_result("2", 255, "NFD(zte-hss-1.0) already exists.") - + @mock.patch.object(restcall, 'call_req') @mock.patch.object(sdc, 'download_artifacts') @mock.patch.object(toscaparser, 'parse_vnfd') - def test_nf_pkg_distribute_successfully(self, - mock_parse_vnfd, mock_download_artifacts, mock_call_req): - mock_parse_vnfd.return_value = json.JSONEncoder().encode(self.vnfd_data) + def test_nf_pkg_distribute_successfully(self, mock_parse_vnfd, mock_download_artifacts, mock_call_req): + mock_parse_vnfd.return_value = json.JSONEncoder().encode(self.vnfd_data) mock_download_artifacts.return_value = "/home/hss.csar" mock_call_req.return_value = [0, json.JSONEncoder().encode([{ "uuid": "1", "toscaModelURL": "https://127.0.0.1:1234/sdc/v1/hss.csar" - }]), '200'] - SdcNfDistributeThread(csar_id="1", - vim_ids=["1"], - lab_vim_id="", - job_id="4").run() + }]), '200'] + SdcNfDistributeThread(csar_id="1", vim_ids=["1"], lab_vim_id="", job_id="4").run() self.assert_job_result("4", 100, "CSAR(1) distribute successfully.") ############################################################################################################### @@ -304,7 +291,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() @@ -327,30 +314,25 @@ class TestNfPackage(TestCase): resp = self.client.get("/api/nslcm/v1/vnfpackage") self.assertEqual(resp.status_code, status.HTTP_200_OK) - self.assertEqual({"csars": [{"csarId":"3", "vnfdId": "4"}]}, resp.data) + self.assertEqual({"csars": [{"csarId": "3", "vnfdId": "4"}]}, resp.data) def test_nf_pkg_get_one(self): - NfPackageModel(uuid="4", nfpackageid="4", vnfdid="5", - vendor="6", vnfdversion="7", vnfversion="8").save() + NfPackageModel(uuid="4", nfpackageid="4", vnfdid="5", vendor="6", vnfdversion="7", vnfversion="8").save() NfInstModel(nfinstid="1", package_id="4", nf_name="3").save() resp = self.client.get("/api/nslcm/v1/vnfpackage/4") self.assertEqual(resp.status_code, status.HTTP_200_OK) - self.assertEqual({"csarId": "4", + expect_data = { + "csarId": "4", "packageInfo": { "vnfdId": "5", "vnfdProvider": "6", "vnfdVersion": "7", "vnfVersion": "8" - }, + }, "imageInfo": [], "vnfInstanceInfo": [{ "vnfInstanceId": "1", "vnfInstanceName": "3" - }]}, resp.data) - - - - - - - + }] + } + self.assertEqual(expect_data, resp.data) diff --git a/lcm/packages/tests/test_sdc_ns.py b/lcm/packages/tests/test_sdc_ns.py index f14c6f79..d3f5b036 100644 --- a/lcm/packages/tests/test_sdc_ns.py +++ b/lcm/packages/tests/test_sdc_ns.py @@ -87,19 +87,19 @@ class TestSdcNsPackage(TestCase): "description": "", "properties": { "vendor": "zte", - "request_reclassification": False , + "request_reclassification": False, "pnf_type": "m6000s", "version": "1.0", "management_address": "111111", "id": "m6000_s", - "nsh_aware": False + "nsh_aware": False } } ], "fps": [ { "properties": { - "symmetric": False , + "symmetric": False, "policy": { "type": "ACL", "criteria": { @@ -201,7 +201,7 @@ class TestSdcNsPackage(TestCase): "properties": { "plugin_info": "vbrasplugin_1.0", "vendor": "zte", - "is_shared": False , + "is_shared": False, "adjust_vnf_capacity": True, "name": "VFW", "vnf_extend_type": "driver", @@ -210,13 +210,13 @@ class TestSdcNsPackage(TestCase): "csarProvider": "ZTE", "version": "1.0", "nsh_aware": True, - "cross_dc": False , + "cross_dc": False, "vnf_type": "VFW", "vmnumber_overquota_alarm": True, "vnfd_version": "1.0.0", "externalPluginManageNetworkName": "vlan_4007_plugin_net", "id": "vcpe_vfw_zte_1_0", - "request_reclassification": False + "request_reclassification": False }, "dependencies": [ { @@ -246,7 +246,7 @@ class TestSdcNsPackage(TestCase): { "route_id": "", "vl_id": "ext_mnet_net", - "route_external": False , + "route_external": False, "description": "", "properties": { "name": "vlan_4008_mng_net", @@ -265,7 +265,7 @@ class TestSdcNsPackage(TestCase): { "route_id": "", "vl_id": "ext_datanet_net", - "route_external": False , + "route_external": False, "description": "", "properties": { "name": "vlan_4004_tunnel_net", @@ -284,12 +284,12 @@ class TestSdcNsPackage(TestCase): { "route_id": "", "vl_id": "sfc_data_network", - "route_external": False , + "route_external": False, "description": "", "properties": { "name": "sfc_data_network", "dhcp_enabled": True, - "is_predefined": False , + "is_predefined": False, "location_info": { "tenant": "admin", "vimid": 2, @@ -404,14 +404,14 @@ class TestSdcNsPackage(TestCase): @mock.patch.object(restcall, 'call_req') @mock.patch.object(sdc, 'download_artifacts') @mock.patch.object(toscaparser, 'parse_nsd') - def test_ns_pkg_distribute_when_nsd_already_exists(self, - mock_parse_nsd, mock_download_artifacts, mock_call_req): + def test_ns_pkg_distribute_when_nsd_already_exists(self, mock_parse_nsd, mock_download_artifacts, + mock_call_req): mock_parse_nsd.return_value = json.JSONEncoder().encode(self.nsd_data) mock_download_artifacts.return_value = "/home/vcpe.csar" mock_call_req.return_value = [0, json.JSONEncoder().encode([{ "uuid": "1", "toscaModelURL": "https://127.0.0.1:1234/sdc/v1/vcpe.csar" - }]), '200'] + }]), '200'] NSDModel(id="2", nsd_id="VCPE_NS").save() resp = self.client.post("/api/nslcm/v1/nspackage", {"csarId": "1"}, format='json') self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) @@ -421,14 +421,14 @@ class TestSdcNsPackage(TestCase): @mock.patch.object(restcall, 'call_req') @mock.patch.object(sdc, 'download_artifacts') @mock.patch.object(toscaparser, 'parse_nsd') - def test_ns_pkg_distribute_when_nf_not_distributed(self, - mock_parse_nsd, mock_download_artifacts, mock_call_req): + def test_ns_pkg_distribute_when_nf_not_distributed(self, mock_parse_nsd, mock_download_artifacts, + mock_call_req): mock_parse_nsd.return_value = json.JSONEncoder().encode(self.nsd_data) mock_download_artifacts.return_value = "/home/vcpe.csar" mock_call_req.return_value = [0, json.JSONEncoder().encode([{ "uuid": "1", "toscaModelURL": "https://127.0.0.1:1234/sdc/v1/vcpe.csar" - }]), '200'] + }]), '200'] resp = self.client.post("/api/nslcm/v1/nspackage", {"csarId": "1"}, format='json') self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("failed", resp.data["status"]) @@ -437,14 +437,13 @@ class TestSdcNsPackage(TestCase): @mock.patch.object(restcall, 'call_req') @mock.patch.object(sdc, 'download_artifacts') @mock.patch.object(toscaparser, 'parse_nsd') - def test_ns_pkg_distribute_when_successfully(self, - mock_parse_nsd, mock_download_artifacts, mock_call_req): + def test_ns_pkg_distribute_when_successfully(self, mock_parse_nsd, mock_download_artifacts, mock_call_req): mock_parse_nsd.return_value = json.JSONEncoder().encode(self.nsd_data) mock_download_artifacts.return_value = "/home/vcpe.csar" mock_call_req.return_value = [0, json.JSONEncoder().encode([{ "uuid": "1", "toscaModelURL": "https://127.0.0.1:1234/sdc/v1/vcpe.csar" - }]), '200'] + }]), '200'] NfPackageModel(uuid="1", nfpackageid="1", vnfdid="vcpe_vfw_zte_1_0").save() resp = self.client.post("/api/nslcm/v1/nspackage", {"csarId": "1"}, format='json') self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) @@ -481,7 +480,7 @@ class TestSdcNsPackage(TestCase): resp = self.client.get("/api/nslcm/v1/nspackage") self.assertEqual(resp.status_code, status.HTTP_200_OK) - self.assertEqual({"csars": [{"csarId":"13", "nsdId": "2"}]}, resp.data) + self.assertEqual({"csars": [{"csarId": "13", "nsdId": "2"}]}, resp.data) def test_ns_pkg_get_one(self): NSDModel(id="14", nsd_id="2", vendor="3", version="4").save() @@ -489,24 +488,18 @@ class TestSdcNsPackage(TestCase): resp = self.client.get("/api/nslcm/v1/nspackage/14") self.assertEqual(resp.status_code, status.HTTP_200_OK) - self.assertEqual({"csarId": "14", + expect_data = { + "csarId": "14", "packageInfo": { "nsdId": "2", "nsdProvider": "3", "nsdVersion": "4" - }, - "nsInstanceInfo": [{ - "nsInstanceId": "1", "nsInstanceName": "11" - }]}, resp.data) - - - - - - - - - - - - + }, + "nsInstanceInfo": [ + { + "nsInstanceId": "1", + "nsInstanceName": "11" + } + ] + } + self.assertEqual(expect_data, resp.data)