From fe5ee0a36a59675427801f7d3d2aefb89fc49ef2 Mon Sep 17 00:00:00 2001 From: Vishakha Agarwal Date: Tue, 13 Nov 2018 13:04:41 +0530 Subject: [PATCH] Removing default_assigment_driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The [assignment] driver now defaults to sql. Logic to determine the default assignment driver if one wasn’t supplied through configuration has been removed. Same for [resource] driver. This patch removes the func default_assignment _driver used nowhere except test case from assignment as well as resource. Change-Id: Idb6c96dcabe9d93ecce6b8857f8f5bebba9dee27 --- keystone/identity/backends/base.py | 5 ----- keystone/resource/backends/sql.py | 3 --- keystone/tests/unit/identity/backends/test_base.py | 4 ---- 3 files changed, 12 deletions(-) diff --git a/keystone/identity/backends/base.py b/keystone/identity/backends/base.py index 953311b465..bdd13ce9b8 100644 --- a/keystone/identity/backends/base.py +++ b/keystone/identity/backends/base.py @@ -154,11 +154,6 @@ class IdentityDriverBase(object): """Indicate if the driver supports domains.""" return True - def default_assignment_driver(self): - # TODO(morganfainberg): To be removed when assignment driver based - # upon [identity]/driver option is removed in the "O" release. - return 'sql' - @property def is_sql(self): """Indicate if this Driver uses SQL.""" diff --git a/keystone/resource/backends/sql.py b/keystone/resource/backends/sql.py index 09b7d1b30f..79fbb7d060 100644 --- a/keystone/resource/backends/sql.py +++ b/keystone/resource/backends/sql.py @@ -27,9 +27,6 @@ class Resource(base.ResourceDriverBase): # TODO(morgan): Merge all of this code into the manager, Resource backend # is only SQL. There is no configurable driver. - def default_assignment_driver(self): - return 'sql' - def _encode_domain_id(self, ref): if 'domain_id' in ref and ref['domain_id'] is None: new_ref = ref.copy() diff --git a/keystone/tests/unit/identity/backends/test_base.py b/keystone/tests/unit/identity/backends/test_base.py index c5b3f59fba..17aee984c5 100644 --- a/keystone/tests/unit/identity/backends/test_base.py +++ b/keystone/tests/unit/identity/backends/test_base.py @@ -78,10 +78,6 @@ class IdentityDriverTests(object): self.assertIs(self.expected_is_domain_aware, self.driver.is_domain_aware()) - def test_default_assignment_driver(self): - self.assertEqual(self.expected_default_assignment_driver, - self.driver.default_assignment_driver()) - def test_is_sql(self): self.assertIs(self.expected_is_sql, self.driver.is_sql)