diff options
| author | lin-hua-cheng <lin-hua.cheng@hp.com> | 2014-08-22 21:34:42 -0700 |
|---|---|---|
| committer | lin-hua-cheng <lin-hua.cheng@hp.com> | 2014-08-22 21:34:42 -0700 |
| commit | feea560e879fe3d904a6e9891e21eb21c935be15 (patch) | |
| tree | c80f6537b3bbeaedcaf73b6422d7e6820161c905 | |
| parent | 41f868edaab2c9979459c338dde4b02e5f033f15 (diff) | |
| download | django_openstack_auth-feea560e879fe3d904a6e9891e21eb21c935be15.tar.gz | |
Add user_domain_name in the user object
user_domain_name is exposed by keystoneclient, adding
this information for horizon as well.
Change-Id: Ic09b892bcb7669ed19a353e535d1aea43bbe92b7
Closes-Bug: #1360521
| -rw-r--r-- | openstack_auth/user.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/openstack_auth/user.py b/openstack_auth/user.py index ebd49b4..01e204b 100644 --- a/openstack_auth/user.py +++ b/openstack_auth/user.py @@ -40,6 +40,7 @@ def create_user_from_token(request, token, endpoint, services_region=None): token=token, user=token.user['name'], user_domain_id=token.user_domain_id, + user_domain_name=token.user_domain_name, project_id=token.project['id'], project_name=token.project['name'], domain_id=token.domain['id'], @@ -65,6 +66,7 @@ class Token(object): user['name'] = auth_ref.username self.user = user self.user_domain_id = auth_ref.user_domain_id + self.user_domain_name = auth_ref.user_domain_name # Token-related attributes self.id = auth_ref.auth_token @@ -147,6 +149,10 @@ class User(models.AnonymousUser): The domain id of the current user. + .. attribute:: user_domain_name + + The domain name of the current user. + .. attribute:: domain_id The id of the Keystone domain scoped for the current user/token. @@ -155,13 +161,15 @@ class User(models.AnonymousUser): def __init__(self, id=None, token=None, user=None, tenant_id=None, service_catalog=None, tenant_name=None, roles=None, authorized_tenants=None, endpoint=None, enabled=False, - services_region=None, user_domain_id=None, domain_id=None, - domain_name=None, project_id=None, project_name=None): + services_region=None, user_domain_id=None, + user_domain_name=None, domain_id=None, domain_name=None, + project_id=None, project_name=None): self.id = id self.pk = id self.token = token self.username = user self.user_domain_id = user_domain_id + self.user_domain_name = user_domain_name self.domain_id = domain_id self.domain_name = domain_name self.project_id = project_id or tenant_id |