From 582b718221c67ddb71e39fbad0a72241761304a9 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 27 Feb 2021 21:37:15 +0100
Subject: tunnel: T3366: rename local-ip to source-address

Streamline the CLI configuration where we try to use source-address when
creating connections which are especially sourced from a discrete address.
---
 .../include/radius-server-ipv4-ipv6.xml.i          | 22 +++++++++++++++++++++-
 .../include/source-address-ipv4-ipv6.xml.i         |  1 -
 .../include/tunnel-local-remote-ip.xml.i           | 20 +-------------------
 3 files changed, 22 insertions(+), 21 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/radius-server-ipv4-ipv6.xml.i b/interface-definitions/include/radius-server-ipv4-ipv6.xml.i
index ab3c6d72a..c57d39b6b 100644
--- a/interface-definitions/include/radius-server-ipv4-ipv6.xml.i
+++ b/interface-definitions/include/radius-server-ipv4-ipv6.xml.i
@@ -26,7 +26,27 @@
         #include <include/radius-server-port.xml.i>
       </children>
     </tagNode>
-    #include <include/source-address-ipv4-ipv6.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="ipv4-address"/>
+          <validator name="ipv6-address"/>
+        </constraint>
+        <multi/>
+      </properties>
+    </leafNode>
   </children>
 </node>
 <!-- included end -->
diff --git a/interface-definitions/include/source-address-ipv4-ipv6.xml.i b/interface-definitions/include/source-address-ipv4-ipv6.xml.i
index 4da4698c2..004e04f7b 100644
--- a/interface-definitions/include/source-address-ipv4-ipv6.xml.i
+++ b/interface-definitions/include/source-address-ipv4-ipv6.xml.i
@@ -17,7 +17,6 @@
       <validator name="ipv4-address"/>
       <validator name="ipv6-address"/>
     </constraint>
-    <multi/>
   </properties>
 </leafNode>
 <!-- included end -->
diff --git a/interface-definitions/include/tunnel-local-remote-ip.xml.i b/interface-definitions/include/tunnel-local-remote-ip.xml.i
index 85c20f482..f86e1dd8c 100644
--- a/interface-definitions/include/tunnel-local-remote-ip.xml.i
+++ b/interface-definitions/include/tunnel-local-remote-ip.xml.i
@@ -1,23 +1,5 @@
 <!-- included start from tunnel-local-remote-ip.xml.i -->
-<leafNode name="local-ip">
-  <properties>
-    <help>Local IP address for this tunnel</help>
-    <valueHelp>
-      <format>ipv4</format>
-      <description>Local IPv4 address for this tunnel</description>
-    </valueHelp>
-    <valueHelp>
-      <format>ipv6</format>
-      <description>Local IPv6 address for this tunnel</description>
-    </valueHelp>
-    <completionHelp>
-      <script>${vyos_completion_dir}/list_local_ips.sh --both</script>
-    </completionHelp>
-    <constraint>
-      <validator name="ip-address"/>
-    </constraint>
-  </properties>
-</leafNode>
+#include <include/source-address-ipv4-ipv6.xml.i>
 <leafNode name="remote-ip">
   <properties>
     <help>Remote IP address for this tunnel</help>
-- 
cgit v1.2.3