x/vmware-nsx
Code Issues Proposed changes

Merge "Return 409 for second firewall creation"

Browse Source
This commit is contained in:
Jenkins
2014-04-02 10:12:58 +00:00
committed by Gerrit Code Review
parent 14ffe72c5b dd2aea87c8
commit db4bd757c2
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/services/firewall/fwaas_plugin.py
View File

@@ -130,7 +130,7 @@ class FirewallAgentApi(proxy.RpcProxy):
) )
class FirewallCountExceeded(n_exception.NeutronException): class FirewallCountExceeded(n_exception.Conflict):
"""Reference implementation specific exception for firewall count. """Reference implementation specific exception for firewall count.

11
neutron/tests/unit/services/firewall/test_fwaas_plugin.py
View File

@@ -21,6 +21,7 @@
import contextlib import contextlib
import mock import mock
from webob import exc
from neutron import context from neutron import context
from neutron.extensions import firewall from neutron.extensions import firewall
@@ -198,7 +199,7 @@ class TestFirewallPluginBase(test_db_firewall.TestFirewallDBPlugin):
res = self._create_firewall( res = self._create_firewall(
None, 'firewall2', description='test', None, 'firewall2', description='test',
firewall_policy_id=None, admin_state_up=True) firewall_policy_id=None, admin_state_up=True)
self.assertEqual(res.status_int, 500) self.assertEqual(res.status_int, exc.HTTPConflict.code)
def test_create_firewall_admin_not_affected_by_other_tenant(self): def test_create_firewall_admin_not_affected_by_other_tenant(self):
# Create fw with admin after creating fw with other tenant # Create fw with admin after creating fw with other tenant
@@ -245,7 +246,7 @@ class TestFirewallPluginBase(test_db_firewall.TestFirewallDBPlugin):
data = {'firewall': {'name': name}} data = {'firewall': {'name': name}}
req = self.new_update_request('firewalls', data, fw_id) req = self.new_update_request('firewalls', data, fw_id)
res = req.get_response(self.ext_api) res = req.get_response(self.ext_api)
self.assertEqual(res.status_int, 409) self.assertEqual(res.status_int, exc.HTTPConflict.code)
def test_update_firewall_policy_fails_when_firewall_pending(self): def test_update_firewall_policy_fails_when_firewall_pending(self):
name = "new_firewall1" name = "new_firewall1"
@@ -261,7 +262,7 @@ class TestFirewallPluginBase(test_db_firewall.TestFirewallDBPlugin):
req = self.new_update_request('firewall_policies', req = self.new_update_request('firewall_policies',
data, fwp_id) data, fwp_id)
res = req.get_response(self.ext_api) res = req.get_response(self.ext_api)
self.assertEqual(res.status_int, 409) self.assertEqual(res.status_int, exc.HTTPConflict.code)
def test_update_firewall_rule_fails_when_firewall_pending(self): def test_update_firewall_rule_fails_when_firewall_pending(self):
with self.firewall_rule(name='fwr1') as fr: with self.firewall_rule(name='fwr1') as fr:
@@ -281,7 +282,7 @@ class TestFirewallPluginBase(test_db_firewall.TestFirewallDBPlugin):
req = self.new_update_request('firewall_rules', req = self.new_update_request('firewall_rules',
data, fr_id) data, fr_id)
res = req.get_response(self.ext_api) res = req.get_response(self.ext_api)
self.assertEqual(res.status_int, 409) self.assertEqual(res.status_int, exc.HTTPConflict.code)
def test_delete_firewall(self): def test_delete_firewall(self):
ctx = context.get_admin_context() ctx = context.get_admin_context()
@@ -315,7 +316,7 @@ class TestFirewallPluginBase(test_db_firewall.TestFirewallDBPlugin):
fw_id = fw['firewall']['id'] fw_id = fw['firewall']['id']
req = self.new_delete_request('firewalls', fw_id) req = self.new_delete_request('firewalls', fw_id)
res = req.get_response(self.ext_api) res = req.get_response(self.ext_api)
self.assertEqual(res.status_int, 204) self.assertEqual(res.status_int, exc.HTTPNoContent.code)
self.assertRaises(firewall.FirewallNotFound, self.assertRaises(firewall.FirewallNotFound,
self.plugin.get_firewall, self.plugin.get_firewall,
ctx, fw_id) ctx, fw_id)