From 0bf1e5e9534ed7133376708edc203b2f736314a2 Mon Sep 17 00:00:00 2001 From: Tres Henry Date: Fri, 30 Mar 2012 18:15:55 -0700 Subject: [PATCH] Using internalURL for Keystone endpoint. Change-Id: I50632a7dda2d7fd64f083135b91d821e050fc284 --- horizon/api/keystone.py | 10 +++++----- horizon/tests/api_tests/keystone_tests.py | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/horizon/api/keystone.py b/horizon/api/keystone.py index 45f23f632..681b2bcc5 100644 --- a/horizon/api/keystone.py +++ b/horizon/api/keystone.py @@ -70,7 +70,7 @@ def _get_endpoint_url(request, endpoint_type, catalog=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): """Returns a client connected to the Keystone backend. @@ -157,7 +157,7 @@ def tenant_update(request, tenant_id, tenant_name, description, 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, token_id=token, endpoint=_get_endpoint_url(request, endpoint_type), @@ -176,7 +176,7 @@ def token_create(request, tenant, username, password): username=username, password=password, tenant_id=tenant, - endpoint=_get_endpoint_url(request, 'publicURL')) + endpoint=_get_endpoint_url(request, 'internalURL')) token = c.tokens.authenticate(username=username, password=password, tenant_id=tenant) @@ -193,7 +193,7 @@ def token_create_scoped(request, tenant, token): c = keystoneclient(request, tenant_id=tenant, token_id=token, - endpoint=_get_endpoint_url(request, 'publicURL')) + endpoint=_get_endpoint_url(request, 'internalURL')) raw_token = c.tokens.authenticate(tenant_id=tenant, token=token, return_raw=True) @@ -203,7 +203,7 @@ def token_create_scoped(request, tenant, token): endpoint_type='adminURL') else: 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) return scoped_token diff --git a/horizon/tests/api_tests/keystone_tests.py b/horizon/tests/api_tests/keystone_tests.py index c3730e040..59e6743f9 100644 --- a/horizon/tests/api_tests/keystone_tests.py +++ b/horizon/tests/api_tests/keystone_tests.py @@ -39,16 +39,16 @@ class ClientConnectionTests(test.TestCase): user=self.user.name, service_catalog=self.service_catalog) 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', - endpoint_type='publicURL') + endpoint_type='internalURL') self.admin_url = api.base.url_for(self.request, 'identity', endpoint_type='adminURL') self.conn = FakeConnection() def test_connect(self): - keystone_client.Client(auth_url=self.public_url, + keystone_client.Client(auth_url=self.internal_url, endpoint=None, password=self.user.password, tenant_id=None, @@ -58,7 +58,7 @@ class ClientConnectionTests(test.TestCase): client = api.keystone.keystoneclient(self.request, username=self.user.name, 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): self.test_user.roles = [{'name': 'admin'}] @@ -78,7 +78,7 @@ class ClientConnectionTests(test.TestCase): def connection_caching(self): self.test_user.roles = [{'name': 'admin'}] # Regular connection - keystone_client.Client(auth_url=self.public_url, + keystone_client.Client(auth_url=self.internal_url, endpoint=None, password=self.user.password, tenant_id=None, @@ -98,7 +98,7 @@ class ClientConnectionTests(test.TestCase): client = api.keystone.keystoneclient(self.request, username=self.user.name, 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, username=self.user.name, password=self.user.password, @@ -107,7 +107,7 @@ class ClientConnectionTests(test.TestCase): client = api.keystone.keystoneclient(self.request, username=self.user.name, 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, username=self.user.name, password=self.user.password,