From 7f17c94476715e9d9b50d9d483deb20ab4412a2d Mon Sep 17 00:00:00 2001 From: Luis Tomas Bolivar Date: Thu, 16 Jan 2020 11:57:47 +0100 Subject: [PATCH] Fix more problem of changing size during dict iteration Change-Id: Ie1d7fb2d7d62c1a43a32d513fdcbbb265bebff98 Closes-Bug: 1859005 (cherry picked from commit c7b8816c350fc3394044e76524153cad07215336) --- kuryr_kubernetes/controller/drivers/vif_pool.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kuryr_kubernetes/controller/drivers/vif_pool.py b/kuryr_kubernetes/controller/drivers/vif_pool.py index 61baf6608..d98e9ab3f 100644 --- a/kuryr_kubernetes/controller/drivers/vif_pool.py +++ b/kuryr_kubernetes/controller/drivers/vif_pool.py @@ -305,7 +305,7 @@ class BaseVIFPool(base.VIFPoolDriver): for pool_key, pool_ports in list(self._available_ports_pools.items()): if self._get_pool_key_net(pool_key) != net_id: continue - for sg_key, ports in pool_ports.items(): + for sg_key, ports in list(pool_ports.items()): if sg_id not in sg_key: continue # remove the pool associated to that SG @@ -478,7 +478,7 @@ class NeutronVIFPool(BaseVIFPool): pool_updates = self._last_update.get(pool_key, {}) if not pool_updates: # No pools update info. Selecting a random one - for sg_group, ports in pool_ports.items(): + for sg_group, ports in list(pool_ports.items()): if len(ports) > 0: port_id = pool_ports[sg_group].pop() break @@ -486,7 +486,7 @@ class NeutronVIFPool(BaseVIFPool): raise exceptions.ResourceNotReady(pod) else: min_date = -1 - for sg_group, date in pool_updates.items(): + for sg_group, date in list(pool_updates.items()): if pool_ports.get(sg_group): if min_date == -1 or date < min_date: min_date = date @@ -749,7 +749,7 @@ class NestedVIFPool(BaseVIFPool): pool_updates = self._last_update.get(pool_key, {}) if not pool_updates: # No pools update info. Selecting a random one - for sg_group, ports in pool_ports.items(): + for sg_group, ports in list(pool_ports.items()): if len(ports) > 0: port_id = pool_ports[sg_group].pop() break @@ -757,7 +757,7 @@ class NestedVIFPool(BaseVIFPool): raise exceptions.ResourceNotReady(pod) else: min_date = -1 - for sg_group, date in pool_updates.items(): + for sg_group, date in list(pool_updates.items()): if pool_ports.get(sg_group): if min_date == -1 or date < min_date: min_date = date