summaryrefslogtreecommitdiff
path: root/src/migration-scripts
diff options
context:
space:
mode:
authorKyrylo Yatsenko <hedrok@gmail.com>2025-12-28 17:21:11 +0200
committerKyrylo Yatsenko <hedrok@gmail.com>2026-01-12 23:17:50 +0200
commit2471f686979fd83bd015f124b6faa66f27b8c9ba (patch)
tree8cad7c97dc73393e387d99aaf677b588d189758d /src/migration-scripts
parente8080f2412a0eeeeea40f12c164213468bca1957 (diff)
downloadvyos-1x-2471f686979fd83bd015f124b6faa66f27b8c9ba.tar.gz
vyos-1x-2471f686979fd83bd015f124b6faa66f27b8c9ba.zip
T7664: ip protocol 'kernel' etc removed
In FRR 10.5 ip protocols * connected * kernel * local * table * table-direct are removed. First three in fb8e399e4f66d09780f176fbecb99168089e64eb, table* in 7fd030504be060387694e8a2af7f19ddd7dee39d. In `ip protocols`, `ipv6 protocols` and `vrf` VyOS supports * connected * kernel * table Remove these from CLI, add migration scripts, update tests.
Diffstat (limited to 'src/migration-scripts')
-rw-r--r--src/migration-scripts/system/30-to-3142
-rw-r--r--src/migration-scripts/vrf/3-to-450
2 files changed, 92 insertions, 0 deletions
diff --git a/src/migration-scripts/system/30-to-31 b/src/migration-scripts/system/30-to-31
new file mode 100644
index 000000000..3e57b3db6
--- /dev/null
+++ b/src/migration-scripts/system/30-to-31
@@ -0,0 +1,42 @@
+# Copyright VyOS maintainers and contributors <maintainers@vyos.io>
+#
+# 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 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+# T7644:
+# FRR 10.5 doesn't have ip protocols:
+# - connected
+# - kernel
+# - table
+#
+# Remove them from
+# - system ip protocol
+# - system ipv6 protocol
+
+from vyos.configtree import ConfigTree
+
+bases = [
+ ['system', 'ip', 'protocol'],
+ ['system', 'ipv6', 'protocol'],
+]
+remove_ip_protocols = ['connected', 'kernel', 'table']
+
+def migrate(config: ConfigTree) -> None:
+ for base in bases:
+ if not config.exists(base):
+ continue
+
+ # Iterate over all ip protocols to remove
+ for protocol in remove_ip_protocols:
+ if config.exists(base + [protocol]):
+ config.delete(base + [protocol])
diff --git a/src/migration-scripts/vrf/3-to-4 b/src/migration-scripts/vrf/3-to-4
new file mode 100644
index 000000000..959b736e5
--- /dev/null
+++ b/src/migration-scripts/vrf/3-to-4
@@ -0,0 +1,50 @@
+# Copyright VyOS maintainers and contributors <maintainers@vyos.io>
+#
+# 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 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+# T7664:
+# FRR 10.5 doesn't have ip protocols:
+# - connected
+# - kernel
+# - table
+#
+# Remove them from
+# - vrf name VRF ip protocol
+# - vrf name VRF ipv6 protocol
+
+from vyos.configtree import ConfigTree
+
+subbases = [
+ ['ip', 'protocol'],
+ ['ipv6', 'protocol'],
+]
+remove_ip_protocols = ['connected', 'kernel', 'table']
+
+base = ['vrf', 'name']
+
+def migrate(config: ConfigTree) -> None:
+ if not config.exists(base):
+ # Nothing to do
+ return
+
+ for vrf in config.list_nodes(base):
+ for subbase in subbases:
+ protocol_base = base + [vrf] + subbase
+
+ if not config.exists(protocol_base):
+ continue
+
+ for protocol in remove_ip_protocols:
+ if config.exists(protocol_base + [protocol]):
+ config.delete(protocol_base + [protocol])