From ac686ca016c00e731a3175f0f0ab34981d62b525 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Mon, 23 Feb 2015 14:28:02 +0900 Subject: [PATCH] OVS UT: Change misleading constants in veth tests Make them consistent with test_setup_physical_bridges case. Change-Id: Ia1d39b498d563142b59cca2ff491bee7385ca3cf --- neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py b/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py index 76e913236..e97f24195 100644 --- a/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py +++ b/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py @@ -577,8 +577,8 @@ class TestOvsNeutronAgent(base.BaseTestCase): parent.attach_mock(addveth_fn, 'add_veth') addveth_fn.return_value = (ip_lib.IPDevice("int-br-eth1"), ip_lib.IPDevice("phy-br-eth1")) - ovs_addport_fn.return_value = "int_ofport" - br_addport_fn.return_value = "phys_veth" + ovs_addport_fn.return_value = "phys_veth_ofport" + br_addport_fn.return_value = "int_veth_ofport" get_br_fn.return_value = ["br-eth"] self.agent.setup_physical_bridges({"physnet1": "br-eth"}) expected_calls = [mock.call.link_delete(), @@ -589,9 +589,9 @@ class TestOvsNeutronAgent(base.BaseTestCase): 'phy-br-eth')] parent.assert_has_calls(expected_calls, any_order=False) self.assertEqual(self.agent.int_ofports["physnet1"], - "phys_veth") + "int_veth_ofport") self.assertEqual(self.agent.phys_ofports["physnet1"], - "int_ofport") + "phys_veth_ofport") def test_get_peer_name(self): bridge1 = "A_REALLY_LONG_BRIDGE_NAME1" -- 2.45.2