From 8ffef7f6bd9454208b12e1d0236303c3ec995711 Mon Sep 17 00:00:00 2001 From: Maysa Macedo Date: Sat, 24 Feb 2018 18:08:40 +0000 Subject: [PATCH] Ensure pools recovery creates the right pool key. This patch reorganizes the security groups retrieved from Neutron, which does not always returns them in proper order causing differents 'pool_key' to be created. Since the 'pool_key' is composed by host address, project id and security groups. Change-Id: I6a33a075bce83a09fbb642d796a86c936968fde4 Closes-Bug: #1751794 --- kuryr_kubernetes/controller/drivers/vif_pool.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kuryr_kubernetes/controller/drivers/vif_pool.py b/kuryr_kubernetes/controller/drivers/vif_pool.py index f86a9a80e..4fbdd8cd0 100644 --- a/kuryr_kubernetes/controller/drivers/vif_pool.py +++ b/kuryr_kubernetes/controller/drivers/vif_pool.py @@ -553,7 +553,8 @@ class NestedVIFPool(BaseVIFPool): kuryr_subport = available_subports.get(subport['port_id']) if kuryr_subport: pool_key = (host_addr, kuryr_subport['project_id'], - tuple(kuryr_subport['security_groups'])) + tuple(sorted(kuryr_subport['security_groups'])) + ) if action == 'recover': subnet_id = kuryr_subport['fixed_ips'][0]['subnet_id']