openstack
/
castellan
Code Issues Proposed changes

Merge "Append a forward slash to the base_url"

This commit is contained in:
Jenkins 2017-09-11 19:41:28 +00:00 committed by Gerrit Code Review
parent bed97b49ae 233febb0c1
commit aa2a03f5ec
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
castellan/key_manager/barbican_key_manager.py
View File

@ -202,8 +202,12 @@ class BarbicanKeyManager(key_manager.KeyManager):
latest_version = raw_data[-1]
api_version = latest_version.get('id')
if endpoint[-1] != '/':
endpoint += '/'
base_url = urllib.parse.urljoin(
endpoint, api_version)
return base_url
def create_key(self, context, algorithm, length,

18
castellan/tests/unit/key_manager/test_barbican_key_manager.py
View File

@ -76,6 +76,24 @@ class BarbicanKeyManagerTestCase(test_key_manager.KeyManagerTestCase):
self.key_mgr._barbican_client = self.mock_barbican
self.key_mgr._current_context = self.ctxt
def test_base_url_old_version(self):
version = "v1"
self.key_mgr.conf.barbican.barbican_api_version = version
endpoint = "http://localhost:9311"
base_url = self.key_mgr._create_base_url(mock.Mock(),
mock.Mock(),
endpoint)
self.assertEqual(endpoint + "/" + version, base_url)
def test_base_url_new_version(self):
version = "v1"
self.key_mgr.conf.barbican.barbican_api_version = version
endpoint = "http://localhost/key_manager"
base_url = self.key_mgr._create_base_url(mock.Mock(),
mock.Mock(),
endpoint)
self.assertEqual(endpoint + "/" + version, base_url)
def test_create_key(self):
# Create order_ref_url and assign return value
order_ref_url = ("http://localhost:9311/v1/orders/"