openstack/deb-python-glanceclient
Code Issues Proposed changes

Merge "Revert "Add last_request_id member to HTTPClient and SessionClient""

Browse Source
This commit is contained in:
Jenkins
2016-12-14 17:35:22 +00:00
committed by Gerrit Code Review
parent 611401d229 7d106c677a
commit 8b96bbc34c
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glanceclient/common/http.py
View File

@@ -140,7 +140,6 @@ class HTTPClient(_BaseHTTPClient):
self.identity_headers = kwargs.get('identity_headers')
self.auth_token = kwargs.get('token')
self.language_header = kwargs.get('language_header')
self.last_request_id = None
if self.identity_headers:
if self.identity_headers.get('X-Auth-Token'):
self.auth_token = self.identity_headers.get('X-Auth-Token')
@@ -275,7 +274,6 @@ class HTTPClient(_BaseHTTPClient):
{'endpoint': endpoint, 'e': e})
raise exc.CommunicationError(message=message)
self.last_request_id = resp.headers.get('x-openstack-request-id')
resp, body_iter = self._handle_response(resp)
self.log_http_response(resp)
return resp, body_iter
@@ -315,7 +313,6 @@ class SessionClient(adapter.Adapter, _BaseHTTPClient):
def __init__(self, session, **kwargs):
kwargs.setdefault('user_agent', USER_AGENT)
kwargs.setdefault('service_type', 'image')
self.last_request_id = None
super(SessionClient, self).__init__(session, **kwargs)
def request(self, url, method, **kwargs):
@@ -342,7 +339,6 @@ class SessionClient(adapter.Adapter, _BaseHTTPClient):
dict(url=conn_url, e=e))
raise exc.CommunicationError(message=message)
self.last_request_id = resp.headers.get('x-openstack-request-id')
return self._handle_response(resp)

8
glanceclient/tests/unit/test_http.py
View File

@@ -198,14 +198,6 @@ class TestClient(testtools.TestCase):
resp, body = self.client.get(path, headers=headers)
self.assertEqual(text, resp.text)
def test_request_id(self):
path = '/v1/images/detail'
self.mock.get(self.endpoint + path,
headers={"x-openstack-request-id": "req-aaa"})
self.client.get(path)
self.assertEqual(self.client.last_request_id, 'req-aaa')
def test_headers_encoding(self):
value = u'ni\xf1o'
headers = {"test": value, "none-val": None}