openstack
/
keystone
Code Issues Proposed changes

Remove unused pointer to assignment in identity driver 

The code in identity core that configures the driver stores a
reference to the assignment_api in it. This is never used, so
should be removed.

Closes-bug: 1407540

Change-Id: I4d677c74461eb319ba49d5c41d0ff86fc973a849
This commit is contained in:
Henry Nash 2015-01-05 03:53:20 +00:00
parent 0e05353d09
commit cbcece0fc8
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
keystone/identity/core.py
View File

@ -87,12 +87,9 @@ class DomainConfigs(dict):
driver = None
_any_sql = False
def _load_driver(self, domain_config, assignment_api):
domain_config_driver = (
importutils.import_object(
domain_config['cfg'].identity.driver, domain_config['cfg']))
domain_config_driver.assignment_api = assignment_api
return domain_config_driver
def _load_driver(self, domain_config):
return importutils.import_object(
domain_config['cfg'].identity.driver, domain_config['cfg'])
def _load_config(self, assignment_api, file_list, domain_name):
@ -129,8 +126,7 @@ class DomainConfigs(dict):
config.configure(conf=domain_config['cfg'])
domain_config['cfg'](args=[], project='keystone',
default_config_files=file_list)
domain_config['driver'] = self._load_driver(
domain_config, assignment_api)
domain_config['driver'] = self._load_driver(domain_config)
assert_no_more_than_one_sql_driver(domain_config, file_list)
self[domain_ref['id']] = domain_config
@ -167,7 +163,7 @@ class DomainConfigs(dict):
if domain_id in self:
return self[domain_id]['cfg']
def reload_domain_driver(self, assignment_api, domain_id):
def reload_domain_driver(self, domain_id):
# Only used to support unit tests that want to set
# new config values. This should only be called once
# the domains have been configured, since it relies on
@ -176,11 +172,10 @@ class DomainConfigs(dict):
if self.configured:
if domain_id in self:
self[domain_id]['driver'] = (
self._load_driver(self[domain_id], assignment_api))
self._load_driver(self[domain_id]))
else:
# The standard driver
self.driver = self.driver()
self.driver.assignment_api = assignment_api
def domains_configured(f):

9
keystone/tests/test_backend_ldap.py
View File

@ -2432,8 +2432,7 @@ class MultiLDAPandSQLIdentity(BaseLDAPIdentity, tests.SQLDriverOverrides,
def reload_backends(self, domain_id):
# Just reload the driver for this domain - which will pickup
# any updated cfg
self.identity_api.domain_configs.reload_domain_driver(
self.identity_api.assignment_api, domain_id)
self.identity_api.domain_configs.reload_domain_driver(domain_id)
def get_config(self, domain_id):
# Get the config for this domain, will return CONF
@ -2690,8 +2689,7 @@ class DomainSpecificLDAPandSQLIdentity(
def reload_backends(self, domain_id):
# Just reload the driver for this domain - which will pickup
# any updated cfg
self.identity_api.domain_configs.reload_domain_driver(
self.identity_api.assignment_api, domain_id)
self.identity_api.domain_configs.reload_domain_driver(domain_id)
def get_config(self, domain_id):
# Get the config for this domain, will return CONF
@ -2861,8 +2859,7 @@ class DomainSpecificSQLIdentity(DomainSpecificLDAPandSQLIdentity):
else:
# Just reload the driver for this domain - which will pickup
# any updated cfg
self.identity_api.domain_configs.reload_domain_driver(
self.identity_api.assignment_api, domain_id)
self.identity_api.domain_configs.reload_domain_driver(domain_id)
def test_default_sql_plus_sql_specific_driver_fails(self):
# First confirm that if ldap is default driver, domain1 can be