diff --git a/neutron/agent/linux/ovs_lib.py b/neutron/agent/linux/ovs_lib.py index e1172234f8..b50ea7a30c 100644 --- a/neutron/agent/linux/ovs_lib.py +++ b/neutron/agent/linux/ovs_lib.py @@ -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]) diff --git a/neutron/tests/unit/agent/linux/test_ovs_lib.py b/neutron/tests/unit/agent/linux/test_ovs_lib.py index a9c1b981ad..b34f7be648 100644 --- a/neutron/tests/unit/agent/linux/test_ovs_lib.py +++ b/neutron/tests/unit/agent/linux/test_ovs_lib.py @@ -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: