openstack
/
neutron
Code Issues Proposed changes

Revert changes removing OVSBridge return 

This reverts changes from this review [1] which incorrectly removed
the return of the OVSBridge object when calling BaseOVS.add_bridge.
This broke all functional tests relying on this return.

[1] https://review.openstack.org/#/c/71142/

Related-Bug: #1301363

Change-Id: If32e155cc2bd368b2e842f14b1d1da0827ccfeff
This commit is contained in:
Kyle Mestery 2014-04-02 14:39:13 +00:00
parent bc3da2877e
commit 783b88ccdd
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
neutron/agent/linux/ovs_lib.py
View File

@ -75,6 +75,7 @@ class BaseOVS(object):
def add_bridge(self, bridge_name):
self.run_vsctl(["--", "--may-exist", "add-br", bridge_name])
return OVSBridge(bridge_name, self.root_helper)
def delete_bridge(self, bridge_name):
self.run_vsctl(["--", "--if-exists", "del-br", bridge_name])

5
neutron/tests/unit/agent/linux/test_ovs_lib.py
View File

@ -42,9 +42,12 @@ class TestBaseOVS(base.BaseTestCase):
def test_add_bridge(self):
with mock.patch.object(self.ovs, 'run_vsctl') as mock_vsctl:
self.ovs.add_bridge(self.br_name)
bridge = self.ovs.add_bridge(self.br_name)
mock_vsctl.assert_called_with(["--", "--may-exist",
"add-br", self.br_name])
self.assertEqual(bridge.br_name, self.br_name)
self.assertEqual(bridge.root_helper, self.ovs.root_helper)
def test_delete_bridge(self):
with mock.patch.object(self.ovs, 'run_vsctl') as mock_vsctl: