Merge "Remove unused db_sync from extensions"
This commit is contained in:
commit
d8c0c81d68
|
@ -13,10 +13,7 @@
|
|||
# under the License.
|
||||
|
||||
from keystone.common import sql
|
||||
from keystone.common.sql import migration_helpers
|
||||
from keystone.contrib import endpoint_filter
|
||||
from keystone import exception
|
||||
from keystone.openstack.common.db.sqlalchemy import migration
|
||||
from keystone.openstack.common.gettextutils import _
|
||||
|
||||
|
||||
|
@ -33,11 +30,6 @@ class ProjectEndpoint(sql.ModelBase, sql.DictBase):
|
|||
|
||||
|
||||
class EndpointFilter(object):
|
||||
# Internal interface to manage the database
|
||||
|
||||
def db_sync(self, version=None):
|
||||
abs_path = migration_helpers.find_migrate_repo(endpoint_filter)
|
||||
migration.db_sync(sql.get_engine(), abs_path, version=version)
|
||||
|
||||
@sql.handle_conflicts(conflict_type='project_endpoint')
|
||||
def add_endpoint_to_project(self, endpoint_id, project_id):
|
||||
|
|
|
@ -13,11 +13,8 @@
|
|||
# under the License.
|
||||
|
||||
from keystone.common import sql
|
||||
from keystone.common.sql import migration_helpers
|
||||
from keystone.contrib import federation
|
||||
from keystone.contrib.federation import core
|
||||
from keystone import exception
|
||||
from keystone.openstack.common.db.sqlalchemy import migration
|
||||
from keystone.openstack.common import jsonutils
|
||||
|
||||
|
||||
|
@ -89,10 +86,6 @@ class MappingModel(sql.ModelBase, sql.DictBase):
|
|||
|
||||
class Federation(core.Driver):
|
||||
|
||||
def db_sync(self):
|
||||
abs_path = migration_helpers.find_migrate_repo(federation)
|
||||
migration.db_sync(sql.get_engine(), abs_path)
|
||||
|
||||
# Identity Provider CRUD
|
||||
@sql.handle_conflicts(conflict_type='identity_provider')
|
||||
def create_idp(self, idp_id, idp):
|
||||
|
|
|
@ -19,11 +19,8 @@ import uuid
|
|||
import six
|
||||
|
||||
from keystone.common import sql
|
||||
from keystone.common.sql import migration_helpers
|
||||
from keystone.contrib import oauth1
|
||||
from keystone.contrib.oauth1 import core
|
||||
from keystone import exception
|
||||
from keystone.openstack.common.db.sqlalchemy import migration
|
||||
from keystone.openstack.common.gettextutils import _
|
||||
from keystone.openstack.common import jsonutils
|
||||
from keystone.openstack.common import timeutils
|
||||
|
@ -85,10 +82,6 @@ class AccessToken(sql.ModelBase, sql.DictBase):
|
|||
|
||||
|
||||
class OAuth1(object):
|
||||
def db_sync(self):
|
||||
migration.db_sync(sql.get_engine(),
|
||||
migration_helpers.find_migrate_repo(oauth1))
|
||||
|
||||
def _get_consumer(self, session, consumer_id):
|
||||
consumer_ref = session.query(Consumer).get(consumer_id)
|
||||
if consumer_ref is None:
|
||||
|
|
Loading…
Reference in New Issue