Switch to using of oslo.db
oslo.db first stable release has been cut and we can start using it instead of openstack/common/db/* code which is now marked obsolete. Change-Id: I1ccf896922a5a762d37a1a3b93c56c8b8ae8c085
This commit is contained in:
parent
93816926df
commit
d0ec6c5443
|
@ -13,6 +13,7 @@
|
|||
# under the License.
|
||||
#
|
||||
|
||||
from oslo.db import exception
|
||||
import sqlalchemy as sa
|
||||
from sqlalchemy import orm
|
||||
from sqlalchemy.orm import exc
|
||||
|
@ -26,7 +27,6 @@ from neutron.db import models_v2
|
|||
from neutron.db import servicetype_db as st_db
|
||||
from neutron.extensions import loadbalancer
|
||||
from neutron import manager
|
||||
from neutron.openstack.common.db import exception
|
||||
from neutron.openstack.common import excutils
|
||||
from neutron.openstack.common import log as logging
|
||||
from neutron.openstack.common import uuidutils
|
||||
|
|
|
@ -19,9 +19,9 @@ import sys
|
|||
|
||||
import mock
|
||||
from oslo.config import cfg
|
||||
from oslo.db import exception as n_exc
|
||||
|
||||
from neutron import context
|
||||
from neutron.openstack.common.db import exception as n_exc
|
||||
from neutron.tests.unit.db.loadbalancer import test_db_loadbalancer
|
||||
|
||||
HELEOSAPIMOCK = mock.Mock()
|
||||
|
|
|
@ -2,8 +2,6 @@
|
|||
# The list of modules to copy from oslo-incubator.git
|
||||
module=cache
|
||||
module=context
|
||||
module=db
|
||||
module=db.sqlalchemy
|
||||
module=eventlet_backdoor
|
||||
module=excutils
|
||||
module=fileutils
|
||||
|
|
|
@ -23,6 +23,7 @@ alembic>=0.4.1
|
|||
six>=1.7.0
|
||||
stevedore>=0.14
|
||||
oslo.config>=1.2.1
|
||||
oslo.db>=0.2.0
|
||||
oslo.messaging>=1.3.0
|
||||
oslo.rootwrap
|
||||
|
||||
|
|
Loading…
Reference in New Issue