diff options
author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2022-04-08 13:47:14 +0000 |
---|---|---|
committer | Viacheslav Hletenko <v.gletenko@vyos.io> | 2022-04-18 11:03:31 +0000 |
commit | f71f9b4a2c40ae4d617f7ddefbdaabb136e887b3 (patch) | |
tree | 110499f16da48dfe80866f053271efee768bd2da /src/conf_mode/dhcp_server.py | |
parent | bd50d51f1e49724c9a01e9ce5c0aefa04ec3e913 (diff) | |
download | vyos-1x-f71f9b4a2c40ae4d617f7ddefbdaabb136e887b3.tar.gz vyos-1x-f71f9b4a2c40ae4d617f7ddefbdaabb136e887b3.zip |
dhcp-server: T4344: Fix underscores for shared network name
Shared network name should not be handled by tag node mangling
I.e. should not replace underscores with dashed
set service dhcp-server shared-network-name NET_01
shared-network NET_01 {
authoritative;
...
on commit {
set shared-networkname = "NET_01";
}
}
(cherry picked from commit b75b351b7dd2ec87407f98668468b1fc146428bf)
Diffstat (limited to 'src/conf_mode/dhcp_server.py')
-rwxr-xr-x | src/conf_mode/dhcp_server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/conf_mode/dhcp_server.py b/src/conf_mode/dhcp_server.py index a8cef5ebf..d27f8d995 100755 --- a/src/conf_mode/dhcp_server.py +++ b/src/conf_mode/dhcp_server.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2018-2021 VyOS maintainers and contributors +# Copyright (C) 2018-2022 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -109,7 +109,7 @@ def get_config(config=None): if not conf.exists(base): return None - dhcp = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True) + dhcp = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True, no_tag_node_value_mangle=True) # T2665: defaults include lease time per TAG node which need to be added to # individual subnet definitions default_values = defaults(base + ['shared-network-name', 'subnet']) |