openstack/neutron
Code Issues Proposed changes

[OVN] Allow multiple values in DHCPv4/v6 options

Browse Source 
The configuration parameters ``ovn_dhcp4_global_options`` and
``ovn_dhcp6_global_options`` allow multiple values per key, separated by
a semi-colon character. E.g.:
  ntp_server:1.2.3.4,wpad:1.2.3.5;1.2.3.6

Conflicts:
  neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_ovn_client.py

Closes-Bug: #2126923
Signed-off-by: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
Change-Id: I09fef07438a569c5db6f4e28803a7aaf2a57089f
(cherry picked from commit b344f4f57fbaca53e9649e4c454ca75573e5b991)
(cherry picked from commit 4d0607693c)
This commit is contained in:
Rodolfo Alonso Hernandez
2025-10-14 11:10:40 +00:00
parent 7e24127c4d
commit 512758b1a3
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
neutron/conf/plugins/ml2/drivers/ovn/ovn_conf.py
View File

@@ -171,10 +171,11 @@ ovn_opts = [
"automatically set on each subnet upon creation and " "automatically set on each subnet upon creation and "
"on all existing subnets when Neutron starts.\n" "on all existing subnets when Neutron starts.\n"
"An empty value for a DHCP option will cause that " "An empty value for a DHCP option will cause that "
"option to be unset globally.\n" "option to be unset globally. Multiple values should "
"be separated by semi-colon.\n"
"EXAMPLES:\n" "EXAMPLES:\n"
"- ntp_server:1.2.3.4,wpad:1.2.3.5 - Set ntp_server " "- ntp_server:1.2.3.4,wpad:1.2.3.5;1.2.3.6 - Set "
"and wpad\n" "ntp_server and wpad\n"
"- ntp_server:,wpad:1.2.3.5 - Unset ntp_server and " "- ntp_server:,wpad:1.2.3.5 - Unset ntp_server and "
"set wpad\n" "set wpad\n"
"See the ovn-nb(5) man page for available options.")), "See the ovn-nb(5) man page for available options.")),
@@ -184,7 +185,8 @@ ovn_opts = [
"automatically set on each subnet upon creation and " "automatically set on each subnet upon creation and "
"on all existing subnets when Neutron starts.\n" "on all existing subnets when Neutron starts.\n"
"An empty value for a DHCPv6 option will cause that " "An empty value for a DHCPv6 option will cause that "
"option to be unset globally.\n" "option to be unset globally. Multiple values should "
"be separated by semi-colon.\n"
"See the ovn-nb(5) man page for available options.")), "See the ovn-nb(5) man page for available options.")),
cfg.BoolOpt('ovn_emit_need_to_frag', cfg.BoolOpt('ovn_emit_need_to_frag',
default=True, default=True,

7
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py
View File

@@ -2348,7 +2348,12 @@ class OVNClient:
# If the value is null (i.e. config ntp_server:), treat it as # If the value is null (i.e. config ntp_server:), treat it as
# a request to remove the option # a request to remove the option
if value: if value:
options[option] = value # Example: ntp_server='{1.2.3.4, 1.2.3.5}'. A single value is
# also allowed but in shake of readability, it is printed as a
# single string.
_value = value.split(';')
options[option] = (_value[0] if len(_value) == 1 else
'{%s}' % ', '.join(_value))
else: else:
try: try:
del options[option] del options[option]

13
neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_ovn_client.py
View File

@@ -452,3 +452,16 @@ class TestOVNClient(testlib_api.MySQLTestCaseMixin,
port_data['id']) port_data['id'])
req.get_response(self.api) req.get_response(self.api)
_check_bw(port_data['id'], max_kbps, max_burst_kbps, min_kbps) _check_bw(port_data['id'], max_kbps, max_burst_kbps, min_kbps)
def test_create_subnet_with_dhcp_options(self):
cfg.CONF.set_override('ovn_dhcp4_global_options',
'ntp_server:1.2.3.4;1.2.3.5,wpad:1.2.3.6',
group='ovn')
with self.network('test-ovn-client') as net:
with self.subnet(net):
dhcp_options = self.nb_api.dhcp_options_list().execute(
check_error=True)[0]
self.assertEqual('{1.2.3.4, 1.2.3.5}',
dhcp_options.options['ntp_server'])
self.assertEqual('1.2.3.6',
dhcp_options.options['wpad'])