openstack/deb-tempest
Code Issues Proposed changes

Merge "Return complete response from tenant_networks_client"

Browse Source
This commit is contained in:
Jenkins
2015-08-29 06:05:04 +00:00
committed by Gerrit Code Review
parent f6c9cac136 0b84c3cf0e
commit f45b2f62c2
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tempest/api/compute/test_tenant_networks.py
View File

@@ -25,9 +25,10 @@ class NetworksTestJSON(base.BaseV2ComputeTest):
@test.idempotent_id('edfea98e-bbe3-4c7a-9739-87b986baff26') @test.idempotent_id('edfea98e-bbe3-4c7a-9739-87b986baff26')
def test_list_show_tenant_networks(self): def test_list_show_tenant_networks(self):
tenant_networks = self.client.list_tenant_networks() tenant_networks = self.client.list_tenant_networks()['networks']
self.assertNotEmpty(tenant_networks, "No tenant networks found.") self.assertNotEmpty(tenant_networks, "No tenant networks found.")
for net in tenant_networks: for net in tenant_networks:
tenant_network = self.client.show_tenant_network(net['id']) tenant_network = (self.client.show_tenant_network(net['id'])
['network'])
self.assertEqual(net['id'], tenant_network['id']) self.assertEqual(net['id'], tenant_network['id'])

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

@@ -24,10 +24,10 @@ class TenantNetworksClient(service_client.ServiceClient):
resp, body = self.get("os-tenant-networks") resp, body = self.get("os-tenant-networks")
body = json.loads(body) body = json.loads(body)
self.validate_response(schema.list_tenant_networks, resp, body) self.validate_response(schema.list_tenant_networks, resp, body)
return service_client.ResponseBodyList(resp, body['networks']) return service_client.ResponseBody(resp, body)
def show_tenant_network(self, network_id): def show_tenant_network(self, network_id):
resp, body = self.get("os-tenant-networks/%s" % network_id) resp, body = self.get("os-tenant-networks/%s" % network_id)
body = json.loads(body) body = json.loads(body)
self.validate_response(schema.get_tenant_network, resp, body) self.validate_response(schema.get_tenant_network, resp, body)
return service_client.ResponseBody(resp, body['network']) return service_client.ResponseBody(resp, body)