summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-05-16 21:52:28 +0000
committerGerrit Code Review <review@openstack.org>2018-05-16 21:52:28 +0000
commit775550d25628a9cb3ce56f9518b4239e6a2bca75 (patch)
tree88fc7169b1e8320a78859c9d6d083c2de3fc0174
parent35de6ebe93b94076964f4250bf3fa9b8ff1f8463 (diff)
parent8a963de05a7484e0269165e7547320e83407df1a (diff)
Merge "Return the endpoint_override from EndpointData"
-rw-r--r--keystoneauth1/identity/base.py1
-rw-r--r--keystoneauth1/tests/unit/identity/test_identity_common.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/keystoneauth1/identity/base.py b/keystoneauth1/identity/base.py
index d73ef52..81498ac 100644
--- a/keystoneauth1/identity/base.py
+++ b/keystoneauth1/identity/base.py
@@ -245,6 +245,7 @@ class BaseIdentityPlugin(plugin.BaseAuthPlugin):
245 # For now, just use any information the use has 245 # For now, just use any information the use has
246 # provided. 246 # provided.
247 endpoint_data = discover.EndpointData( 247 endpoint_data = discover.EndpointData(
248 service_url=endpoint_override,
248 catalog_url=endpoint_override, 249 catalog_url=endpoint_override,
249 interface=interface, 250 interface=interface,
250 region_name=region_name, 251 region_name=region_name,
diff --git a/keystoneauth1/tests/unit/identity/test_identity_common.py b/keystoneauth1/tests/unit/identity/test_identity_common.py
index b208e54..9a7c5fb 100644
--- a/keystoneauth1/tests/unit/identity/test_identity_common.py
+++ b/keystoneauth1/tests/unit/identity/test_identity_common.py
@@ -1711,6 +1711,8 @@ class CatalogHackTests(utils.TestCase):
1711 max_version=(2, discover.LATEST)) 1711 max_version=(2, discover.LATEST))
1712 1712
1713 self.assertTrue(common_m.called) 1713 self.assertTrue(common_m.called)
1714 self.assertEqual(self.OTHER_URL, data.service_url)
1715 self.assertEqual(self.OTHER_URL, data.catalog_url)
1714 self.assertEqual(self.OTHER_URL, data.url) 1716 self.assertEqual(self.OTHER_URL, data.url)
1715 self.assertEqual((2, 1), data.min_microversion) 1717 self.assertEqual((2, 1), data.min_microversion)
1716 self.assertEqual((2, 35), data.max_microversion) 1718 self.assertEqual((2, 35), data.max_microversion)