use FAULT_MAP from neutron-lib

Idfd956fa213e1ba6c3b1c983f246c5b515951e6d rehomed the FAULT_MAP into
neutron-lib. This patch consumes it from lib and removes its definition
from neutron.

NeutronLibImpact

Change-Id: Ib051555ea8496ed7eec8ed30733c964012e31c32

neutron/api/v2/base.py

@@ -40,9 +40,6 @@ from neutron.quota import resource_registry
 
 LOG = logging.getLogger(__name__)
 
-# TODO(boden): remove shim once consumers are using lib's FAULT_MAP
-FAULT_MAP = faults.FAULT_MAP
-
 
 class Controller(object):
     LIST = 'list'
@@ -755,4 +752,4 @@ def create_resource(collection, resource, plugin, params, allow_bulk=False,
                             allow_pagination=allow_pagination,
                             allow_sorting=allow_sorting)
 
-    return wsgi_resource.Resource(controller, FAULT_MAP)
+    return wsgi_resource.Resource(controller, faults.FAULT_MAP)

neutron/extensions/dhcpagentscheduler.py

@@ -16,6 +16,7 @@
 import abc
 
 from neutron_lib.api import extensions as api_extensions
+from neutron_lib.api import faults
 from neutron_lib import constants
 from neutron_lib import exceptions
 from neutron_lib.plugins import directory
@@ -23,7 +24,6 @@ import six
 
 from neutron._i18n import _
 from neutron.api import extensions
-from neutron.api.v2 import base
 from neutron.api.v2 import resource
 from neutron.common import rpc as n_rpc
 from neutron.extensions import agent
@@ -106,7 +106,7 @@ class Dhcpagentscheduler(api_extensions.ExtensionDescriptor):
         parent = dict(member_name="agent",
                       collection_name="agents")
         controller = resource.Resource(NetworkSchedulerController(),
-                                       base.FAULT_MAP)
+                                       faults.FAULT_MAP)
         exts.append(extensions.ResourceExtension(
             DHCP_NETS, controller, parent))
 
@@ -114,7 +114,7 @@ class Dhcpagentscheduler(api_extensions.ExtensionDescriptor):
                       collection_name="networks")
 
         controller = resource.Resource(DhcpAgentsHostingNetworkController(),
-                                       base.FAULT_MAP)
+                                       faults.FAULT_MAP)
         exts.append(extensions.ResourceExtension(
             DHCP_AGENTS, controller, parent))
         return exts

neutron/extensions/l3agentscheduler.py

@@ -16,6 +16,7 @@
 import abc
 
 from neutron_lib.api import extensions as api_extensions
+from neutron_lib.api import faults
 from neutron_lib import constants
 from neutron_lib import exceptions
 from neutron_lib.plugins import constants as plugin_constants
@@ -26,7 +27,6 @@ import webob.exc
 
 from neutron._i18n import _
 from neutron.api import extensions
-from neutron.api.v2 import base
 from neutron.api.v2 import resource
 from neutron.common import rpc as n_rpc
 from neutron.extensions import agent
@@ -132,7 +132,7 @@ class L3agentscheduler(api_extensions.ExtensionDescriptor):
                       collection_name="agents")
 
         controller = resource.Resource(RouterSchedulerController(),
-                                       base.FAULT_MAP)
+                                       faults.FAULT_MAP)
         exts.append(extensions.ResourceExtension(
             L3_ROUTERS, controller, parent))
 
@@ -140,7 +140,7 @@ class L3agentscheduler(api_extensions.ExtensionDescriptor):
                       collection_name="routers")
 
         controller = resource.Resource(L3AgentsHostingRouterController(),
-                                       base.FAULT_MAP)
+                                       faults.FAULT_MAP)
         exts.append(extensions.ResourceExtension(
             L3_AGENTS, controller, parent))
         return exts

neutron/extensions/quotasv2.py

@@ -15,6 +15,7 @@
 
 from neutron_lib.api import converters
 from neutron_lib.api import extensions as api_extensions
+from neutron_lib.api import faults
 from neutron_lib.db import constants as const
 from neutron_lib import exceptions as n_exc
 from neutron_lib.plugins import directory
@@ -155,7 +156,7 @@ class Quotasv2(api_extensions.ExtensionDescriptor):
         """Returns Ext Resources."""
         controller = resource.Resource(
             QuotaSetsController(directory.get_plugin()),
-            faults=base.FAULT_MAP)
+            faults=faults.FAULT_MAP)
         return [extensions.ResourceExtension(
             Quotasv2.get_alias(),
             controller,

neutron/extensions/quotasv2_detail.py

@@ -15,13 +15,13 @@
 #    under the License.
 
 from neutron_lib.api import extensions as api_extensions
+from neutron_lib.api import faults
 from neutron_lib import exceptions as n_exc
 from neutron_lib.plugins import directory
 from oslo_config import cfg
 
 from neutron._i18n import _
 from neutron.api import extensions
-from neutron.api.v2 import base
 from neutron.api.v2 import resource
 from neutron.extensions import quotasv2
 from neutron.quota import resource_registry
@@ -85,7 +85,7 @@ class Quotasv2_detail(api_extensions.ExtensionDescriptor):
         """Returns Extension Resources."""
         controller = resource.Resource(
             DetailQuotaSetsController(directory.get_plugin()),
-            faults=base.FAULT_MAP)
+            faults=faults.FAULT_MAP)
         return [extensions.ResourceExtension(
             RESOURCE_COLLECTION,
             controller,

neutron/extensions/tag.py

@@ -13,10 +13,10 @@
 
 from neutron_lib.api.definitions import network
 from neutron_lib.api import extensions as api_extensions
+from neutron_lib.api import faults
 from neutron_lib.plugins import directory
 
 from neutron.api import extensions
-from neutron.api.v2 import base
 from neutron.api.v2 import resource as api_resource
 from neutron.extensions import tagging
 
@@ -62,7 +62,7 @@ class Tag(api_extensions.ExtensionDescriptor):
         action_status = {'index': 200, 'show': 204, 'update': 201,
                          'update_all': 200, 'delete': 204, 'delete_all': 204}
         controller = api_resource.Resource(TagController(),
-                                           base.FAULT_MAP,
+                                           faults.FAULT_MAP,
                                            action_status=action_status)
         collection_methods = {"delete_all": "DELETE",
                               "update_all": "PUT"}

neutron/extensions/tag_ext.py

@@ -15,10 +15,10 @@ from neutron_lib.api.definitions import port as port_def
 from neutron_lib.api.definitions import subnet as subnet_def
 from neutron_lib.api.definitions import subnetpool as subnetpool_def
 from neutron_lib.api import extensions as api_extensions
+from neutron_lib.api import faults
 from neutron_lib.plugins import directory
 
 from neutron.api import extensions
-from neutron.api.v2 import base
 from neutron.api.v2 import resource as api_resource
 from neutron.extensions import l3
 from neutron.extensions import tagging
@@ -69,7 +69,7 @@ class Tag_ext(api_extensions.ExtensionDescriptor):
         action_status = {'index': 200, 'show': 204, 'update': 201,
                          'update_all': 200, 'delete': 204, 'delete_all': 204}
         controller = api_resource.Resource(TagExtController(),
-                                           base.FAULT_MAP,
+                                           faults.FAULT_MAP,
                                            action_status=action_status)
         collection_methods = {"delete_all": "DELETE",
                               "update_all": "PUT"}

neutron/extensions/tagging.py

@@ -14,6 +14,7 @@
 import abc
 
 from neutron_lib.api import extensions as api_extensions
+from neutron_lib.api import faults
 from neutron_lib.api import validators
 from neutron_lib import exceptions
 from neutron_lib.plugins import directory
@@ -23,7 +24,6 @@ import webob.exc
 
 from neutron._i18n import _
 from neutron.api import extensions
-from neutron.api.v2 import base
 from neutron.api.v2 import resource as api_resource
 from neutron.common import rpc as n_rpc
 from neutron.db import standard_attr
@@ -198,7 +198,7 @@ class Tagging(api_extensions.ExtensionDescriptor):
         action_status = {'index': 200, 'show': 204, 'update': 201,
                          'update_all': 200, 'delete': 204, 'delete_all': 204}
         controller = api_resource.Resource(TaggingController(),
-                                           base.FAULT_MAP,
+                                           faults.FAULT_MAP,
                                            action_status=action_status)
         collection_methods = {"delete_all": "DELETE",
                               "update_all": "PUT"}

neutron/pecan_wsgi/hooks/translation.py

@@ -13,12 +13,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from neutron_lib.api import faults
 import oslo_i18n
 from oslo_log import log as logging
 from pecan import hooks
 
 from neutron.api import api_common
-from neutron.api.v2 import base as v2base
 
 
 LOG = logging.getLogger(__name__)
@@ -30,7 +30,7 @@ class ExceptionTranslationHook(hooks.PecanHook):
         if state.request.accept_language:
             language = state.request.accept_language.best_match(
                 oslo_i18n.get_available_languages('neutron'))
-        exc = api_common.convert_exception_to_http_exc(e, v2base.FAULT_MAP,
+        exc = api_common.convert_exception_to_http_exc(e, faults.FAULT_MAP,
                                                        language)
         if hasattr(exc, 'code') and 400 <= exc.code < 500:
             LOG.info('%(action)s failed (client error): %(exc)s',