openstack/neutron
Code Issues Proposed changes

Merge "DVR: handle unbound allowed_address_pairs added"

Browse Source
This commit is contained in:
Jenkins 2017-09-28 05:48:00 +00:00 committed by Gerrit Code Review
commit a4b51937a5
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
neutron/db/l3_dvrscheduler_db.py
View File

@ -459,25 +459,19 @@ def _notify_l3_agent_port_update(resource, event, trigger, **kwargs):
if allowed_address_pairs_list and new_port_host: if allowed_address_pairs_list and new_port_host:
new_port_state = new_port.get('admin_state_up') new_port_state = new_port.get('admin_state_up')
original_port_state = original_port.get('admin_state_up') original_port_state = original_port.get('admin_state_up')
if new_port_state and not original_port_state: if new_port_state:
# Case were we activate the port from inactive state. # Case were we activate the port from inactive state,
# or the same port has additional address_pairs added.
for address_pair in allowed_address_pairs_list: for address_pair in allowed_address_pairs_list:
_dvr_handle_unbound_allowed_addr_pair_add( _dvr_handle_unbound_allowed_addr_pair_add(
l3plugin, context, new_port, address_pair) l3plugin, context, new_port, address_pair)
return return
elif original_port_state and not new_port_state: elif original_port_state:
# Case were we deactivate the port from active state. # Case were we deactivate the port from active state.
for address_pair in allowed_address_pairs_list: for address_pair in allowed_address_pairs_list:
_dvr_handle_unbound_allowed_addr_pair_del( _dvr_handle_unbound_allowed_addr_pair_del(
l3plugin, context, original_port, address_pair) l3plugin, context, original_port, address_pair)
return return
elif new_port_state and original_port_state:
# Case were the same port has additional address_pairs
# added.
for address_pair in allowed_address_pairs_list:
_dvr_handle_unbound_allowed_addr_pair_add(
l3plugin, context, new_port, address_pair)
return
is_fixed_ips_changed = ( is_fixed_ips_changed = (
'fixed_ips' in new_port and 'fixed_ips' in new_port and