Return complete response from tenant_networks_client
Currently compute tenant_networks_client returns Response by
removing top key from Response.
For example-
return service_client.ResponseBody(resp, body['network'])
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 tenant_networks_client to return
complete Response body.
Change-Id: Ie0f6e709cbb3a215752344cb39f2f7a6f5a7a91b
Implements: blueprint method-return-value-and-move-service-clients-to-lib
diff --git a/tempest/api/compute/test_tenant_networks.py b/tempest/api/compute/test_tenant_networks.py
index ad5adaa..11f572e 100644
--- a/tempest/api/compute/test_tenant_networks.py
+++ b/tempest/api/compute/test_tenant_networks.py
@@ -25,9 +25,10 @@
@test.idempotent_id('edfea98e-bbe3-4c7a-9739-87b986baff26')
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.")
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'])
diff --git a/tempest/services/compute/json/tenant_networks_client.py b/tempest/services/compute/json/tenant_networks_client.py
index d31c5f5..33166c0 100644
--- a/tempest/services/compute/json/tenant_networks_client.py
+++ b/tempest/services/compute/json/tenant_networks_client.py
@@ -24,10 +24,10 @@
resp, body = self.get("os-tenant-networks")
body = json.loads(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):
resp, body = self.get("os-tenant-networks/%s" % network_id)
body = json.loads(body)
self.validate_response(schema.get_tenant_network, resp, body)
- return service_client.ResponseBody(resp, body['network'])
+ return service_client.ResponseBody(resp, body)