From 169729cd114603b355faf5effd08ea660b81551f Mon Sep 17 00:00:00 2001 From: Carl Baldwin Date: Wed, 28 Aug 2013 19:32:34 +0000 Subject: [PATCH] Add jump to float-snat chain after clearing snat chain Clearing the chain in this code eliminates the rule to jump to the floating-snat chain. This is the simplest way to get it working again. Change-Id: Ic1818e10bd64170b6f0a2f52af8dc0814d7e04e0 Fixes: Bug #1218040 --- neutron/agent/l3_agent.py | 4 ++++ neutron/tests/unit/test_l3_agent.py | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/neutron/agent/l3_agent.py b/neutron/agent/l3_agent.py index c53d930e014..ad3023d8058 100644 --- a/neutron/agent/l3_agent.py +++ b/neutron/agent/l3_agent.py @@ -405,6 +405,10 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, manager.Manager): # each router's SNAT rules will be in their own namespace ri.iptables_manager.ipv4['nat'].empty_chain('POSTROUTING') ri.iptables_manager.ipv4['nat'].empty_chain('snat') + + # Add back the jump to float-snat + ri.iptables_manager.ipv4['nat'].add_rule('snat', '-j $float-snat') + # And add them back if the action if add_rules if action == 'add_rules' and ex_gw_port: # ex_gw_port should not be None in this case diff --git a/neutron/tests/unit/test_l3_agent.py b/neutron/tests/unit/test_l3_agent.py index f04c4efef8d..17ed10ea82b 100644 --- a/neutron/tests/unit/test_l3_agent.py +++ b/neutron/tests/unit/test_l3_agent.py @@ -496,6 +496,23 @@ class TestBasicRouterOperations(base.BaseTestCase): self.assertEqual(len(nat_rules_delta), 1) self._verify_snat_rules(nat_rules_delta, router, negate=True) + def test_handle_router_snat_rules_add_back_jump(self): + agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) + ri = mock.MagicMock() + port = {'fixed_ips': [{'ip_address': '192.168.1.4'}]} + + agent._handle_router_snat_rules(ri, port, [], "iface", "add_rules") + + nat = ri.iptables_manager.ipv4['nat'] + nat.empty_chain.assert_any_call('snat') + nat.add_rule.assert_any_call('snat', '-j $float-snat') + for call in nat.mock_calls: + name, args, kwargs = call + if name == 'add_rule': + self.assertEquals(args, ('snat', '-j $float-snat')) + self.assertEquals(kwargs, {}) + break + def testRoutersWithAdminStateDown(self): agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) self.plugin_api.get_external_network_id.return_value = None