mgr/dashboard: rgw accounts form group mode disable option is not working

Fixes: https://tracker.ceph.com/issues/73926
Signed-off-by: Naman Munet <naman.munet@ibm.com>
(cherry picked from commit 89005c0f29ccad9a8bab37dba94f4559e135a238)

diff --git a/src/pybind/mgr/dashboard/controllers/rgw_iam.py b/src/pybind/mgr/dashboard/controllers/rgw_iam.py
index 3be4ffcee0282772d26966af3c85f8c3f5046fa4..7bc9ff56b8c5bff8758d90967178d6327904eedb 100644 (file)
--- a/src/pybind/mgr/dashboard/controllers/rgw_iam.py
+++ b/src/pybind/mgr/dashboard/controllers/rgw_iam.py
@@ -45,7 +45,7 @@ class RgwUserAccountsController(RgwRESTController):
         if max_roles:
             params['max-roles'] = str(max_roles)
         if max_group:
-            params['max-group'] = str(max_group)
+            params['max-groups'] = str(max_group)
         if max_access_keys:
             params['max-access-keys'] = str(max_access_keys)
 
@@ -131,7 +131,7 @@ class RgwUserAccountsController(RgwRESTController):
         if max_roles:
             params['max-roles'] = str(max_roles)
         if max_group:
-            params['max-group'] = str(max_group)
+            params['max-groups'] = str(max_group)
         if max_access_keys:
             params['max-access-keys'] = str(max_access_keys)
 

diff --git a/src/pybind/mgr/dashboard/tests/test_rgw_iam.py b/src/pybind/mgr/dashboard/tests/test_rgw_iam.py
index 567021910251fdb1b703338eab3687c02278c0cf..6fa5022724757e9ddcc3fc28152c47a48d778916 100644 (file)
--- a/src/pybind/mgr/dashboard/tests/test_rgw_iam.py
+++ b/src/pybind/mgr/dashboard/tests/test_rgw_iam.py
@@ -153,7 +153,7 @@ class TestRgwUserAccountsController(ControllerTestCase):
                 'max-buckets': '1000',
                 'max-users': '1000',
                 'max-roles': '1000',
-                'max-group': '1000',
+                'max-groups': '1000',
                 'max-access-keys': '4'
             })
 
@@ -265,7 +265,7 @@ class TestRgwUserAccountsController(ControllerTestCase):
                 'max-buckets': '1000',
                 'max-users': '1000',
                 'max-roles': '1000',
-                'max-group': '1000',
+                'max-groups': '1000',
                 'max-access-keys': '4'
             })