Merge "Use endpoint_override in version negotiation"

openstack · Mar 20, 2019 · c038f1d · c038f1d
2 parents ef992f6 + 8071d5d
commit c038f1d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ironicclient/common/http.py b/ironicclient/common/http.py
@@ -620,7 +620,8 @@ def _make_simple_request(self, conn, method, url):
         # 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
@@ -741,6 +741,7 @@ def test_make_simple_request(self):
                 'service_type': 'baremetal',
                 'region_name': ''
             },
+            endpoint_override='http://127.0.0.1',
             user_agent=http.USER_AGENT)
         self.assertEqual(res, session.request.return_value)