openstack/kuryr-kubernetes
Code Issues Proposed changes

Merge "Fix deletion of ports on a pool"

Browse Source
This commit is contained in:
Zuul 2019-11-24 20:23:40 +00:00 committed by Gerrit Code Review
commit a8fe3afa69
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kuryr_kubernetes/controller/drivers/vif_pool.py
View File

@ -654,7 +654,8 @@ class NeutronVIFPool(BaseVIFPool):
# on the available_ports_pools dict. The next call forces it to be on
# that dict before cleaning it up
self._trigger_return_to_pool()
for pool_key, ports in self._available_ports_pools.items():
available_ports_pools = self._available_ports_pools.copy()
for pool_key, ports in available_ports_pools.items():
if self._get_pool_key_net(pool_key) != net_id:
continue
ports_id = []
@ -1031,7 +1032,8 @@ class NestedVIFPool(BaseVIFPool):
# on the available_ports_pools dict. The next call forces it to be on
# that dict before cleaning it up
self._trigger_return_to_pool()
for pool_key, ports in self._available_ports_pools.items():
available_ports_pools = self._available_ports_pools.copy()
for pool_key, ports in available_ports_pools.items():
if self._get_pool_key_net(pool_key) != net_id:
continue
trunk_id = self._get_trunk_id(neutron, pool_key)