openstack
/
horizon
Code Issues Proposed changes

Merge "Update keystone v3 admin URL in UT"

This commit is contained in:
Zuul 2018-08-13 20:11:20 +00:00 committed by Gerrit Code Review
parent f313e8a679 c6611abe16
commit ecf52d83aa
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_auth/tests/data_v3.py
View File

@ -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,

6
openstack_dashboard/test/test_data/keystone_data.py
View File

@ -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": [],

2
openstack_dashboard/test/unit/api/test_base.py
View File

@ -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):

4
openstack_dashboard/test/unit/api/test_keystone.py
View File

@ -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)