openstack/python-openstackclient
Code Issues Proposed changes

openstack catalog list always returns publicURL for internalURL and adminURL

Browse Source 
With this change 'openstack catalog list' returns the correspoding URL for
publicURL, internalURL and adminURL in _format_endpoints .

Change-Id: I5d946c9d70a2d3c22a7cc77067fec8e2e9aa4940
Closes-Bug: 1472629
This commit is contained in:
Martin Schuppert 2015-07-08 16:15:54 +02:00
parent f07f71661f
commit 7af00f833f
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstackclient/identity/v2_0/catalog.py
View File

@ -31,7 +31,7 @@ def _format_endpoints(eps=None):
region = eps[index].get('region', '<none>')
ret += region + '\n'
for url in ['publicURL', 'internalURL', 'adminURL']:
ret += " %s: %s\n" % (url, eps[index]['publicURL'])
ret += " %s: %s\n" % (url, eps[index][url])
return ret

18
openstackclient/tests/identity/v2_0/test_catalog.py
View File

@ -27,11 +27,13 @@ class TestCatalog(utils.TestCommand):
{
'region': 'one',
'publicURL': 'https://public.one.example.com',
'internalURL': 'https://internal.one.example.com',
'adminURL': 'https://admin.one.example.com',
},
{
'region': 'two',
'publicURL': 'https://public.two.example.com',
'internalURL': 'https://internal.two.example.com',
'adminURL': 'https://admin.two.example.com',
},
],
@ -74,11 +76,11 @@ class TestCatalogList(TestCatalog):
'supernova',
'compute',
'one\n publicURL: https://public.one.example.com\n '
'internalURL: https://public.one.example.com\n '
'adminURL: https://public.one.example.com\n'
'internalURL: https://internal.one.example.com\n '
'adminURL: https://admin.one.example.com\n'
'two\n publicURL: https://public.two.example.com\n '
'internalURL: https://public.two.example.com\n '
'adminURL: https://public.two.example.com\n',
'internalURL: https://internal.two.example.com\n '
'adminURL: https://admin.two.example.com\n',
), )
self.assertEqual(datalist, tuple(data))
@ -108,11 +110,11 @@ class TestCatalogShow(TestCatalog):
self.assertEqual(collist, columns)
datalist = (
'one\n publicURL: https://public.one.example.com\n '
'internalURL: https://public.one.example.com\n '
'adminURL: https://public.one.example.com\n'
'internalURL: https://internal.one.example.com\n '
'adminURL: https://admin.one.example.com\n'
'two\n publicURL: https://public.two.example.com\n '
'internalURL: https://public.two.example.com\n '
'adminURL: https://public.two.example.com\n',
'internalURL: https://internal.two.example.com\n '
'adminURL: https://admin.two.example.com\n',
'qwertyuiop',
'supernova',
'compute',