diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-04-08 19:52:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-08 19:52:03 +0200 |
| commit | f9ebccd2ef0b144617b5f4acf79d37502114d34a (patch) | |
| tree | 9c96321f2432ee11db826a7051b4b5adefc030c5 /src/conf_mode | |
| parent | 2bf7589e926b3d5f2f7aee0f98505eeb14fc826d (diff) | |
| parent | f43031ec4591662fadee3176fe1ace2ac018a9df (diff) | |
| download | vyos-1x-f9ebccd2ef0b144617b5f4acf79d37502114d34a.tar.gz vyos-1x-f9ebccd2ef0b144617b5f4acf79d37502114d34a.zip | |
Merge pull request #1278 from sever-sever/T4344
dhcp-server: T4344: Fix underscores for shared network name
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/dhcp_server.py | 4 | ||||
| -rwxr-xr-x | src/conf_mode/dhcpv6_server.py | 4 |
2 files changed, 4 insertions, 4 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']) diff --git a/src/conf_mode/dhcpv6_server.py b/src/conf_mode/dhcpv6_server.py index e6a2e4486..be1e6db1e 100755 --- a/src/conf_mode/dhcpv6_server.py +++ b/src/conf_mode/dhcpv6_server.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2018-2020 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 @@ -41,7 +41,7 @@ def get_config(config=None): if not conf.exists(base): return None - dhcpv6 = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True) + dhcpv6 = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True, no_tag_node_value_mangle=True) return dhcpv6 def verify(dhcpv6): |