summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-15 22:38:16 +0000
committerGerrit Code Review <review@openstack.org>2017-06-15 22:38:16 +0000
commit8aa67a7674c408827c5b11b8f0bf0e7bc85cf715 (patch)
tree2c52c8821b83bc8c8d77e230b87a1ca1082f8631
parentd74a5bab45ba811cbf03f23ce889deb402b6a8b6 (diff)
parent3c0f4b7390e2204eaee9e821baa393a81095c4d5 (diff)
Merge "Don't iterate updated_rule_sg_ids or updated_sg_members" into stable/newton
-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 9212ff0..9d7a34d 100644
--- a/neutron/agent/linux/iptables_firewall.py
+++ b/neutron/agent/linux/iptables_firewall.py
@@ -831,7 +831,7 @@ class IptablesFirewallDriver(firewall.FirewallDriver):
831 831
832 def _clean_deleted_sg_rule_conntrack_entries(self): 832 def _clean_deleted_sg_rule_conntrack_entries(self):
833 deleted_sg_ids = set() 833 deleted_sg_ids = set()
834 for sg_id in self.updated_rule_sg_ids: 834 for sg_id in set(self.updated_rule_sg_ids):
835 del_rules = self._find_deleted_sg_rules(sg_id) 835 del_rules = self._find_deleted_sg_rules(sg_id)
836 if not del_rules: 836 if not del_rules:
837 continue 837 continue
@@ -845,7 +845,7 @@ class IptablesFirewallDriver(firewall.FirewallDriver):
845 845
846 def _clean_updated_sg_member_conntrack_entries(self): 846 def _clean_updated_sg_member_conntrack_entries(self):
847 updated_device_ids = set() 847 updated_device_ids = set()
848 for device in self.updated_sg_members: 848 for device in set(self.updated_sg_members):
849 sec_group_change = False 849 sec_group_change = False
850 device_info = self.filtered_ports.get(device) 850 device_info = self.filtered_ports.get(device)
851 pre_device_info = self._pre_defer_filtered_ports.get(device) 851 pre_device_info = self._pre_defer_filtered_ports.get(device)