From a818afbe81d1b12244551606610a8a810f221414 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Tue, 14 Nov 2023 08:07:36 +0000
Subject: xml: T5738: add source-address-ipv4-ipv6-multi building block

(cherry picked from commit dccca4307339d13e5c3ae78058194baf2fd04002)
---
 interface-definitions/dns-forwarding.xml.in        | 19 +------------------
 .../include/radius-server-ipv4-ipv6.xml.i          | 22 +---------------------
 .../include/source-address-ipv4-ipv6-multi.xml.i   | 22 ++++++++++++++++++++++
 interface-definitions/system-login.xml.in          | 16 +---------------
 4 files changed, 25 insertions(+), 54 deletions(-)
 create mode 100644 interface-definitions/include/source-address-ipv4-ipv6-multi.xml.i

diff --git a/interface-definitions/dns-forwarding.xml.in b/interface-definitions/dns-forwarding.xml.in
index 86dc47a47..c00051c47 100644
--- a/interface-definitions/dns-forwarding.xml.in
+++ b/interface-definitions/dns-forwarding.xml.in
@@ -654,25 +654,8 @@
                 <defaultValue>1500</defaultValue>
               </leafNode>
               #include <include/name-server-ipv4-ipv6-port.xml.i>
+              #include <include/source-address-ipv4-ipv6-multi.xml.i>
               <leafNode name="source-address">
-                <properties>
-                  <help>Local addresses from which to send DNS queries</help>
-                  <completionHelp>
-                    <script>${vyos_completion_dir}/list_local_ips.sh --both</script>
-                  </completionHelp>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>IPv4 address from which to send traffic</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>ipv6</format>
-                    <description>IPv6 address from which to send traffic</description>
-                  </valueHelp>
-                  <multi/>
-                  <constraint>
-                    <validator name="ip-address"/>
-                  </constraint>
-                </properties>
                 <defaultValue>0.0.0.0 ::</defaultValue>
               </leafNode>
               <leafNode name="system">
diff --git a/interface-definitions/include/radius-server-ipv4-ipv6.xml.i b/interface-definitions/include/radius-server-ipv4-ipv6.xml.i
index efd418bb2..ac0950ae8 100644
--- a/interface-definitions/include/radius-server-ipv4-ipv6.xml.i
+++ b/interface-definitions/include/radius-server-ipv4-ipv6.xml.i
@@ -25,27 +25,7 @@
         #include <include/radius-server-auth-port.xml.i>
       </children>
     </tagNode>
-    <leafNode name="source-address">
-      <properties>
-        <help>Source IP address used to initiate connection</help>
-        <completionHelp>
-          <script>${vyos_completion_dir}/list_local_ips.sh --both</script>
-        </completionHelp>
-        <valueHelp>
-          <format>ipv4</format>
-          <description>IPv4 source address</description>
-        </valueHelp>
-        <valueHelp>
-          <format>ipv6</format>
-          <description>IPv6 source address</description>
-        </valueHelp>
-        <constraint>
-          <validator name="ipv4-address"/>
-          <validator name="ipv6-address"/>
-        </constraint>
-        <multi/>
-      </properties>
-    </leafNode>
+    #include <include/source-address-ipv4-ipv6-multi.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/source-address-ipv4-ipv6-multi.xml.i b/interface-definitions/include/source-address-ipv4-ipv6-multi.xml.i
new file mode 100644
index 000000000..d56ca5be6
--- /dev/null
+++ b/interface-definitions/include/source-address-ipv4-ipv6-multi.xml.i
@@ -0,0 +1,22 @@
+<!-- include start from source-address-ipv4-ipv6-multi.xml.i -->
+<leafNode name="source-address">
+  <properties>
+    <help>Source IP address used to initiate connection</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_local_ips.sh --both</script>
+    </completionHelp>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>IPv4 source address</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv6</format>
+      <description>IPv6 source address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ip-address"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/system-login.xml.in b/interface-definitions/system-login.xml.in
index 71db8b1d6..a0eda9045 100644
--- a/interface-definitions/system-login.xml.in
+++ b/interface-definitions/system-login.xml.in
@@ -244,21 +244,7 @@
                   </leafNode>
                 </children>
               </tagNode>
-              <leafNode name="source-address">
-                <properties>
-                  <help>Source IP used to communicate with TACACS+ server</help>
-                  <completionHelp>
-                    <script>${vyos_completion_dir}/list_local_ips.sh --ipv4</script>
-                  </completionHelp>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>IPv4 source address</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv4-address"/>
-                  </constraint>
-                </properties>
-              </leafNode>
+              #include <include/source-address-ipv4.xml.i>
               #include <include/radius-timeout.xml.i>
               #include <include/interface/vrf.xml.i>
             </children>
-- 
cgit v1.2.3