From: Francois Eleouet Date: Fri, 30 Aug 2013 20:30:04 +0000 (+0200) Subject: Add missing match in OVS agent tunnel mac leaning X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0b703922e380438452b7fddf8ddff9392cb0d1cd;p=openstack-build%2Fneutron-build.git Add missing match in OVS agent tunnel mac leaning Learned flows introduced in commit a369f9e39691c01a4e4f7f8668cb37fc17ba03b3 to learn remote mac addresses on tunnels currently only match local VLAN, but not destination mac address, as a consequence, connectivity may be erratic as soon as more than two agents are used Change-Id: I467e47d0dd2c1e5aca12a4e240e348116d530d4f Closes-Bug: #1219074 --- diff --git a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py index 6cdca563c..5216e2971 100644 --- a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py +++ b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py @@ -610,6 +610,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin): "priority=1," "hard_timeout=300," "NXM_OF_VLAN_TCI[0..11]," + "NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[]," "load:0->NXM_OF_VLAN_TCI[]," "load:NXM_NX_TUN_ID[]->NXM_NX_TUN_ID[]," "output:NXM_OF_IN_PORT[]" % diff --git a/neutron/tests/unit/openvswitch/test_ovs_tunnel.py b/neutron/tests/unit/openvswitch/test_ovs_tunnel.py index c9f0f5791..571b2361e 100644 --- a/neutron/tests/unit/openvswitch/test_ovs_tunnel.py +++ b/neutron/tests/unit/openvswitch/test_ovs_tunnel.py @@ -139,6 +139,7 @@ class TunnelTest(base.BaseTestCase): "priority=1," "hard_timeout=300," "NXM_OF_VLAN_TCI[0..11]," + "NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[]," "load:0->NXM_OF_VLAN_TCI[]," "load:NXM_NX_TUN_ID[]->NXM_NX_TUN_ID[]," "output:NXM_OF_IN_PORT[]" %