x/vmware-nsx
Code Issues Proposed changes

Merge "Add jump to float-snat chain after clearing snat chain"

Browse Source
This commit is contained in:
Jenkins 2013-09-04 17:34:12 +00:00 committed by Gerrit Code Review
commit f9e80c2c38
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/agent/l3_agent.py
View File

@ -405,6 +405,10 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, manager.Manager):
# each router's SNAT rules will be in their own namespace # 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('POSTROUTING')
ri.iptables_manager.ipv4['nat'].empty_chain('snat') 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 # And add them back if the action if add_rules
if action == 'add_rules' and ex_gw_port: if action == 'add_rules' and ex_gw_port:
# ex_gw_port should not be None in this case # ex_gw_port should not be None in this case

17
neutron/tests/unit/test_l3_agent.py
View File

@ -496,6 +496,23 @@ class TestBasicRouterOperations(base.BaseTestCase):
self.assertEqual(len(nat_rules_delta), 1) self.assertEqual(len(nat_rules_delta), 1)
self._verify_snat_rules(nat_rules_delta, router, negate=True) 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): def testRoutersWithAdminStateDown(self):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf) agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
self.plugin_api.get_external_network_id.return_value = None self.plugin_api.get_external_network_id.return_value = None