summaryrefslogtreecommitdiffstats
path: root/nova/exception.py
diff options
context:
space:
mode:
authorEoghan Glynn <eglynn@redhat.com>2012-07-19 16:19:49 +0100
committerEoghan Glynn <eglynn@redhat.com>2012-07-19 16:19:49 +0100
commitebc05b803615b78a14008136bb549a41013e6cd1 (patch)
treee0d13d2f57904fe6f4a65776ea03acccb5d840c4 /nova/exception.py
parent5f45eadbf2c1ea4a4cf6c9358aac269ca3f2cff6 (diff)
Allow NoMoreFloatingIps to bubble up to FaultWrapper
Fixes LP 1026167. The fix for LP 1021721 caught the wrong exception in order to address floating IP quota over-run. NoMoreFloatingIps is raised when the floating range is exhausted, whereas FloatingIpLimitExceeded is raised on over-quota. Also the HTTPRequestEntityTooLarge exception raised is mapped to 500 Server Error due to the required retry-after header being left unset. We now allow the NoMoreFloatingIps to bubble up to the FaultWrapper middleware, where its mapped to a 404 status due to it extending the NotFound exception. Change-Id: Id35c487113059ec3053f2f9e9e7eca24854ac02c
Diffstat (limited to 'nova/exception.py')
-rw-r--r--nova/exception.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/exception.py b/nova/exception.py
index f70cbe48e..c6f05e97e 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -651,6 +651,7 @@ class FloatingIpNotFoundForHost(FloatingIpNotFound):
class NoMoreFloatingIps(FloatingIpNotFound):
message = _("Zero floating ips available.")
+ safe = True
class FloatingIpAssociated(NovaException):