openstack
/
neutron
Code Issues Proposed changes

Merge "Fix a pylint error in an L3 agent unit test"

This commit is contained in:
Jenkins 2016-07-19 00:08:29 +00:00 committed by Gerrit Code Review
parent bcdbeeb278 4f875ea3fe
commit 45ce07fa08
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/tests/unit/agent/l3/test_agent.py
View File

@ -878,11 +878,10 @@ class TestBasicRouterOperations(BasicRouterOperationsFramework):
self.assertEqual(distributed, ri.process_floating_ip_addresses.called) self.assertEqual(distributed, ri.process_floating_ip_addresses.called)
self.assertEqual(distributed, ri.process_floating_ip_nat_rules.called) self.assertEqual(distributed, ri.process_floating_ip_nat_rules.called)
@mock.patch('neutron.agent.linux.ip_lib.IPDevice') def _test_process_floating_ip_addresses_add(self, ri, agent):
def _test_process_floating_ip_addresses_add(self, ri, agent, IPDevice):
floating_ips = ri.get_floating_ips() floating_ips = ri.get_floating_ips()
fip_id = floating_ips[0]['id'] fip_id = floating_ips[0]['id']
IPDevice.return_value = device = mock.Mock() device = self.mock_ip_dev
device.addr.list.return_value = [] device.addr.list.return_value = []
ri.iptables_manager.ipv4['nat'] = mock.MagicMock() ri.iptables_manager.ipv4['nat'] = mock.MagicMock()
ex_gw_port = {'id': _uuid(), 'network_id': mock.sentinel.ext_net_id} ex_gw_port = {'id': _uuid(), 'network_id': mock.sentinel.ext_net_id}