openstack/neutron
Code Issues Proposed changes

Merge "dhcp/agent: fix 'get_metadata_bind_interface' driver call"

Browse Source
This commit is contained in:
Zuul 2023-06-22 22:27:24 +00:00 committed by Gerrit Code Review
commit 7f460ab1af
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/agent/dhcp/agent.py
View File

@ -206,6 +206,10 @@ class DhcpAgent(manager.Manager):
action, action_kwargs) action, action_kwargs)
# There is nothing we can do. # There is nothing we can do.
return return
if action == 'get_metadata_bind_interface':
# Special condition, this action returns a string instead of a
# bool.
return self._call_driver(action, network, **action_kwargs)
if 'segments' in network and network.segments: if 'segments' in network and network.segments:
# In case of multi-segments network, let's group network per # In case of multi-segments network, let's group network per
# segments. We can then create DHPC process per segmentation # segments. We can then create DHPC process per segmentation

11
neutron/tests/unit/agent/dhcp/test_agent.py
View File

@ -405,6 +405,17 @@ class TestDhcpAgent(base.BaseTestCase):
'iface0', 'iface0',
agent.call_driver('get_metadata_bind_interface', network)) agent.call_driver('get_metadata_bind_interface', network))
def test_call_driver_get_metadata_bind_interface_returns_segments(self):
network = fake_network
network.segments = [
dhcp.DictModel(id='bbbbbbbb-bbbb-bbbb-bbbbbbbbbbbb')]
network.subnets[0] = fake_subnet1
self.driver().get_metadata_bind_interface.return_value = 'iface0'
agent = dhcp_agent.DhcpAgent(cfg.CONF)
self.assertEqual(
'iface0',
agent.call_driver('get_metadata_bind_interface', network))
def _test_sync_state_helper(self, known_net_ids, active_net_ids): def _test_sync_state_helper(self, known_net_ids, active_net_ids):
active_networks = set(mock.Mock(id=netid) for netid in active_net_ids) active_networks = set(mock.Mock(id=netid) for netid in active_net_ids)