Merge "Return complete response from availability_zone_client"

This commit is contained in:
Jenkins
2015-08-24 10:20:14 +00:00
committed by Gerrit Code Review
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)