From 5574bd672825a87b1983cc135ae2e0bdabbe751b Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 28 Feb 2021 10:14:20 +0100
Subject: l2tpv3: T3366: migrate local-ip and remote-ip CLI options

Rename CLI options local-ip to source-address and remote-ip to remote to
get a consistent CLI experience for the user.
---
 interface-definitions/interfaces-l2tpv3.xml.in | 35 +++-----------------------
 1 file changed, 3 insertions(+), 32 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/interfaces-l2tpv3.xml.in b/interface-definitions/interfaces-l2tpv3.xml.in
index 3853cd339..68ac15861 100644
--- a/interface-definitions/interfaces-l2tpv3.xml.in
+++ b/interface-definitions/interfaces-l2tpv3.xml.in
@@ -55,22 +55,7 @@
           </leafNode>
           #include <include/interface-ipv4-options.xml.i>
           #include <include/interface-ipv6-options.xml.i>
-          <leafNode name="local-ip">
-            <properties>
-              <help>Local IP address for L2TPv3 tunnel</help>
-              <valueHelp>
-                <format>ipv4</format>
-                <description>Local IPv4 address of tunnel</description>
-              </valueHelp>
-              <valueHelp>
-                <format>ipv6</format>
-                <description>Local IPv6 address of tunnel</description>
-              </valueHelp>
-              <constraint>
-                <validator name="ip-address"/>
-              </constraint>
-            </properties>
-          </leafNode>
+          #include <include/source-address-ipv4-ipv6.xml.i>
           #include <include/interface-mtu-68-16000.xml.i>
           <leafNode name="mtu">
             <defaultValue>1488</defaultValue>
@@ -99,22 +84,8 @@
               </constraint>
             </properties>
           </leafNode>
-          <leafNode name="remote-ip">
-            <properties>
-              <help>Remote IP address for L2TPv3 tunnel</help>
-              <valueHelp>
-                <format>ipv4</format>
-                <description>Remote IPv4 address of tunnel</description>
-              </valueHelp>
-              <valueHelp>
-                <format>ipv6</format>
-                <description>Remote IPv6 address of tunnel</description>
-              </valueHelp>
-              <constraint>
-                <validator name="ip-address"/>
-              </constraint>
-            </properties>
-          </leafNode>
+          #include <include/interface-mtu-68-16000.xml.i>
+          #include <include/tunnel-remote.xml.i>
           <leafNode name="session-id">
             <properties>
               <help>Session identifier</help>
-- 
cgit v1.2.3