Merge "Return the endpoint_override from EndpointData"
This commit is contained in:
commit
775550d256
@ -245,6 +245,7 @@ class BaseIdentityPlugin(plugin.BaseAuthPlugin):
|
|||||||
# For now, just use any information the use has
|
# For now, just use any information the use has
|
||||||
# provided.
|
# provided.
|
||||||
endpoint_data = discover.EndpointData(
|
endpoint_data = discover.EndpointData(
|
||||||
|
service_url=endpoint_override,
|
||||||
catalog_url=endpoint_override,
|
catalog_url=endpoint_override,
|
||||||
interface=interface,
|
interface=interface,
|
||||||
region_name=region_name,
|
region_name=region_name,
|
||||||
|
@ -1711,6 +1711,8 @@ class CatalogHackTests(utils.TestCase):
|
|||||||
max_version=(2, discover.LATEST))
|
max_version=(2, discover.LATEST))
|
||||||
|
|
||||||
self.assertTrue(common_m.called)
|
self.assertTrue(common_m.called)
|
||||||
|
self.assertEqual(self.OTHER_URL, data.service_url)
|
||||||
|
self.assertEqual(self.OTHER_URL, data.catalog_url)
|
||||||
self.assertEqual(self.OTHER_URL, data.url)
|
self.assertEqual(self.OTHER_URL, data.url)
|
||||||
self.assertEqual((2, 1), data.min_microversion)
|
self.assertEqual((2, 1), data.min_microversion)
|
||||||
self.assertEqual((2, 35), data.max_microversion)
|
self.assertEqual((2, 35), data.max_microversion)
|
||||||
|
Loading…
Reference in New Issue
Block a user