ofagent: Enable local arp responder for TYPE_FLAT

handling TYPE_FLAT is particularly useful because,
as stated in README, a flat provider network is
the recommended way to provide public network connectivity
for ofagent.

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

diff --git a/neutron/plugins/ofagent/agent/ofa_neutron_agent.py b/neutron/plugins/ofagent/agent/ofa_neutron_agent.py
index 8be7fa5cb4fc424bb3a4c82be5dc6d200c7fc9c5..15a5a71b78740a6e3f3006857892e8484f359a77 100644 (file)
--- a/neutron/plugins/ofagent/agent/ofa_neutron_agent.py
+++ b/neutron/plugins/ofagent/agent/ofa_neutron_agent.py
@@ -224,7 +224,8 @@ class OFANeutronAgent(n_rpc.RpcCallback,
                                                 ofa_const.LOCAL_VLAN_MAX))
         self.tunnel_types = tunnel_types or []
         l2pop_network_types = list(set(self.tunnel_types +
-                                       [p_const.TYPE_VLAN]))
+                                       [p_const.TYPE_VLAN,
+                                        p_const.TYPE_FLAT]))
         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 b9b83655dc52da5defcfef80b43afba74448e182..3212cf421c3cbae20d203522786639a005ea6e11 100644 (file)
--- a/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py
+++ b/neutron/tests/unit/ofagent/test_ofa_neutron_agent.py
@@ -683,6 +683,9 @@ class TestOFANeutronAgent(ofa_test_base.OFAAgentTestBase):
     def test_add_arp_table_entry_vlan(self):
         self._test_add_arp_table_entry_non_tunnel('vlan')
 
+    def test_add_arp_table_entry_flat(self):
+        self._test_add_arp_table_entry_non_tunnel('flat')
+
     def test_del_arp_table_entry(self):
         self._prepare_l2_pop_ofports()
         fdb_entry = {self.lvms[0].net:
@@ -730,6 +733,9 @@ class TestOFANeutronAgent(ofa_test_base.OFAAgentTestBase):
     def test_del_arp_table_entry_vlan(self):
         self._test_del_arp_table_entry_non_tunnel('vlan')
 
+    def test_del_arp_table_entry_flat(self):
+        self._test_del_arp_table_entry_non_tunnel('flat')
+
     def test_recl_lv_port_to_preserve(self):
         self._prepare_l2_pop_ofports()
         self.agent.enable_tunneling = True