openstack/python-ironicclient
Code Issues Proposed changes

Fix python3 compatibility when HTTP Error are returned

Browse Source 
When trying to contact Ironic with a bad token, Forbidden exception
should be raised, in python3 a TypeError is raised due to json
lib being unable do decode a bytes object.

In order to be really python3 compatible, the json lib was replaced
with oslo.serialization module jsontuils since it's the recommended
migration to python3 guide. This is to ensure that data coming from
the requests lib can be read even if it's not string any more but
bytes.
https://wiki.openstack.org/wiki/Python3

Change-Id: I27540f58e31817d4de604334bc4c62899d82f4cc
Closes-Bug: #1629068
This commit is contained in:
Marc Aubry 2016-09-27 17:42:53 -04:00 committed by Maxime Belanger
parent 32c415e76b
commit e512550ab7
5 changed files with 111 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ironicclient/common/http.py
View File

@ -17,7 +17,6 @@ import copy
from distutils.version import StrictVersion from distutils.version import StrictVersion
import functools import functools
import hashlib import hashlib
import json
import logging import logging
import os import os
import socket import socket
@ -27,6 +26,7 @@ import time
from keystoneauth1 import adapter from keystoneauth1 import adapter
from keystoneauth1 import exceptions as kexc from keystoneauth1 import exceptions as kexc
from oslo_serialization import jsonutils
from oslo_utils import strutils from oslo_utils import strutils
import requests import requests
import six import six
@ -73,10 +73,10 @@ def _extract_error_json(body):
"""Return error_message from the HTTP response body.""" """Return error_message from the HTTP response body."""
error_json = {} error_json = {}
try: try:
body_json = json.loads(body) body_json = jsonutils.loads(body)
if 'error_message' in body_json: if 'error_message' in body_json:
raw_msg = body_json['error_message'] raw_msg = body_json['error_message']
error_json = json.loads(raw_msg) error_json = jsonutils.loads(raw_msg)
except ValueError: except ValueError:
pass pass
@ -354,16 +354,15 @@ class HTTPClient(VersionNegotiationMixin):
raise exc.ConnectionRefused(message) raise exc.ConnectionRefused(message)
body_iter = resp.iter_content(chunk_size=CHUNKSIZE)
# Read body into string if it isn't obviously image data
body_str = None body_str = None
if resp.headers.get('Content-Type') != 'application/octet-stream': if resp.headers.get('Content-Type') == 'application/octet-stream':
body_str = ''.join([chunk for chunk in body_iter]) body_iter = resp.iter_content(chunk_size=CHUNKSIZE)
self.log_http_response(resp)
else:
# Read body into string if it isn't obviously image data
body_str = resp.text
self.log_http_response(resp, body_str) self.log_http_response(resp, body_str)
body_iter = six.StringIO(body_str) body_iter = six.StringIO(body_str)
else:
self.log_http_response(resp)
if resp.status_code >= http_client.BAD_REQUEST: if resp.status_code >= http_client.BAD_REQUEST:
error_json = _extract_error_json(body_str) error_json = _extract_error_json(body_str)
@ -386,7 +385,7 @@ class HTTPClient(VersionNegotiationMixin):
kwargs['headers'].setdefault('Accept', 'application/json') kwargs['headers'].setdefault('Accept', 'application/json')
if 'body' in kwargs: if 'body' in kwargs:
kwargs['body'] = json.dumps(kwargs['body']) kwargs['body'] = jsonutils.dump_as_bytes(kwargs['body'])
resp, body_iter = self._http_request(url, method, **kwargs) resp, body_iter = self._http_request(url, method, **kwargs)
content_type = resp.headers.get('Content-Type') content_type = resp.headers.get('Content-Type')
@ -399,7 +398,7 @@ class HTTPClient(VersionNegotiationMixin):
if 'application/json' in content_type: if 'application/json' in content_type:
body = ''.join([chunk for chunk in body_iter]) body = ''.join([chunk for chunk in body_iter])
try: try:
body = json.loads(body) body = jsonutils.loads(body)
except ValueError: except ValueError:
LOG.error(_LE('Could not decode response body as JSON')) LOG.error(_LE('Could not decode response body as JSON'))
else: else:
@ -548,7 +547,7 @@ class SessionClient(VersionNegotiationMixin, adapter.LegacyJsonAdapter):
kwargs['headers'].setdefault('Accept', 'application/json') kwargs['headers'].setdefault('Accept', 'application/json')
if 'body' in kwargs: if 'body' in kwargs:
kwargs['data'] = json.dumps(kwargs.pop('body')) kwargs['data'] = jsonutils.dump_as_bytes(kwargs.pop('body'))
resp = self._http_request(url, method, **kwargs) resp = self._http_request(url, method, **kwargs)
body = resp.content body = resp.content

134
ironicclient/tests/unit/common/test_http.py
View File

@ -13,10 +13,11 @@
# 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
import time import time
import mock import mock
from oslo_serialization import jsonutils
import requests
import six import six
from six.moves import http_client from six.moves import http_client
@ -39,10 +40,9 @@ def _get_error_body(faultstring=None, debuginfo=None):
'faultstring': faultstring, 'faultstring': faultstring,
'debuginfo': debuginfo 'debuginfo': debuginfo
} }
raw_error_body = json.dumps(error_body) raw_error_body = jsonutils.dump_as_bytes(error_body)
body = {'error_message': raw_error_body} body = {'error_message': raw_error_body}
raw_body = json.dumps(body) return jsonutils.dumps(body)
return raw_body
def _session_client(**kwargs): def _session_client(**kwargs):
@ -204,12 +204,24 @@ class HttpClientTest(utils.BaseTestCase):
url = client._make_connection_url('v1/resources') url = client._make_connection_url('v1/resources')
self.assertEqual('http://localhost/v1/resources', url) self.assertEqual('http://localhost/v1/resources', url)
def test_server_https_request_with_application_octet_stream(self):
client = http.HTTPClient('https://localhost/')
client.session = utils.mockSession(
{'Content-Type': 'application/octet-stream'},
"Body",
version=1,
status_code=http_client.OK)
response, body = client.json_request('GET', '/v1/resources')
self.assertEqual(client.session.request.return_value, response)
self.assertIsNone(body)
def test_server_exception_empty_body(self): def test_server_exception_empty_body(self):
error_body = _get_error_body() error_body = _get_error_body()
client = http.HTTPClient('http://localhost/') client = http.HTTPClient('http://localhost/')
client.session = utils.FakeSession( client.session = utils.mockSession(
{'Content-Type': 'application/json'}, {'Content-Type': 'application/json'},
six.StringIO(error_body), error_body,
version=1, version=1,
status_code=http_client.INTERNAL_SERVER_ERROR) status_code=http_client.INTERNAL_SERVER_ERROR)
@ -221,9 +233,9 @@ class HttpClientTest(utils.BaseTestCase):
error_msg = 'test error msg' error_msg = 'test error msg'
error_body = _get_error_body(error_msg) error_body = _get_error_body(error_msg)
client = http.HTTPClient('http://localhost/') client = http.HTTPClient('http://localhost/')
client.session = utils.FakeSession( client.session = utils.mockSession(
{'Content-Type': 'application/json'}, {'Content-Type': 'application/json'},
six.StringIO(error_body), error_body,
version=1, version=1,
status_code=http_client.INTERNAL_SERVER_ERROR) status_code=http_client.INTERNAL_SERVER_ERROR)
@ -233,9 +245,9 @@ class HttpClientTest(utils.BaseTestCase):
def test_server_https_request_ok(self): def test_server_https_request_ok(self):
client = http.HTTPClient('https://localhost/') client = http.HTTPClient('https://localhost/')
client.session = utils.FakeSession( client.session = utils.mockSession(
{'Content-Type': 'application/json'}, {'Content-Type': 'application/json'},
six.StringIO("Body"), "Body",
version=1, version=1,
status_code=http_client.OK) status_code=http_client.OK)
@ -245,9 +257,9 @@ class HttpClientTest(utils.BaseTestCase):
error_body = _get_error_body() error_body = _get_error_body()
client = http.HTTPClient('https://localhost/') client = http.HTTPClient('https://localhost/')
client.session = utils.FakeSession( client.session = utils.mockSession(
{'Content-Type': 'application/json'}, {'Content-Type': 'application/json'},
six.StringIO(error_body), error_body,
version=1, version=1,
status_code=http_client.INTERNAL_SERVER_ERROR) status_code=http_client.INTERNAL_SERVER_ERROR)
@ -258,9 +270,9 @@ class HttpClientTest(utils.BaseTestCase):
def test_401_unauthorized_exception(self): def test_401_unauthorized_exception(self):
error_body = _get_error_body() error_body = _get_error_body()
client = http.HTTPClient('http://localhost/') client = http.HTTPClient('http://localhost/')
client.session = utils.FakeSession( client.session = utils.mockSession(
{'Content-Type': 'text/plain'}, {'Content-Type': 'text/plain'},
six.StringIO(error_body), error_body,
version=1, version=1,
status_code=http_client.UNAUTHORIZED) status_code=http_client.UNAUTHORIZED)
@ -281,12 +293,12 @@ class HttpClientTest(utils.BaseTestCase):
expected_result = ('1.1', '1.6') expected_result = ('1.1', '1.6')
client = http.HTTPClient('http://localhost/') client = http.HTTPClient('http://localhost/')
fake_resp = utils.FakeSessionResponse( fake_resp = utils.mockSessionResponse(
{'X-OpenStack-Ironic-API-Minimum-Version': '1.1', {'X-OpenStack-Ironic-API-Minimum-Version': '1.1',
'X-OpenStack-Ironic-API-Maximum-Version': '1.6', 'X-OpenStack-Ironic-API-Maximum-Version': '1.6',
'Content-Type': 'text/plain', 'Content-Type': 'text/plain',
}, },
six.StringIO(error_body), error_body,
version=1, version=1,
status_code=http_client.NOT_ACCEPTABLE) status_code=http_client.NOT_ACCEPTABLE)
result = client._parse_version_headers(fake_resp) result = client._parse_version_headers(fake_resp)
@ -299,12 +311,12 @@ class HttpClientTest(utils.BaseTestCase):
error_body = _get_error_body() error_body = _get_error_body()
client = http.HTTPClient('http://%s:%s/' % (host, port)) client = http.HTTPClient('http://%s:%s/' % (host, port))
client.session = utils.FakeSession( client.session = utils.mockSession(
{'X-OpenStack-Ironic-API-Minimum-Version': '1.1', {'X-OpenStack-Ironic-API-Minimum-Version': '1.1',
'X-OpenStack-Ironic-API-Maximum-Version': latest_ver, 'X-OpenStack-Ironic-API-Maximum-Version': latest_ver,
'content-type': 'text/plain', 'content-type': 'text/plain',
}, },
six.StringIO(error_body), error_body,
version=1, version=1,
status_code=http_client.NOT_ACCEPTABLE) status_code=http_client.NOT_ACCEPTABLE)
self.assertRaises( self.assertRaises(
@ -321,20 +333,20 @@ class HttpClientTest(utils.BaseTestCase):
# Test when fallback to a supported version succeeds # Test when fallback to a supported version succeeds
mock_negotiate.return_value = '1.6' mock_negotiate.return_value = '1.6'
error_body = _get_error_body() error_body = _get_error_body()
bad_resp = utils.FakeSessionResponse( bad_resp = utils.mockSessionResponse(
{'X-OpenStack-Ironic-API-Minimum-Version': '1.1', {'X-OpenStack-Ironic-API-Minimum-Version': '1.1',
'X-OpenStack-Ironic-API-Maximum-Version': '1.6', 'X-OpenStack-Ironic-API-Maximum-Version': '1.6',
'content-type': 'text/plain', 'content-type': 'text/plain',
}, },
six.StringIO(error_body), error_body,
version=1, version=1,
status_code=http_client.NOT_ACCEPTABLE) status_code=http_client.NOT_ACCEPTABLE)
good_resp = utils.FakeSessionResponse( good_resp = utils.mockSessionResponse(
{'X-OpenStack-Ironic-API-Minimum-Version': '1.1', {'X-OpenStack-Ironic-API-Minimum-Version': '1.1',
'X-OpenStack-Ironic-API-Maximum-Version': '1.6', 'X-OpenStack-Ironic-API-Maximum-Version': '1.6',
'content-type': 'text/plain', 'content-type': 'text/plain',
}, },
six.StringIO("We got some text"), "We got some text",
version=1, version=1,
status_code=http_client.OK) status_code=http_client.OK)
client = http.HTTPClient('http://localhost/') client = http.HTTPClient('http://localhost/')
@ -432,7 +444,7 @@ class SessionClientTest(utils.BaseTestCase):
def test_server_exception_empty_body(self): def test_server_exception_empty_body(self):
error_body = _get_error_body() error_body = _get_error_body()
fake_session = utils.FakeSession({'Content-Type': 'application/json'}, fake_session = utils.mockSession({'Content-Type': 'application/json'},
error_body, error_body,
http_client.INTERNAL_SERVER_ERROR) http_client.INTERNAL_SERVER_ERROR)
@ -444,7 +456,7 @@ class SessionClientTest(utils.BaseTestCase):
def test__parse_version_headers(self): def test__parse_version_headers(self):
# Test parsing of version headers from SessionClient # Test parsing of version headers from SessionClient
fake_session = utils.FakeSession( fake_session = utils.mockSession(
{'X-OpenStack-Ironic-API-Minimum-Version': '1.1', {'X-OpenStack-Ironic-API-Minimum-Version': '1.1',
'X-OpenStack-Ironic-API-Maximum-Version': '1.6', 'X-OpenStack-Ironic-API-Maximum-Version': '1.6',
'content-type': 'text/plain', 'content-type': 'text/plain',
@ -453,15 +465,15 @@ class SessionClientTest(utils.BaseTestCase):
http_client.HTTP_VERSION_NOT_SUPPORTED) http_client.HTTP_VERSION_NOT_SUPPORTED)
expected_result = ('1.1', '1.6') expected_result = ('1.1', '1.6')
client = _session_client(session=fake_session) client = _session_client(session=fake_session)
result = client._parse_version_headers(fake_session) result = client._parse_version_headers(fake_session.request())
self.assertEqual(expected_result, result) self.assertEqual(expected_result, result)
def _test_endpoint_override(self, endpoint): def _test_endpoint_override(self, endpoint):
fake_session = utils.FakeSession({'content-type': 'application/json'}, fake_session = utils.mockSession({'content-type': 'application/json'},
status_code=http_client.NO_CONTENT) status_code=http_client.NO_CONTENT)
request_mock = mock.Mock() request_mock = mock.Mock()
fake_session.request = request_mock fake_session.request = request_mock
request_mock.return_value = utils.FakeSessionResponse( request_mock.return_value = utils.mockSessionResponse(
headers={'content-type': 'application/json'}, headers={'content-type': 'application/json'},
status_code=http_client.NO_CONTENT) status_code=http_client.NO_CONTENT)
client = _session_client(session=fake_session, client = _session_client(session=fake_session,
@ -503,9 +515,9 @@ class RetriesTestCase(utils.BaseTestCase):
def test_http_no_retry(self): def test_http_no_retry(self):
error_body = _get_error_body() error_body = _get_error_body()
bad_resp = utils.FakeSessionResponse( bad_resp = utils.mockSessionResponse(
{'Content-Type': 'text/plain'}, {'Content-Type': 'text/plain'},
six.StringIO(error_body), error_body,
version=1, version=1,
status_code=http_client.CONFLICT) status_code=http_client.CONFLICT)
client = http.HTTPClient('http://localhost/', max_retries=0) client = http.HTTPClient('http://localhost/', max_retries=0)
@ -519,14 +531,14 @@ class RetriesTestCase(utils.BaseTestCase):
def test_http_retry(self): def test_http_retry(self):
error_body = _get_error_body() error_body = _get_error_body()
bad_resp = utils.FakeSessionResponse( bad_resp = utils.mockSessionResponse(
{'Content-Type': 'text/plain'}, {'Content-Type': 'text/plain'},
six.StringIO(error_body), error_body,
version=1, version=1,
status_code=http_client.CONFLICT) status_code=http_client.CONFLICT)
good_resp = utils.FakeSessionResponse( good_resp = utils.mockSessionResponse(
{'Content-Type': 'text/plain'}, {'Content-Type': 'text/plain'},
six.StringIO("meow"), "meow",
version=1, version=1,
status_code=http_client.OK) status_code=http_client.OK)
client = http.HTTPClient('http://localhost/') client = http.HTTPClient('http://localhost/')
@ -542,14 +554,14 @@ class RetriesTestCase(utils.BaseTestCase):
def test_http_retry_503(self): def test_http_retry_503(self):
error_body = _get_error_body() error_body = _get_error_body()
bad_resp = utils.FakeSessionResponse( bad_resp = utils.mockSessionResponse(
{'Content-Type': 'text/plain'}, {'Content-Type': 'text/plain'},
six.StringIO(error_body), error_body,
version=1, version=1,
status_code=http_client.SERVICE_UNAVAILABLE) status_code=http_client.SERVICE_UNAVAILABLE)
good_resp = utils.FakeSessionResponse( good_resp = utils.mockSessionResponse(
{'Content-Type': 'text/plain'}, {'Content-Type': 'text/plain'},
six.StringIO("meow"), "meow",
version=1, version=1,
status_code=http_client.OK) status_code=http_client.OK)
client = http.HTTPClient('http://localhost/') client = http.HTTPClient('http://localhost/')
@ -563,9 +575,9 @@ class RetriesTestCase(utils.BaseTestCase):
self.assertEqual(2, mock_session.request.call_count) self.assertEqual(2, mock_session.request.call_count)
def test_http_retry_connection_refused(self): def test_http_retry_connection_refused(self):
good_resp = utils.FakeSessionResponse( good_resp = utils.mockSessionResponse(
{'content-type': 'text/plain'}, {'content-type': 'text/plain'},
six.StringIO("meow"), "meow",
version=1, version=1,
status_code=http_client.OK) status_code=http_client.OK)
client = http.HTTPClient('http://localhost/') client = http.HTTPClient('http://localhost/')
@ -581,9 +593,9 @@ class RetriesTestCase(utils.BaseTestCase):
def test_http_failed_retry(self): def test_http_failed_retry(self):
error_body = _get_error_body() error_body = _get_error_body()
bad_resp = utils.FakeSessionResponse( bad_resp = utils.mockSessionResponse(
{'content-type': 'text/plain'}, {'content-type': 'text/plain'},
six.StringIO(error_body), error_body,
version=1, version=1,
status_code=http_client.CONFLICT) status_code=http_client.CONFLICT)
client = http.HTTPClient('http://localhost/') client = http.HTTPClient('http://localhost/')
@ -598,9 +610,9 @@ class RetriesTestCase(utils.BaseTestCase):
def test_http_max_retries_none(self): def test_http_max_retries_none(self):
error_body = _get_error_body() error_body = _get_error_body()
bad_resp = utils.FakeSessionResponse( bad_resp = utils.mockSessionResponse(
{'content-type': 'text/plain'}, {'content-type': 'text/plain'},
six.StringIO(error_body), error_body,
version=1, version=1,
status_code=http_client.CONFLICT) status_code=http_client.CONFLICT)
client = http.HTTPClient('http://localhost/', max_retries=None) client = http.HTTPClient('http://localhost/', max_retries=None)
@ -615,9 +627,9 @@ class RetriesTestCase(utils.BaseTestCase):
def test_http_change_max_retries(self): def test_http_change_max_retries(self):
error_body = _get_error_body() error_body = _get_error_body()
bad_resp = utils.FakeSessionResponse( bad_resp = utils.mockSessionResponse(
{'content-type': 'text/plain'}, {'content-type': 'text/plain'},
six.StringIO(error_body), error_body,
version=1, version=1,
status_code=http_client.CONFLICT) status_code=http_client.CONFLICT)
client = http.HTTPClient('http://localhost/', client = http.HTTPClient('http://localhost/',
@ -634,15 +646,15 @@ class RetriesTestCase(utils.BaseTestCase):
def test_session_retry(self): def test_session_retry(self):
error_body = _get_error_body() error_body = _get_error_body()
fake_resp = utils.FakeSessionResponse( fake_resp = utils.mockSessionResponse(
{'Content-Type': 'application/json'}, {'Content-Type': 'application/json'},
error_body, error_body,
http_client.CONFLICT) http_client.CONFLICT)
ok_resp = utils.FakeSessionResponse( ok_resp = utils.mockSessionResponse(
{'Content-Type': 'application/json'}, {'Content-Type': 'application/json'},
b"OK", b"OK",
http_client.OK) http_client.OK)
fake_session = mock.Mock(spec=utils.FakeSession) fake_session = mock.Mock(spec=requests.Session)
fake_session.request.side_effect = iter((fake_resp, ok_resp)) fake_session.request.side_effect = iter((fake_resp, ok_resp))
client = _session_client(session=fake_session) client = _session_client(session=fake_session)
@ -652,15 +664,15 @@ class RetriesTestCase(utils.BaseTestCase):
def test_session_retry_503(self): def test_session_retry_503(self):
error_body = _get_error_body() error_body = _get_error_body()
fake_resp = utils.FakeSessionResponse( fake_resp = utils.mockSessionResponse(
{'Content-Type': 'application/json'}, {'Content-Type': 'application/json'},
error_body, error_body,
http_client.SERVICE_UNAVAILABLE) http_client.SERVICE_UNAVAILABLE)
ok_resp = utils.FakeSessionResponse( ok_resp = utils.mockSessionResponse(
{'Content-Type': 'application/json'}, {'Content-Type': 'application/json'},
b"OK", b"OK",
http_client.OK) http_client.OK)
fake_session = mock.Mock(spec=utils.FakeSession) fake_session = mock.Mock(spec=requests.Session)
fake_session.request.side_effect = iter((fake_resp, ok_resp)) fake_session.request.side_effect = iter((fake_resp, ok_resp))
client = _session_client(session=fake_session) client = _session_client(session=fake_session)
@ -668,11 +680,11 @@ class RetriesTestCase(utils.BaseTestCase):
self.assertEqual(2, fake_session.request.call_count) self.assertEqual(2, fake_session.request.call_count)
def test_session_retry_connection_refused(self): def test_session_retry_connection_refused(self):
ok_resp = utils.FakeSessionResponse( ok_resp = utils.mockSessionResponse(
{'Content-Type': 'application/json'}, {'Content-Type': 'application/json'},
b"OK", b"OK",
http_client.OK) http_client.OK)
fake_session = mock.Mock(spec=utils.FakeSession) fake_session = mock.Mock(spec=requests.Session)
fake_session.request.side_effect = iter((exc.ConnectionRefused(), fake_session.request.side_effect = iter((exc.ConnectionRefused(),
ok_resp)) ok_resp))
@ -681,11 +693,11 @@ class RetriesTestCase(utils.BaseTestCase):
self.assertEqual(2, fake_session.request.call_count) self.assertEqual(2, fake_session.request.call_count)
def test_session_retry_retriable_connection_failure(self): def test_session_retry_retriable_connection_failure(self):
ok_resp = utils.FakeSessionResponse( ok_resp = utils.mockSessionResponse(
{'Content-Type': 'application/json'}, {'Content-Type': 'application/json'},
b"OK", b"OK",
http_client.OK) http_client.OK)
fake_session = mock.Mock(spec=utils.FakeSession) fake_session = mock.Mock(spec=requests.Session)
fake_session.request.side_effect = iter( fake_session.request.side_effect = iter(
(kexc.RetriableConnectionFailure(), ok_resp)) (kexc.RetriableConnectionFailure(), ok_resp))
@ -696,11 +708,11 @@ class RetriesTestCase(utils.BaseTestCase):
def test_session_retry_fail(self): def test_session_retry_fail(self):
error_body = _get_error_body() error_body = _get_error_body()
fake_resp = utils.FakeSessionResponse( fake_resp = utils.mockSessionResponse(
{'Content-Type': 'application/json'}, {'Content-Type': 'application/json'},
error_body, error_body,
http_client.CONFLICT) http_client.CONFLICT)
fake_session = mock.Mock(spec=utils.FakeSession) fake_session = mock.Mock(spec=requests.Session)
fake_session.request.return_value = fake_resp fake_session.request.return_value = fake_resp
client = _session_client(session=fake_session) client = _session_client(session=fake_session)
@ -713,11 +725,11 @@ class RetriesTestCase(utils.BaseTestCase):
def test_session_max_retries_none(self): def test_session_max_retries_none(self):
error_body = _get_error_body() error_body = _get_error_body()
fake_resp = utils.FakeSessionResponse( fake_resp = utils.mockSessionResponse(
{'Content-Type': 'application/json'}, {'Content-Type': 'application/json'},
error_body, error_body,
http_client.CONFLICT) http_client.CONFLICT)
fake_session = mock.Mock(spec=utils.FakeSession) fake_session = mock.Mock(spec=requests.Session)
fake_session.request.return_value = fake_resp fake_session.request.return_value = fake_resp
client = _session_client(session=fake_session) client = _session_client(session=fake_session)
@ -731,11 +743,11 @@ class RetriesTestCase(utils.BaseTestCase):
def test_session_change_max_retries(self): def test_session_change_max_retries(self):
error_body = _get_error_body() error_body = _get_error_body()
fake_resp = utils.FakeSessionResponse( fake_resp = utils.mockSessionResponse(
{'Content-Type': 'application/json'}, {'Content-Type': 'application/json'},
error_body, error_body,
http_client.CONFLICT) http_client.CONFLICT)
fake_session = mock.Mock(spec=utils.FakeSession) fake_session = mock.Mock(spec=requests.Session)
fake_session.request.return_value = fake_resp fake_session.request.return_value = fake_resp
client = _session_client(session=fake_session) client = _session_client(session=fake_session)

45
ironicclient/tests/unit/utils.py
View File

@ -19,12 +19,12 @@ import os
import fixtures import fixtures
import mock import mock
from oslo_utils import strutils from oslo_utils import strutils
import requests
import six import six
import testtools import testtools
class BaseTestCase(testtools.TestCase): class BaseTestCase(testtools.TestCase):
def setUp(self): def setUp(self):
super(BaseTestCase, self).setUp() super(BaseTestCase, self).setUp()
self.useFixture(fixtures.FakeLogger()) self.useFixture(fixtures.FakeLogger())
@ -107,31 +107,26 @@ class FakeResponse(object):
self.reason)) self.reason))
class FakeSessionResponse(object): def mockSessionResponse(headers, content=None, status_code=None, version=None):
raw = mock.Mock()
raw.version = version
response = mock.Mock(spec=requests.Response,
headers=headers,
content=content,
status_code=status_code,
raw=raw,
reason='',
encoding='UTF-8')
response.text = content
def __init__(self, headers, content=None, status_code=None, version=None): return response
self.headers = headers
self.content = content
self.status_code = status_code
self.raw = mock.Mock()
self.raw.version = version
self.reason = ''
def iter_content(self, chunk_size):
return iter(self.content)
class FakeSession(object): def mockSession(headers, content=None, status_code=None, version=None):
session = mock.Mock(spec=requests.Session,
verify=False,
cert=('test_cert', 'test_key'))
response = mockSessionResponse(headers, content, status_code, version)
session.request = mock.Mock(return_value=response)
def __init__(self, headers, content=None, status_code=None, version=None): return session
self.headers = headers
self.content = content
self.status_code = status_code
self.version = version
self.verify = False
self.cert = ('test_cert', 'test_key')
def request(self, url, method, **kwargs):
request = FakeSessionResponse(
self.headers, self.content, self.status_code, self.version)
return request

5
releasenotes/notes/fix-python3-compatibility-993ace45fefcba34.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- Fixes an issue in a python 3 environment, where TypeError
exceptions were being raised (due to the "requests"
library returning bytes instead of a string).

1
requirements.txt
View File

@ -8,6 +8,7 @@ jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
keystoneauth1>=2.14.0 # Apache-2.0 keystoneauth1>=2.14.0 # Apache-2.0
osc-lib>=1.2.0 # Apache-2.0 osc-lib>=1.2.0 # Apache-2.0
oslo.i18n>=2.1.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
oslo.utils>=3.18.0 # Apache-2.0 oslo.utils>=3.18.0 # Apache-2.0
PrettyTable<0.8,>=0.7.1 # BSD PrettyTable<0.8,>=0.7.1 # BSD
python-openstackclient>=3.3.0 # Apache-2.0 python-openstackclient>=3.3.0 # Apache-2.0