From: Ricardo Dias <rdias@suse.com>
Date: Thu, 20 Dec 2018 09:24:03 +0000 (+0000)
Subject: mgr/dashboard: rgw_client: add optinal user_id param to user_exists method
X-Git-Tag: v14.1.0~199^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=89f789398bab6a6f3427ab3c75ff6163e944cfd3;p=ceph.git

mgr/dashboard: rgw_client: add optinal user_id param to user_exists method

Signed-off-by: Ricardo Dias <rdias@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/services/rgw_client.py b/src/pybind/mgr/dashboard/services/rgw_client.py
index 324f9964fde..72b6b1d913e 100644
--- a/src/pybind/mgr/dashboard/services/rgw_client.py
+++ b/src/pybind/mgr/dashboard/services/rgw_client.py
@@ -319,13 +319,15 @@ class RgwClient(RestClient):
         return response['data']['user_id']
 
     @RestClient.api_get('/{admin_path}/metadata/user', resp_structure='[+]')
-    def _user_exists(self, admin_path, request=None):
+    def _user_exists(self, admin_path, user_id, request=None):
         # pylint: disable=unused-argument
         response = request()
+        if user_id:
+            return user_id in response
         return self.userid in response
 
-    def user_exists(self):
-        return self._user_exists(self.admin_path)
+    def user_exists(self, user_id=None):
+        return self._user_exists(self.admin_path, user_id)
 
     @RestClient.api_get('/{admin_path}/metadata/user?key={userid}',
                         resp_structure='data > system')