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

This patch converts 'paginate' and 'admin' parameter values to
Python boolean values in the Projects get method in openstack_dashboard/
api/rest/keystone.py.

Change-Id: I94c09c68152e39d5304065fe1287ac994c958cbe
Closes-Bug: 1472747

openstack_dashboard/api/rest/keystone.py

@@ -420,13 +420,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)

openstack_dashboard/test/api_tests/keystone_rest_tests.py

@@ -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):
+    def _test_project_get_list(self, params, expected_call, kc):
-        request = self.mock_rest_request(**{'GET': {}})
+        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,
+        kc.tenant_list.assert_called_once_with(request, **expected_call)
-                                               marker=None, domain=None,
-                                               user=None, admin=True,
-                                               filters=None)
 
     @mock.patch.object(keystone.api, 'keystone')
     def test_project_get_list_with_filters(self, kc):