File 0002-Fix-DVR-FWaaS-rules-for-fipnamespace.patch of Package openstack-neutron-fwaas

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Fix-DVR-FWaaS-rules-for-fipnamespace.patch of Package openstack-neutron-fwaas (Revision 224cef2559bddb277665a3b1a3a209df)

Currently displaying revision 224cef2559bddb277665a3b1a3a209df , Show latest

diff -crB --new-file neutron-fwaas-11.0.2.dev3-backup/neutron_fwaas/services/firewall/drivers/linux/iptables_fwaas.py neutron-fwaas-11.0.2.dev3/neutron_fwaas/services/firewall/drivers/linux/iptables_fwaas.py
*** neutron-fwaas-11.0.2.dev3-backup/neutron_fwaas/services/firewall/drivers/linux/iptables_fwaas.py	2018-01-16 16:18:36.000000000 -0800
--- neutron-fwaas-11.0.2.dev3/neutron_fwaas/services/firewall/drivers/linux/iptables_fwaas.py	2018-03-20 16:58:35.536884316 -0700
***************
*** 116,122 ****
              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:
              # 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})
--- 116,122 ----
              if router_info.snat_iptables_manager:
                  ipt_mgrs.append({'ipt': router_info.snat_iptables_manager,
                                   'if_prefix': SNAT_INT_DEV_PREFIX})
!         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})
diff -crB --new-file neutron-fwaas-11.0.2.dev3-backup/neutron_fwaas/services/firewall/drivers/linux/iptables_fwaas_v2.py neutron-fwaas-11.0.2.dev3/neutron_fwaas/services/firewall/drivers/linux/iptables_fwaas_v2.py
*** neutron-fwaas-11.0.2.dev3-backup/neutron_fwaas/services/firewall/drivers/linux/iptables_fwaas_v2.py	2018-01-16 16:18:36.000000000 -0800
--- neutron-fwaas-11.0.2.dev3/neutron_fwaas/services/firewall/drivers/linux/iptables_fwaas_v2.py	2018-03-20 16:59:11.028712191 -0700
***************
*** 101,107 ****
              if ri.snat_iptables_manager:
                  ipt_mgrs.append({'ipt': ri.snat_iptables_manager,
                                   'if_prefix': SNAT_INT_DEV_PREFIX})
!         if ri.dist_fip_count:
              # handle the fip case on n/w or compute node.
              ipt_mgrs.append({'ipt': ri.iptables_manager,
                               'if_prefix': ROUTER_2_FIP_DEV_PREFIX})
--- 101,107 ----
              if ri.snat_iptables_manager:
                  ipt_mgrs.append({'ipt': ri.snat_iptables_manager,
                                   'if_prefix': SNAT_INT_DEV_PREFIX})
!         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})
diff -crB --new-file neutron-fwaas-11.0.2.dev3-backup/neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py neutron-fwaas-11.0.2.dev3/neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py
*** neutron-fwaas-11.0.2.dev3-backup/neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py	2018-01-16 16:18:14.000000000 -0800
--- neutron-fwaas-11.0.2.dev3/neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py	2018-03-20 17:00:04.252454073 -0700
***************
*** 121,127 ****
              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.router = router_inst
              apply_list.append(router_info_inst)
              router_count -= 1
--- 121,127 ----
              router_info_inst.iptables_manager = iptables_inst
              router_info_inst.snat_iptables_manager = iptables_inst
              if distributed_mode == 'dvr':
!                 router_info_inst.rtr_fip_connect = True
              router_info_inst.router = router_inst
              apply_list.append(router_info_inst)
              router_count -= 1
diff -crB --new-file neutron-fwaas-11.0.2.dev3-backup/neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas_v2.py neutron-fwaas-11.0.2.dev3/neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas_v2.py
*** neutron-fwaas-11.0.2.dev3-backup/neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas_v2.py	2018-01-16 16:18:36.000000000 -0800
--- neutron-fwaas-11.0.2.dev3/neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas_v2.py	2018-03-20 17:00:43.121386949 -0700
***************
*** 124,130 ****
              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.router = router_inst
              apply_list.append((router_info_inst, FAKE_PORT_IDS))
              router_count -= 1
--- 124,130 ----
              router_info_inst.iptables_manager = iptables_inst
              router_info_inst.snat_iptables_manager = iptables_inst
              if distributed_mode == 'dvr':
!                 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

Places

File 0002-Fix-DVR-FWaaS-rules-for-fipnamespace.patch of Package openstack-neutron-fwaas (Revision 224cef2559bddb277665a3b1a3a209df)

Places