Return complete response from compute networks_client

Currently compute 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 networks_client to return complete
Response body.

Change-Id: I953c9daf10e8b0d07f6999fd4a61330222c1d2e5
Implements: blueprint method-return-value-and-move-service-clients-to-lib

tempest/api/compute/admin/test_networks.py

@@ -36,7 +36,7 @@ class NetworksTest(base.BaseComputeAdminTest):
 
     @test.idempotent_id('d206d211-8912-486f-86e2-a9d090d1f416')
     def test_get_network(self):
-        networks = self.client.list_networks()
+        networks = self.client.list_networks()['networks']
         if CONF.compute.fixed_network_name:
             configured_network = [x for x in networks if x['label'] ==
                                   CONF.compute.fixed_network_name]
@@ -47,12 +47,13 @@ class NetworksTest(base.BaseComputeAdminTest):
         else:
             configured_network = networks
         configured_network = configured_network[0]
-        network = self.client.show_network(configured_network['id'])
+        network = (self.client.show_network(configured_network['id'])
+                   ['network'])
         self.assertEqual(configured_network['label'], network['label'])
 
     @test.idempotent_id('df3d1046-6fa5-4b2c-ad0c-cfa46a351cb9')
     def test_list_all_networks(self):
-        networks = self.client.list_networks()
+        networks = self.client.list_networks()['networks']
         # Check the configured network is in the list
         if CONF.compute.fixed_network_name:
             configured_network = CONF.compute.fixed_network_name

tempest/api/compute/test_networks.py

@@ -33,5 +33,5 @@ class NetworksTestJSON(base.BaseV2ComputeTest):
 
     @test.idempotent_id('3fe07175-312e-49a5-a623-5f52eeada4c2')
     def test_list_networks(self):
-        networks = self.client.list_networks()
+        networks = self.client.list_networks()['networks']
         self.assertNotEmpty(networks, "No networks found.")

tempest/common/fixed_network.py

@@ -40,7 +40,7 @@ def get_network_from_name(name, compute_networks_client):
     if not name:
         raise exceptions.InvalidConfiguration()
 
-    networks = compute_networks_client.list_networks()
+    networks = compute_networks_client.list_networks()['networks']
     networks = [n for n in networks if n['label'] == name]
 
     # Check that a network exists, else raise an InvalidConfigurationException

tempest/services/compute/json/networks_client.py

@@ -24,10 +24,10 @@ class NetworksClient(service_client.ServiceClient):
         resp, body = self.get("os-networks")
         body = json.loads(body)
         self.expected_success(200, resp.status)
-        return service_client.ResponseBodyList(resp, body['networks'])
+        return service_client.ResponseBody(resp, body)
 
     def show_network(self, network_id):
         resp, body = self.get("os-networks/%s" % network_id)
         body = json.loads(body)
         self.expected_success(200, resp.status)
-        return service_client.ResponseBody(resp, body['network'])
+        return service_client.ResponseBody(resp, body)

tempest/tests/common/test_accounts.py

@@ -297,8 +297,9 @@ class TestAccount(base.TestCase):
         test_accounts_class = accounts.Accounts('v2', 'test_name')
         with mock.patch('tempest.services.compute.json.networks_client.'
                         'NetworksClient.list_networks',
-                        return_value=[{'name': 'network-2', 'id': 'fake-id',
-                                       'label': 'network-2'}]):
+                        return_value={'networks': [{'name': 'network-2',
+                                                    'id': 'fake-id',
+                                                    'label': 'network-2'}]}):
             creds = test_accounts_class.get_creds_by_roles(['role-7'])
         self.assertTrue(isinstance(creds, cred_provider.TestResources))
         network = creds.network

tempest/tests/services/compute/test_networks_client.py

@@ -70,7 +70,8 @@ class TestNetworksClient(base.TestCase):
             fake_auth, 'compute', 'regionOne')
 
     def _test_list_networks(self, bytes_body=False):
-        serialized_body = json.dumps({"networks": self.FAKE_NETWORKS})
+        expected = {"networks": self.FAKE_NETWORKS}
+        serialized_body = json.dumps(expected)
         if bytes_body:
             serialized_body = serialized_body.encode('utf-8')
 
@@ -79,7 +80,7 @@ class TestNetworksClient(base.TestCase):
             'tempest.common.service_client.ServiceClient.get',
             return_value=mocked_resp))
         resp = self.client.list_networks()
-        self.assertEqual(self.FAKE_NETWORKS, resp)
+        self.assertEqual(expected, resp)
 
     def test_list_networks_with_str_body(self):
         self._test_list_networks()
@@ -88,7 +89,8 @@ class TestNetworksClient(base.TestCase):
         self._test_list_networks(bytes_body=True)
 
     def _test_show_network(self, bytes_body=False):
-        serialized_body = json.dumps({"network": self.FAKE_NETWORK})
+        expected = {"network": self.FAKE_NETWORKS}
+        serialized_body = json.dumps(expected)
         if bytes_body:
             serialized_body = serialized_body.encode('utf-8')
 
@@ -97,7 +99,7 @@ class TestNetworksClient(base.TestCase):
             'tempest.common.service_client.ServiceClient.get',
             return_value=mocked_resp))
         resp = self.client.show_network(self.network_id)
-        self.assertEqual(self.FAKE_NETWORK, resp)
+        self.assertEqual(expected, resp)
 
     def test_show_network_with_str_body(self):
         self._test_show_network()