From 5e1cfbb7deeb7b5c819c45fadcf4abdf2ddcb118 Mon Sep 17 00:00:00 2001 From: Brant Knudson Date: Wed, 13 Jan 2016 15:18:19 -0600 Subject: [PATCH] Revert "Change default endpoint for Keystone v3 to public" This reverts commit d3b11d674d6539a0a09e0c432983ebf172e8ad79. This is causing auth_token middleware tests to fail. The error is like: EndpointNotFound: public endpoint for identity service in east region not found So this is going to potentially affect customers. Change-Id: I5ad917e48c9b140709dd3bf95e89c07ea58d6a66 --- keystoneclient/tests/unit/v3/test_auth.py | 4 ++-- keystoneclient/tests/unit/v3/test_client.py | 10 ---------- keystoneclient/tests/unit/v3/utils.py | 3 +-- keystoneclient/v3/client.py | 5 ----- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/keystoneclient/tests/unit/v3/test_auth.py b/keystoneclient/tests/unit/v3/test_auth.py index 5928f8e15..177eb3b77 100644 --- a/keystoneclient/tests/unit/v3/test_auth.py +++ b/keystoneclient/tests/unit/v3/test_auth.py @@ -232,7 +232,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase): self.stub_auth(json=self.TEST_RESPONSE_DICT) self.stub_url('GET', [fake_url], json=fake_resp, - base_url=self.TEST_PUBLIC_IDENTITY_ENDPOINT) + base_url=self.TEST_ADMIN_IDENTITY_ENDPOINT) # Creating a HTTPClient not using session is deprecated. with self.deprecations.expect_deprecations_here(): @@ -336,7 +336,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase): self.stub_auth(json=self.TEST_RESPONSE_DICT) self.stub_url('GET', [fake_url], json=fake_resp, - base_url=self.TEST_PUBLIC_IDENTITY_ENDPOINT) + base_url=self.TEST_ADMIN_IDENTITY_ENDPOINT) # Creating a HTTPClient not using session is deprecated. with self.deprecations.expect_deprecations_here(): diff --git a/keystoneclient/tests/unit/v3/test_client.py b/keystoneclient/tests/unit/v3/test_client.py index 902881f11..e35810e57 100644 --- a/keystoneclient/tests/unit/v3/test_client.py +++ b/keystoneclient/tests/unit/v3/test_client.py @@ -257,13 +257,3 @@ class KeystoneClientTest(utils.TestCase): self.assertEqual('identity', cl._adapter.service_type) self.assertEqual((3, 0), cl._adapter.version) - - def test_client_params_default_interface(self): - opts = {'auth': token_endpoint.Token('a', 'b'), - 'service_name': uuid.uuid4().hex, - } - - sess = session.Session() - cl = client.Client(session=sess, **opts) - - self.assertEqual('public', cl._adapter.interface) diff --git a/keystoneclient/tests/unit/v3/utils.py b/keystoneclient/tests/unit/v3/utils.py index d5736087a..0e88a552b 100644 --- a/keystoneclient/tests/unit/v3/utils.py +++ b/keystoneclient/tests/unit/v3/utils.py @@ -48,7 +48,6 @@ class UnauthenticatedTestCase(utils.TestCase): class TestCase(UnauthenticatedTestCase): TEST_ADMIN_IDENTITY_ENDPOINT = "http://127.0.0.1:35357/v3" - TEST_PUBLIC_IDENTITY_ENDPOINT = "http://127.0.0.1:5000/v3" TEST_SERVICE_CATALOG = [{ "endpoints": [{ @@ -98,7 +97,7 @@ class TestCase(UnauthenticatedTestCase): "name": "glance" }, { "endpoints": [{ - "url": TEST_PUBLIC_IDENTITY_ENDPOINT, + "url": "http://127.0.0.1:5000/v3", "region": "RegionOne", "interface": "public" }, { diff --git a/keystoneclient/v3/client.py b/keystoneclient/v3/client.py index 84b6ad7f7..38be932eb 100644 --- a/keystoneclient/v3/client.py +++ b/keystoneclient/v3/client.py @@ -187,11 +187,6 @@ EndpointPolicyManager` def __init__(self, **kwargs): """Initialize a new client for the Keystone v3 API.""" - # NOTE(Roxana Gherle): Keystone V3 APIs has no admin versus public - # distinction. They are both going through the same endpoint, so - # set a public default here instead of picking up an admin default in - # httpclient.HTTPClient - kwargs.setdefault('interface', 'public') super(Client, self).__init__(**kwargs) if not kwargs.get('session'):