From: Cedric Brandily <zzelle@gmail.com>
Date: Wed, 25 Nov 2015 21:43:43 +0000 (+0100)
Subject: Remove useless lb-agent remove_empty_bridges
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ba6b4302413ccd8b0553cdb5868a824c7595da1d;p=openstack-build%2Fneutron-build.git

Remove useless lb-agent remove_empty_bridges

This change removes LB-agent[1] remove_empty_bridges is no more unused
since change[2].

[1] neutron.plugins.ml2.drivers.linuxbridge.agent.linuxbridge_neutron_agent
[2] I4ccc96566a5770384eacbbdc492bf09a514f5b31

Partial-Bug: #1514548
Change-Id: Iaf7213aaeddcac4843d9b410d910cf7dc7b8e603
---

diff --git a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
index 9036e27fb..e5007ca47 100644
--- a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
@@ -494,18 +494,6 @@ class LinuxBridgeManager(object):
             LOG.debug("Cannot delete bridge %s; it does not exist",
                       bridge_name)
 
-    def remove_empty_bridges(self):
-        for network_id in list(self.network_map.keys()):
-            # NOTE(nick-ma-z): Don't remove pre-existing user-defined bridges
-            phy_net = self.network_map[network_id].physical_network
-            if phy_net and phy_net in self.bridge_mappings:
-                continue
-
-            bridge_name = self.get_bridge_name(network_id)
-            if not self.get_tap_devices_count(bridge_name):
-                self.delete_bridge(bridge_name)
-                del self.network_map[network_id]
-
     def remove_interface(self, bridge_name, interface_name):
         bridge_device = bridge_lib.BridgeDevice(bridge_name)
         if bridge_device.exists():
diff --git a/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py b/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py
index 0a84f1b23..8a2800e88 100644
--- a/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py
@@ -858,36 +858,6 @@ class TestLinuxBridgeManager(base.BaseTestCase):
             self.lbm.delete_bridge("br0")
             del_int.assert_called_once_with("eth1.1")
 
-    def test_remove_empty_bridges(self):
-        self.lbm.network_map = {'net1': mock.Mock(), 'net2': mock.Mock()}
-
-        def tap_count_side_effect(*args):
-            return 0 if args[0] == 'brqnet1' else 1
-
-        with mock.patch.object(self.lbm, "delete_bridge") as del_br_fn,\
-                mock.patch.object(self.lbm,
-                                  "get_tap_devices_count",
-                                  side_effect=tap_count_side_effect):
-            self.lbm.remove_empty_bridges()
-            del_br_fn.assert_called_once_with('brqnet1')
-
-    def test_remove_empty_bridges_with_existed_brq(self):
-        phy_net = mock.Mock()
-        phy_net.physical_network = 'physnet0'
-        self.lbm.network_map = {'net1': mock.Mock(),
-                                'net2': mock.Mock(),
-                                'net3': phy_net}
-
-        def tap_count_side_effect(*args):
-            return 0
-
-        with mock.patch.object(self.lbm, "delete_bridge") as del_br_fn,\
-                mock.patch.object(self.lbm,
-                                  "get_tap_devices_count",
-                                  side_effect=tap_count_side_effect):
-            self.lbm.remove_empty_bridges()
-            self.assertEqual(2, del_br_fn.call_count)
-
     def test_remove_interface(self):
         with mock.patch.object(ip_lib.IPDevice, "exists") as de_fn,\
                 mock.patch.object(bridge_lib,