openstack/neutron
Code Issues Proposed changes

Merge "Always try to delete bridge for ID on network_delete"

Browse Source
This commit is contained in:
Jenkins
2017-07-25 01:32:05 +00:00
committed by Gerrit Code Review
parent b293b59b81 499faa3074
commit bc4b0b23b9
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
View File

@@ -848,9 +848,6 @@ class LinuxBridgeRpcCallbacks(
"bridge_mappings and cannot be deleted."),
network_id)
return
else:
LOG.debug("Network %s is not on this agent.", network_id)
return
bridge_name = self.agent.mgr.get_bridge_name(network_id)
LOG.debug("Delete %s", bridge_name)

9
neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py
View File

@@ -942,11 +942,16 @@ class TestLinuxBridgeRpcCallbacks(base.BaseTestCase):
segment.segmentation_id = 1
self.lb_rpc.network_map['net_id'] = segment
def test_network_delete(self):
def test_network_delete_mapped_net(self):
mock_net = mock.Mock()
mock_net.physical_network = None
self._test_network_delete({NETWORK_ID: mock_net})
self.lb_rpc.network_map = {NETWORK_ID: mock_net}
def test_network_delete_unmapped_net(self):
self._test_network_delete({})
def _test_network_delete(self, net_map):
self.lb_rpc.network_map = net_map
with mock.patch.object(self.lb_rpc.agent.mgr,
"get_bridge_name") as get_br_fn,\