openstack/tempest
Code Issues Proposed changes

Merge "Return complete response from floating_ip_pools_client"

Browse Source
This commit is contained in:
Jenkins
2015-08-24 10:15:30 +00:00
committed by Gerrit Code Review
parent 3ece5befe9 0e47aeb683
commit b1deec0142
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tempest/api/compute/floating_ips/test_list_floating_ips.py
View File

@@ -78,5 +78,5 @@ class FloatingIPDetailsTestJSON(base.BaseV2ComputeTest):
def test_list_floating_ip_pools(self):
# Positive test:Should return the list of floating IP Pools
floating_ip_pools = self.pools_client.list_floating_ip_pools()
self.assertNotEqual(0, len(floating_ip_pools),
self.assertNotEqual(0, len(floating_ip_pools['floating_ip_pools']),
"Expected floating IP Pools. Got zero.")

4
tempest/services/compute/json/floating_ip_pools_client.py
View File

@@ -24,7 +24,7 @@ from tempest.common import service_client
class FloatingIPPoolsClient(service_client.ServiceClient):
def list_floating_ip_pools(self, params=None):
"""Returns a list of all floating IP Pools."""
"""Gets all floating IP Pools list."""
url = 'os-floating-ip-pools'
if params:
url += '?%s' % urllib.urlencode(params)
@@ -32,4 +32,4 @@ class FloatingIPPoolsClient(service_client.ServiceClient):
resp, body = self.get(url)
body = json.loads(body)
self.validate_response(schema.list_floating_ip_pools, resp, body)
return service_client.ResponseBodyList(resp, body['floating_ip_pools'])
return service_client.ResponseBody(resp, body)