Merge "Adding handling for get user/tenant by name"

1 files changed, 17 insertions, 0 deletions

diff --git a/keystone/identity/core.py b/keystone/identity/core.py
index e0297432..08f599f9 100644
--- a/keystone/identity/core.py
+++ b/keystone/identity/core.py
@@ -341,6 +341,10 @@ class TenantController(wsgi.Application):
 
     def get_all_tenants(self, context, **kw):
         """Gets a list of all tenants for an admin user."""
+        if 'name' in context['query_string']:
+            return self.get_tenant_by_name(
+                context, context['query_string'].get('name'))
+
         self.assert_admin(context)
         tenant_refs = self.identity_api.get_tenants(context)
         params = {
@@ -385,6 +389,11 @@ class TenantController(wsgi.Application):
         self.assert_admin(context)
         return {'tenant': self.identity_api.get_tenant(context, tenant_id)}
 
+    def get_tenant_by_name(self, context, tenant_name):
+        self.assert_admin(context)
+        return {'tenant': self.identity_api.get_tenant_by_name(
+            context, tenant_name)}
+
     # CRUD Extension
     def create_tenant(self, context, tenant):
         tenant_ref = self._normalize_dict(tenant)
@@ -463,9 +472,17 @@ class UserController(wsgi.Application):
     def get_users(self, context):
         # NOTE(termie): i can't imagine that this really wants all the data
         #               about every single user in the system...
+        if 'name' in context['query_string']:
+            return self.get_user_by_name(
+                context, context['query_string'].get('name'))
+
         self.assert_admin(context)
         return {'users': self.identity_api.list_users(context)}
 
+    def get_user_by_name(self, context, user_name):
+        self.assert_admin(context)
+        return {'user': self.identity_api.get_user_by_name(context, user_name)}
+
     # CRUD extension
     def create_user(self, context, user):
         user = self._normalize_dict(user)