x/deb-python-tempest-lib
Code Issues Proposed changes

Merge "Switch json to oslo_serialization for token_client"

Browse Source
This commit is contained in:
Jenkins
2015-09-24 17:28:13 +00:00
committed by Gerrit Code Review
parent 83fe3778c8 37a767c30c
commit 5dd2ea4d6b
3 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tempest_lib/common/rest_client.py
View File

@@ -15,13 +15,13 @@
# under the License. # under the License.
import collections import collections
import json
import logging as real_logging import logging as real_logging
import re import re
import time import time
import jsonschema import jsonschema
from oslo_log import log as logging from oslo_log import log as logging
from oslo_serialization import jsonutils as json
import six import six
from tempest_lib.common import http from tempest_lib.common import http
@@ -442,16 +442,9 @@ class RestClient(object):
self._log_request_full(method, req_url, resp, secs, req_headers, self._log_request_full(method, req_url, resp, secs, req_headers,
req_body, resp_body, caller_name, extra) req_body, resp_body, caller_name, extra)
def _json_loads(self, resp_body):
if isinstance(resp_body, bytes):
resp_body = json.loads(resp_body.decode('utf8'))
else:
resp_body = json.loads(resp_body)
return resp_body
def _parse_resp(self, body): def _parse_resp(self, body):
try: try:
body = self._json_loads(body) body = json.loads(body)
except ValueError: except ValueError:
return body return body

7
tempest_lib/services/identity/v2/token_client.py
View File

@@ -12,9 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import json
from oslo_log import log as logging from oslo_log import log as logging
from oslo_serialization import jsonutils as json
from tempest_lib.common import rest_client from tempest_lib.common import rest_client
from tempest_lib import exceptions from tempest_lib import exceptions
@@ -88,13 +87,13 @@ class TokenClient(rest_client.RestClient):
self._log_request(method, url, resp) self._log_request(method, url, resp)
if resp.status in [401, 403]: if resp.status in [401, 403]:
resp_body = self._json_loads(resp_body) resp_body = json.loads(resp_body)
raise exceptions.Unauthorized(resp_body['error']['message']) raise exceptions.Unauthorized(resp_body['error']['message'])
elif resp.status not in [200, 201]: elif resp.status not in [200, 201]:
raise exceptions.IdentityError( raise exceptions.IdentityError(
'Unexpected status code {0}'.format(resp.status)) 'Unexpected status code {0}'.format(resp.status))
return resp, self._json_loads(resp_body) return resp, json.loads(resp_body)
def get_token(self, user, password, tenant, auth_data=False): def get_token(self, user, password, tenant, auth_data=False):
"""Returns (token id, token data) for supplied credentials.""" """Returns (token id, token data) for supplied credentials."""

7
tempest_lib/services/identity/v3/token_client.py
View File

@@ -12,9 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import json
from oslo_log import log as logging from oslo_log import log as logging
from oslo_serialization import jsonutils as json
from tempest_lib.common import rest_client from tempest_lib.common import rest_client
from tempest_lib import exceptions from tempest_lib import exceptions
@@ -138,13 +137,13 @@ class V3TokenClient(rest_client.RestClient):
self._log_request(method, url, resp) self._log_request(method, url, resp)
if resp.status in [401, 403]: if resp.status in [401, 403]:
resp_body = self._json_loads(resp_body) resp_body = json.loads(resp_body)
raise exceptions.Unauthorized(resp_body['error']['message']) raise exceptions.Unauthorized(resp_body['error']['message'])
elif resp.status not in [200, 201, 204]: elif resp.status not in [200, 201, 204]:
raise exceptions.IdentityError( raise exceptions.IdentityError(
'Unexpected status code {0}'.format(resp.status)) 'Unexpected status code {0}'.format(resp.status))
return resp, self._json_loads(resp_body) return resp, json.loads(resp_body)
def get_token(self, **kwargs): def get_token(self, **kwargs):
"""Returns (token id, token data) for supplied credentials""" """Returns (token id, token data) for supplied credentials"""