diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-09-23 03:27:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-09-23 03:27:49 +0000 |
| commit | bb1d302a50e8098e348b8d449f25128ff0f649c6 (patch) | |
| tree | d807dc66e293d501f1ab62916462615f68e4fdf7 | |
| parent | 538c605bf2656bee01323d3753e7052296c04370 (diff) | |
| parent | f8ec11d75fbdc58e5c9700b4afdd3baaeae2e9e6 (diff) | |
| download | keystone-bb1d302a50e8098e348b8d449f25128ff0f649c6.tar.gz keystone-bb1d302a50e8098e348b8d449f25128ff0f649c6.tar.xz keystone-bb1d302a50e8098e348b8d449f25128ff0f649c6.zip | |
Merge "Fix for bug 856857 - add user.name to User() constructor to re-align param"
| -rwxr-xr-x | keystone/logic/service.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/keystone/logic/service.py b/keystone/logic/service.py index 24bf1871..c07dd514 100755 --- a/keystone/logic/service.py +++ b/keystone/logic/service.py @@ -242,7 +242,7 @@ class IdentityService(object): dtenant = api.TENANT.get(tenant_id) if not dtenant: raise fault.ItemNotFoundFault("The tenant could not be found") - return Tenant(dtenant.id, dtenant.desc, dtenant.enabled) + return Tenant(dtenant.id, dtenant.name, dtenant.desc, dtenant.enabled) def update_tenant(self, admin_token, tenant_id, tenant): self.__validate_admin_token(admin_token) @@ -342,7 +342,7 @@ class IdentityService(object): dtenantusers = api.USER.users_get_by_tenant_get_page(tenant_id, marker, limit) for dtenantuser in dtenantusers: - ts.append(User(None, dtenantuser.id, tenant_id, + ts.append(User(None, dtenantuser.id, tenant_id, dtenantuser.name, dtenantuser.email, dtenantuser.enabled, dtenantuser.tenant_roles if hasattr(dtenantuser, "tenant_roles") else None)) @@ -363,7 +363,7 @@ class IdentityService(object): ts = [] dusers = api.USER.users_get_page(marker, limit) for duser in dusers: - ts.append(User(None, duser.id, duser.tenant_id, + ts.append(User(None, duser.id, duser.tenant_id, duser.name, duser.email, duser.enabled)) links = [] if ts.__len__(): |