From 5c43242a13f21aaeaa9499fd9f07e36d23fc5e17 Mon Sep 17 00:00:00 2001
From: Hui HX Xiang <xianghui@cn.ibm.com>
Date: Thu, 28 Nov 2013 20:38:10 -0800
Subject: [PATCH] Sync dhcp_agent.ini with the codes

Add an option item into dhcp_agent.ini to sync with the codes.
* Add ovs_integration_bridge in /etc/dhcp_agent.ini
* Add corresponding unit test

Change-Id: Ia78e7ca6c1fcbeca3e962f870a393e44183d719c
closes-Bug: #1256197
---
 etc/dhcp_agent.ini                         |  3 +++
 neutron/tests/unit/test_linux_interface.py | 25 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/etc/dhcp_agent.ini b/etc/dhcp_agent.ini
index 1fea47858..78fb6c165 100644
--- a/etc/dhcp_agent.ini
+++ b/etc/dhcp_agent.ini
@@ -15,6 +15,9 @@
 # BigSwitch/Floodlight)
 # interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
 
+# Name of Open vSwitch bridge to use
+# ovs_integration_bridge = br-int
+
 # Use veth for an OVS interface or not.
 # Support kernels with limited namespace support
 # (e.g. RHEL 6.5) so long as ovs_use_veth is set to True.
diff --git a/neutron/tests/unit/test_linux_interface.py b/neutron/tests/unit/test_linux_interface.py
index d5576439e..1b540a431 100644
--- a/neutron/tests/unit/test_linux_interface.py
+++ b/neutron/tests/unit/test_linux_interface.py
@@ -110,6 +110,31 @@ class TestOVSInterfaceDriver(TestBase):
     def test_plug_alt_bridge(self):
         self._test_plug(bridge='br-foo')
 
+    def test_plug_configured_bridge(self):
+        br = 'br-v'
+        self.conf.set_override('ovs_use_veth', False)
+        self.conf.set_override('ovs_integration_bridge', br)
+        self.assertEqual(self.conf.ovs_integration_bridge, br)
+
+        def device_exists(dev, root_helper=None, namespace=None):
+            return dev == br
+
+        ovs = interface.OVSInterfaceDriver(self.conf)
+        with mock.patch.object(ovs, '_ovs_add_port') as add_port:
+            self.device_exists.side_effect = device_exists
+            ovs.plug('01234567-1234-1234-99',
+                     'port-1234',
+                     'tap0',
+                     'aa:bb:cc:dd:ee:ff',
+                     bridge=None,
+                     namespace=None)
+
+        add_port.assert_called_once_with('br-v',
+                                         'tap0',
+                                         'port-1234',
+                                         'aa:bb:cc:dd:ee:ff',
+                                         internal=True)
+
     def _test_plug(self, additional_expectation=[], bridge=None,
                    namespace=None):