Removes unused db_sync methods
In reviewing https://review.openstack.org/79211 we discovered that none of the db_sync methods are called anymore. Change-Id: Ie9714822efd06ba51654ac3aa3b93886cae24d6f
This commit is contained in:
parent
87414ade06
commit
05f3c12107
@ -18,10 +18,8 @@ import sqlalchemy
|
|||||||
from keystone import assignment
|
from keystone import assignment
|
||||||
from keystone import clean
|
from keystone import clean
|
||||||
from keystone.common import sql
|
from keystone.common import sql
|
||||||
from keystone.common.sql import migration_helpers
|
|
||||||
from keystone import config
|
from keystone import config
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.openstack.common.db.sqlalchemy import migration
|
|
||||||
from keystone.openstack.common.gettextutils import _
|
from keystone.openstack.common.gettextutils import _
|
||||||
|
|
||||||
|
|
||||||
@ -37,12 +35,6 @@ class AssignmentType:
|
|||||||
|
|
||||||
class Assignment(assignment.Driver):
|
class Assignment(assignment.Driver):
|
||||||
|
|
||||||
# Internal interface to manage the database
|
|
||||||
def db_sync(self, version=None):
|
|
||||||
migration.db_sync(
|
|
||||||
sql.get_engine(), migration_helpers.find_migrate_repo(),
|
|
||||||
version=version)
|
|
||||||
|
|
||||||
def _get_project(self, session, project_id):
|
def _get_project(self, session, project_id):
|
||||||
project_ref = session.query(Project).get(project_id)
|
project_ref = session.query(Project).get(project_id)
|
||||||
if project_ref is None:
|
if project_ref is None:
|
||||||
|
@ -19,10 +19,8 @@ import sqlalchemy
|
|||||||
from keystone import catalog
|
from keystone import catalog
|
||||||
from keystone.catalog import core
|
from keystone.catalog import core
|
||||||
from keystone.common import sql
|
from keystone.common import sql
|
||||||
from keystone.common.sql import migration_helpers
|
|
||||||
from keystone import config
|
from keystone import config
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.openstack.common.db.sqlalchemy import migration
|
|
||||||
|
|
||||||
|
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
@ -82,10 +80,6 @@ class Endpoint(sql.ModelBase, sql.DictBase):
|
|||||||
|
|
||||||
|
|
||||||
class Catalog(catalog.Driver):
|
class Catalog(catalog.Driver):
|
||||||
def db_sync(self, version=None):
|
|
||||||
migration.db_sync(
|
|
||||||
sql.get_engine(), migration_helpers.find_migrate_repo(),
|
|
||||||
version=version)
|
|
||||||
|
|
||||||
# Regions
|
# Regions
|
||||||
def list_regions(self):
|
def list_regions(self):
|
||||||
|
@ -13,10 +13,8 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from keystone.common import sql
|
from keystone.common import sql
|
||||||
from keystone.common.sql import migration_helpers
|
|
||||||
from keystone import credential
|
from keystone import credential
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.openstack.common.db.sqlalchemy import migration
|
|
||||||
|
|
||||||
|
|
||||||
class CredentialModel(sql.ModelBase, sql.DictBase):
|
class CredentialModel(sql.ModelBase, sql.DictBase):
|
||||||
@ -32,11 +30,6 @@ class CredentialModel(sql.ModelBase, sql.DictBase):
|
|||||||
|
|
||||||
|
|
||||||
class Credential(credential.Driver):
|
class Credential(credential.Driver):
|
||||||
# Internal interface to manage the database
|
|
||||||
def db_sync(self, version=None):
|
|
||||||
migration.db_sync(
|
|
||||||
sql.get_engine(), migration_helpers.find_migrate_repo(),
|
|
||||||
version=version)
|
|
||||||
|
|
||||||
# credential crud
|
# credential crud
|
||||||
|
|
||||||
|
@ -14,11 +14,9 @@
|
|||||||
|
|
||||||
from keystone.common import dependency
|
from keystone.common import dependency
|
||||||
from keystone.common import sql
|
from keystone.common import sql
|
||||||
from keystone.common.sql import migration_helpers
|
|
||||||
from keystone.common import utils
|
from keystone.common import utils
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone import identity
|
from keystone import identity
|
||||||
from keystone.openstack.common.db.sqlalchemy import migration
|
|
||||||
from keystone.openstack.common.gettextutils import _
|
from keystone.openstack.common.gettextutils import _
|
||||||
|
|
||||||
# Import assignment sql to ensure that the models defined in there are
|
# Import assignment sql to ensure that the models defined in there are
|
||||||
@ -79,12 +77,6 @@ class Identity(identity.Driver):
|
|||||||
def default_assignment_driver(self):
|
def default_assignment_driver(self):
|
||||||
return "keystone.assignment.backends.sql.Assignment"
|
return "keystone.assignment.backends.sql.Assignment"
|
||||||
|
|
||||||
# Internal interface to manage the database
|
|
||||||
def db_sync(self, version=None):
|
|
||||||
migration.db_sync(
|
|
||||||
sql.get_engine(), migration_helpers.find_migrate_repo(),
|
|
||||||
version=version)
|
|
||||||
|
|
||||||
def _check_password(self, password, user_ref):
|
def _check_password(self, password, user_ref):
|
||||||
"""Check the specified password against the data store.
|
"""Check the specified password against the data store.
|
||||||
|
|
||||||
|
@ -13,9 +13,7 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from keystone.common import sql
|
from keystone.common import sql
|
||||||
from keystone.common.sql import migration_helpers
|
|
||||||
from keystone import exception
|
from keystone import exception
|
||||||
from keystone.openstack.common.db.sqlalchemy import migration
|
|
||||||
from keystone.policy.backends import rules
|
from keystone.policy.backends import rules
|
||||||
|
|
||||||
|
|
||||||
@ -29,11 +27,6 @@ class PolicyModel(sql.ModelBase, sql.DictBase):
|
|||||||
|
|
||||||
|
|
||||||
class Policy(rules.Policy):
|
class Policy(rules.Policy):
|
||||||
# Internal interface to manage the database
|
|
||||||
def db_sync(self, version=None):
|
|
||||||
migration.db_sync(
|
|
||||||
sql.get_engine(), migration_helpers.find_migrate_repo(),
|
|
||||||
version=version)
|
|
||||||
|
|
||||||
@sql.handle_conflicts(conflict_type='policy')
|
@sql.handle_conflicts(conflict_type='policy')
|
||||||
def create_policy(self, policy_id, policy):
|
def create_policy(self, policy_id, policy):
|
||||||
|
Loading…
Reference in New Issue
Block a user