From: Gary Kotton <gkotton@redhat.com>
Date: Tue, 4 Dec 2012 14:41:41 +0000 (+0000)
Subject: Returns more appropriate error when address pool is exhausted
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b939b0749a1a37400702286d19951d1682abccc7;p=openstack-build%2Fneutron-build.git

Returns more appropriate error when address pool is exhausted

Fixes bug 1086226

Change-Id: I97a73151a1ed42877116238a6a741c68c75e199a
---

diff --git a/quantum/api/v2/base.py b/quantum/api/v2/base.py
index 02b2e935b..37fedf475 100644
--- a/quantum/api/v2/base.py
+++ b/quantum/api/v2/base.py
@@ -47,6 +47,7 @@ FAULT_MAP = {exceptions.NotFound: webob.exc.HTTPNotFound,
              netaddr.AddrFormatError: webob.exc.HTTPBadRequest,
              AttributeError: webob.exc.HTTPBadRequest,
              ValueError: webob.exc.HTTPBadRequest,
+             exceptions.IpAddressGenerationFailure: webob.exc.HTTPConflict,
              }
 
 QUOTAS = quota.QUOTAS