OVS UT: Change misleading constants in veth tests

Make them consistent with test_setup_physical_bridges case.

Change-Id: Ia1d39b498d563142b59cca2ff491bee7385ca3cf

diff --git a/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py b/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py
index 76e9132368e1e0b92f141792558c9929e94a6514..e97f2419543d2e00f32c734d68f315563dfea149 100644 (file)
--- 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"