Merge "Do not use urljoin in base http client"

ironicclient/common/http.py

@@ -64,7 +64,7 @@ SUPPORTED_ENDPOINT_SCHEME = ('http', 'https')
 
 def _trim_endpoint_api_version(url):
     """Trim API version and trailing slash from endpoint."""
-    return url.rstrip('/').rstrip(API_VERSION)
+    return url.rstrip('/').rstrip(API_VERSION).rstrip('/')
 
 
 def _extract_error_json(body):
@@ -274,7 +274,7 @@ class HTTPClient(VersionNegotiationMixin):
             body = strutils.mask_password(kwargs['body'])
             curl.append('-d \'%s\'' % body)
 
-        curl.append(urlparse.urljoin(self.endpoint_trimmed, url))
+        curl.append(self._make_connection_url(url))
         LOG.debug(' '.join(curl))
 
     @staticmethod
@@ -292,7 +292,10 @@ class HTTPClient(VersionNegotiationMixin):
         LOG.debug('\n'.join(dump))
 
     def _make_connection_url(self, url):
-        return urlparse.urljoin(self.endpoint_trimmed, url)
+        # NOTE(pas-ha) we already stripped trailing / from endpoint_trimmed
+        if not url.startswith('/'):
+            url = '/' + url
+        return self.endpoint_trimmed + url
 
     def _parse_version_headers(self, resp):
         return self._generic_parse_version_headers(resp.headers.get)

ironicclient/tests/unit/common/test_http.py

@@ -382,9 +382,10 @@ class HttpClientTest(utils.BaseTestCase):
         client = http.HTTPClient('http://localhost/')
         kwargs = {'headers': {'foo-header': 'bar-header'},
                   'body': '{"password": "foo"}'}
-        client.log_curl_request('foo', 'http://127.0.0.1', kwargs)
+        client.log_curl_request('foo', '/v1/nodes', kwargs)
         expected_log = ("curl -i -X foo -H 'foo-header: bar-header' "
-                        "-d '{\"password\": \"***\"}' http://127.0.0.1")
+                        "-d '{\"password\": \"***\"}' "
+                        "http://localhost/v1/nodes")
         mock_log.assert_called_once_with(expected_log)
 
     @mock.patch.object(http.LOG, 'debug', autospec=True)

releasenotes/notes/fix-token-with-vhosts-5d0a6d53e807fa5e.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixed a bug where ironicclient instantiated with keystone token and
+    ironic API endpoint could not access ironic API that has a virtual host
+    in its endpoint (like "http://hostname/baremetal").
+    For more details see `bug 1721599 <https://launchpad.net/bugs/1721599>`_.