From b5f75253048438891a8740a1ea4719e5f3208ccb Mon Sep 17 00:00:00 2001 From: Eoghan Glynn Date: Fri, 9 Mar 2012 15:15:23 +0000 Subject: Sub in InstanceLimitExceeded in overLimit message Fixes bug 950768 Previously the error message in the 413 overLimit response returned by the OS compute API was missing a parameter subsitution indicating the actual quota that was breeched: 'Quota exceeded: code=%(code)s' This is now properly reported as: 'Quota exceeded: code=InstanceLimitExceeded' Also a potentially useful log message is no longer discarded. Change-Id: I7e1f8b078329a6530bb7d7ea3b006ff578cdcdd3 --- nova/api/openstack/compute/servers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nova/api') diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 2bfbfb745..0be57793c 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -491,7 +491,8 @@ class Controller(wsgi.Controller): "InstanceLimitExceeded": error.message, } - expl = code_mappings.get(error.kwargs['code'], error.message) + code = error.kwargs['code'] + expl = code_mappings.get(code, error.message) % error.kwargs raise exc.HTTPRequestEntityTooLarge(explanation=expl, headers={'Retry-After': 0}) -- cgit