openstack
/
neutron
Code Issues Proposed changes

ofagent: Remove network_delete method 

Removing local_vlan_map entry here makes later port_unbound no-op.
While it isn't a problem right now, it will be when per-port cleanup
is introduced.
This commit simply removes network_delete method.  The local_vlan_map
will be cleaned up when the last port on the network is removed.

Related: blueprint ofagent-merge-bridges
Change-Id: Ib1f1ee16e0178d0362ff2b731957f1f52dd9a596
This commit is contained in:
YAMAMOTO Takashi 2014-07-28 17:43:10 +09:00
parent fccb7f72f1
commit afe9097666
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,7 +298,6 @@ class OFANeutronAgent(n_rpc.RpcCallback,
self.endpoints = [self]
# Define the listening consumers for the agent
consumers = [[topics.PORT, topics.UPDATE],
[topics.NETWORK, topics.DELETE],
[topics.SECURITY_GROUP, topics.UPDATE],
[topics.L2POPULATION, topics.UPDATE, cfg.CONF.host]]
self.connection = agent_rpc.create_consumers(self.endpoints,
@ -332,16 +331,6 @@ class OFANeutronAgent(n_rpc.RpcCallback,
if vif_id in vlan_mapping.vif_ports:
return network_id
def network_delete(self, context, **kwargs):
network_id = kwargs.get('network_id')
LOG.debug(_("network_delete received network %s"), network_id)
# The network may not be defined on this agent
lvm = self.local_vlan_map.get(network_id)
if lvm:
self.reclaim_local_vlan(network_id)
else:
LOG.debug(_("Network %s not used on agent."), network_id)
def port_update(self, context, **kwargs):
port = kwargs.get('port')
# Put the port identifier in the updated_ports set.

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

@ -544,20 +544,6 @@ class TestOFANeutronAgent(ofa_test_base.OFAAgentTestBase):
self.agent.int_br_device_count
)
def test_network_delete(self):
with contextlib.nested(
mock.patch.object(self.agent, "reclaim_local_vlan"),
mock.patch.object(self.agent.tun_br, "cleanup_tunnel_port")
) as (recl_fn, clean_tun_fn):
self.agent.network_delete("unused_context",
network_id="123")
self.assertFalse(recl_fn.called)
self.agent.local_vlan_map["123"] = "LVM object"
self.agent.network_delete("unused_context",
network_id="123")
self.assertFalse(clean_tun_fn.called)
recl_fn.assert_called_with("123")
def test_port_update(self):
port = {"id": "b1981919-f516-11e3-a8f4-08606e7f74e7",
"network_id": "124",