Skip to content

Commit 32fde52

Browse files
committed
OVN: Add support for DHCP option "domain-search" for IPv4
Nothing much else, what the title says... Change-Id: Ib1d41a6e4c869e108f31c1eb604f22c794d66467 Closes-Bug: #1996759 Signed-off-by: Lucas Alvares Gomes <[email protected]> (cherry picked from commit bf44e70)
1 parent 9a83017 commit 32fde52

File tree

3 files changed

+19
-0
lines changed

3 files changed

+19
-0
lines changed

doc/source/ovn/dhcp_opts.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ classless-static-route classless_static_route
1717
default-ttl default_ttl
1818
dns-server dns_server
1919
domain-name domain_name
20+
domain-search domain_search_list
2021
ethernet-encap ethernet_encap
2122
ip-forward-enable ip_forward_enable
2223
lease-time lease_time
@@ -67,6 +68,7 @@ wpad wpad
6768
59 T2
6869
66 tftp_server
6970
67 bootfile_name
71+
119 domain_search_list
7072
121 classless_static_route
7173
150 tftp_server_address
7274
210 path_prefix

neutron/common/ovn/constants.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
'log-server': 'log_server',
111111
'lpr-server': 'lpr_server',
112112
'domain-name': 'domain_name',
113+
'domain-search': 'domain_search_list',
113114
'swap-server': 'swap_server',
114115
'policy-filter': 'policy_filter',
115116
'router-solicitation': 'router_solicitation',
@@ -160,6 +161,7 @@
160161
'58': 'T1',
161162
'59': 'T2',
162163
'67': 'bootfile_name',
164+
'119': 'domain_search_list',
163165
'252': 'wpad',
164166
'210': 'path_prefix',
165167
'150': 'tftp_server_address'},
@@ -176,6 +178,7 @@
176178
# OVN string type DHCP options
177179
OVN_STR_TYPE_DHCP_OPTS = [
178180
'domain_name',
181+
'domain_search_list',
179182
'bootfile_name',
180183
'path_prefix',
181184
'wpad',

neutron/tests/unit/common/ovn/test_utils.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,20 @@ def test_get_lsp_dhcp_opts(self):
372372
'bootfile_name': '"homer_simpson.bin"'}
373373
self.assertEqual(expected_options, options)
374374

375+
def test_get_lsp_dhcp_opts_for_domain_search(self):
376+
opt = {'opt_name': 'domain-search',
377+
'opt_value': 'openstack.org,ovn.org',
378+
'ip_version': 4}
379+
port = {portbindings.VNIC_TYPE: portbindings.VNIC_NORMAL,
380+
edo_ext.EXTRADHCPOPTS: [opt]}
381+
382+
dhcp_disabled, options = utils.get_lsp_dhcp_opts(port, 4)
383+
self.assertFalse(dhcp_disabled)
384+
# Assert option got translated to "domain_search_list" and
385+
# the value is a string (double-quoted)
386+
expected_options = {'domain_search_list': '"openstack.org,ovn.org"'}
387+
self.assertEqual(expected_options, options)
388+
375389

376390
class TestGetDhcpDnsServers(base.BaseTestCase):
377391

0 commit comments

Comments
 (0)