From 8713c4972dff08405930d675d822a018a5898790 Mon Sep 17 00:00:00 2001 From: Aaron Rosen Date: Fri, 25 May 2012 15:20:55 -0700 Subject: [PATCH] Bug #1004584 When running ovs_quantum_agent in tunneling mode and a new tunnel_ip is added while an agent is running the following exception below occurs. This causes the agent to no longer function since it becomes caught in a loop. ERROR:__main__:Main-loop Exception: Traceback (most recent call last): File "ovs_quantum_agent.py", line 583, in daemon_loop self.manage_tunnels(tunnel_ips, old_tunnel_ips, db) File "ovs_quantum_agent.py", line 550, in manage_tunnels self.add_tun_br_flows_for_local_vlan(lv_obj) AttributeError: 'OVSQuantumTunnelAgent' object has no attribute 'add_tun_br_flows_for_local_vlan' Change-Id: Id03dc4a12a0114c8597cb90f4eabcdd3dc9b3f5c --- quantum/plugins/openvswitch/agent/ovs_quantum_agent.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py index 744b2d03e..1e388d068 100755 --- a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py +++ b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py @@ -543,12 +543,6 @@ class OVSQuantumTunnelAgent(object): self.tun_br.add_tunnel_port(tun_name, ip) self.tunnel_count += 1 - # adding new ports can void flows, so reset flows - self.tun_br.remove_all_flows() - self.tun_br.add_flow(priority=1, actions="drop") - for lv_ojb in self.local_vlan_map.values(): - self.add_tun_br_flows_for_local_vlan(lv_obj) - def rollback_until_success(self, db): while True: time.sleep(self.reconnect_interval) -- 2.45.2