From ebc05b803615b78a14008136bb549a41013e6cd1 Mon Sep 17 00:00:00 2001 From: Eoghan Glynn Date: Thu, 19 Jul 2012 16:19:49 +0100 Subject: 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 --- nova/exception.py | 1 + 1 file changed, 1 insertion(+) (limited to 'nova/exception.py') 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): -- cgit