x/vmware-nsx
Code Issues Proposed changes

Merge "ofagent: Enable local arp responder for TYPE_LOCAL"

Browse Source
This commit is contained in:
Jenkins 2014-09-02 12:39:19 +00:00 committed by Gerrit Code Review
commit 3a8b9d5698
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/plugins/ofagent/agent/ofa_neutron_agent.py
View File

@ -225,7 +225,8 @@ class OFANeutronAgent(n_rpc.RpcCallback,
self.tunnel_types = tunnel_types or [] self.tunnel_types = tunnel_types or []
l2pop_network_types = list(set(self.tunnel_types + l2pop_network_types = list(set(self.tunnel_types +
[p_const.TYPE_VLAN, [p_const.TYPE_VLAN,
p_const.TYPE_FLAT])) p_const.TYPE_FLAT,
p_const.TYPE_LOCAL]))
self.agent_state = { self.agent_state = {
'binary': 'neutron-ofa-agent', 'binary': 'neutron-ofa-agent',
'host': cfg.CONF.host, 'host': cfg.CONF.host,

6
neutron/tests/unit/ofagent/test_ofa_neutron_agent.py
View File

@ -686,6 +686,9 @@ class TestOFANeutronAgent(ofa_test_base.OFAAgentTestBase):
def test_add_arp_table_entry_flat(self): def test_add_arp_table_entry_flat(self):
self._test_add_arp_table_entry_non_tunnel('flat') 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): def test_del_arp_table_entry(self):
self._prepare_l2_pop_ofports() self._prepare_l2_pop_ofports()
fdb_entry = {self.lvms[0].net: fdb_entry = {self.lvms[0].net:
@ -736,6 +739,9 @@ class TestOFANeutronAgent(ofa_test_base.OFAAgentTestBase):
def test_del_arp_table_entry_flat(self): def test_del_arp_table_entry_flat(self):
self._test_del_arp_table_entry_non_tunnel('flat') 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): def test_recl_lv_port_to_preserve(self):
self._prepare_l2_pop_ofports() self._prepare_l2_pop_ofports()
self.agent.enable_tunneling = True self.agent.enable_tunneling = True