summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-17 10:12:22 +0000
committerGerrit Code Review <review@openstack.org>2017-06-17 10:12:22 +0000
commit26537ac05f46d691ce4bcd0e130bf203a54c1afd (patch)
treebfa8b3b1a6952e9ffafbf6d0920a2ac044fc3ca4
parentb99239e06eb63a3dbe656b534526ddb7a9781ae5 (diff)
parent96657be885275969a0feadde6255697b43e01590 (diff)
Merge "Don't iterate updated_rule_sg_ids or updated_sg_members" into stable/ocata
-rw-r--r--neutron/agent/linux/iptables_firewall.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/neutron/agent/linux/iptables_firewall.py b/neutron/agent/linux/iptables_firewall.py
index 6cb2b23..a20cd58 100644
--- a/neutron/agent/linux/iptables_firewall.py
+++ b/neutron/agent/linux/iptables_firewall.py
@@ -842,7 +842,7 @@ class IptablesFirewallDriver(firewall.FirewallDriver):
842 842
843 def _clean_deleted_sg_rule_conntrack_entries(self): 843 def _clean_deleted_sg_rule_conntrack_entries(self):
844 deleted_sg_ids = set() 844 deleted_sg_ids = set()
845 for sg_id in self.updated_rule_sg_ids: 845 for sg_id in set(self.updated_rule_sg_ids):
846 del_rules = self._find_deleted_sg_rules(sg_id) 846 del_rules = self._find_deleted_sg_rules(sg_id)
847 if not del_rules: 847 if not del_rules:
848 continue 848 continue
@@ -856,7 +856,7 @@ class IptablesFirewallDriver(firewall.FirewallDriver):
856 856
857 def _clean_updated_sg_member_conntrack_entries(self): 857 def _clean_updated_sg_member_conntrack_entries(self):
858 updated_device_ids = set() 858 updated_device_ids = set()
859 for device in self.updated_sg_members: 859 for device in set(self.updated_sg_members):
860 sec_group_change = False 860 sec_group_change = False
861 device_info = self.filtered_ports.get(device) 861 device_info = self.filtered_ports.get(device)
862 pre_device_info = self._pre_defer_filtered_ports.get(device) 862 pre_device_info = self._pre_defer_filtered_ports.get(device)