diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-13 16:12:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-13 16:12:01 +0000 |
| commit | cbeb9457ddb43d12d44fc07bd64d8dce2abdbcd6 (patch) | |
| tree | 0937f984c36f7be984e3ccf0ce83bd811a11468a | |
| parent | 03de59d976e1c2e821ebfa2ee8933083c92a27e6 (diff) | |
| parent | b0da2c4f4ed492f11c343852442e447073a5af76 (diff) | |
| download | nova-cbeb9457ddb43d12d44fc07bd64d8dce2abdbcd6.tar.gz nova-cbeb9457ddb43d12d44fc07bd64d8dce2abdbcd6.tar.xz nova-cbeb9457ddb43d12d44fc07bd64d8dce2abdbcd6.zip | |
Merge "When over quota for floating ips, return HTTPRequestEntityTooLarge."
| -rw-r--r-- | nova/api/openstack/compute/contrib/floating_ips.py | 2 | ||||
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_floating_ips.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py index ed5f61d53..df25e4fd2 100644 --- a/nova/api/openstack/compute/contrib/floating_ips.py +++ b/nova/api/openstack/compute/contrib/floating_ips.py @@ -174,7 +174,7 @@ class FloatingIPController(object): msg = _("No more floating ips in pool %s.") % pool else: msg = _("No more floating ips available.") - raise webob.exc.HTTPBadRequest(explanation=msg) + raise webob.exc.HTTPRequestEntityTooLarge(explanation=msg) return _translate_floating_ip_view(ip) diff --git a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py b/nova/tests/api/openstack/compute/contrib/test_floating_ips.py index 6ce0daa05..e1a5593d3 100644 --- a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py +++ b/nova/tests/api/openstack/compute/contrib/test_floating_ips.py @@ -228,7 +228,8 @@ class FloatingIpTest(test.TestCase): self.stubs.Set(rpc, "call", fake_call) req = fakes.HTTPRequest.blank('/v2/fake/os-floating-ips') - self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, + self.assertRaises(webob.exc.HTTPRequestEntityTooLarge, + self.controller.create, req) def test_floating_ip_allocate(self): |