Ensure unit tests work with all interface types

Fixes bug 1167520

Change-Id: I42ed3a5718d771924caffba3f58340e7f1d2e2ad

diff --git a/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py b/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
index 2ca1d13391f40ecb5e32625c5a05d223e0b11a39..92018e0f096100555b309203d2b2c195c8ce4210 100644 (file)
--- a/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
+++ b/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
@@ -64,7 +64,7 @@ class TestLinuxBridgeAgent(base.BaseTestCase):
         '1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue \\'
         'state UNKNOWN \\'
         'link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00',
-        '2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 \\'
+        '2: eth77: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 \\'
         'qdisc mq state UP qlen 1000\    link/ether \\'
         'cc:dd:ee:ff:ab:cd brd ff:ff:ff:ff:ff:ff']
 
@@ -81,6 +81,11 @@ class TestLinuxBridgeAgent(base.BaseTestCase):
         self.execute = self.execute_p.start()
         self.addCleanup(self.execute_p.stop)
         self.execute.return_value = '\n'.join(self.LINK_SAMPLE)
+        self.get_mac_p = mock.patch('quantum.agent.linux.utils.'
+                                    'get_interface_mac')
+        self.get_mac = self.get_mac_p.start()
+        self.addCleanup(self.get_mac_p.stop)
+        self.get_mac.return_value = '00:00:00:00:00:01'
 
     def test_update_devices_failed(self):
         lbmgr_instance = self.lbmgr_mock.return_value

diff --git a/quantum/tests/unit/openvswitch/test_ovs_quantum_agent.py b/quantum/tests/unit/openvswitch/test_ovs_quantum_agent.py
index 92407a4ee06a492fad3160eada4b70f6a4ff564f..88adadce4e2640a574cdedbfa05e14fd375ea63f 100644 (file)
--- a/quantum/tests/unit/openvswitch/test_ovs_quantum_agent.py
+++ b/quantum/tests/unit/openvswitch/test_ovs_quantum_agent.py
@@ -58,7 +58,7 @@ class TestOvsQuantumAgent(base.BaseTestCase):
                         'OVSQuantumAgent.setup_integration_br',
                         return_value=mock.Mock()):
             with mock.patch('quantum.agent.linux.utils.get_interface_mac',
-                            return_value='000000000001'):
+                            return_value='00:00:00:00:00:01'):
                 self.agent = ovs_quantum_agent.OVSQuantumAgent(**kwargs)
         self.agent.sg_agent = mock.Mock()
 

diff --git a/quantum/tests/unit/openvswitch/test_ovs_tunnel.py b/quantum/tests/unit/openvswitch/test_ovs_tunnel.py
index 6476d86a66e995e808cc412a3ffb6ff5840e5429..e3bdcee842208e452ee6ff69b0e504fa83c248e4 100644 (file)
--- a/quantum/tests/unit/openvswitch/test_ovs_tunnel.py
+++ b/quantum/tests/unit/openvswitch/test_ovs_tunnel.py
@@ -124,7 +124,8 @@ class TunnelTest(base.BaseTestCase):
             'phy-tunnel_bridge_mapping').AndReturn([self.inta, self.intb])
 
         self.mox.StubOutWithMock(utils, 'get_interface_mac')
-        utils.get_interface_mac(self.INT_BRIDGE).AndReturn('000000000001')
+        utils.get_interface_mac(self.INT_BRIDGE).AndReturn(
+            '00:00:00:00:00:01')
 
     def testConstruct(self):
         self.mox.ReplayAll()