openstack
/
neutron
Code Issues Proposed changes

Merge "Handle OVSFWPortNotFound and OVSFWTagNotFound in ovs firewall"

This commit is contained in:
Zuul 2019-10-27 20:44:05 +00:00 committed by Gerrit Code Review
parent ec2f50a07b e801159003
commit a94cb83e18
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
neutron/agent/linux/openvswitch_firewall/firewall.py
View File

@ -578,14 +578,23 @@ class OVSFirewallDriver(firewall.FirewallDriver):
self._initialize_egress_no_port_security(port['device']) self._initialize_egress_no_port_security(port['device'])
return return
old_of_port = self.get_ofport(port) try:
of_port = self.get_or_create_ofport(port) old_of_port = self.get_ofport(port)
if old_of_port: of_port = self.get_or_create_ofport(port)
LOG.info("Initializing port %s that was already initialized.", if old_of_port:
port['device']) LOG.info("Initializing port %s that was already initialized.",
self._update_flows_for_port(of_port, old_of_port) port['device'])
else: self._update_flows_for_port(of_port, old_of_port)
self._set_port_filters(of_port) else:
self._set_port_filters(of_port)
except exceptions.OVSFWPortNotFound as not_found_error:
LOG.info("port %(port_id)s does not exist in ovsdb: %(err)s.",
{'port_id': port['device'],
'err': not_found_error})
except exceptions.OVSFWTagNotFound as tag_not_found:
LOG.info("Tag was not found for port %(port_id)s: %(err)s.",
{'port_id': port['device'],
'err': tag_not_found})
def update_port_filter(self, port): def update_port_filter(self, port):
"""Update rules for given port """Update rules for given port