x/vmware-nsx
Code Issues Proposed changes

Merge "ipt_mgr.ipv6 written in the wrong ipt_mgr.ipv4"

Browse Source
This commit is contained in:
Jenkins 2014-02-23 07:22:32 +00:00 committed by Gerrit Code Review
commit 745af2abc0
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/services/firewall/drivers/linux/iptables_fwaas.py
View File

@ -210,7 +210,7 @@ class IptablesFwaasDriver(fwaas_base.FwaasDriverBase):
bname = iptables_manager.binary_name bname = iptables_manager.binary_name
for (ver, tbl) in [(IPV4, ipt_mgr.ipv4['filter']), for (ver, tbl) in [(IPV4, ipt_mgr.ipv4['filter']),
(IPV6, ipt_mgr.ipv4['filter'])]: (IPV6, ipt_mgr.ipv6['filter'])]:
for direction in [INGRESS_DIRECTION, EGRESS_DIRECTION]: for direction in [INGRESS_DIRECTION, EGRESS_DIRECTION]:
chain_name = self._get_chain_name(fwid, ver, direction) chain_name = self._get_chain_name(fwid, ver, direction)
chain_name = iptables_manager.get_chain_name(chain_name) chain_name = iptables_manager.get_chain_name(chain_name)

23
neutron/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py
View File

@ -158,11 +158,13 @@ class IptablesFwaasTestCase(base.BaseTestCase):
self.firewall.create_firewall(apply_list, firewall) self.firewall.create_firewall(apply_list, firewall)
invalid_rule = '-m state --state INVALID -j DROP' invalid_rule = '-m state --state INVALID -j DROP'
est_rule = '-m state --state ESTABLISHED,RELATED -j ACCEPT' est_rule = '-m state --state ESTABLISHED,RELATED -j ACCEPT'
ingress_chain = ('iv4%s' % firewall['id'])
egress_chain = ('ov4%s' % firewall['id'])
bname = fwaas.iptables_manager.binary_name bname = fwaas.iptables_manager.binary_name
calls = [call.ensure_remove_chain('iv4fake-fw-uuid'),
call.ensure_remove_chain('ov4fake-fw-uuid'), for ip_version in (4, 6):
ingress_chain = ('iv%s%s' % (ip_version, firewall['id']))
egress_chain = ('ov%s%s' % (ip_version, firewall['id']))
calls = [call.ensure_remove_chain('iv%sfake-fw-uuid' % ip_version),
call.ensure_remove_chain('ov%sfake-fw-uuid' % ip_version),
call.ensure_remove_chain('fwaas-default-policy'), call.ensure_remove_chain('fwaas-default-policy'),
call.add_chain('fwaas-default-policy'), call.add_chain('fwaas-default-policy'),
call.add_rule('fwaas-default-policy', '-j DROP'), call.add_rule('fwaas-default-policy', '-j DROP'),
@ -172,9 +174,16 @@ class IptablesFwaasTestCase(base.BaseTestCase):
call.add_chain(egress_chain), call.add_chain(egress_chain),
call.add_rule(egress_chain, invalid_rule), call.add_rule(egress_chain, invalid_rule),
call.add_rule(egress_chain, est_rule), call.add_rule(egress_chain, est_rule),
call.add_rule('FORWARD', '-o qr-+ -j %s-fwaas-defau' % bname), call.add_rule('FORWARD',
call.add_rule('FORWARD', '-i qr-+ -j %s-fwaas-defau' % bname)] '-o qr-+ -j %s-fwaas-defau' % bname),
apply_list[0].iptables_manager.ipv4['filter'].assert_has_calls(calls) call.add_rule('FORWARD',
'-i qr-+ -j %s-fwaas-defau' % bname)]
if ip_version == 4:
v4filter_inst = apply_list[0].iptables_manager.ipv4['filter']
v4filter_inst.assert_has_calls(calls)
else:
v6filter_inst = apply_list[0].iptables_manager.ipv6['filter']
v6filter_inst.assert_has_calls(calls)
def test_create_firewall_with_rules(self): def test_create_firewall_with_rules(self):
self._setup_firewall_with_rules(self.firewall.create_firewall) self._setup_firewall_with_rules(self.firewall.create_firewall)