Migrate some stuff to neutron-lib

Partially-Implements: blueprint neutron-lib
Depends-On: If183b7a6797834e29c377937fc06261aa3b00249
Change-Id: Ic03ebb10a53b5d96a9472d4ba4cc4ef11983b229

neutron_lbaas/agent/agent_manager.py

@@ -14,10 +14,10 @@
 #    under the License.
 
 from neutron.agent import rpc as agent_rpc
-from neutron.common import exceptions as n_exc
 from neutron import context as ncontext
 from neutron.plugins.common import constants
 from neutron.services import provider_configuration as provconfig
+from neutron_lib import exceptions as n_exc
 from oslo_config import cfg
 from oslo_log import log as logging
 import oslo_messaging

neutron_lbaas/common/exceptions.py

@@ -17,7 +17,7 @@
 Neutron Lbaas base exception handling.
 """
 
-from neutron.common import exceptions
+from neutron_lib import exceptions
 
 from neutron_lbaas._i18n import _LE
 

neutron_lbaas/db/loadbalancer/loadbalancer_db.py

@@ -17,14 +17,14 @@ from neutron.api.v2 import attributes
 from neutron.callbacks import events
 from neutron.callbacks import registry
 from neutron.callbacks import resources
-from neutron.common import constants as n_constants
-from neutron.common import exceptions as n_exc
 from neutron.db import common_db_mixin as base_db
 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.plugins.common import constants
+from neutron_lib import constants as n_constants
+from neutron_lib import exceptions as n_exc
 from oslo_db import exception
 from oslo_utils import excutils
 from oslo_utils import uuidutils

neutron_lbaas/db/loadbalancer/loadbalancer_dbv2.py

@@ -17,11 +17,11 @@ from neutron.api.v2 import attributes
 from neutron.callbacks import events
 from neutron.callbacks import registry
 from neutron.callbacks import resources
-from neutron.common import constants as n_constants
-from neutron.common import exceptions as n_exc
 from neutron.db import common_db_mixin as base_db
 from neutron import manager
 from neutron.plugins.common import constants
+from neutron_lib import constants as n_constants
+from neutron_lib import exceptions as n_exc
 from oslo_db import exception
 from oslo_log import log as logging
 from oslo_utils import excutils

neutron_lbaas/drivers/common/agent_callbacks.py

@@ -12,9 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from neutron.common import exceptions as n_exc
 from neutron.extensions import portbindings
 from neutron.plugins.common import constants
+from neutron_lib import exceptions as n_exc
 from oslo_log import log as logging
 import oslo_messaging as messaging
 

neutron_lbaas/drivers/common/agent_driver_base.py

@@ -12,10 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from neutron.common import exceptions as n_exc
 from neutron.common import rpc as n_rpc
 from neutron.db import agents_db
 from neutron.services import provider_configuration as provconf
+from neutron_lib import exceptions as n_exc
 from oslo_config import cfg
 import oslo_messaging as messaging
 from oslo_utils import importutils

neutron_lbaas/drivers/haproxy/namespace_driver.py

@@ -20,9 +20,9 @@ import socket
 import netaddr
 from neutron.agent.linux import ip_lib
 from neutron.agent.linux import utils as linux_utils
-from neutron.common import exceptions
 from neutron.common import utils as n_utils
 from neutron.plugins.common import constants
+from neutron_lib import exceptions
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils

neutron_lbaas/drivers/haproxy/synchronous_namespace_driver.py

@@ -20,11 +20,11 @@ import netaddr
 from neutron.agent.common import config
 from neutron.agent.linux import interface
 from neutron.agent.linux import ip_lib
-from neutron.common import exceptions
 from neutron.common import utils as n_utils
 from neutron import context as ncontext
 from neutron.extensions import portbindings
 from neutron.plugins.common import constants
+from neutron_lib import exceptions
 from oslo_config import cfg
 from oslo_log import helpers as log_helpers
 from oslo_log import log as logging

neutron_lbaas/extensions/lbaas_agentscheduler.py

@@ -18,12 +18,12 @@ import abc
 from neutron.api import extensions
 from neutron.api.v2 import base
 from neutron.api.v2 import resource
-from neutron.common import constants
 from neutron.extensions import agent
 from neutron import manager
 from neutron.plugins.common import constants as plugin_const
 from neutron import policy
 from neutron import wsgi
+from neutron_lib import constants
 
 from neutron_lbaas._i18n import _
 from neutron_lbaas.extensions import loadbalancer

neutron_lbaas/extensions/loadbalancer.py

@@ -22,10 +22,10 @@ from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.api.v2 import base
 from neutron.api.v2 import resource_helper
-from neutron.common import exceptions as nexception
 from neutron import manager
 from neutron.plugins.common import constants
 from neutron.services import service_base
+from neutron_lib import exceptions as nexception
 
 from neutron_lbaas._i18n import _
 from neutron_lbaas.extensions import loadbalancerv2

neutron_lbaas/extensions/loadbalancerv2.py

@@ -24,10 +24,10 @@ from neutron.api import extensions
 from neutron.api.v2 import attributes as attr
 from neutron.api.v2 import base
 from neutron.api.v2 import resource_helper
-from neutron.common import exceptions as nexception
 from neutron import manager
 from neutron.plugins.common import constants
 from neutron.services import service_base
+from neutron_lib import exceptions as nexception
 
 from neutron_lbaas._i18n import _
 from neutron_lbaas.services.loadbalancer import constants as lb_const

neutron_lbaas/services/loadbalancer/agent/agent_manager.py

@@ -13,11 +13,11 @@
 #    under the License.
 
 from neutron.agent import rpc as agent_rpc
-from neutron.common import constants as n_const
-from neutron.common import exceptions as n_exc
 from neutron import context as ncontext
 from neutron.plugins.common import constants as np_const
 from neutron.services import provider_configuration as provconfig
+from neutron_lib import constants as n_const
+from neutron_lib import exceptions as n_exc
 from oslo_config import cfg
 from oslo_log import log as logging
 import oslo_messaging

neutron_lbaas/services/loadbalancer/agent_scheduler.py

@@ -16,10 +16,10 @@
 import random
 import sys
 
-from neutron.common import constants
 from neutron.db import agents_db
 from neutron.db import agentschedulers_db
 from neutron.db import model_base
+from neutron_lib import constants
 from oslo_log import log as logging
 import six
 import sqlalchemy as sa

neutron_lbaas/services/loadbalancer/drivers/common/agent_driver_base.py

@@ -14,13 +14,13 @@
 
 import uuid
 
-from neutron.common import constants as q_const
-from neutron.common import exceptions as n_exc
 from neutron.common import rpc as n_rpc
 from neutron.db import agents_db
 from neutron.extensions import portbindings
 from neutron.plugins.common import constants as np_const
 from neutron.services import provider_configuration as provconf
+from neutron_lib import constants as q_const
+from neutron_lib import exceptions as n_exc
 from oslo_config import cfg
 from oslo_log import log as logging
 import oslo_messaging

neutron_lbaas/services/loadbalancer/drivers/haproxy/namespace_driver.py

@@ -19,9 +19,9 @@ import socket
 import netaddr
 from neutron.agent.linux import ip_lib
 from neutron.agent.linux import utils
-from neutron.common import exceptions
 from neutron.common import utils as n_utils
 from neutron.plugins.common import constants
+from neutron_lib import exceptions
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils

neutron_lbaas/services/loadbalancer/drivers/netscaler/ncc_client.py

@@ -15,7 +15,7 @@
 
 import requests
 
-from neutron.common import exceptions as n_exc
+from neutron_lib import exceptions as n_exc
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
 

neutron_lbaas/services/loadbalancer/drivers/radware/exceptions.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 
-from neutron.common import exceptions
+from neutron_lib import exceptions
 
 from neutron_lbaas._i18n import _
 

neutron_lbaas/services/loadbalancer/plugin.py

@@ -16,7 +16,6 @@
 import six
 
 from neutron.api.v2 import attributes as attrs
-from neutron.common import exceptions as n_exc
 from neutron import context as ncontext
 from neutron.db import servicetype_db as st_db
 from neutron.extensions import flavors
@@ -25,6 +24,7 @@ from neutron.plugins.common import constants
 from neutron.services.flavors import flavors_plugin
 from neutron.services import provider_configuration as pconf
 from neutron.services import service_base
+from neutron_lib import exceptions as n_exc
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils

neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancer.py

@@ -21,14 +21,14 @@ from neutron.callbacks import events
 from neutron.callbacks import registry
 from neutron.callbacks import resources
 from neutron.common import config
-from neutron.common import constants as n_constants
-from neutron.common import exceptions as n_exc
 from neutron import context
 from neutron.db import servicetype_db as sdb
 from neutron import manager
 from neutron.plugins.common import constants
 from neutron.services import provider_configuration as pconf
 from neutron.tests.unit.db import test_db_base_plugin_v2
+from neutron_lib import constants as n_constants
+from neutron_lib import exceptions as n_exc
 import testtools
 import webob.exc
 

neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py

@@ -22,12 +22,12 @@ import six
 from neutron.api import extensions
 from neutron.api.v2 import attributes
 from neutron.common import config
-from neutron.common import constants as n_constants
-from neutron.common import exceptions as n_exc
 from neutron import context
 import neutron.db.l3_db  # noqa
 from neutron.plugins.common import constants
 from neutron.tests.unit.db import test_db_base_plugin_v2
+from neutron_lib import constants as n_constants
+from neutron_lib import exceptions as n_exc
 from oslo_config import cfg
 from oslo_utils import uuidutils
 import testtools

neutron_lbaas/tests/unit/drivers/haproxy/test_namespace_driver.py

@@ -18,8 +18,8 @@ import contextlib
 import socket
 
 import mock
-from neutron.common import exceptions
 from neutron.plugins.common import constants
+from neutron_lib import exceptions
 
 from neutron_lbaas.drivers.haproxy import namespace_driver
 from neutron_lbaas.services.loadbalancer import data_models

neutron_lbaas/tests/unit/drivers/haproxy/test_synchronous_driver.py

@@ -17,9 +17,9 @@ import collections
 import contextlib
 
 import mock
-from neutron.common import exceptions
 from neutron.extensions import portbindings
 from neutron.plugins.common import constants
+from neutron_lib import exceptions
 import six
 
 from neutron_lbaas.db.loadbalancer import models

neutron_lbaas/tests/unit/services/loadbalancer/drivers/haproxy/test_namespace_driver.py

@@ -15,7 +15,7 @@
 import contextlib
 
 import mock
-from neutron.common import exceptions
+from neutron_lib import exceptions
 import six
 
 from neutron_lbaas.services.loadbalancer.drivers.haproxy \

neutron_lbaas/tests/unit/services/loadbalancer/drivers/netscaler/test_netscaler_driver.py

@@ -15,10 +15,10 @@
 import contextlib
 
 import mock
-from neutron.common import exceptions
 from neutron import context
 from neutron import manager
 from neutron.plugins.common import constants
+from neutron_lib import exceptions
 
 from neutron_lbaas.db.loadbalancer import loadbalancer_db
 from neutron_lbaas.services.loadbalancer.drivers.netscaler import ncc_client

neutron_lbaas/tests/unit/services/loadbalancer/test_agent_scheduler.py

@@ -16,7 +16,6 @@
 import mock
 from neutron.api import extensions
 from neutron.api.v2 import attributes
-from neutron.common import constants
 from neutron import context
 from neutron.extensions import agent
 from neutron import manager
@@ -25,6 +24,7 @@ from neutron.tests.common import helpers
 from neutron.tests.unit.api import test_extensions
 from neutron.tests.unit.db import test_agentschedulers_db
 from neutron.tests.unit.extensions import test_agent
+from neutron_lib import constants
 from oslo_config import cfg
 import six
 from webob import exc

requirements.txt

@@ -6,6 +6,7 @@ pbr>=1.6 # Apache-2.0
 eventlet>=0.18.2 # MIT
 requests!=2.9.0,>=2.8.1 # Apache-2.0
 netaddr!=0.7.16,>=0.7.12 # BSD
+neutron-lib>=0.0.1 # Apache-2.0
 SQLAlchemy<1.1.0,>=1.0.10 # MIT
 alembic>=0.8.0 # MIT
 six>=1.9.0 # MIT