From 26740a8d583f64dc0a27b59dd4ae303056972c0b Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Wed, 19 Jun 2024 20:16:05 -0500 Subject: migration: T6007: convert all migration scripts to load as module --- src/migration-scripts/dhcpv6-server/1-to-2 | 100 ++++++++++++----------------- 1 file changed, 41 insertions(+), 59 deletions(-) mode change 100755 => 100644 src/migration-scripts/dhcpv6-server/1-to-2 (limited to 'src/migration-scripts/dhcpv6-server/1-to-2') diff --git a/src/migration-scripts/dhcpv6-server/1-to-2 b/src/migration-scripts/dhcpv6-server/1-to-2 old mode 100755 new mode 100644 index cc5a8900a..ad307495c --- a/src/migration-scripts/dhcpv6-server/1-to-2 +++ b/src/migration-scripts/dhcpv6-server/1-to-2 @@ -1,18 +1,17 @@ -#!/usr/bin/env python3 +# Copyright 2023-2024 VyOS maintainers and contributors # -# Copyright (C) 2023 VyOS maintainers and contributors +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. # -# 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 -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, +# This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# You should have received a copy of the GNU Lesser General Public License +# along with this library. If not, see . # T3316: Migrate to Kea # - Kea was meant to have support for key "prefix-highest" under PD which would allow an address range @@ -20,67 +19,50 @@ # Ref: https://lists.isc.org/pipermail/kea-users/2022-November/003686.html # - Remove prefix temporary value, convert to multi leafNode (https://kea.readthedocs.io/en/kea-2.2.0/arm/dhcp6-srv.html#dhcpv6-server-limitations) -import sys from vyos.configtree import ConfigTree from vyos.utils.network import ipv6_prefix_length -if (len(sys.argv) < 1): - print("Must specify file name!") - sys.exit(1) - -file_name = sys.argv[1] - -with open(file_name, 'r') as f: - config_file = f.read() - base = ['service', 'dhcpv6-server', 'shared-network-name'] -config = ConfigTree(config_file) - -if not config.exists(base): - # Nothing to do - exit(0) -for network in config.list_nodes(base): - if not config.exists(base + [network, 'subnet']): - continue +def migrate(config: ConfigTree) -> None: + if not config.exists(base): + # Nothing to do + return - for subnet in config.list_nodes(base + [network, 'subnet']): - # Delete temporary value under address-range prefix, convert tagNode to leafNode multi - if config.exists(base + [network, 'subnet', subnet, 'address-range', 'prefix']): - prefix_base = base + [network, 'subnet', subnet, 'address-range', 'prefix'] - prefixes = config.list_nodes(prefix_base) - - config.delete(prefix_base) + for network in config.list_nodes(base): + if not config.exists(base + [network, 'subnet']): + continue - for prefix in prefixes: - config.set(prefix_base, value=prefix, replace=False) + for subnet in config.list_nodes(base + [network, 'subnet']): + # Delete temporary value under address-range prefix, convert tagNode to leafNode multi + if config.exists(base + [network, 'subnet', subnet, 'address-range', 'prefix']): + prefix_base = base + [network, 'subnet', subnet, 'address-range', 'prefix'] + prefixes = config.list_nodes(prefix_base) + + config.delete(prefix_base) - if config.exists(base + [network, 'subnet', subnet, 'prefix-delegation', 'prefix']): - prefix_base = base + [network, 'subnet', subnet, 'prefix-delegation', 'prefix'] + for prefix in prefixes: + config.set(prefix_base, value=prefix, replace=False) - config.set(prefix_base) - config.set_tag(prefix_base) + if config.exists(base + [network, 'subnet', subnet, 'prefix-delegation', 'prefix']): + prefix_base = base + [network, 'subnet', subnet, 'prefix-delegation', 'prefix'] - for start in config.list_nodes(base + [network, 'subnet', subnet, 'prefix-delegation', 'start']): - path = base + [network, 'subnet', subnet, 'prefix-delegation', 'start', start] + config.set(prefix_base) + config.set_tag(prefix_base) - delegated_length = config.return_value(path + ['prefix-length']) - stop = config.return_value(path + ['stop']) + for start in config.list_nodes(base + [network, 'subnet', subnet, 'prefix-delegation', 'start']): + path = base + [network, 'subnet', subnet, 'prefix-delegation', 'start', start] - prefix_length = ipv6_prefix_length(start, stop) + delegated_length = config.return_value(path + ['prefix-length']) + stop = config.return_value(path + ['stop']) - # This range could not be converted into a simple prefix length and must be skipped - if not prefix_length: - continue + prefix_length = ipv6_prefix_length(start, stop) - config.set(prefix_base + [start, 'delegated-length'], value=delegated_length) - config.set(prefix_base + [start, 'prefix-length'], value=prefix_length) + # This range could not be converted into a simple prefix length and must be skipped + if not prefix_length: + continue - config.delete(base + [network, 'subnet', subnet, 'prefix-delegation', 'start']) + config.set(prefix_base + [start, 'delegated-length'], value=delegated_length) + config.set(prefix_base + [start, 'prefix-length'], value=prefix_length) -try: - with open(file_name, 'w') as f: - f.write(config.to_string()) -except OSError as e: - print("Failed to save the modified config: {}".format(e)) - exit(1) + config.delete(base + [network, 'subnet', subnet, 'prefix-delegation', 'start']) -- cgit v1.2.3