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

diff --git a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
index 744b2d03e09d15e580904845f83daae6edd1895a..1e388d068cd2428c464d6401a844d223d0b69ffd 100755 (executable)
--- 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)