openstack
/
neutron
Code Issues Proposed changes

Merge "shim FAULT_MAP from neutron-lib"

This commit is contained in:
Zuul 2017-10-25 00:30:26 +00:00 committed by Gerrit Code Review
parent 42e4c78d49 7e0d37699f
commit e2dc179870
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
neutron/api/v2/base.py
View File

@ -16,8 +16,8 @@
import collections
import copy
import netaddr
from neutron_lib.api import attributes
from neutron_lib.api import faults
from neutron_lib.callbacks import events
from neutron_lib.callbacks import registry
from neutron_lib import exceptions
@ -40,15 +40,8 @@ from neutron.quota import resource_registry
LOG = logging.getLogger(__name__)
FAULT_MAP = {exceptions.NotFound: webob.exc.HTTPNotFound,
exceptions.Conflict: webob.exc.HTTPConflict,
exceptions.InUse: webob.exc.HTTPConflict,
exceptions.BadRequest: webob.exc.HTTPBadRequest,
exceptions.ServiceUnavailable: webob.exc.HTTPServiceUnavailable,
exceptions.NotAuthorized: webob.exc.HTTPForbidden,
netaddr.AddrFormatError: webob.exc.HTTPBadRequest,
oslo_policy.PolicyNotAuthorized: webob.exc.HTTPForbidden
}
# TODO(boden): remove shim once consumers are using lib's FAULT_MAP
FAULT_MAP = faults.FAULT_MAP
class Controller(object):