Merge "Fix AttributeError in _clean_updated_sg_member_conntrack_entries()"

This commit is contained in:
Jenkins 2015-08-26 10:44:48 +00:00 committed by Gerrit Code Review
commit d66f0e2791

View File

@ -757,7 +757,7 @@ class IptablesFirewallDriver(firewall.FirewallDriver):
sec_group_change = False
device_info = self.filtered_ports.get(device)
pre_device_info = self._pre_defer_filtered_ports.get(device)
if not (device_info or pre_device_info):
if not device_info or not pre_device_info:
continue
for sg_id in pre_device_info.get('security_groups', []):
if sg_id not in device_info.get('security_groups', []):