x/vmware-nsx
Code Issues Proposed changes

fix remap of floating-ip within l3-agent polling interval

Browse Source 
bug 1083990

Change-Id: I1bb365fe6accc24a223acd2b31d4eacdb6809410
This commit is contained in:
Dan Wendlandt 2012-11-28 22:10:41 -08:00
parent f19d4bada1
commit 9fdb15dfce
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
quantum/agent/l3_agent.py
View File

@ -315,7 +315,7 @@ class L3NATAgent(object):
existing_floating_ip_ids = set([fip['id'] for fip in ri.floating_ips]) existing_floating_ip_ids = set([fip['id'] for fip in ri.floating_ips])
cur_floating_ip_ids = set([fip['id'] for fip in floating_ips]) cur_floating_ip_ids = set([fip['id'] for fip in floating_ips])
id_to_fixed_map = {} id_to_fip_map = {}
for fip in floating_ips: for fip in floating_ips:
if fip['port_id']: if fip['port_id']:
@ -326,7 +326,7 @@ class L3NATAgent(object):
fip['fixed_ip_address']) fip['fixed_ip_address'])
# store to see if floatingip was remapped # store to see if floatingip was remapped
id_to_fixed_map[fip['id']] = fip['fixed_ip_address'] id_to_fip_map[fip['id']] = fip
floating_ip_ids_to_remove = (existing_floating_ip_ids - floating_ip_ids_to_remove = (existing_floating_ip_ids -
cur_floating_ip_ids) cur_floating_ip_ids)
@ -338,15 +338,18 @@ class L3NATAgent(object):
fip['fixed_ip_address']) fip['fixed_ip_address'])
else: else:
# handle remapping of a floating IP # handle remapping of a floating IP
cur_fixed_ip = id_to_fixed_map[fip['id']] new_fip = id_to_fip_map[fip['id']]
new_fixed_ip = new_fip['fixed_ip_address']
existing_fixed_ip = fip['fixed_ip_address'] existing_fixed_ip = fip['fixed_ip_address']
if (cur_fixed_ip and existing_fixed_ip and if (new_fixed_ip and existing_fixed_ip and
cur_fixed_ip != existing_fixed_ip): new_fixed_ip != existing_fixed_ip):
floating_ip = fip['floating_ip_address'] floating_ip = fip['floating_ip_address']
self.floating_ip_removed(ri, ri.ex_gw_port, self.floating_ip_removed(ri, ri.ex_gw_port,
floating_ip, existing_fixed_ip) floating_ip, existing_fixed_ip)
self.floating_ip_added(ri, ri.ex_gw_port, self.floating_ip_added(ri, ri.ex_gw_port,
floating_ip, cur_fixed_ip) floating_ip, new_fixed_ip)
ri.floating_ips.remove(fip)
ri.floating_ips.append(new_fip)
def _get_ex_gw_port(self, ri): def _get_ex_gw_port(self, ri):
ports = self.qclient.list_ports( ports = self.qclient.list_ports(