openstack/deb-python-cinderclient
Code Issues Proposed changes

Merge "x-openstack-request-id logged twice in logs"

Browse Source
This commit is contained in:
Jenkins
2017-01-24 20:35:49 +00:00
committed by Gerrit Code Review
parent fe6803c88b 6962056c67
commit 8cd3e87fc9
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cinderclient/client.py
View File

@@ -115,10 +115,6 @@ class SessionClient(adapter.LegacyJsonAdapter):
raise_exc=False, raise_exc=False,
**kwargs) **kwargs)
# if service name is None then use service_type for logging
service = self.service_name or self.service_type
_log_request_id(self._logger, resp, service)
if raise_exc and resp.status_code >= 400: if raise_exc and resp.status_code >= 400:
raise exceptions.from_response(resp, body) raise exceptions.from_response(resp, body)

15
cinderclient/tests/unit/test_client.py
View File

@@ -101,11 +101,10 @@ class ClientTest(utils.TestCase):
cs = cinderclient.client.SessionClient(self, api_version='3.0') cs = cinderclient.client.SessionClient(self, api_version='3.0')
self.assertEqual('http://192.168.122.104:8776/', cs._get_base_url()) self.assertEqual('http://192.168.122.104:8776/', cs._get_base_url())
@mock.patch.object(cinderclient.client, '_log_request_id')
@mock.patch.object(adapter.Adapter, 'request') @mock.patch.object(adapter.Adapter, 'request')
@mock.patch.object(exceptions, 'from_response') @mock.patch.object(exceptions, 'from_response')
def test_sessionclient_request_method( def test_sessionclient_request_method(
self, mock_from_resp, mock_request, mock_log): self, mock_from_resp, mock_request):
kwargs = { kwargs = {
"body": { "body": {
"volume": { "volume": {
@@ -139,18 +138,15 @@ class ClientTest(utils.TestCase):
response, body = session_client.request(mock.sentinel.url, response, body = session_client.request(mock.sentinel.url,
'POST', **kwargs) 'POST', **kwargs)
self.assertIsNotNone(session_client._logger) self.assertIsNotNone(session_client._logger)
mock_log.assert_called_once_with(session_client._logger, mock_response,
mock.ANY)
# In this case, from_response method will not get called # In this case, from_response method will not get called
# because response status_code is < 400 # because response status_code is < 400
self.assertEqual(202, response.status_code) self.assertEqual(202, response.status_code)
self.assertFalse(mock_from_resp.called) self.assertFalse(mock_from_resp.called)
@mock.patch.object(cinderclient.client, '_log_request_id')
@mock.patch.object(adapter.Adapter, 'request') @mock.patch.object(adapter.Adapter, 'request')
def test_sessionclient_request_method_raises_badrequest( def test_sessionclient_request_method_raises_badrequest(
self, mock_request, mock_log): self, mock_request):
kwargs = { kwargs = {
"body": { "body": {
"volume": { "volume": {
@@ -185,13 +181,10 @@ class ClientTest(utils.TestCase):
self.assertRaises(exceptions.BadRequest, session_client.request, self.assertRaises(exceptions.BadRequest, session_client.request,
mock.sentinel.url, 'POST', **kwargs) mock.sentinel.url, 'POST', **kwargs)
self.assertIsNotNone(session_client._logger) self.assertIsNotNone(session_client._logger)
mock_log.assert_called_once_with(session_client._logger, mock_response,
mock.ANY)
@mock.patch.object(cinderclient.client, '_log_request_id')
@mock.patch.object(adapter.Adapter, 'request') @mock.patch.object(adapter.Adapter, 'request')
def test_sessionclient_request_method_raises_overlimit( def test_sessionclient_request_method_raises_overlimit(
self, mock_request, mock_log): self, mock_request):
resp = { resp = {
"overLimitFault": { "overLimitFault": {
"message": "This request was rate-limited.", "message": "This request was rate-limited.",
@@ -212,8 +205,6 @@ class ClientTest(utils.TestCase):
self.assertRaises(exceptions.OverLimit, session_client.request, self.assertRaises(exceptions.OverLimit, session_client.request,
mock.sentinel.url, 'GET') mock.sentinel.url, 'GET')
self.assertIsNotNone(session_client._logger) self.assertIsNotNone(session_client._logger)
mock_log.assert_called_once_with(session_client._logger, mock_response,
mock.ANY)
@mock.patch.object(exceptions, 'from_response') @mock.patch.object(exceptions, 'from_response')
def test_keystone_request_raises_auth_failure_exception( def test_keystone_request_raises_auth_failure_exception(