From: lzklibj <lzklibj@cn.ibm.com>
Date: Thu, 10 Sep 2015 18:37:47 +0000 (+0800)
Subject: Remove unused ovs_lib method reset_bridge
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a13f5afcc821e24e40227965491b964fa85c003c;p=openstack-build%2Fneutron-build.git

Remove unused ovs_lib method reset_bridge

Per [1] we are using a better way to keep tunnel connectivity,
so reset_bridge isn't used anymore. Bug in [2] was caused by
using method reset_bridge which will delete and recreate bridge.
For [1] makes method reset_bridge deprecated, it makes sense to
remove this method, and make [2] no longer produce.

[1] https://review.openstack.org/#/c/182920
[2] Related-bug: #1332450

Change-Id: I155f66a37b8d4081126467fe576e8315c2d5560c
---

diff --git a/neutron/agent/common/ovs_lib.py b/neutron/agent/common/ovs_lib.py
index a7d660976..20b846816 100644
--- a/neutron/agent/common/ovs_lib.py
+++ b/neutron/agent/common/ovs_lib.py
@@ -195,15 +195,6 @@ class OVSBridge(BaseOVS):
     def destroy(self):
         self.delete_bridge(self.br_name)
 
-    def reset_bridge(self, secure_mode=False):
-        with self.ovsdb.transaction() as txn:
-            txn.add(self.ovsdb.del_br(self.br_name))
-            txn.add(self.ovsdb.add_br(self.br_name,
-                                      datapath_type=self.datapath_type))
-            if secure_mode:
-                txn.add(self.ovsdb.set_fail_mode(self.br_name,
-                                                 FAILMODE_SECURE))
-
     def add_port(self, port_name, *interface_attr_tuples):
         with self.ovsdb.transaction() as txn:
             txn.add(self.ovsdb.add_port(self.br_name, port_name))
diff --git a/neutron/tests/functional/agent/test_ovs_lib.py b/neutron/tests/functional/agent/test_ovs_lib.py
index 768209424..3562722ea 100644
--- a/neutron/tests/functional/agent/test_ovs_lib.py
+++ b/neutron/tests/functional/agent/test_ovs_lib.py
@@ -274,16 +274,6 @@ class OVSBridgeTestCase(OVSBridgeTestBase):
         self.br.delete_ports(all_ports=True)
         self.assertEqual(len(self.br.get_port_name_list()), 0)
 
-    def test_reset_bridge(self):
-        self.create_ovs_port()
-        self.br.reset_bridge()
-        self.assertEqual(len(self.br.get_port_name_list()), 0)
-        self._assert_br_fail_mode([])
-
-    def test_reset_bridge_secure_mode(self):
-        self.br.reset_bridge(secure_mode=True)
-        self._assert_br_fail_mode(ovs_lib.FAILMODE_SECURE)
-
     def test_set_controller_connection_mode(self):
         controllers = ['tcp:192.0.2.0:6633']
         self._set_controllers_connection_mode(controllers)