diff --git a/neutron_lbaas/db/loadbalancer/loadbalancer_db.py b/neutron_lbaas/db/loadbalancer/loadbalancer_db.py index 68c74fd22..c5d055d93 100644 --- a/neutron_lbaas/db/loadbalancer/loadbalancer_db.py +++ b/neutron_lbaas/db/loadbalancer/loadbalancer_db.py @@ -24,11 +24,11 @@ from neutron.db import model_base from neutron.db import models_v2 from neutron.db import servicetype_db as st_db from neutron import manager -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants from oslo_db import exception from oslo_log import log as logging from oslo_utils import excutils +from oslo_utils import uuidutils import sqlalchemy as sa from sqlalchemy import orm from sqlalchemy.orm import exc diff --git a/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py b/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py index 286f17558..4cc26d894 100644 --- a/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py +++ b/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py @@ -26,10 +26,10 @@ from neutron.common import exceptions as n_exc from neutron import context import neutron.db.l3_db # noqa from neutron.db import servicetype_db as sdb -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants from neutron.tests.unit.db import test_db_base_plugin_v2 from oslo_config import cfg +from oslo_utils import uuidutils import testtools import webob.exc diff --git a/neutron_lbaas/tests/unit/drivers/common/test_agent_callbacks.py b/neutron_lbaas/tests/unit/drivers/common/test_agent_callbacks.py index 2c7ccaf76..7baa1480b 100644 --- a/neutron_lbaas/tests/unit/drivers/common/test_agent_callbacks.py +++ b/neutron_lbaas/tests/unit/drivers/common/test_agent_callbacks.py @@ -17,9 +17,9 @@ import mock from neutron import context from neutron.extensions import portbindings -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants from neutron.tests.unit import testlib_api +from oslo_utils import uuidutils import six from six import moves diff --git a/neutron_lbaas/tests/unit/services/loadbalancer/drivers/test_agent_driver_base.py b/neutron_lbaas/tests/unit/services/loadbalancer/drivers/test_agent_driver_base.py index 92a481e50..e4ee50586 100644 --- a/neutron_lbaas/tests/unit/services/loadbalancer/drivers/test_agent_driver_base.py +++ b/neutron_lbaas/tests/unit/services/loadbalancer/drivers/test_agent_driver_base.py @@ -19,9 +19,9 @@ from neutron import context from neutron.db import servicetype_db as st_db from neutron.extensions import portbindings from neutron import manager -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants from neutron.tests.unit import testlib_api +from oslo_utils import uuidutils import six from six import moves from webob import exc diff --git a/neutron_lbaas/tests/unit/services/loadbalancer/test_loadbalancer_plugin.py b/neutron_lbaas/tests/unit/services/loadbalancer/test_loadbalancer_plugin.py index b11675f6e..d44a91edf 100644 --- a/neutron_lbaas/tests/unit/services/loadbalancer/test_loadbalancer_plugin.py +++ b/neutron_lbaas/tests/unit/services/loadbalancer/test_loadbalancer_plugin.py @@ -17,9 +17,9 @@ import copy import mock from neutron.api.v2 import attributes as attr -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants from neutron.tests.unit.api.v2 import test_base +from oslo_utils import uuidutils from webob import exc from neutron_lbaas.extensions import loadbalancer