Merge "DVR-FWaaS: Fix DVR FWaaS rules for fipnamespace"
This commit is contained in:
commit
244e2a647b
@ -94,7 +94,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})
|
||||
|
@ -98,7 +98,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})
|
||||
|
@ -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
|
||||
|
@ -123,7 +123,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
|
||||
|
Loading…
Reference in New Issue
Block a user