use neutron-lib's OVO exceptions

neutron-lib contains the OVO exception module. This patch switches all
such reference's over to lib's version of the module and removes it
from neutron.

Change-Id: Ic3d435eef51f970598bf50486894838498b2d438
Note: We don't currently have any out-of-tree consumers of this module.

neutron/db/allowedaddresspairs_db.py

@@ -15,13 +15,13 @@
 
 from neutron_lib.api.definitions import port as port_def
 from neutron_lib.api import validators
+from neutron_lib.objects import exceptions
 
 from neutron.common import utils
 from neutron.db import _resource_extend as resource_extend
 from neutron.db import _utils as db_utils
 from neutron.db import api as db_api
 from neutron.extensions import allowedaddresspairs as addr_pair
-from neutron.objects import exceptions
 from neutron.objects.port.extensions import (allowedaddresspairs
     as obj_addr_pair)
 

neutron/db/api.py

@@ -20,6 +20,7 @@ import weakref
 from debtcollector import removals
 from neutron_lib.db import api
 from neutron_lib import exceptions
+from neutron_lib.objects import exceptions as obj_exc
 from oslo_config import cfg
 from oslo_db import api as oslo_db_api
 from oslo_db import exception as db_exc
@@ -35,8 +36,6 @@ from sqlalchemy import exc as sql_exc
 from sqlalchemy import orm
 from sqlalchemy.orm import exc
 
-from neutron.objects import exceptions as obj_exc
-
 
 def set_hook(engine):
     if (profiler_opts.is_trace_enabled() and

neutron/db/dvr_mac_db.py

@@ -21,6 +21,7 @@ from neutron_lib.callbacks import registry
 from neutron_lib.callbacks import resources
 from neutron_lib import constants
 from neutron_lib import exceptions as n_exc
+from neutron_lib.objects import exceptions
 from neutron_lib.plugins import directory
 from oslo_config import cfg
 from oslo_log import helpers as log_helpers
@@ -32,7 +33,6 @@ from neutron.common import utils
 from neutron.db import api as db_api
 from neutron.db import models_v2
 from neutron.extensions import dvr as ext_dvr
-from neutron.objects import exceptions
 from neutron.objects import router
 
 

neutron/objects/base.py

@@ -17,6 +17,7 @@ import functools
 import itertools
 
 from neutron_lib import exceptions as n_exc
+from neutron_lib.objects import exceptions as o_exc
 from oslo_db import exception as obj_exc
 from oslo_db.sqlalchemy import utils as db_utils
 from oslo_serialization import jsonutils
@@ -28,7 +29,6 @@ from neutron._i18n import _
 from neutron.db import api as db_api
 from neutron.db import standard_attr
 from neutron.objects.db import api as obj_db_api
-from neutron.objects import exceptions as o_exc
 from neutron.objects.extensions import standardattributes
 
 _NO_DB_MODEL = object()

neutron/objects/common_types.py

@@ -17,6 +17,7 @@ import uuid
 import netaddr
 from neutron_lib import constants as lib_constants
 from neutron_lib.db import constants as lib_db_const
+from neutron_lib.objects import exceptions as o_exc
 
 from oslo_serialization import jsonutils
 from oslo_versionedobjects import fields as obj_fields
@@ -25,7 +26,6 @@ import six
 from neutron._i18n import _
 from neutron.common import constants
 from neutron.common import utils
-from neutron.objects import exceptions as o_exc
 from neutron.plugins.common import constants as plugin_constants
 
 

neutron/objects/exceptions.py

@@ -1,62 +0,0 @@
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    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 neutron._i18n import _
-from neutron_lib import exceptions
-from oslo_utils import reflection
-
-
-class NeutronObjectUpdateForbidden(exceptions.NeutronException):
-    message = _("Unable to update the following object fields: %(fields)s")
-
-
-class NeutronDbObjectDuplicateEntry(exceptions.Conflict):
-    message = _("Failed to create a duplicate %(object_type)s: "
-                "for attribute(s) %(attributes)s with value(s) %(values)s")
-
-    def __init__(self, object_class, db_exception):
-        super(NeutronDbObjectDuplicateEntry, self).__init__(
-            object_type=reflection.get_class_name(object_class,
-                                                  fully_qualified=False),
-            attributes=db_exception.columns,
-            values=db_exception.value)
-
-
-class NeutronDbObjectNotFoundByModel(exceptions.NotFound):
-    message = _("NeutronDbObject not found by model %(model)s.")
-
-
-class NeutronPrimaryKeyMissing(exceptions.BadRequest):
-    message = _("For class %(object_type)s missing primary keys: "
-                "%(missing_keys)s")
-
-    def __init__(self, object_class, missing_keys):
-        super(NeutronPrimaryKeyMissing, self).__init__(
-            object_type=reflection.get_class_name(object_class,
-                                                  fully_qualified=False),
-            missing_keys=missing_keys
-        )
-
-
-class NeutronRangeConstrainedIntegerInvalidLimit(exceptions.NeutronException):
-    message = _("Incorrect range limits specified: "
-                "start = %(start)s, end = %(end)s")
-
-
-class NeutronSyntheticFieldMultipleForeignKeys(exceptions.NeutronException):
-    message = _("Synthetic field %(field)s shouldn't have more than one "
-                "foreign key")
-
-
-class NeutronSyntheticFieldsForeignKeysNotFound(exceptions.NeutronException):
-    message = _("%(child)s does not define a foreign key for %(parent)s")

neutron/objects/trunk.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 from neutron_lib import exceptions as n_exc
+from neutron_lib.objects import exceptions as o_exc
 from oslo_db import exception as o_db_exc
 from oslo_utils import versionutils
 from oslo_versionedobjects import base as obj_base
@@ -22,7 +23,6 @@ from oslo_versionedobjects import fields as obj_fields
 from neutron.db import api as db_api
 from neutron.objects import base
 from neutron.objects import common_types
-from neutron.objects import exceptions as o_exc
 from neutron.services.trunk import exceptions as t_exc
 from neutron.services.trunk import models
 

neutron/plugins/ml2/drivers/type_flat.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 from neutron_lib import exceptions as exc
+from neutron_lib.objects import exceptions as obj_base
 from neutron_lib.plugins.ml2 import api
 from oslo_config import cfg
 from oslo_log import log
@@ -22,7 +23,6 @@ from neutron._i18n import _
 from neutron.common import exceptions as n_exc
 from neutron.conf.plugins.ml2.drivers import driver_type
 from neutron.db import api as db_api
-from neutron.objects import exceptions as obj_base
 from neutron.objects.plugins.ml2 import flatallocation as flat_obj
 from neutron.plugins.common import constants as p_const
 from neutron.plugins.ml2.drivers import helpers

neutron/services/auto_allocate/db.py

@@ -19,6 +19,7 @@ from neutron_lib.callbacks import events
 from neutron_lib.callbacks import registry
 from neutron_lib.callbacks import resources
 from neutron_lib import exceptions as n_exc
+from neutron_lib.objects import exceptions as obj_exc
 from neutron_lib.plugins import constants
 from neutron_lib.plugins import directory
 from oslo_log import log as logging
@@ -32,7 +33,6 @@ from neutron.db import common_db_mixin
 from neutron.extensions import l3
 from neutron.objects import auto_allocate as auto_allocate_obj
 from neutron.objects import base as base_obj
-from neutron.objects import exceptions as obj_exc
 from neutron.objects import network as net_obj
 from neutron.plugins.common import utils as p_utils
 from neutron.services.auto_allocate import exceptions

neutron/services/tag/tag_plugin.py

@@ -14,6 +14,7 @@
 
 import functools
 
+from neutron_lib.objects import exceptions as obj_exc
 from neutron_lib.plugins import directory
 from oslo_log import helpers as log_helpers
 from sqlalchemy.orm import exc
@@ -25,7 +26,6 @@ from neutron.db import common_db_mixin
 from neutron.db import standard_attr
 from neutron.db import tag_db as tag_methods
 from neutron.extensions import tagging
-from neutron.objects import exceptions as obj_exc
 from neutron.objects import tag as tag_obj
 
 

neutron/tests/unit/objects/test_base.py

@@ -19,6 +19,7 @@ import mock
 import netaddr
 from neutron_lib import context
 from neutron_lib import exceptions as n_exc
+from neutron_lib.objects import exceptions as o_exc
 from neutron_lib.utils import helpers
 from oslo_db import exception as obj_exc
 from oslo_db.sqlalchemy import utils as db_utils
@@ -38,7 +39,6 @@ from neutron.objects import agent
 from neutron.objects import base
 from neutron.objects import common_types
 from neutron.objects.db import api as obj_db_api
-from neutron.objects import exceptions as o_exc
 from neutron.objects import flavor
 from neutron.objects.logapi import event_types
 from neutron.objects import network as net_obj