Merge "Implement local ARP responder onto OVS agent"

diff --cc neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
index 6e8e02fd49db3c89e8325aecb9d9101bf88f7b98,fd565bc09446f0ba9e3618a2cb17254c2f026a41..9219beca3aadf1a3f0496e716bb0786e0da436e3
--- 1/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
--- 2/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
@@@ -701,9 -809,19 +809,19 @@@ class OVSNeutronAgent(sg_rpc.SecurityGr
                               actions="resubmit(,%s)" %
                               constants.PATCH_LV_TO_TUN)
          self.tun_br.add_flow(priority=0, actions="drop")
+         if self.arp_responder_enabled:
+             # ARP broadcast-ed request go to the local ARP_RESPONDER table to
+             # be locally resolved
+             self.tun_br.add_flow(table=constants.PATCH_LV_TO_TUN,
+                                  priority=1,
+                                  proto='arp',
+                                  dl_dst="ff:ff:ff:ff:ff:ff",
+                                  actions=("resubmit(,%s)" %
+                                           constants.ARP_RESPONDER))
          # PATCH_LV_TO_TUN table will handle packets coming from patch_int
 -        # unicasts go to table UCAST_TO_TUN where remote adresses are learnt
 +        # unicasts go to table UCAST_TO_TUN where remote addresses are learnt
          self.tun_br.add_flow(table=constants.PATCH_LV_TO_TUN,
+                              priority=0,
                               dl_dst="00:00:00:00:00:00/01:00:00:00:00:00",
                               actions="resubmit(,%s)" % constants.UCAST_TO_TUN)
          # Broadcasts/multicasts go to table FLOOD_TO_TUN that handles flooding