summaryrefslogtreecommitdiff
path: root/src/migration-scripts
diff options
context:
space:
mode:
authoraapostoliuk <a.apostoliuk@vyos.io>2024-12-17 13:39:49 +0200
committerChristian Breunig <christian@breunig.cc>2025-01-06 12:05:22 +0100
commit4a194b32509ffcd9574bb7571a5a6347f7dc4e42 (patch)
treef12c3bba738fe1bcbdab8deb7dba56e8adb7d0f4 /src/migration-scripts
parentdf176d9b9b4cc67ae509ae2ff17a02f2520cc881 (diff)
downloadvyos-1x-4a194b32509ffcd9574bb7571a5a6347f7dc4e42.tar.gz
vyos-1x-4a194b32509ffcd9574bb7571a5a6347f7dc4e42.zip
T6841: firewall: Fixed issues in ZBF when using VRFs
Improve config parsing for ZBF when using VRFs and interfaces attached to VRFs
Diffstat (limited to 'src/migration-scripts')
-rwxr-xr-xsrc/migration-scripts/firewall/17-to-187
1 files changed, 4 insertions, 3 deletions
diff --git a/src/migration-scripts/firewall/17-to-18 b/src/migration-scripts/firewall/17-to-18
index af16ba8ec..891f9f195 100755
--- a/src/migration-scripts/firewall/17-to-18
+++ b/src/migration-scripts/firewall/17-to-18
@@ -16,9 +16,9 @@
# From
# set firewall zone <zone> interface <iface>
# To
- # set firewall zone <zone> interface name <iface>
+ # set firewall zone <zone> member interface <iface>
# or
- # set firewall zone <zone> interface vrf <vrf>
+ # set firewall zone <zone> member vrf <vrf>
from vyos.configtree import ConfigTree
@@ -33,4 +33,5 @@ def migrate(config: ConfigTree) -> None:
for zone in config.list_nodes(base):
if config.exists(base + [zone, 'interface']):
for iface in config.return_values(base + [zone, 'interface']):
- config.set(base + [zone, 'interface', 'name'], value=iface, replace=False) \ No newline at end of file
+ config.set(base + [zone, 'member', 'interface'], value=iface, replace=False)
+ config.delete(base + [zone, 'interface']) \ No newline at end of file