From: YAMAMOTO Takashi Date: Thu, 14 Aug 2014 18:20:05 +0000 (+0900) Subject: ofagent: Enable local arp responder for TYPE_LOCAL X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b7d332c5eee1b1d6a9dfc4def09110911d939c23;p=openstack-build%2Fneutron-build.git 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 15a5a71b7..1cef97aa6 100644 --- 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 3212cf421..eccc6c670 100644 --- 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