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
This commit is contained in:
ghanshyam
2015-08-04 15:18:12 +09:00
parent eb426a6c94
commit c651ea0467
3 changed files with 4 additions and 5 deletions

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)