From 78ead3c00e16cf9e4fd24535a925d3766c6f6aa8 Mon Sep 17 00:00:00 2001 From: Xiaohua Zhang Date: Tue, 27 Nov 2018 10:30:56 +0000 Subject: Fix pep8 errors in windriver plugin Fix errors in resource module Change-Id: I59d43b3c62928bdacffc7fcd6f4c1c8055412e59 Issue-ID: MULTICLOUD-420 Signed-off-by: Xiaohua Zhang --- .../titanium_cloud/resource/tests/test_capacity.py | 82 +++++++++++----------- 1 file changed, 42 insertions(+), 40 deletions(-) (limited to 'windriver/titanium_cloud/resource/tests/test_capacity.py') diff --git a/windriver/titanium_cloud/resource/tests/test_capacity.py b/windriver/titanium_cloud/resource/tests/test_capacity.py index 51785308..baca720f 100644 --- a/windriver/titanium_cloud/resource/tests/test_capacity.py +++ b/windriver/titanium_cloud/resource/tests/test_capacity.py @@ -17,30 +17,30 @@ import json from rest_framework import status -from common.utils import restcall +# from common.utils import restcall from newton_base.tests import mock_info from newton_base.tests import test_base from newton_base.util import VimDriverUtils MOCK_GET_TENANT_LIMIT_RESPONSE = { - "limits" : { - "rate" : [], - "absolute" : { - "maxTotalRAMSize" : 128*1024, - "totalRAMUsed" : 8*1024, - "totalCoresUsed" : 4, - "maxTotalCores" : 20, - } - } + "limits": { + "rate": [], + "absolute": { + "maxTotalRAMSize": 128 * 1024, + "totalRAMUsed": 8 * 1024, + "totalCoresUsed": 4, + "maxTotalCores": 20, + } + } } MOCK_GET_HYPER_STATATICS_RESPONSE = { - "hypervisor_statistics" : { - "vcpus_used" : 4, - "free_ram_mb" : 120*1024, - "vcpus" : 10, - "free_disk_gb" : 300 - } + "hypervisor_statistics": { + "vcpus_used": 4, + "free_ram_mb": 120 * 1024, + "vcpus": 10, + "free_disk_gb": 300 + } } MOCK_GET_STORAGE_RESPONSE_OOS = { @@ -66,8 +66,8 @@ MOCK_GET_TENANT_LIMIT_RESPONSE_OUTOFRAM = { "limits": { "rate": [], "absolute": { - "maxTotalRAMSize": 128 * 1024, - "totalRAMUsed": 1 * 1024, + "maxTotalRAMSize": 12 * 1024, + "totalRAMUsed": 10 * 1024, "totalCoresUsed": 4, "maxTotalCores": 20, } @@ -75,31 +75,31 @@ MOCK_GET_TENANT_LIMIT_RESPONSE_OUTOFRAM = { } MOCK_GET_HYPER_STATATICS_RESPONSE_OUTOFRAM = { - "hypervisor_statistics" : { - "vcpus_used" : 4, - "free_ram_mb" : 1*1024, - "vcpus" : 10, - "free_disk_gb" : 300 - } + "hypervisor_statistics": { + "vcpus_used": 4, + "free_ram_mb": 1 * 1024, + "vcpus": 10, + "free_disk_gb": 300 + } } MOCK_GET_HYPER_STATATICS_RESPONSE_OUTOFSTORAGE = { - "hypervisor_statistics" : { - "vcpus_used" : 4, - "free_ram_mb" : 120*1024, - "vcpus" : 10, - "free_disk_gb" : 3 - } + "hypervisor_statistics": { + "vcpus_used": 4, + "free_ram_mb": 120 * 1024, + "vcpus": 10, + "free_disk_gb": 3 + } } MOCK_GET_STORAGE_RESPONSE = { - "limits" : { - "rate" : [], - "absolute" : { - "totalGigabytesUsed" : 200, - "maxTotalVolumeGigabytes" : 500, - } - } + "limits": { + "rate": [], + "absolute": { + "totalGigabytesUsed": 200, + "maxTotalVolumeGigabytes": 500, + } + } } TEST_REQ_SUCCESS_SOURCE = { @@ -108,13 +108,13 @@ TEST_REQ_SUCCESS_SOURCE = { "Storage": "200" } - TEST_REQ_FAILED_SOURCE = { "vCPU": "17", "Memory": "4096", "Storage": "200" } + class TestCapacity(test_base.TestRequest): def setUp(self): super(TestCapacity, self).setUp() @@ -163,7 +163,7 @@ class TestCapacity(test_base.TestRequest): "/api/multicloud-titaniumcloud/v0/windriver-hudson-dc_RegionOne/capacity_check", TEST_REQ_FAILED_SOURCE, HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID) - + self.assertEquals(status.HTTP_200_OK, response.status_code) self.assertEqual({"result": False}, response.data) @@ -252,6 +252,9 @@ class TestCapacity(test_base.TestRequest): content_type='application/json', HTTP_X_AUTH_TOKEN=mock_info.MOCK_TOKEN_ID) + self.assertEquals(status.HTTP_200_OK, response.status_code) + self.assertEqual({"result": False}, response.data) + @mock.patch.object(VimDriverUtils, 'get_session') @mock.patch.object(VimDriverUtils, 'get_vim_info') def test_capacity_check_volume_limits_outofstorage(self, mock_get_vim_info, mock_get_session): @@ -273,4 +276,3 @@ class TestCapacity(test_base.TestRequest): self.assertEquals(status.HTTP_200_OK, response.status_code) self.assertEqual({"result": False}, response.data) - -- cgit 1.2.3-korg