ofagent: Enable local arp responder for TYPE_LOCAL

Related: blueprint ofagent-l2pop
Related: blueprint ofagent-merge-bridges
Change-Id: I838917ffffff8fd52c68b4633bd84dccdfe656de

diff --git a/neutron/plugins/ofagent/agent/ofa_neutron_agent.py b/neutron/plugins/ofagent/agent/ofa_neutron_agent.py
index 15a5a71b78740a6e3f3006857892e8484f359a77..1cef97aa6de2ab948f152d1411b1a62de6e7205c 100644 (file)
--- a/neutron/plugins/ofagent/agent/ofa_neutron_agent.py
+++ b/neutron/plugins/ofagent/agent/ofa_neutron_agent.py
@@ -225,7 +225,8 @@ class OFANeutronAgent(n_rpc.RpcCallback,
         self.tunnel_types = tunnel_types or []
         l2pop_network_types = list(set(self.tunnel_types +
                                        [p_const.TYPE_VLAN,
-                                        p_const.TYPE_FLAT]))
+                                        p_const.TYPE_FLAT,
+                                        p_const.TYPE_LOCAL]))
         self.agent_state = {
             'binary': 'neutron-ofa-agent',
             'host': cfg.CONF.host,

diff --git a/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py b/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py
index 3212cf421c3cbae20d203522786639a005ea6e11..eccc6c67082c82b541fe8906c3ca7295b575f68d 100644 (file)
--- a/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py
+++ b/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py
@@ -686,6 +686,9 @@ class TestOFANeutronAgent(ofa_test_base.OFAAgentTestBase):
     def test_add_arp_table_entry_flat(self):
         self._test_add_arp_table_entry_non_tunnel('flat')
 
+    def test_add_arp_table_entry_local(self):
+        self._test_add_arp_table_entry_non_tunnel('local')
+
     def test_del_arp_table_entry(self):
         self._prepare_l2_pop_ofports()
         fdb_entry = {self.lvms[0].net:
@@ -736,6 +739,9 @@ class TestOFANeutronAgent(ofa_test_base.OFAAgentTestBase):
     def test_del_arp_table_entry_flat(self):
         self._test_del_arp_table_entry_non_tunnel('flat')
 
+    def test_del_arp_table_entry_local(self):
+        self._test_del_arp_table_entry_non_tunnel('local')
+
     def test_recl_lv_port_to_preserve(self):
         self._prepare_l2_pop_ofports()
         self.agent.enable_tunneling = True