openstack
/
neutron
Code Issues Proposed changes

Merge "Pass host parameter to the get_network_info method"

This commit is contained in:
Zuul 2022-02-03 04:40:11 +00:00 committed by Gerrit Code Review
parent f94226c514 8fd88fd223
commit f434f4a011
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/api/rpc/handlers/dhcp_rpc.py
View File

@ -167,7 +167,7 @@ class DhcpRpcCallback(object):
ret = []
for network in networks:
ret.append(self.get_network_info(
context, network=network, enable_dhcp=enable_dhcp,
context, network=network, enable_dhcp=enable_dhcp, host=host,
ports=grouped_ports.get(network.id, [])))
return ret

12
neutron/tests/unit/api/rpc/handlers/test_dhcp_rpc.py
View File

@ -70,9 +70,9 @@ class TestDhcpRpcCallback(base.BaseTestCase):
{'id': 'port2', 'network_id': 'net2'},
{'id': 'port3', 'network_id': 'net3'}]
self.plugin.get_ports.return_value = ports
iter_kwargs = iter([{'enable_dhcp_filter': True},
{'enable_dhcp_filter': False},
{}])
iter_kwargs = iter([{'enable_dhcp_filter': True, 'host': 'test-host'},
{'enable_dhcp_filter': False, 'host': 'test-host'},
{'host': 'test-host'}])
with mock.patch.object(self.callbacks, '_get_active_networks') as \
mock_get_networks, \
mock.patch.object(self.callbacks, 'get_network_info') as \
@ -86,11 +86,11 @@ class TestDhcpRpcCallback(base.BaseTestCase):
None)
mock_get_network_info.assert_has_calls([
mock.call('ctx', network=networks[0], enable_dhcp=enable_dhcp,
ports=[ports[0]]),
host='test-host', ports=[ports[0]]),
mock.call('ctx', network=networks[1], enable_dhcp=enable_dhcp,
ports=[ports[1]]),
host='test-host', ports=[ports[1]]),
mock.call('ctx', network=networks[2], enable_dhcp=enable_dhcp,
ports=[ports[2]])
host='test-host', ports=[ports[2]])
])
def _test__port_action_with_failures(self, exc=None, action=None):