From cc1ae7e87732095e17f66b3d5abaa89ed51e956a Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 20 Feb 2022 22:06:49 +0100
Subject: vxlan: T4120: rename tunnel-remotes.xml.i ->
tunnel-remote-multi.xml.i
(cherry picked from commit d418cd36027aef5993122ec62419e8c66fe7a1ed)
---
.../include/interface/tunnel-remote-multi.xml.i | 19 +++++++++++++++++++
.../include/interface/tunnel-remotes.xml.i | 19 -------------------
interface-definitions/interfaces-vxlan.xml.in | 2 +-
3 files changed, 20 insertions(+), 20 deletions(-)
create mode 100644 interface-definitions/include/interface/tunnel-remote-multi.xml.i
delete mode 100644 interface-definitions/include/interface/tunnel-remotes.xml.i
diff --git a/interface-definitions/include/interface/tunnel-remote-multi.xml.i b/interface-definitions/include/interface/tunnel-remote-multi.xml.i
new file mode 100644
index 000000000..f672087a4
--- /dev/null
+++ b/interface-definitions/include/interface/tunnel-remote-multi.xml.i
@@ -0,0 +1,19 @@
+<!-- include start from interface/tunnel-remote-multi.xml.i -->
+<leafNode name="remote">
+ <properties>
+ <help>Tunnel remote address</help>
+ <valueHelp>
+ <format>ipv4</format>
+ <description>Tunnel remote IPv4 address</description>
+ </valueHelp>
+ <valueHelp>
+ <format>ipv6</format>
+ <description>Tunnel remote IPv6 address</description>
+ </valueHelp>
+ <constraint>
+ <validator name="ip-address"/>
+ </constraint>
+ <multi/>
+ </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/tunnel-remotes.xml.i b/interface-definitions/include/interface/tunnel-remotes.xml.i
deleted file mode 100644
index ae8481898..000000000
--- a/interface-definitions/include/interface/tunnel-remotes.xml.i
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- include start from interface/tunnel-remotes.xml.i -->
-<leafNode name="remote">
- <properties>
- <help>Tunnel remote address</help>
- <valueHelp>
- <format>ipv4</format>
- <description>Tunnel remote IPv4 address</description>
- </valueHelp>
- <valueHelp>
- <format>ipv6</format>
- <description>Tunnel remote IPv6 address</description>
- </valueHelp>
- <constraint>
- <validator name="ip-address"/>
- </constraint>
- <multi/>
- </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in
index a676a274e..efc019e04 100644
--- a/interface-definitions/interfaces-vxlan.xml.in
+++ b/interface-definitions/interfaces-vxlan.xml.in
@@ -59,7 +59,6 @@
</leafNode>
#include <include/source-address-ipv4-ipv6.xml.i>
#include <include/source-interface.xml.i>
- #include <include/interface/tunnel-remotes.xml.i>
<leafNode name="vni">
<properties>
<help>Virtual Network Identifier</help>
@@ -72,6 +71,7 @@
</constraint>
</properties>
</leafNode>
+ #include <include/interface/tunnel-remote-multi.xml.i>
#include <include/interface/vrf.xml.i>
</children>
</tagNode>
--
cgit v1.2.3