From c651ea0467caac1fa4b043e6218298ff19b05fcc Mon Sep 17 00:00:00 2001 From: ghanshyam Date: Tue, 4 Aug 2015 15:18:12 +0900 Subject: [PATCH] Return complete response from availability_zone_client Currently compute availability_zone_client returns Response by removing top key from Response. For example- return service_client.ResponseBodyList(resp, body['availabilityZoneInfo']) As service clients are in direction to move to Tempest-lib, all service clients should return Response without any truncation. One good example is Resource pagination links which are lost with current way of return value. Resource pagination links are present in parallel (not inside) to top key of Response. This patch makes compute availability_zone_client to return complete Response body. Change-Id: I593d09fcae8b7973d5f4232408c91f046022fe99 Implements: blueprint method-return-value-and-move-service-clients-to-lib --- tempest/api/compute/admin/test_availability_zone.py | 4 ++-- tempest/api/compute/servers/test_availability_zone.py | 2 +- tempest/services/compute/json/availability_zone_client.py | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tempest/api/compute/admin/test_availability_zone.py b/tempest/api/compute/admin/test_availability_zone.py index 22eae03c28..1b36ff2010 100644 --- a/tempest/api/compute/admin/test_availability_zone.py +++ b/tempest/api/compute/admin/test_availability_zone.py @@ -32,10 +32,10 @@ class AZAdminV2TestJSON(base.BaseComputeAdminTest): def test_get_availability_zone_list(self): # List of availability zone availability_zone = self.client.list_availability_zones() - self.assertTrue(len(availability_zone) > 0) + self.assertTrue(len(availability_zone['availabilityZoneInfo']) > 0) @test.idempotent_id('ef726c58-530f-44c2-968c-c7bed22d5b8c') def test_get_availability_zone_list_detail(self): # List of availability zones and available services availability_zone = self.client.list_availability_zones(detail=True) - self.assertTrue(len(availability_zone) > 0) + self.assertTrue(len(availability_zone['availabilityZoneInfo']) > 0) diff --git a/tempest/api/compute/servers/test_availability_zone.py b/tempest/api/compute/servers/test_availability_zone.py index d1fbcec71a..080441ac39 100644 --- a/tempest/api/compute/servers/test_availability_zone.py +++ b/tempest/api/compute/servers/test_availability_zone.py @@ -32,4 +32,4 @@ class AZV2TestJSON(base.BaseComputeTest): def test_get_availability_zone_list_with_non_admin_user(self): # List of availability zone with non-administrator user availability_zone = self.client.list_availability_zones() - self.assertTrue(len(availability_zone) > 0) + self.assertTrue(len(availability_zone['availabilityZoneInfo']) > 0) diff --git a/tempest/services/compute/json/availability_zone_client.py b/tempest/services/compute/json/availability_zone_client.py index c74fd108d9..0012637668 100644 --- a/tempest/services/compute/json/availability_zone_client.py +++ b/tempest/services/compute/json/availability_zone_client.py @@ -32,5 +32,4 @@ class AvailabilityZoneClient(service_client.ServiceClient): resp, body = self.get(url) body = json.loads(body) self.validate_response(schema_list, resp, body) - return service_client.ResponseBodyList(resp, - body['availabilityZoneInfo']) + return service_client.ResponseBody(resp, body)