Add rel field to links display

Currently the "rel" keys from the links list are not displayed, so
it's not that clear which link refers to what unless you're familiar
with heat.  So add a suffix which mentions the rel so e.g users can
see "nested" there and tell the link refers to a nested stack.

Change-Id: I5abe7f7b51c290bd9d8daaccb7f9a842af898f58
This commit is contained in:
Steven Hardy
2014-06-11 11:35:10 +01:00
parent 6eb45625e5
commit 755f609c31
2 changed files with 11 additions and 1 deletions

View File

@@ -37,7 +37,12 @@ print_list = cliutils.print_list
def link_formatter(links):
return '\n'.join([l.get('href', '') for l in links or []])
def format_link(l):
if 'rel' in l:
return "%s (%s)" % (l.get('href', ''), l.get('rel', ''))
else:
return "%s" % (l.get('href', ''))
return '\n'.join(format_link(l) for l in links or [])
def json_formatter(js):

View File

@@ -96,6 +96,11 @@ class shellTest(testtools.TestCase):
utils.link_formatter([
{'href': 'http://foo.example.com'},
{'href': 'http://bar.example.com'}]))
self.assertEqual(
'http://foo.example.com (a)\nhttp://bar.example.com (b)',
utils.link_formatter([
{'href': 'http://foo.example.com', 'rel': 'a'},
{'href': 'http://bar.example.com', 'rel': 'b'}]))
self.assertEqual(
'\n',
utils.link_formatter([