From 3b04cc29f0baf618351d67b4d6aa47f55b54bb20 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 23 Dec 2024 13:14:11 +0100
Subject: [PATCH] T6841: firewall: re-use existing
 generic-interface-multi.xml.i XML building block

---
 interface-definitions/firewall.xml.in | 34 +++------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/interface-definitions/firewall.xml.in b/interface-definitions/firewall.xml.in
index 018e0dbdfb..e4fe9a5087 100644
--- a/interface-definitions/firewall.xml.in
+++ b/interface-definitions/firewall.xml.in
@@ -16,15 +16,7 @@
         </properties>
         <children>
           #include <include/generic-description.xml.i>
-          <leafNode name="interface">
-            <properties>
-              <help>Interfaces to use this flowtable</help>
-              <completionHelp>
-                <script>${vyos_completion_dir}/list_interfaces</script>
-              </completionHelp>
-              <multi/>
-            </properties>
-          </leafNode>
+          #include <include/generic-interface-multi.xml.i>
           <leafNode name="offload">
             <properties>
               <help>Offloading method</help>
@@ -155,15 +147,7 @@
               <constraintErrorMessage>Name of firewall group can only contain alphanumeric letters, hyphen, underscores and dot</constraintErrorMessage>
             </properties>
             <children>
-              <leafNode name="interface">
-                <properties>
-                  <help>Interface-group member</help>
-                  <completionHelp>
-                    <script>${vyos_completion_dir}/list_interfaces</script>
-                  </completionHelp>
-                  <multi/>
-                </properties>
-              </leafNode>
+              #include <include/generic-interface-multi.xml.i>
               <leafNode name="include">
                 <properties>
                   <help>Include another interface-group</help>
@@ -469,19 +453,7 @@
               <help>Interface associated with zone</help>
             </properties>
             <children>
-              <leafNode name="interface">
-                <properties>
-                  <help>Interface associated with zone</help>
-                  <valueHelp>
-                    <format>txt</format>
-                    <description>Interface associated with zone</description>
-                  </valueHelp>
-                  <completionHelp>
-                    <script>${vyos_completion_dir}/list_interfaces</script>
-                  </completionHelp>
-                  <multi/>
-                </properties>
-              </leafNode>
+              #include <include/generic-interface-multi.xml.i>
               <leafNode name="vrf">
                 <properties>
                   <help>VRF associated with zone</help>