x
/
vmware-nsx
Code Issues Proposed changes

Merge "Fix interface IP address for DVR with gateway"

This commit is contained in:
Jenkins 2014-09-03 16:52:17 +00:00 committed by Gerrit Code Review
parent 808eeb5a5b bbf8ae212d
commit 8e40a5603f
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/agent/l3_agent.py
View File

@ -1425,7 +1425,8 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, manager.Manager):
self.get_snat_int_device_name(sn_port['id']))
self._internal_network_added(ns_name,
sn_port['network_id'],
sn_port['id'], internal_cidr,
sn_port['id'],
sn_port['ip_cidr'],
sn_port['mac_address'],
interface_name,
SNAT_INT_DEV_PREFIX)

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

@ -446,6 +446,14 @@ class TestBasicRouterOperations(base.BaseTestCase):
self.assertEqual(agent._snat_redirect_add.call_count, 1)
self.assertEqual(agent._set_subnet_info.call_count, 1)
self.assertEqual(agent._internal_network_added.call_count, 2)
agent._internal_network_added.assert_called_with(
agent.get_snat_ns_name(ri.router['id']),
sn_port['network_id'],
sn_port['id'],
sn_port['ip_cidr'],
sn_port['mac_address'],
agent.get_snat_int_device_name(sn_port['id']),
l3_agent.SNAT_INT_DEV_PREFIX)
def test_agent_add_internal_network(self):
self._test_internal_network_action('add')