From 4a194b32509ffcd9574bb7571a5a6347f7dc4e42 Mon Sep 17 00:00:00 2001
From: aapostoliuk <a.apostoliuk@vyos.io>
Date: Tue, 17 Dec 2024 13:39:49 +0200
Subject: T6841: firewall: Fixed issues in ZBF when using VRFs

Improve config parsing for ZBF when using VRFs and interfaces attached to VRFs
---
 src/migration-scripts/firewall/17-to-18 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/migration-scripts')

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
-- 
cgit v1.2.3