openstack
/
neutron-fwaas
Code Issues Proposed changes

Merge "DVR-FWaaS: Fix DVR FWaaS rules for fipnamespace" into stable/pike

This commit is contained in:
Zuul 2018-07-12 22:40:39 +00:00 committed by Gerrit Code Review
parent 1d884eab72 e96a39f22f
commit f9aff573b4
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,7 @@ class IptablesFwaasDriver(fwaas_base.FwaasDriverBase):
if router_info.snat_iptables_manager:
ipt_mgrs.append({'ipt': router_info.snat_iptables_manager,
'if_prefix': SNAT_INT_DEV_PREFIX})
if router_info.dist_fip_count:
if router_info.rtr_fip_connect:
# handle the fip case on n/w or compute node.
ipt_mgrs.append({'ipt': router_info.iptables_manager,
'if_prefix': ROUTER_2_FIP_DEV_PREFIX})

2
neutron_fwaas/services/firewall/drivers/linux/iptables_fwaas_v2.py
View File

@ -101,7 +101,7 @@ class IptablesFwaasDriver(fwaas_base_v2.FwaasDriverBase):
if ri.snat_iptables_manager:
ipt_mgrs.append({'ipt': ri.snat_iptables_manager,
'if_prefix': SNAT_INT_DEV_PREFIX})
if ri.dist_fip_count:
if ri.rtr_fip_connect:
# handle the fip case on n/w or compute node.
ipt_mgrs.append({'ipt': ri.iptables_manager,
'if_prefix': ROUTER_2_FIP_DEV_PREFIX})

2
neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py
View File

@ -121,7 +121,7 @@ class IptablesFwaasTestCase(base.BaseTestCase):
router_info_inst.iptables_manager = iptables_inst
router_info_inst.snat_iptables_manager = iptables_inst
if distributed_mode == 'dvr':
router_info_inst.dist_fip_count = 1
router_info_inst.rtr_fip_connect = True
router_info_inst.router = router_inst
apply_list.append(router_info_inst)
router_count -= 1

2
neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas_v2.py
View File

@ -124,7 +124,7 @@ class IptablesFwaasTestCase(base.BaseTestCase):
router_info_inst.iptables_manager = iptables_inst
router_info_inst.snat_iptables_manager = iptables_inst
if distributed_mode == 'dvr':
router_info_inst.dist_fip_count = 1
router_info_inst.rtr_fip_connect = True
router_info_inst.router = router_inst
apply_list.append((router_info_inst, FAKE_PORT_IDS))
router_count -= 1