openstack
/
ironic
Code Issues Proposed changes

Fix key word argument interface_type -> interface 

When calling session.get_endpoint, the key word argument to specify the
interface type (public, admin, internal), is "interface", not
"interface_type".  This was causing the public endpoint to be returned
instead of the internal endpoint.

Change-Id: I77f697e74769cd622fb30f6b065e8645ba5cc39f
Closes-Bug: #1613331
This commit is contained in:
James Slagle 2016-08-15 11:43:20 -04:00
parent f55de1bf81
commit 96bca2db24
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/common/keystone.py
View File

@ -121,7 +121,7 @@ def get_service_url(session, service_type='baremetal',
:returns: an http/https url for the desired endpoint.
"""
return session.get_endpoint(service_type=service_type,
interface_type=endpoint_type,
interface=endpoint_type,
region=CONF.keystone.region_name)

3
ironic/tests/unit/common/test_keystone.py
View File

@ -56,6 +56,9 @@ class KeystoneTestCase(base.TestCase):
mock_sess = mock.Mock()
mock_sess.get_endpoint.return_value = fake_url
res = keystone.get_service_url(mock_sess)
mock_sess.get_endpoint.assert_called_with(
interface='internal', region='fake_region',
service_type='baremetal')
self.assertEqual(fake_url, res)
def test_get_url_failure(self):