openstack
/
cinder
Code Issues Proposed changes

Merge "cinder list fails with 'name' sort key"

This commit is contained in:
Jenkins 2015-07-13 20:28:51 +00:00 committed by Gerrit Code Review
parent ebfc7c6439 3b77f765c0
commit 2ee68a9c02
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/api/v2/volumes.py
View File

@ -238,6 +238,9 @@ class VolumeController(wsgi.Controller):
self._get_volume_filter_options())
# NOTE(thingee): v2 API allows name instead of display_name
if 'name' in sort_keys:
sort_keys[sort_keys.index('name')] = 'display_name'
if 'name' in filters:
filters['display_name'] = filters['name']
del filters['name']

15
cinder/tests/unit/api/v2/test_volumes.py
View File

@ -1619,6 +1619,21 @@ class VolumeApiTest(test.TestCase):
sort_keys=['created_at'], sort_dirs=['desc'],
filters={'availability_zone': 'nova'}, viewable_admin_meta=True)
@mock.patch('cinder.volume.api.API.get_all')
def test_get_volumes_sort_by_name(self, get_all):
"""Name in client means display_name in database."""
req = mock.MagicMock()
ctxt = context.RequestContext('fake', 'fake', auth_token=True)
req.environ = {'cinder.context': ctxt}
req.params = {'sort': 'name'}
self.controller._view_builder.detail_list = mock.Mock()
self.controller._get_volumes(req, True)
get_all.assert_called_once_with(
ctxt, None, None,
sort_dirs=['desc'], viewable_admin_meta=True,
sort_keys=['display_name'], filters={})
def test_get_volume_filter_options_using_config(self):
self.override_config('query_volume_filters', ['name', 'status',
'metadata'])