x/tuskar-ui
Code Issues Proposed changes

Using internalURL for Keystone endpoint.

Browse Source 
Change-Id: I50632a7dda2d7fd64f083135b91d821e050fc284
This commit is contained in:
Tres Henry 2012-03-30 18:15:55 -07:00 committed by Joe Heck
parent 31912ff553
commit 0bf1e5e953
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
horizon/api/keystone.py
View File

@ -70,7 +70,7 @@ def _get_endpoint_url(request, endpoint_type, catalog=None):
def keystoneclient(request, username=None, password=None, tenant_id=None, def keystoneclient(request, username=None, password=None, tenant_id=None,
token_id=None, endpoint=None, endpoint_type='publicURL', token_id=None, endpoint=None, endpoint_type='internalURL',
admin=False): admin=False):
"""Returns a client connected to the Keystone backend. """Returns a client connected to the Keystone backend.
@ -157,7 +157,7 @@ def tenant_update(request, tenant_id, tenant_name, description, enabled):
enabled) enabled)
def tenant_list_for_token(request, token, endpoint_type='publicURL'): def tenant_list_for_token(request, token, endpoint_type='internalURL'):
c = keystoneclient(request, c = keystoneclient(request,
token_id=token, token_id=token,
endpoint=_get_endpoint_url(request, endpoint_type), endpoint=_get_endpoint_url(request, endpoint_type),
@ -176,7 +176,7 @@ def token_create(request, tenant, username, password):
username=username, username=username,
password=password, password=password,
tenant_id=tenant, tenant_id=tenant,
endpoint=_get_endpoint_url(request, 'publicURL')) endpoint=_get_endpoint_url(request, 'internalURL'))
token = c.tokens.authenticate(username=username, token = c.tokens.authenticate(username=username,
password=password, password=password,
tenant_id=tenant) tenant_id=tenant)
@ -193,7 +193,7 @@ def token_create_scoped(request, tenant, token):
c = keystoneclient(request, c = keystoneclient(request,
tenant_id=tenant, tenant_id=tenant,
token_id=token, token_id=token,
endpoint=_get_endpoint_url(request, 'publicURL')) endpoint=_get_endpoint_url(request, 'internalURL'))
raw_token = c.tokens.authenticate(tenant_id=tenant, raw_token = c.tokens.authenticate(tenant_id=tenant,
token=token, token=token,
return_raw=True) return_raw=True)
@ -203,7 +203,7 @@ def token_create_scoped(request, tenant, token):
endpoint_type='adminURL') endpoint_type='adminURL')
else: else:
c.management_url = c.service_catalog.url_for(service_type='identity', c.management_url = c.service_catalog.url_for(service_type='identity',
endpoint_type='publicURL') endpoint_type='internalURL')
scoped_token = tokens.Token(tokens.TokenManager, raw_token) scoped_token = tokens.Token(tokens.TokenManager, raw_token)
return scoped_token return scoped_token

14
horizon/tests/api_tests/keystone_tests.py
View File

@ -39,16 +39,16 @@ class ClientConnectionTests(test.TestCase):
user=self.user.name, user=self.user.name,
service_catalog=self.service_catalog) service_catalog=self.service_catalog)
self.request.user = self.test_user self.request.user = self.test_user
self.public_url = api.base.url_for(self.request, self.internal_url = api.base.url_for(self.request,
'identity', 'identity',
endpoint_type='publicURL') endpoint_type='internalURL')
self.admin_url = api.base.url_for(self.request, self.admin_url = api.base.url_for(self.request,
'identity', 'identity',
endpoint_type='adminURL') endpoint_type='adminURL')
self.conn = FakeConnection() self.conn = FakeConnection()
def test_connect(self): def test_connect(self):
keystone_client.Client(auth_url=self.public_url, keystone_client.Client(auth_url=self.internal_url,
endpoint=None, endpoint=None,
password=self.user.password, password=self.user.password,
tenant_id=None, tenant_id=None,
@ -58,7 +58,7 @@ class ClientConnectionTests(test.TestCase):
client = api.keystone.keystoneclient(self.request, client = api.keystone.keystoneclient(self.request,
username=self.user.name, username=self.user.name,
password=self.user.password) password=self.user.password)
self.assertEqual(client.management_url, self.public_url) self.assertEqual(client.management_url, self.internal_url)
def test_connect_admin(self): def test_connect_admin(self):
self.test_user.roles = [{'name': 'admin'}] self.test_user.roles = [{'name': 'admin'}]
@ -78,7 +78,7 @@ class ClientConnectionTests(test.TestCase):
def connection_caching(self): def connection_caching(self):
self.test_user.roles = [{'name': 'admin'}] self.test_user.roles = [{'name': 'admin'}]
# Regular connection # Regular connection
keystone_client.Client(auth_url=self.public_url, keystone_client.Client(auth_url=self.internal_url,
endpoint=None, endpoint=None,
password=self.user.password, password=self.user.password,
tenant_id=None, tenant_id=None,
@ -98,7 +98,7 @@ class ClientConnectionTests(test.TestCase):
client = api.keystone.keystoneclient(self.request, client = api.keystone.keystoneclient(self.request,
username=self.user.name, username=self.user.name,
password=self.user.password) password=self.user.password)
self.assertEqual(client.management_url, self.public_url) self.assertEqual(client.management_url, self.internal_url)
client = api.keystone.keystoneclient(self.request, client = api.keystone.keystoneclient(self.request,
username=self.user.name, username=self.user.name,
password=self.user.password, password=self.user.password,
@ -107,7 +107,7 @@ class ClientConnectionTests(test.TestCase):
client = api.keystone.keystoneclient(self.request, client = api.keystone.keystoneclient(self.request,
username=self.user.name, username=self.user.name,
password=self.user.password) password=self.user.password)
self.assertEqual(client.management_url, self.public_url) self.assertEqual(client.management_url, self.internal_url)
client = api.keystone.keystoneclient(self.request, client = api.keystone.keystoneclient(self.request,
username=self.user.name, username=self.user.name,
password=self.user.password, password=self.user.password,