x/vmware-nsx
Code Issues Proposed changes

Merge "Fix for FIPs duplicated across hosts for DVR"

Browse Source
This commit is contained in:
Jenkins 2014-11-13 03:12:01 +00:00 committed by Gerrit Code Review
commit d68005f3c1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/l3_agent.py
View File

@ -1167,7 +1167,7 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback,
"""
fip_statuses = {}
floating_ips = ri.router.get(l3_constants.FLOATINGIP_KEY, [])
floating_ips = self.get_floating_ips(ri)
interface_name = self._get_external_device_interface_name(
ri, ex_gw_port, floating_ips)
if interface_name is None:

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

@ -1150,6 +1150,12 @@ vrrp_instance VR_1 {
'floating_ip_address': '15.1.2.3',
'fixed_ip_address': '192.168.0.1',
'floating_network_id': _uuid(),
'port_id': _uuid()},
{'id': _uuid(),
'host': 'some-other-host',
'floating_ip_address': '15.1.2.4',
'fixed_ip_address': '192.168.0.10',
'floating_network_id': _uuid(),
'port_id': _uuid()}]}
router = prepare_router_data(enable_snat=True)