Moved to oslo_db namespace
Change-Id: Ib3f5bbd841ae198f41b36cd164e94435a13bdecf Closes-Bug: 1410546
This commit is contained in:
parent
b462badbb4
commit
c6a7cbbd69
|
@ -17,7 +17,7 @@ import copy
|
|||
import threading
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo.db import options
|
||||
from oslo_db import options
|
||||
from oslo.utils import excutils
|
||||
from sqlalchemy.sql import select
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ import os
|
|||
|
||||
from migrate.versioning import api as versioning_api
|
||||
from oslo.config import cfg
|
||||
from oslo.db.sqlalchemy.migration_cli import manager as migration_manager
|
||||
from oslo_db.sqlalchemy.migration_cli import manager as migration_manager
|
||||
|
||||
from designate.openstack.common import log as logging
|
||||
from designate.manage import base
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
from oslo.config import cfg
|
||||
from oslo.db import options
|
||||
from oslo_db import options
|
||||
|
||||
from designate.openstack.common import log as logging
|
||||
from designate import exceptions
|
||||
|
|
|
@ -17,8 +17,8 @@ import abc
|
|||
import threading
|
||||
|
||||
import six
|
||||
from oslo.db.sqlalchemy import utils as oslo_utils
|
||||
from oslo.db import exception as oslo_db_exception
|
||||
from oslo_db.sqlalchemy import utils as oslo_utils
|
||||
from oslo_db import exception as oslo_db_exception
|
||||
from oslo.utils import timeutils
|
||||
from sqlalchemy import exc as sqlalchemy_exc
|
||||
from sqlalchemy import select, or_
|
||||
|
|
|
@ -13,8 +13,8 @@
|
|||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
from oslo.db.sqlalchemy import models
|
||||
from oslo.db import exception as oslo_db_exc
|
||||
from oslo_db.sqlalchemy import models
|
||||
from oslo_db import exception as oslo_db_exc
|
||||
from sqlalchemy import Column, DateTime
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.types import CHAR
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
"""Session Handling for SQLAlchemy backend."""
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo.db.sqlalchemy import session
|
||||
from oslo_db.sqlalchemy import session
|
||||
|
||||
from designate.openstack.common import log as logging
|
||||
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
import logging
|
||||
|
||||
import sqlalchemy
|
||||
from oslo.db.sqlalchemy import utils
|
||||
from oslo.db.sqlalchemy.migration_cli import manager
|
||||
from oslo_db.sqlalchemy import utils
|
||||
from oslo_db.sqlalchemy.migration_cli import manager
|
||||
|
||||
from designate.i18n import _
|
||||
from designate.i18n import _LW
|
||||
|
|
|
@ -17,7 +17,7 @@ import time
|
|||
import hashlib
|
||||
|
||||
from oslo.config import cfg
|
||||
from oslo.db import options
|
||||
from oslo_db import options
|
||||
from sqlalchemy import select, distinct, func
|
||||
from sqlalchemy.sql.expression import or_
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ import hashlib
|
|||
from sqlalchemy import MetaData, Table, Enum
|
||||
from sqlalchemy.sql import select
|
||||
from migrate.changeset.constraint import UniqueConstraint
|
||||
from oslo.db import exception
|
||||
from oslo_db import exception
|
||||
|
||||
from designate import utils
|
||||
|
||||
|
|
Loading…
Reference in New Issue