From c6611abe165db2d3c8b3c6a1c5525c5a682ce24c Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Tue, 14 Aug 2018 02:50:47 +0900 Subject: [PATCH] Update keystone v3 admin URL in UT We no longer use port 35357 for keystone v3 API admin operation and it is recommended to use port 5000. This commit updates keystone catalog for keystone v3 API. It also replace keystone v2 URL with v3 one. Note that keystone v2 data is kept as-is. Change-Id: Ia152d602b80ae418e0020b3ba30a11016a83da6a --- openstack_auth/tests/data_v3.py | 2 +- openstack_dashboard/test/test_data/keystone_data.py | 6 +++--- openstack_dashboard/test/unit/api/test_base.py | 2 +- openstack_dashboard/test/unit/api/test_keystone.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/openstack_auth/tests/data_v3.py b/openstack_auth/tests/data_v3.py index 1d2ef82b1d..366b9d8f6d 100644 --- a/openstack_auth/tests/data_v3.py +++ b/openstack_auth/tests/data_v3.py @@ -65,7 +65,7 @@ def generate_test_data(pki=False, service_providers=False, 'id': uuid.uuid4().hex, 'endpoints': [ { - 'url': 'http://admin.%s:35357/v3' % endpoint, + 'url': 'http://admin.%s:5000/v3' % endpoint, 'region': 'RegionOne', 'interface': 'admin', 'id': uuid.uuid4().hex, diff --git a/openstack_dashboard/test/test_data/keystone_data.py b/openstack_dashboard/test/test_data/keystone_data.py index eede16d757..69f2a7af47 100644 --- a/openstack_dashboard/test/test_data/keystone_data.py +++ b/openstack_dashboard/test/test_data/keystone_data.py @@ -89,9 +89,9 @@ SERVICE_CATALOG = [ "endpoints_links": [], "endpoints": [ {"region": "RegionOne", - "adminURL": "http://admin.keystone.example.com:35357/v2.0", - "internalURL": "http://int.keystone.example.com:5000/v2.0", - "publicURL": "http://public.keystone.example.com:5000/v2.0"}]}, + "adminURL": "http://admin.keystone.example.com:5000/v3", + "internalURL": "http://int.keystone.example.com:5000/v3", + "publicURL": "http://public.keystone.example.com:5000/v3"}]}, {"type": "object-store", "name": "swift", "endpoints_links": [], diff --git a/openstack_dashboard/test/unit/api/test_base.py b/openstack_dashboard/test/unit/api/test_base.py index 016ac72ab5..48c2f3525b 100644 --- a/openstack_dashboard/test/unit/api/test_base.py +++ b/openstack_dashboard/test/unit/api/test_base.py @@ -285,7 +285,7 @@ class ApiHelperTests(test.TestCase): self.request.user.services_region = "bogus_value" url = api_base.url_for(self.request, 'identity', endpoint_type='adminURL') - self.assertEqual('http://admin.keystone.example.com:35357/v2.0', url) + self.assertEqual('http://admin.keystone.example.com:5000/v3', url) self.request.user.services_region = "bogus_value" with self.assertRaises(exceptions.ServiceCatalogException): diff --git a/openstack_dashboard/test/unit/api/test_keystone.py b/openstack_dashboard/test/unit/api/test_keystone.py index 857632fd0d..91e41935b6 100644 --- a/openstack_dashboard/test/unit/api/test_keystone.py +++ b/openstack_dashboard/test/unit/api/test_keystone.py @@ -84,9 +84,9 @@ class ServiceAPITests(test.APIMockTestCase): self.assertEqual(u"identity (native backend)", six.text_type(service)) self.assertEqual(identity_data["endpoints"][0]["region"], service.region) - self.assertEqual("http://int.keystone.example.com:5000/v2.0", + self.assertEqual("http://int.keystone.example.com:5000/v3", service.url) - self.assertEqual("http://public.keystone.example.com:5000/v2.0", + self.assertEqual("http://public.keystone.example.com:5000/v3", service.public_url) self.assertEqual("int.keystone.example.com", service.host)