x/vmware-nsx
Code Issues Proposed changes

Merge "Fix NVP FWaaS errors when creating firewall without policy"

Browse Source
This commit is contained in:
Jenkins 2014-03-03 22:31:10 +00:00 committed by Gerrit Code Review
commit 301bc1c071
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/vmware/plugins/service.py
View File

@ -852,7 +852,7 @@ class NsxAdvancedPlugin(sr_db.ServiceRouter_mixin,
LOG.exception(msg) LOG.exception(msg)
raise e raise e
except exceptions.BadRequest as e: except exceptions.VcnsBadRequest as e:
self._firewall_set_status( self._firewall_set_status(
context, fw['id'], service_constants.ERROR) context, fw['id'], service_constants.ERROR)
LOG.exception(_("Bad Firewall request Input")) LOG.exception(_("Bad Firewall request Input"))

6
neutron/plugins/vmware/vshield/edge_firewall_driver.py
View File

@ -41,7 +41,7 @@ class EdgeFirewallDriver(db_base_plugin_v2.NeutronDbPluginV2):
return VSE_FWAAS_DENY return VSE_FWAAS_DENY
else: else:
msg = _("Invalid action value %s in a firewall rule") % action msg = _("Invalid action value %s in a firewall rule") % action
raise vcns_exc.BadRequest(resource='firewall_rule', msg=msg) raise vcns_exc.VcnsBadRequest(resource='firewall_rule', msg=msg)
def _restore_firewall_action(self, action): def _restore_firewall_action(self, action):
if action == VSE_FWAAS_ALLOW: if action == VSE_FWAAS_ALLOW:
@ -51,7 +51,7 @@ class EdgeFirewallDriver(db_base_plugin_v2.NeutronDbPluginV2):
else: else:
msg = (_("Invalid action value %s in " msg = (_("Invalid action value %s in "
"a vshield firewall rule") % action) "a vshield firewall rule") % action)
raise vcns_exc.BadRequest(resource='firewall_rule', msg=msg) raise vcns_exc.VcnsBadRequest(resource='firewall_rule', msg=msg)
def _get_port_range_from_min_max_ports(self, min_port, max_port): def _get_port_range_from_min_max_ports(self, min_port, max_port):
if not min_port: if not min_port:
@ -351,4 +351,4 @@ class EdgeFirewallDriver(db_base_plugin_v2.NeutronDbPluginV2):
else: else:
msg = _("Can't execute insert rule operation " msg = _("Can't execute insert rule operation "
"without reference rule_id") "without reference rule_id")
raise vcns_exc.BadRequest(resource='firewall_rule', msg=msg) raise vcns_exc.VcnsBadRequest(resource='firewall_rule', msg=msg)

15
neutron/tests/unit/vmware/vshield/test_fwaas_plugin.py
View File

@ -141,6 +141,21 @@ class FirewallPluginTestCase(test_db_firewall.FirewallPluginDbTestCase,
for k, v in attrs.iteritems(): for k, v in attrs.iteritems():
self.assertEqual(fw['firewall'][k], v) self.assertEqual(fw['firewall'][k], v)
def test_create_firewall_without_policy(self):
name = "new_fw"
attrs = self._get_test_firewall_attrs(name)
attrs['router_id'] = self._create_and_get_router()
with self.firewall(name=name,
router_id=attrs['router_id'],
admin_state_up=
test_db_firewall.ADMIN_STATE_UP,
expected_res_status=201) as fw:
attrs = self._replace_firewall_status(
attrs, const.PENDING_CREATE, const.ACTIVE)
for k, v in attrs.iteritems():
self.assertEqual(fw['firewall'][k], v)
def test_update_firewall(self): def test_update_firewall(self):
name = "new_fw" name = "new_fw"
attrs = self._get_test_firewall_attrs(name) attrs = self._get_test_firewall_attrs(name)