openstack
/
magnum
Code Issues Proposed changes

Merge "Magnum api show wrong bookmark link for baymodels"

This commit is contained in:
Jenkins 2016-03-03 10:43:51 +00:00 committed by Gerrit Code Review
parent cc4516aa16 a066c75538
commit 448ae3dc9b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/api/controllers/v1/__init__.py
View File

@ -144,7 +144,7 @@ class V1(controllers_base.APIBase):
'baymodels', ''),
link.Link.make_link('bookmark',
pecan.request.host_url,
'bays', '',
'baymodels', '',
bookmark=True)]
v1.bays = [link.Link.make_link('self', pecan.request.host_url,
'bays', ''),

2
magnum/tests/unit/api/controllers/test_root.py
View File

@ -56,7 +56,7 @@ class TestRootController(api_base.FunctionalTest):
u'rel': u'bookmark'}],
u'baymodels': [{u'href': u'http://localhost/v1/baymodels/',
u'rel': u'self'},
{u'href': u'http://localhost/bays/',
{u'href': u'http://localhost/baymodels/',
u'rel': u'bookmark'}],
u'pods': [{u'href': u'http://localhost/v1/pods/',
u'rel': u'self'},