diff options
| author | Brant Knudson <bknudson@us.ibm.com> | 2015-03-21 13:57:18 -0500 |
|---|---|---|
| committer | Brant Knudson <bknudson@us.ibm.com> | 2015-03-22 08:39:20 -0500 |
| commit | 776b4009905f8bcf5b1fb469a63d07a75abc43a7 (patch) | |
| tree | 9fedd45b924bff6ceabbabfca6bcea3752c7d6ab | |
| parent | 203228f8994d67ce8916b59626e95fc1ede43552 (diff) | |
| download | keystone-776b4009905f8bcf5b1fb469a63d07a75abc43a7.tar.gz | |
Cleanup use of .driver
Unless being used to override the Manager implementation, .driver
doesn't need to be used because the Manager automatically
forwards calls to the driver. The code shouldn't use .driver
directly where it's not necessary since developers should be
able to override behavior in the Manager, which we've done
several times (for deprecations or reorganization for
example).
Change-Id: I05b13d4f4ec7e6be8e72b73bac164333535aebee
| -rw-r--r-- | keystone/assignment/core.py | 5 | ||||
| -rw-r--r-- | keystone/cli.py | 10 | ||||
| -rw-r--r-- | keystone/resource/core.py | 5 |
3 files changed, 9 insertions, 11 deletions
diff --git a/keystone/assignment/core.py b/keystone/assignment/core.py index 0f9c03e97..73187e916 100644 --- a/keystone/assignment/core.py +++ b/keystone/assignment/core.py @@ -902,9 +902,8 @@ class RoleManager(manager.Manager): role_driver = CONF.role.driver if role_driver is None: - assignment_driver = ( - dependency.get_provider('assignment_api').driver) - role_driver = assignment_driver.default_role_driver() + assignment_manager = dependency.get_provider('assignment_api') + role_driver = assignment_manager.default_role_driver() super(RoleManager, self).__init__(role_driver) diff --git a/keystone/cli.py b/keystone/cli.py index b5fff136f..0a8dd143e 100644 --- a/keystone/cli.py +++ b/keystone/cli.py @@ -238,7 +238,7 @@ class TokenFlush(BaseApp): @classmethod def main(cls): token_manager = token.persistence.PersistenceManager() - token_manager.driver.flush_expired_tokens() + token_manager.flush_expired_tokens() class MappingPurge(BaseApp): @@ -296,7 +296,7 @@ class MappingPurge(BaseApp): # init assignment manager to avoid KeyError in resource.core assignment.Manager() resource_manager = resource.Manager() - return resource_manager.driver.get_domain_by_name(name)['id'] + return resource_manager.get_domain_by_name(name)['id'] except KeyError: raise ValueError(_("Unknown domain '%(name)s' specified by " "--domain-name") % {'name': name}) @@ -319,7 +319,7 @@ class MappingPurge(BaseApp): mapping['type'] = CONF.command.type mapping_manager = identity.MappingManager() - mapping_manager.driver.purge_mappings(mapping) + mapping_manager.purge_mappings(mapping) DOMAIN_CONF_FHEAD = 'keystone.' @@ -392,7 +392,7 @@ class DomainConfigUploadFiles(object): """ try: domain_ref = ( - self.resource_manager.driver.get_domain_by_name(domain_name)) + self.resource_manager.get_domain_by_name(domain_name)) except exception.DomainNotFound: print(_('Invalid domain name: %(domain)s found in config file ' 'name: %(file)s - ignoring this file.') % { @@ -496,7 +496,7 @@ class DomainConfigUploadFiles(object): def run(self): # First off, let's just check we can talk to the domain database try: - self.resource_manager.driver.list_domains(driver_hints.Hints()) + self.resource_manager.list_domains(driver_hints.Hints()) except Exception: # It is likely that there is some SQL or other backend error # related to set up diff --git a/keystone/resource/core.py b/keystone/resource/core.py index 017eb4e71..3dcd74935 100644 --- a/keystone/resource/core.py +++ b/keystone/resource/core.py @@ -62,9 +62,8 @@ class Manager(manager.Manager): resource_driver = CONF.resource.driver if resource_driver is None: - assignment_driver = ( - dependency.get_provider('assignment_api').driver) - resource_driver = assignment_driver.default_resource_driver() + assignment_manager = dependency.get_provider('assignment_api') + resource_driver = assignment_manager.default_resource_driver() super(Manager, self).__init__(resource_driver) |