diff options
| author | Zuul <zuul@review.opendev.org> | 2020-07-16 15:54:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-07-16 15:54:26 +0000 |
| commit | 3cd06f763fdb2c2ee233cb8167aadb5f29000d97 (patch) | |
| tree | d62ba98c8f2c726e0762275f9b9a9d165865e200 | |
| parent | 3a58ab0f41835599514fabbce04d50e10e889885 (diff) | |
| parent | bae1d89cc767949fc61cef63dcacec200a2c236a (diff) | |
| download | python-glanceclient-3cd06f763fdb2c2ee233cb8167aadb5f29000d97.tar.gz | |
Merge "Pass Global Request ID on with session client"
| -rw-r--r-- | glanceclient/common/http.py | 1 | ||||
| -rw-r--r-- | glanceclient/tests/unit/test_http.py | 14 | ||||
| -rw-r--r-- | releasenotes/notes/sess_client_grid-3c2101609110f413.yaml | 6 |
3 files changed, 20 insertions, 1 deletions
diff --git a/glanceclient/common/http.py b/glanceclient/common/http.py index 6973f60..247b92d 100644 --- a/glanceclient/common/http.py +++ b/glanceclient/common/http.py @@ -352,7 +352,6 @@ class SessionClient(adapter.Adapter, _BaseHTTPClient): def __init__(self, session, **kwargs): kwargs.setdefault('user_agent', USER_AGENT) kwargs.setdefault('service_type', 'image') - self.global_request_id = kwargs.pop('global_request_id', None) super(SessionClient, self).__init__(session, **kwargs) def request(self, url, method, **kwargs): diff --git a/glanceclient/tests/unit/test_http.py b/glanceclient/tests/unit/test_http.py index 0cf8f5b..0c93a84 100644 --- a/glanceclient/tests/unit/test_http.py +++ b/glanceclient/tests/unit/test_http.py @@ -267,6 +267,20 @@ class TestClient(testtools.TestCase): self.assertEqual(b"application/openstack-images-v2.1-json-patch", ksarqh[b"Content-Type"]) + def test_request_id_header_session_client(self): + global_id = "req-%s" % uuid.uuid4() + kwargs = {'global_request_id': global_id} + auth = token_endpoint.Token(self.endpoint, self.token) + sess = session.Session(auth=auth) + http_client = http.SessionClient(sess, **kwargs) + + path = '/v2/images/my-image' + self.mock.get(self.endpoint + path) + http_client.get(path) + + headers = self.mock.last_request.headers + self.assertEqual(global_id, headers['X-OpenStack-Request-ID']) + def test_raw_request(self): """Verify the path being used for HTTP requests reflects accurately.""" headers = {"Content-Type": "text/plain"} diff --git a/releasenotes/notes/sess_client_grid-3c2101609110f413.yaml b/releasenotes/notes/sess_client_grid-3c2101609110f413.yaml new file mode 100644 index 0000000..4552c43 --- /dev/null +++ b/releasenotes/notes/sess_client_grid-3c2101609110f413.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + * Bug 1886650_: Glance client does not correctly forward global request IDs + + .. _1886650: https://code.launchpad.net/bugs/1886650 |