mgr/dashboard: Improve RgwUser controller

Use the new 'user?list' RGW Admin OPS API endpoint.

Signed-off-by: Volker Theile <vtheile@suse.com>

diff --git a/src/pybind/mgr/dashboard/controllers/rgw.py b/src/pybind/mgr/dashboard/controllers/rgw.py
index 07429cad590fd5fc99c69f3af86854d9d9643c7e..83679d28ae8cd8f40f22e704675627add28592e0 100644 (file)
--- a/src/pybind/mgr/dashboard/controllers/rgw.py
+++ b/src/pybind/mgr/dashboard/controllers/rgw.py
@@ -168,7 +168,22 @@ class RgwUser(RgwRESTController):
         return user
 
     def list(self):
-        return self.proxy('GET', 'metadata/user')
+        users = []
+        marker = None
+        while True:
+            params = {}
+            if marker:
+                params['marker'] = marker
+            result = self.proxy('GET', 'user?list', params)
+            users.extend(result['keys'])
+            if not result['truncated']:
+                break
+            # Make sure there is a marker.
+            assert result['marker']
+            # Make sure the marker has changed.
+            assert marker != result['marker']
+            marker = result['marker']
+        return users
 
     def get(self, uid):
         result = self.proxy('GET', 'user', {'uid': uid})

diff --git a/src/pybind/mgr/dashboard/tests/test_rgw.py b/src/pybind/mgr/dashboard/tests/test_rgw.py
new file mode 100644 (file)
index 0000000..1dfe901
--- /dev/null
+++ b/src/pybind/mgr/dashboard/tests/test_rgw.py
@@ -0,0 +1,85 @@
+import mock
+
+from .helper import ControllerTestCase
+from ..controllers.rgw import RgwUser
+
+
+class RgwUserControllerTestCase(ControllerTestCase):
+    @classmethod
+    def setup_server(cls):
+        RgwUser._cp_config['tools.authenticate.on'] = False  # pylint: disable=protected-access
+        cls.setup_controllers([RgwUser], '/test')
+
+    @mock.patch('dashboard.controllers.rgw.RgwRESTController.proxy')
+    def test_user_list(self, mock_proxy):
+        mock_proxy.side_effect = [{
+            'count': 3,
+            'keys': ['test1', 'test2', 'test3'],
+            'truncated': False
+        }]
+        self._get('/test/api/rgw/user')
+        self.assertStatus(200)
+        mock_proxy.assert_has_calls([
+            mock.call('GET', 'user?list', {})
+        ])
+        self.assertJsonBody(['test1', 'test2', 'test3'])
+
+    @mock.patch('dashboard.controllers.rgw.RgwRESTController.proxy')
+    def test_user_list_marker(self, mock_proxy):
+        mock_proxy.side_effect = [{
+            'count': 3,
+            'keys': ['test1', 'test2', 'test3'],
+            'marker': 'foo:bar',
+            'truncated': True
+        }, {
+            'count': 1,
+            'keys': ['admin'],
+            'truncated': False
+        }]
+        self._get('/test/api/rgw/user')
+        self.assertStatus(200)
+        mock_proxy.assert_has_calls([
+            mock.call('GET', 'user?list', {}),
+            mock.call('GET', 'user?list', {'marker': 'foo:bar'})
+        ])
+        self.assertJsonBody(['test1', 'test2', 'test3', 'admin'])
+
+    @mock.patch('dashboard.controllers.rgw.RgwRESTController.proxy')
+    def test_user_list_duplicate_marker(self, mock_proxy):
+        mock_proxy.side_effect = [{
+            'count': 3,
+            'keys': ['test1', 'test2', 'test3'],
+            'marker': 'foo:bar',
+            'truncated': True
+        }, {
+            'count': 3,
+            'keys': ['test4', 'test5', 'test6'],
+            'marker': 'foo:bar',
+            'truncated': True
+        }, {
+            'count': 1,
+            'keys': ['admin'],
+            'truncated': False
+        }]
+        self._get('/test/api/rgw/user')
+        self.assertStatus(500)
+
+    @mock.patch('dashboard.controllers.rgw.RgwRESTController.proxy')
+    def test_user_list_invalid_marker(self, mock_proxy):
+        mock_proxy.side_effect = [{
+            'count': 3,
+            'keys': ['test1', 'test2', 'test3'],
+            'marker': 'foo:bar',
+            'truncated': True
+        }, {
+            'count': 3,
+            'keys': ['test4', 'test5', 'test6'],
+            'marker': '',
+            'truncated': True
+        }, {
+            'count': 1,
+            'keys': ['admin'],
+            'truncated': False
+        }]
+        self._get('/test/api/rgw/user')
+        self.assertStatus(500)