From 615cac19913830e3dd15d1668d4fb2046202270f Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Mon, 23 Feb 2015 16:25:53 +0900 Subject: [PATCH] test_ovs_neutron_agent: Remove useless ofport=10 arguments The kwarg ofport has been removed from method signatures where it was never used. Change-Id: Iee671e8d870ba4ef5175a639bbaf365a5eaf5ef7 --- .../agent/test_ovs_neutron_agent.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py b/neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py index 9a567dfe3..10c9f5440 100644 --- a/neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py +++ b/neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py @@ -1251,9 +1251,9 @@ class TestOvsDvrNeutronAgent(object): self.agent.tun_br = self.br_tun_cls(br_name='br-tun') self.agent.sg_agent = mock.Mock() - def _setup_for_dvr_test(self, ofport=10): + def _setup_for_dvr_test(self): self._port = mock.Mock() - self._port.ofport = ofport + self._port.ofport = 10 self._port.vif_id = "1234-5678-90" self._physical_network = 'physeth1' self._old_local_vlan = None @@ -1518,7 +1518,7 @@ class TestOvsDvrNeutronAgent(object): self._test_port_bound_for_dvr_on_vxlan_network( device_owner=n_const.DEVICE_OWNER_DHCP, ip_version=6) - def test_port_bound_for_dvr_with_csnat_ports(self, ofport=10): + def test_port_bound_for_dvr_with_csnat_ports(self): self._setup_for_dvr_test() int_br = mock.create_autospec(self.agent.int_br) tun_br = mock.create_autospec(self.agent.tun_br) @@ -1566,13 +1566,11 @@ class TestOvsDvrNeutronAgent(object): ] self.assertEqual(expected_on_tun_br, tun_br.mock_calls) - def test_treat_devices_removed_for_dvr_interface(self, ofport=10): - self._test_treat_devices_removed_for_dvr_interface(ofport) - self._test_treat_devices_removed_for_dvr_interface( - ofport, ip_version=6) + def test_treat_devices_removed_for_dvr_interface(self): + self._test_treat_devices_removed_for_dvr_interface() + self._test_treat_devices_removed_for_dvr_interface(ip_version=6) - def _test_treat_devices_removed_for_dvr_interface(self, ofport=10, - ip_version=4): + def _test_treat_devices_removed_for_dvr_interface(self, ip_version=4): self._setup_for_dvr_test() if ip_version == 4: gateway_ip = '1.1.1.1' @@ -1760,7 +1758,7 @@ class TestOvsDvrNeutronAgent(object): self._test_treat_devices_removed_for_dvr( device_owner=n_const.DEVICE_OWNER_DHCP, ip_version=6) - def test_treat_devices_removed_for_dvr_csnat_port(self, ofport=10): + def test_treat_devices_removed_for_dvr_csnat_port(self): self._setup_for_dvr_test() gateway_mac = 'aa:bb:cc:11:22:33' int_br = mock.create_autospec(self.agent.int_br) -- 2.45.2