From 21ebf44480cedf7cf4a03f22bc01550c4db1ddea Mon Sep 17 00:00:00 2001 From: Avan Thakkar Date: Fri, 20 Aug 2021 14:37:17 +0530 Subject: [PATCH] mgr/dashboard: stats=false not working when listing buckets Fixes: https://tracker.ceph.com/issues/51154 Signed-off-by: Avan Thakkar (cherry picked from commit 95543bb150fc9e458314e62d80667190863caa0b) --- qa/tasks/mgr/dashboard/test_rgw.py | 5 +++++ src/pybind/mgr/dashboard/controllers/rgw.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/qa/tasks/mgr/dashboard/test_rgw.py b/qa/tasks/mgr/dashboard/test_rgw.py index f545c74832906..525948a855c65 100644 --- a/qa/tasks/mgr/dashboard/test_rgw.py +++ b/qa/tasks/mgr/dashboard/test_rgw.py @@ -211,6 +211,11 @@ class RgwBucketTest(RgwTestCase): 'tenant': JLeaf(str), }, allow_unknown=True)) + # List all buckets names without stats. + data = self._get('/api/rgw/bucket?stats=false') + self.assertStatus(200) + self.assertEqual(data, ['teuth-test-bucket']) + # Get the bucket. data = self._get('/api/rgw/bucket/teuth-test-bucket') self.assertStatus(200) diff --git a/src/pybind/mgr/dashboard/controllers/rgw.py b/src/pybind/mgr/dashboard/controllers/rgw.py index faf003ef4d1dd..c5ba6384fa2ed 100644 --- a/src/pybind/mgr/dashboard/controllers/rgw.py +++ b/src/pybind/mgr/dashboard/controllers/rgw.py @@ -234,7 +234,7 @@ class RgwBucket(RgwRESTController): def list(self, stats=False, daemon_name=None): # type: (bool, Optional[str]) -> List[Any] - query_params = '?stats' if stats else '' + query_params = '?stats' if str_to_bool(stats) else '' result = self.proxy(daemon_name, 'GET', 'bucket{}'.format(query_params)) if stats: -- 2.39.5