summaryrefslogtreecommitdiff
path: root/src/migration-scripts/dhcp-server
diff options
context:
space:
mode:
authorSimon <965089+sarthurdev@users.noreply.github.com>2024-01-11 06:46:33 +0100
committerGitHub <noreply@github.com>2024-01-11 06:46:33 +0100
commitee494c3a1dbfca3457bcaffe89d45971348e4848 (patch)
tree4e29926fae96e8837e6b903fc46478a92e6890da /src/migration-scripts/dhcp-server
parent7c6cb9829356d07c3cfa865eff7f60c24d982d6e (diff)
downloadvyos-1x-ee494c3a1dbfca3457bcaffe89d45971348e4848.tar.gz
vyos-1x-ee494c3a1dbfca3457bcaffe89d45971348e4848.zip
dhcp: dhcpv6: T3316: Add `subnet-id` so leases remain mapped to entries in the lease file (#2796)
Diffstat (limited to 'src/migration-scripts/dhcp-server')
-rwxr-xr-xsrc/migration-scripts/dhcp-server/8-to-914
1 files changed, 10 insertions, 4 deletions
diff --git a/src/migration-scripts/dhcp-server/8-to-9 b/src/migration-scripts/dhcp-server/8-to-9
index 908420c18..810e403a6 100755
--- a/src/migration-scripts/dhcp-server/8-to-9
+++ b/src/migration-scripts/dhcp-server/8-to-9
@@ -16,6 +16,7 @@
# T3316:
# - Migrate dhcp options under new option node
+# - Add subnet IDs to existing subnets
import sys
import re
@@ -44,6 +45,8 @@ option_nodes = ['bootfile-name', 'bootfile-server', 'bootfile-size', 'captive-po
'tftp-server-name', 'time-offset', 'time-server', 'time-zone',
'vendor-option', 'wins-server', 'wpad-url']
+subnet_id = 1
+
for network in config.list_nodes(base):
for option in option_nodes:
if config.exists(base + [network, option]):
@@ -56,10 +59,13 @@ for network in config.list_nodes(base):
base_subnet = base + [network, 'subnet', subnet]
for option in option_nodes:
- if config.exists(base + [network, 'subnet', subnet, option]):
- config.set(base + [network, 'subnet', subnet, 'option'])
- config.copy(base + [network, 'subnet', subnet, option], base + [network, 'subnet', subnet, 'option', option])
- config.delete(base + [network, 'subnet', subnet, option])
+ if config.exists(base_subnet + [option]):
+ config.set(base_subnet + ['option'])
+ config.copy(base_subnet + [option], base_subnet + ['option', option])
+ config.delete(base_subnet + [option])
+
+ config.set(base_subnet + ['subnet-id'], value=subnet_id)
+ subnet_id += 1
try:
with open(file_name, 'w') as f: