diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-20 11:02:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-20 11:02:36 +0000 |
| commit | c038f1db67e7809513d5535648d15c3590b191d5 (patch) | |
| tree | 5ff9c66d2801bfa6854d13662c5703588d378815 | |
| parent | ef992f6a196c1b935442d5e76e2a9a49b2a70635 (diff) | |
| parent | 8071d5de57c728ce09d25d04c8c9fe48cd7db42e (diff) | |
| download | python-ironicclient-c038f1db67e7809513d5535648d15c3590b191d5.tar.gz | |
Merge "Use endpoint_override in version negotiation"
| -rw-r--r-- | ironicclient/common/http.py | 3 | ||||
| -rw-r--r-- | ironicclient/tests/unit/common/test_http.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ironicclient/common/http.py b/ironicclient/common/http.py index 0144e98..96ec5a4 100644 --- a/ironicclient/common/http.py +++ b/ironicclient/common/http.py @@ -620,7 +620,8 @@ class SessionClient(VersionNegotiationMixin, adapter.LegacyJsonAdapter): # NOTE: conn is self.session for this class return conn.request(url, method, raise_exc=False, user_agent=USER_AGENT, - endpoint_filter=endpoint_filter) + endpoint_filter=endpoint_filter, + endpoint_override=self.endpoint_override) @with_retries def _http_request(self, url, method, **kwargs): diff --git a/ironicclient/tests/unit/common/test_http.py b/ironicclient/tests/unit/common/test_http.py index 1035aa6..af1ad45 100644 --- a/ironicclient/tests/unit/common/test_http.py +++ b/ironicclient/tests/unit/common/test_http.py @@ -741,6 +741,7 @@ class SessionClientTest(utils.BaseTestCase): 'service_type': 'baremetal', 'region_name': '' }, + endpoint_override='http://127.0.0.1', user_agent=http.USER_AGENT) self.assertEqual(res, session.request.return_value) |