Remove sql.Base

With the change to use oslo's db.sqlalchemy.sessions, the
sql.Base class isn't doing enough to justify its continued
existence.

This change removes sql.Base.

Part of bp use-common-oslo-db-code

Change-Id: I2fec97187bdca920757585994810f6a8065be4c4

keystone/assignment/backends/sql.py

@@ -34,7 +34,7 @@ class AssignmentType:
     GROUP_DOMAIN = 'GroupDomain'
 
 
-class Assignment(sql.Base, assignment.Driver):
+class Assignment(assignment.Driver):
 
     # Internal interface to manage the database
     def db_sync(self, version=None):

keystone/catalog/backends/sql.py

@@ -77,7 +77,7 @@ class Endpoint(sql.ModelBase, sql.DictBase):
     extra = sql.Column(sql.JsonBlob())
 
 
-class Catalog(sql.Base, catalog.Driver):
+class Catalog(catalog.Driver):
     def db_sync(self, version=None):
         migration.db_sync(
             migration_helpers.find_migrate_repo(), version=version)

keystone/common/sql/core.py

@@ -209,12 +209,6 @@ def truncated(f):
     return wrapper
 
 
-# Backends
-class Base(object):
-    # TODO(blk-u): remove this class since doesn't do anything.
-    pass
-
-
 def _filter(model, query, hints):
     """Applies filtering to a query.
 

keystone/contrib/endpoint_filter/backends/sql.py

@@ -32,7 +32,7 @@ class ProjectEndpoint(sql.ModelBase, sql.DictBase):
                             nullable=False)
 
 
-class EndpointFilter(sql.Base):
+class EndpointFilter(object):
     # Internal interface to manage the database
 
     def db_sync(self, version=None):

keystone/contrib/federation/backends/sql.py

@@ -88,7 +88,7 @@ class MappingModel(sql.ModelBase, sql.DictBase):
         return d
 
 
-class Federation(sql.Base, core.Driver):
+class Federation(core.Driver):
 
     def db_sync(self):
         abs_path = migration_helpers.find_migrate_repo(federation)

keystone/contrib/oauth1/backends/sql.py

@@ -84,7 +84,7 @@ class AccessToken(sql.ModelBase, sql.DictBase):
         return dict(six.iteritems(self))
 
 
-class OAuth1(sql.Base):
+class OAuth1(object):
     def db_sync(self):
         migration.db_sync(migration_helpers.find_migrate_repo(oauth1))
 

keystone/credential/backends/sql.py

@@ -32,7 +32,7 @@ class CredentialModel(sql.ModelBase, sql.DictBase):
     extra = sql.Column(sql.JsonBlob())
 
 
-class Credential(sql.Base, credential.Driver):
+class Credential(credential.Driver):
     # Internal interface to manage the database
     def db_sync(self, version=None):
         migration.db_sync(

keystone/identity/backends/sql.py

@@ -75,7 +75,7 @@ class UserGroupMembership(sql.ModelBase, sql.DictBase):
 
 
 @dependency.requires('assignment_api')
-class Identity(sql.Base, identity.Driver):
+class Identity(identity.Driver):
     def default_assignment_driver(self):
         return "keystone.assignment.backends.sql.Assignment"
 

keystone/policy/backends/sql.py

@@ -29,7 +29,7 @@ class PolicyModel(sql.ModelBase, sql.DictBase):
     extra = sql.Column(sql.JsonBlob())
 
 
-class Policy(sql.Base, rules.Policy):
+class Policy(rules.Policy):
     # Internal interface to manage the database
     def db_sync(self, version=None):
         migration.db_sync(

keystone/tests/test_backend_ldap.py

@@ -1179,7 +1179,7 @@ class LDAPIdentityEnabledEmulation(LDAPIdentity):
             "Enabled emulation conflicts with enabled mask")
 
 
-class LdapIdentitySqlAssignment(sql.Base, tests.TestCase, BaseLDAPIdentity):
+class LdapIdentitySqlAssignment(tests.TestCase, BaseLDAPIdentity):
 
     def _set_config(self):
         self.config([tests.dirs.etc('keystone.conf.sample'),
@@ -1242,7 +1242,7 @@ class LdapIdentitySqlAssignment(sql.Base, tests.TestCase, BaseLDAPIdentity):
         self.skipTest('Blocked by bug 1221805')
 
 
-class MultiLDAPandSQLIdentity(sql.Base, tests.TestCase, BaseLDAPIdentity):
+class MultiLDAPandSQLIdentity(tests.TestCase, BaseLDAPIdentity):
     """Class to test common SQL plus individual LDAP backends.
 
     We define a set of domains and domain-specific backends:

keystone/tests/test_backend_sql.py

@@ -32,7 +32,7 @@ CONF = config.CONF
 DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id
 
 
-class SqlTests(tests.TestCase, sql.Base):
+class SqlTests(tests.TestCase):
 
     def setUp(self):
         super(SqlTests, self).setUp()

keystone/tests/test_keystoneclient_sql.py

@@ -17,7 +17,6 @@ import uuid
 
 from keystoneclient.contrib.ec2 import utils as ec2_utils
 
-from keystone.common import sql
 from keystone import config
 from keystone import tests
 from keystone.tests import test_keystoneclient
@@ -26,7 +25,7 @@ from keystone.tests import test_keystoneclient
 CONF = config.CONF
 
 
-class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase, sql.Base):
+class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase):
     def config(self, config_files):
         super(KcMasterSqlTestCase, self).config([
             tests.dirs.etc('keystone.conf.sample'),

keystone/token/backends/sql.py

@@ -36,7 +36,7 @@ class TokenModel(sql.ModelBase, sql.DictBase):
     )
 
 
-class Token(sql.Base, token.Driver):
+class Token(token.Driver):
     # Public interface
     def get_token(self, token_id):
         if token_id is None:

keystone/trust/backends/sql.py

@@ -42,7 +42,7 @@ class TrustRole(sql.ModelBase):
     role_id = sql.Column(sql.String(64), primary_key=True, nullable=False)
 
 
-class Trust(sql.Base, trust.Driver):
+class Trust(trust.Driver):
     @sql.handle_conflicts(conflict_type='trust')
     def create_trust(self, trust_id, trust, roles):
         session = db_session.get_session()