NSX: make use of neutron_lib exceptions

Commit 87a79256c494c36f2d9597313f430b24c0110161 added neutron_lib
for shared exceptions. This patch moves us to make use of the
aforementioned library.

Change-Id: I9fe014c5da85faca87bf88a80c4ee19f7f123123
This commit is contained in:
Abhishek Raut 2016-02-21 08:39:56 -08:00
parent e5a97461cc
commit 8c61877187
49 changed files with 52 additions and 51 deletions

View File

@ -14,7 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from neutron.common import exceptions as n_exc
from neutron_lib import exceptions as n_exc
from vmware_nsx._i18n import _

View File

@ -14,9 +14,9 @@
# under the License.
from neutron.api.v2 import attributes as attr
from neutron.common import exceptions as n_exc
from neutron.extensions import multiprovidernet as mpnet
from neutron.extensions import providernet as pnet
from neutron_lib import exceptions as n_exc
from oslo_log import log
import six

View File

@ -16,13 +16,13 @@
import random
from neutron_lib import constants
from neutron_lib import exceptions
from oslo_log import log
from oslo_serialization import jsonutils
from oslo_service import loopingcall
from oslo_utils import timeutils
import six
from neutron.common import exceptions
from neutron import context
from neutron.db import external_net_db
from neutron.db import l3_db

View File

@ -16,8 +16,8 @@
import hashlib
from neutron.api.v2 import attributes
from neutron.common import exceptions
from neutron import version
from neutron_lib import exceptions
from oslo_config import cfg
from oslo_log import log
import retrying

View File

@ -15,8 +15,8 @@
from sqlalchemy.orm import exc as sa_orm_exc
from neutron.api.v2 import attributes
from neutron.common import exceptions
from neutron.plugins.common import utils
from neutron_lib import exceptions
from oslo_log import log as logging
from oslo_utils import uuidutils
import six

View File

@ -15,7 +15,7 @@
# under the License.
#
from neutron.common import exceptions as n_exc
from neutron_lib import exceptions as n_exc
from oslo_config import cfg
from oslo_db import exception as db_exc
from oslo_log import log as logging

View File

@ -15,9 +15,9 @@
# under the License.
#
from neutron.common import exceptions as n_exc
from neutron.extensions import external_net
from neutron_lib import constants as const
from neutron_lib import exceptions as n_exc
from oslo_log import log as logging
from vmware_nsx._i18n import _, _LE

View File

@ -16,12 +16,12 @@
#
from neutron_lib import constants as const
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
from neutron.api.v2 import attributes as attr
from neutron.common import exceptions as n_exc
from neutron.db import db_base_plugin_v2
from neutron.db import l3_db
from neutron.extensions import external_net

View File

@ -17,12 +17,12 @@
from eventlet import greenthread
import netaddr
from neutron_lib import constants as const
from neutron_lib import exceptions as ntn_exc
from oslo_config import cfg
from oslo_log import log as logging
from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
from neutron.api.v2 import attributes
from neutron.common import exceptions as ntn_exc
from neutron.db import db_base_plugin_v2
from neutron.db import models_v2

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from neutron.common import exceptions
from neutron_lib import exceptions
from oslo_log import log as logging
from oslo_utils import excutils
from oslo_vmware import vim_util

View File

@ -19,9 +19,10 @@ import abc
from neutron.api import extensions
from neutron.api.v2 import attributes as attr
from neutron.api.v2 import base
from neutron.common import exceptions as nexception
from neutron import manager
from neutron_lib import exceptions as nexception
from vmware_nsx._i18n import _
# For policy.json/Auth

View File

@ -13,8 +13,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from neutron.common import exceptions as exception
from neutron import version
from neutron_lib import exceptions as exception
from oslo_log import log
from oslo_serialization import jsonutils
import six

View File

@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from neutron.common import exceptions as exception
from neutron_lib import exceptions as exception
from oslo_log import log
from oslo_serialization import jsonutils
import six

View File

@ -14,7 +14,7 @@
# under the License.
from neutron.api.v2 import attributes as attr
from neutron.common import exceptions as exception
from neutron_lib import exceptions as exception
from oslo_log import log
from oslo_serialization import jsonutils
from oslo_utils import excutils

View File

@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from neutron.common import exceptions as exception
from neutron_lib import exceptions as exception
from oslo_config import cfg
from oslo_log import log
from oslo_serialization import jsonutils

View File

@ -14,12 +14,11 @@
# under the License.
from neutron_lib import constants
from neutron_lib import exceptions
from oslo_log import log
from oslo_serialization import jsonutils
from oslo_utils import excutils
from neutron.common import exceptions
from vmware_nsx._i18n import _LW
from vmware_nsx.common import utils
from vmware_nsx.nsxlib import mh as nsxlib

View File

@ -15,12 +15,11 @@
#
from neutron_lib import constants
from neutron_lib import exceptions as exception
from oslo_config import cfg
from oslo_log import log
from oslo_serialization import jsonutils
from neutron.common import exceptions as exception
from vmware_nsx._i18n import _, _LE, _LI, _LW
from vmware_nsx.api_client import exception as api_exc
from vmware_nsx.common import exceptions as nsx_exc

View File

@ -18,7 +18,7 @@ NSX-V3 Plugin router module
"""
import copy
from neutron.common import exceptions as n_exc
from neutron_lib import exceptions as n_exc
from oslo_log import log
from vmware_nsx._i18n import _, _LW

View File

@ -20,7 +20,6 @@ from oslo_utils import excutils
from neutron.api import extensions as neutron_extensions
from neutron.api.v2 import attributes as attr
from neutron.common import exceptions as n_exc
from neutron.db import agentschedulers_db
from neutron.db import allowedaddresspairs_db as addr_pair_db
from neutron.db import db_base_plugin_v2
@ -37,6 +36,7 @@ from neutron.extensions import providernet as pnet
from neutron.extensions import securitygroup as ext_sg
from neutron.plugins.common import constants
from neutron.plugins.common import utils
from neutron_lib import exceptions as n_exc
import vmware_nsx
from vmware_nsx._i18n import _, _LE, _LW

View File

@ -16,6 +16,7 @@
import uuid
from neutron_lib import constants
from neutron_lib import exceptions as n_exc
from oslo_concurrency import lockutils
from oslo_config import cfg
from oslo_db import exception as db_exc
@ -29,7 +30,6 @@ import webob.exc
from neutron.api import extensions as neutron_extensions
from neutron.api.v2 import attributes as attr
from neutron.api.v2 import base
from neutron.common import exceptions as n_exc
from neutron import context as q_context
from neutron.db import agentschedulers_db
from neutron.db import allowedaddresspairs_db as addr_pair_db

View File

@ -16,9 +16,10 @@ from oslo_log import log as logging
from oslo_utils import excutils
from neutron.api.v2 import attributes as attr
from neutron.common import exceptions as n_exc
from neutron.db import l3_db
from neutron_lib import exceptions as n_exc
from vmware_nsx._i18n import _LE
from vmware_nsx.common import locking
from vmware_nsx.db import nsxv_db

View File

@ -20,7 +20,7 @@ import hmac
import netaddr
from neutron.api.v2 import attributes as attr
from neutron import context as neutron_context
from neutron_lib import constants as constants
from neutron_lib import constants
from oslo_config import cfg
from oslo_log import log as logging

View File

@ -19,6 +19,7 @@ import uuid
import netaddr
from neutron_lib import constants
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
@ -30,7 +31,6 @@ from neutron.api.v2 import attributes as attr
from neutron.callbacks import events
from neutron.callbacks import registry
from neutron.callbacks import resources
from neutron.common import exceptions as n_exc
from neutron.db import agents_db
from neutron.db import allowedaddresspairs_db as addr_pair_db
from neutron.db import db_base_plugin_v2

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from neutron.common import exceptions
from neutron_lib import exceptions
from vmware_nsx._i18n import _

View File

@ -26,11 +26,12 @@ from oslo_utils import uuidutils
from six import moves
from sqlalchemy.orm import exc as sa_exc
from neutron.common import exceptions as n_exc
from neutron import context as q_context
from neutron.extensions import l3
from neutron.plugins.common import constants as plugin_const
from neutron_lib import exceptions as n_exc
from vmware_nsx._i18n import _, _LE, _LW
from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.common import locking

View File

@ -18,7 +18,7 @@ import uuid
from eventlet import event
from eventlet import greenthread
from neutron.common import exceptions
from neutron_lib import exceptions
from oslo_log import log as logging
from oslo_service import loopingcall
import six

View File

@ -23,7 +23,6 @@ from neutron.callbacks import events
from neutron.callbacks import exceptions as callback_exc
from neutron.callbacks import registry
from neutron.callbacks import resources
from neutron.common import exceptions as n_exc
from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.common import utils as neutron_utils
@ -53,6 +52,7 @@ from neutron.extensions import securitygroup as ext_sg
from neutron.plugins.common import constants as plugin_const
from neutron.plugins.common import utils as n_utils
from neutron_lib import constants as const
from neutron_lib import exceptions as n_exc
from oslo_config import cfg
from oslo_log import log
from oslo_utils import excutils

View File

@ -17,8 +17,8 @@
from networking_l2gw.db.l2gateway import l2gateway_db
from networking_l2gw.services.l2gateway.common import constants as l2gw_const
from networking_l2gw.services.l2gateway import exceptions as l2gw_exc
from neutron.common import exceptions as n_exc
from neutron import manager
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

View File

@ -27,11 +27,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 exceptions as n_exc
from neutron import context
from neutron.extensions import providernet
from neutron import manager
from neutron.plugins.common import utils as n_utils
from neutron_lib import exceptions as n_exc
from vmware_nsx._i18n import _, _LE, _LI
from vmware_nsx.common import exceptions as nsx_exc

View File

@ -16,7 +16,7 @@
import netaddr
import xml.etree.ElementTree as et
from neutron.common import exceptions as n_exc
from neutron_lib import exceptions as n_exc
from vmware_nsx._i18n import _
from vmware_nsx.common import locking

View File

@ -13,9 +13,9 @@
# License for the specific language governing permissions and limitations
# under the License.
from neutron.common import exceptions as n_exc
from neutron import manager
from neutron.plugins.common import constants
from neutron_lib import exceptions as n_exc
from oslo_log import log as logging
from oslo_utils import excutils

View File

@ -16,8 +16,8 @@
import logging
from neutron.callbacks import registry
from neutron.common import exceptions
from neutron.db import l3_db
from neutron_lib import exceptions
from oslo_utils import uuidutils
from vmware_nsx._i18n import _LE, _LI

View File

@ -24,7 +24,7 @@ import vmware_nsx.shell.admin.plugins.nsxv.resources.utils as utils
import vmware_nsx.shell.nsxadmin as shell
from neutron.callbacks import registry
from neutron.common import exceptions
from neutron_lib import exceptions
from vmware_nsx._i18n import _LE, _LI
from vmware_nsx.db import nsxv_db

View File

@ -24,7 +24,7 @@ import vmware_nsx.shell.admin.plugins.nsxv.resources.utils as utils
import vmware_nsx.shell.nsxadmin as shell
from neutron.callbacks import registry
from neutron.common import exceptions
from neutron_lib import exceptions
from vmware_nsx._i18n import _LE, _LI
from vmware_nsx.db import nsxv_db

View File

@ -17,12 +17,12 @@ import mock
from oslo_config import cfg
from oslo_utils import uuidutils
from neutron.common import exceptions as exp
from neutron import context
from neutron.extensions import portbindings
from neutron import manager
from neutron.tests import base
import neutron.tests.unit.db.test_db_base_plugin_v2 as test_plugin
from neutron_lib import exceptions as exp
from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.db import db as nsx_db
from vmware_nsx.dvs import dvs

View File

@ -16,10 +16,10 @@
import mock
import netaddr
from neutron_lib import constants
from neutron_lib import exceptions as n_exc
from oslo_config import cfg
import webob.exc
from neutron.common import exceptions as n_exc
from neutron import manager
from vmware_nsx.api_client import exception as api_exc

View File

@ -15,9 +15,9 @@
import mock
from neutron_lib import constants as n_consts
from neutron_lib import exceptions as n_exc
from oslo_config import cfg
from neutron.common import exceptions as n_exc
from neutron import context
from neutron.tests import base
from neutron.tests.unit import testlib_api

View File

@ -17,7 +17,6 @@ import uuid
import mock
from neutron.api.v2 import attributes
from neutron.common import exceptions as ntn_exc
from neutron import context
from neutron.extensions import dvr
from neutron.extensions import external_net
@ -35,6 +34,7 @@ import neutron.tests.unit.extensions.test_l3_ext_gw_mode as test_ext_gw_mode
import neutron.tests.unit.extensions.test_securitygroup as ext_sg
from neutron.tests.unit import testlib_api
from neutron_lib import constants
from neutron_lib import exceptions as ntn_exc
from oslo_config import cfg
from oslo_db import exception as db_exc
from oslo_log import log

View File

@ -19,12 +19,12 @@ import time
import mock
from neutron_lib import constants
from neutron_lib import exceptions as n_exc
from oslo_config import cfg
from oslo_log import log
from oslo_serialization import jsonutils
from neutron.api.v2 import attributes as attr
from neutron.common import exceptions as n_exc
from neutron import context
from neutron.extensions import l3
from neutron.tests import base

View File

@ -18,7 +18,6 @@ from eventlet import greenthread
import mock
import netaddr
from neutron.api.v2 import attributes
from neutron.common import exceptions as n_exc
from neutron import context
from neutron.extensions import dvr as dist_router
from neutron.extensions import external_net
@ -38,6 +37,7 @@ import neutron.tests.unit.extensions.test_portsecurity as test_psec
import neutron.tests.unit.extensions.test_securitygroup as ext_sg
from neutron.tests.unit import testlib_api
from neutron_lib import constants
from neutron_lib import exceptions as n_exc
from oslo_config import cfg
from oslo_db import exception as db_exc
from oslo_utils import uuidutils

View File

@ -18,10 +18,10 @@ from oslo_config import cfg
from oslo_utils import uuidutils
from six import moves
from neutron.common import exceptions as n_exc
from neutron import context
from neutron.plugins.common import constants as plugin_const
from neutron.tests.unit import testlib_api
from neutron_lib import exceptions as n_exc
from vmware_nsx.common import nsxv_constants
from vmware_nsx.db import nsxv_db
from vmware_nsx.plugins.nsx_v.vshield.common import (

View File

@ -17,7 +17,6 @@ import six
from webob import exc
from neutron.api.v2 import attributes
from neutron.common import exceptions as n_exc
from neutron import context
from neutron.db import models_v2
from neutron.extensions import availability_zone as az_ext
@ -41,6 +40,7 @@ from neutron.tests.unit.scheduler \
from neutron import version
from neutron_lib import constants
from neutron_lib import exceptions as n_exc
from oslo_config import cfg
from oslo_serialization import jsonutils
from oslo_utils import uuidutils

View File

@ -14,8 +14,8 @@
# limitations under the License.
import mock
from neutron.common import exceptions
from neutron.tests import base
from neutron_lib import exceptions
from oslo_serialization import jsonutils
import six

View File

@ -15,7 +15,7 @@
#
import mock
from neutron.common import exceptions
from neutron_lib import exceptions
from vmware_nsx.api_client import exception as api_exc
from vmware_nsx.nsxlib import mh as nsxlib

View File

@ -15,8 +15,8 @@
#
import mock
from neutron.common import exceptions
from neutron.tests.unit.api.v2 import test_base
from neutron_lib import exceptions
from oslo_config import cfg
from oslo_utils import uuidutils

View File

@ -14,9 +14,9 @@
# limitations under the License.
#
from neutron.common import exceptions
from neutron.tests.unit.api.v2 import test_base
from neutron_lib import constants
from neutron_lib import exceptions
from vmware_nsx.nsxlib import mh as nsxlib
from vmware_nsx.nsxlib.mh import secgroup as secgrouplib

View File

@ -17,9 +17,9 @@
import hashlib
import mock
from neutron.common import exceptions
from neutron.tests.unit.api.v2 import test_base
from neutron_lib import constants
from neutron_lib import exceptions
from vmware_nsx.common import utils
from vmware_nsx.nsxlib.mh import switch as switchlib

View File

@ -21,10 +21,10 @@ from oslo_config import cfg
from oslo_utils import importutils
from oslo_utils import uuidutils
from neutron.common import exceptions as n_exc
from neutron import context
from neutron.tests import base
from neutron_lib import exceptions as n_exc
from vmware_nsx.common import nsx_constants
from vmware_nsx.services.l2gateway.common import plugin as l2gw_plugin
from vmware_nsx.services.l2gateway.nsx_v3 import driver as nsx_v3_driver

View File

@ -14,11 +14,11 @@
# under the License.
import mock
from neutron.common import exceptions as n_exc
from neutron import context
from neutron.tests import base
from networking_l2gw.db.l2gateway import l2gateway_db
from neutron_lib import exceptions as n_exc
from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.db import nsxv_db
from vmware_nsx.services.l2gateway.nsx_v import driver as nsx_v_driver