openstack/horizon
Code Issues Proposed changes

Merge "Fix 'paginate' and 'admin' GET parameters in Keystone Projects REST API"

Browse Source
This commit is contained in:
Jenkins 2015-08-08 04:46:09 +00:00 committed by Gerrit Code Review
commit 8879e6f7ee
2 changed files with 53 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack_dashboard/api/rest/keystone.py
View File

@ -412,13 +412,16 @@ class Projects(generic.View):
if len(filters) == 0:
filters = None
paginate = request.GET.get('paginate') == 'true'
admin = False if request.GET.get('admin') == 'false' else True
result, has_more = api.keystone.tenant_list(
request,
paginate=request.GET.get('paginate', False),
paginate=paginate,
marker=request.GET.get('marker'),
domain=request.GET.get('domain_id'),
user=request.GET.get('user_id'),
admin=request.GET.get('admin', True),
admin=admin,
filters=filters
)
# return (list of results, has_more_data)

54
openstack_dashboard/test/api_tests/keystone_rest_tests.py
View File

@ -467,9 +467,54 @@ class KeystoneRestTestCase(test.TestCase):
self.assertEqual(response.content, '{"name": "Ni!"}')
kc.tenant_get.assert_called_once_with(request, 'the_id')
def test_project_get_list(self):
self._test_project_get_list(
{},
{
'paginate': False,
'marker': None,
'domain': None,
'user': None,
'admin': True,
'filters': None
}
)
def test_project_get_list_with_params_true(self):
self._test_project_get_list(
{
'paginate': 'true',
'admin': 'true'
},
{
'paginate': True,
'marker': None,
'domain': None,
'user': None,
'admin': True,
'filters': None
}
)
def test_project_get_list_with_params_false(self):
self._test_project_get_list(
{
'paginate': 'false',
'admin': 'false'
},
{
'paginate': False,
'marker': None,
'domain': None,
'user': None,
'admin': False,
'filters': None
}
)
@mock.patch.object(keystone.api, 'keystone')
def test_project_get_list(self, kc):
request = self.mock_rest_request(**{'GET': {}})
def _test_project_get_list(self, params, expected_call, kc):
request = self.mock_rest_request(**{'GET': dict(**params)})
kc.tenant_list.return_value = ([
mock.Mock(**{'to_dict.return_value': {'name': 'Ni!'}}),
mock.Mock(**{'to_dict.return_value': {'name': 'Ptang!'}})
@ -479,10 +524,7 @@ class KeystoneRestTestCase(test.TestCase):
self.assertStatusCode(response, 200)
self.assertEqual(response.content, '{"has_more": false, '
'"items": [{"name": "Ni!"}, {"name": "Ptang!"}]}')
kc.tenant_list.assert_called_once_with(request, paginate=False,
marker=None, domain=None,
user=None, admin=True,
filters=None)
kc.tenant_list.assert_called_once_with(request, **expected_call)
@mock.patch.object(keystone.api, 'keystone')
def test_project_get_list_with_filters(self, kc):