Change v3 identity client methods to return one value
Tests were updated. Although DataGenerator had already been modified to
treat v2/v3 differently there were a few methods in BaseIdentityAdminTest
that were not. The required methods are now overridden in the V3 subclass.
The V2/V3 separation here could be cleaned up a bit more but not in this
patch which is already large.
Partially implements: blueprint clients-return-one-value
Change-Id: Ie925b17fe352a7f942d413c32f156137e0cba7e4
diff --git a/tempest/services/identity/v3/json/service_client.py b/tempest/services/identity/v3/json/service_client.py
index b8b2556..c6595f6 100644
--- a/tempest/services/identity/v3/json/service_client.py
+++ b/tempest/services/identity/v3/json/service_client.py
@@ -15,6 +15,7 @@
import json
+from tempest.common import rest_client
from tempest.services.identity.v3.json import base
@@ -22,7 +23,7 @@
def update_service(self, service_id, **kwargs):
"""Updates a service."""
- resp, body = self.get_service(service_id)
+ body = self.get_service(service_id)
name = kwargs.get('name', body['name'])
type = kwargs.get('type', body['type'])
desc = kwargs.get('description', body['description'])
@@ -35,7 +36,7 @@
resp, body = self.patch('services/%s' % service_id, patch_body)
self.expected_success(200, resp.status)
body = json.loads(body)
- return resp, body['service']
+ return rest_client.ResponseBody(resp, body['service'])
def get_service(self, service_id):
"""Get Service."""
@@ -43,7 +44,7 @@
resp, body = self.get(url)
self.expected_success(200, resp.status)
body = json.loads(body)
- return resp, body['service']
+ return rest_client.ResponseBody(resp, body['service'])
def create_service(self, serv_type, name=None, description=None,
enabled=True):
@@ -57,16 +58,16 @@
resp, body = self.post("services", body)
self.expected_success(201, resp.status)
body = json.loads(body)
- return resp, body["service"]
+ return rest_client.ResponseBody(resp, body["service"])
def delete_service(self, serv_id):
url = "services/" + serv_id
resp, body = self.delete(url)
self.expected_success(204, resp.status)
- return resp, body
+ return rest_client.ResponseBody(resp, body)
def list_services(self):
resp, body = self.get('services')
self.expected_success(200, resp.status)
body = json.loads(body)
- return resp, body['services']
+ return rest_client.ResponseBodyList(resp, body['services'])