diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-14 01:44:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-14 01:44:48 +0000 |
| commit | 1f685153435aba5bc387f598599c8684daae30cf (patch) | |
| tree | 448b76ca64568f93e2ab6a7c08202f4927fb4f1a | |
| parent | 90ba2372f5bf7861578180f29d83d555546b5223 (diff) | |
| parent | 8a7812602dc108faaa65b517b51b2dc6db57bd4c (diff) | |
Merge "don't create a new, copied list in get_project_users"
| -rw-r--r-- | keystone/identity/backends/ldap/core.py | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py index 177dd026..a6197e13 100644 --- a/keystone/identity/backends/ldap/core.py +++ b/keystone/identity/backends/ldap/core.py @@ -160,27 +160,17 @@ class Identity(identity.Driver): def get_projects_for_user(self, user_id): self.get_user(user_id) - tenant_list = [] - for tenant in self.project.get_user_projects(user_id): - tenant_list.append(tenant['id']) - return tenant_list + return [p['id'] for p in self.project.get_user_projects(user_id)] def get_project_users(self, tenant_id): self.get_project(tenant_id) - user_list = [] - for user in self.project.get_users(tenant_id): - user_list.append(user) - return user_list + return self.project.get_users(tenant_id) def get_roles_for_user_and_project(self, user_id, tenant_id): self.get_user(user_id) self.get_project(tenant_id) - assignments = self.role.get_role_assignments(tenant_id) - roles = [] - for assignment in assignments: - if assignment.user_id == user_id: - roles.append(assignment.role_id) - return roles + return [a.role_id for a in self.role.get_role_assignments(tenant_id) + if a.user_id == user_id] def add_role_to_user_and_project(self, user_id, tenant_id, role_id): self.get_user(user_id) |
