openstack/deb-nova
Code Issues Proposed changes

Merge "Error code for creating duplicate floating_ip_bulk"

Browse Source
This commit is contained in:
Jenkins
2014-11-27 14:21:31 +00:00
committed by Gerrit Code Review
parent 88f6cb4c8a 943d700316
commit 07ee4d44b1
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/openstack/compute/contrib/floating_ips_bulk.py
View File

@@ -103,7 +103,7 @@ class FloatingIPBulkController(object):
try: try:
objects.FloatingIPList.create(context, ips) objects.FloatingIPList.create(context, ips)
except exception.FloatingIpExists as exc: except exception.FloatingIpExists as exc:
raise webob.exc.HTTPBadRequest(explanation=exc.format_message()) raise webob.exc.HTTPConflict(explanation=exc.format_message())
return {"floating_ips_bulk_create": {"ip_range": ip_range, return {"floating_ips_bulk_create": {"ip_range": ip_range,
"pool": pool, "pool": pool,

4
nova/api/openstack/compute/plugins/v3/floating_ips_bulk.py
View File

@@ -84,7 +84,7 @@ class FloatingIPBulkController(wsgi.Controller):
return floating_ip_info return floating_ip_info
@extensions.expected_errors(400) @extensions.expected_errors((400, 409))
@validation.schema(floating_ips_bulk.create) @validation.schema(floating_ips_bulk.create)
def create(self, req, body): def create(self, req, body):
"""Bulk create floating ips.""" """Bulk create floating ips."""
@@ -106,7 +106,7 @@ class FloatingIPBulkController(wsgi.Controller):
try: try:
objects.FloatingIPList.create(context, ips) objects.FloatingIPList.create(context, ips)
except exception.FloatingIpExists as exc: except exception.FloatingIpExists as exc:
raise webob.exc.HTTPBadRequest(explanation=exc.format_message()) raise webob.exc.HTTPConflict(explanation=exc.format_message())
return {"floating_ips_bulk_create": {"ip_range": ip_range, return {"floating_ips_bulk_create": {"ip_range": ip_range,
"pool": pool, "pool": pool,

2
nova/tests/unit/api/openstack/compute/contrib/test_floating_ips_bulk.py
View File

@@ -146,7 +146,7 @@ class FloatingIPBulkV21(test.TestCase):
ip_range = '192.168.1.0/29' ip_range = '192.168.1.0/29'
body = {'floating_ips_bulk_create': {'ip_range': ip_range}} body = {'floating_ips_bulk_create': {'ip_range': ip_range}}
req = fakes.HTTPRequest.blank(self.url) req = fakes.HTTPRequest.blank(self.url)
self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create, self.assertRaises(webob.exc.HTTPConflict, self.controller.create,
req, body=body) req, body=body)
def test_create_bad_cidr_fail(self): def test_create_bad_cidr_fail(self):