diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-08-09 22:58:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-08-09 22:58:32 +0000 |
| commit | f1cc2255afe33b6faf0db287f011ee304e70057c (patch) | |
| tree | f2e3bf554f2ebd8c7aefd89bce8e0741eb90d1d2 /keystone/common | |
| parent | 2c2ebe88a18f3096035812e96ffcf4b23a0395be (diff) | |
| parent | 1289bbf12e8cf6e7792df0de44a3bc9bf6e9c505 (diff) | |
| download | keystone-f1cc2255afe33b6faf0db287f011ee304e70057c.tar.gz keystone-f1cc2255afe33b6faf0db287f011ee304e70057c.tar.xz keystone-f1cc2255afe33b6faf0db287f011ee304e70057c.zip | |
Merge "Abstract out attribute_mapping filling in LDAP driver."
Diffstat (limited to 'keystone/common')
| -rw-r--r-- | keystone/common/ldap/core.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/keystone/common/ldap/core.py b/keystone/common/ldap/core.py index 7a2dfee7..71423064 100644 --- a/keystone/common/ldap/core.py +++ b/keystone/common/ldap/core.py @@ -114,7 +114,7 @@ class BaseLdap(object): notfound_arg = None options_name = None model = None - attribute_mapping = {} + attribute_options_names = {} attribute_ignore = [] tree_dn = None @@ -129,6 +129,7 @@ class BaseLdap(object): self.tls_cacertfile = conf.ldap.tls_cacertfile self.tls_cacertdir = conf.ldap.tls_cacertdir self.tls_req_cert = parse_tls_cert(conf.ldap.tls_req_cert) + self.attribute_mapping = {} if self.options_name is not None: self.suffix = conf.ldap.suffix @@ -145,6 +146,10 @@ class BaseLdap(object): self.object_class = (getattr(conf.ldap, objclass) or self.DEFAULT_OBJECTCLASS) + for k, v in self.attribute_options_names.iteritems(): + v = '%s_%s_attribute' % (self.options_name, v) + self.attribute_mapping[k] = getattr(conf.ldap, v) + attr_mapping_opt = ('%s_additional_attribute_mapping' % self.options_name) attr_mapping = (getattr(conf.ldap, attr_mapping_opt) |