Merge "Removing default_assigment_driver"

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."""

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()

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)