From: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Date: Tue, 24 Feb 2015 03:30:32 +0000 (+0900)
Subject: test_ovs_dvr_neutron_agent: Use consistent variable names
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e0c1ca52fcf1acc02f964433871b185f31477b32;p=openstack-build%2Fneutron-build.git

test_ovs_dvr_neutron_agent: Use consistent variable names

Stop using expected_in_xxx_br.
Use expected_on_xxx_br consistently.

Change-Id: I5eb66eca6396cbf5a3e3384a442b211576371328
---

diff --git a/neutron/tests/unit/openvswitch/test_ovs_dvr_neutron_agent.py b/neutron/tests/unit/openvswitch/test_ovs_dvr_neutron_agent.py
index d6049de3b..1e2ead58f 100644
--- a/neutron/tests/unit/openvswitch/test_ovs_dvr_neutron_agent.py
+++ b/neutron/tests/unit/openvswitch/test_ovs_dvr_neutron_agent.py
@@ -300,7 +300,7 @@ class TestOvsDvrNeutronAgent(base.BaseTestCase):
                     physical_network, segmentation_id, self._fixed_ips,
                     n_const.DEVICE_OWNER_DVR_INTERFACE, False)
                 lvm = self.agent.local_vlan_map[self._net_uuid]
-                expected_in_tun_br = [
+                expected_on_tun_br = [
                     mock.call(
                         table=constants.TUN_TABLE['vxlan'],
                         priority=1, tun_id=lvm.segmentation_id,
@@ -320,27 +320,27 @@ class TestOvsDvrNeutronAgent(base.BaseTestCase):
                             self.agent.dvr_agent.dvr_mac_address,
                             constants.PATCH_LV_TO_TUN))]
                 if ip_version == 4:
-                    expected_in_tun_br.insert(1, mock.call(
+                    expected_on_tun_br.insert(1, mock.call(
                         proto='arp',
                         nw_dst=gateway_ip, actions='drop',
                         priority=3, table=constants.DVR_PROCESS,
                         dl_vlan=lvm.vlan))
                 else:
-                    expected_in_tun_br.insert(1, mock.call(
+                    expected_on_tun_br.insert(1, mock.call(
                         icmp_type=n_const.ICMPV6_TYPE_RA,
                         proto='icmp6',
                         dl_src=self._port.vif_mac,
                         actions='drop',
                         priority=3, table=constants.DVR_PROCESS,
                         dl_vlan=lvm.vlan))
-                self.assertEqual(expected_in_tun_br,
+                self.assertEqual(expected_on_tun_br,
                                  add_flow_tun_fn.call_args_list)
                 self.agent.port_bound(self._compute_port, self._net_uuid,
                                       network_type, physical_network,
                                       segmentation_id,
                                       self._compute_fixed_ips,
                                       device_owner, False)
-                expected_in_int_br = [
+                expected_on_int_br = [
                     mock.call(table=constants.DVR_TO_SRC_MAC, priority=4,
                         dl_dst=self._compute_port.vif_mac,
                         dl_vlan=lvm.vlan,
@@ -348,14 +348,14 @@ class TestOvsDvrNeutronAgent(base.BaseTestCase):
                         "output:%s" %
                         (gateway_mac, self._compute_port.ofport))
                                 ]
-                self.assertEqual(expected_in_int_br,
+                self.assertEqual(expected_on_int_br,
                                  add_flow_int_fn.call_args_list)
                 self.assertFalse(add_flow_phys_fn.called)
-                expected_in_int_br = [
+                expected_on_int_br = [
                     mock.call(in_port=self._port.ofport),
                     mock.call(in_port=self._compute_port.ofport)
                                       ]
-                self.assertEqual(expected_in_int_br,
+                self.assertEqual(expected_on_int_br,
                                  delete_flows_int_fn.call_args_list)
                 self.assertFalse(add_flow_phys_fn.called)
                 self.assertFalse(delete_flows_tun_fn.called)