From 8fd0f912caf2e7db9ccf701354d7a7a9b89adf5c Mon Sep 17 00:00:00 2001 From: Lajos Katona Date: Tue, 15 Jan 2019 09:20:54 +0100 Subject: [PATCH] Catch OVSFWTagNotFound in update_port_filter In neutron.agent.linux.openvswitch_firewall.firewall make the method update_port_filter catch OVSFWTagNotFound and log it to avoid traceback in log files. Conflicts: neutron/agent/linux/openvswitch_firewall/firewall.py Change-Id: I584d867f0e1c47447cb8790fd715fa01ec902438 Closes-Bug: #1811405 (cherry picked from commit 22f55822aab17c758f5f723c304b1acaf3179ec1) (cherry picked from commit 6d17829aa664e7cf6a92291963ff622c8b763b53) --- neutron/agent/linux/openvswitch_firewall/firewall.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neutron/agent/linux/openvswitch_firewall/firewall.py b/neutron/agent/linux/openvswitch_firewall/firewall.py index 90675b75b35..357003263d2 100644 --- a/neutron/agent/linux/openvswitch_firewall/firewall.py +++ b/neutron/agent/linux/openvswitch_firewall/firewall.py @@ -671,6 +671,10 @@ class OVSFirewallDriver(firewall.FirewallDriver): # If port doesn't exist in ovsdb, lets ensure that there are no # leftovers self.remove_port_filter(port) + 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 _set_port_filters(self, of_port): self.initialize_port_flows(of_port)