From ea4c72ed0dbcee3f7e8f9693c5310190833651d8 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Thu, 21 Jan 2021 15:02:41 -0600
Subject: xml: T3239: override default mtu values and remove workarounds

---
 interface-definitions/interfaces-l2tpv3.xml.in    | 3 +++
 interface-definitions/interfaces-macsec.xml.in    | 3 +++
 interface-definitions/interfaces-pppoe.xml.in     | 3 +++
 interface-definitions/interfaces-tunnel.xml.in    | 3 +++
 interface-definitions/interfaces-vxlan.xml.in     | 3 +++
 interface-definitions/interfaces-wireguard.xml.in | 3 +++
 6 files changed, 18 insertions(+)

(limited to 'interface-definitions')

diff --git a/interface-definitions/interfaces-l2tpv3.xml.in b/interface-definitions/interfaces-l2tpv3.xml.in
index a8ddb74fb..3853cd339 100644
--- a/interface-definitions/interfaces-l2tpv3.xml.in
+++ b/interface-definitions/interfaces-l2tpv3.xml.in
@@ -72,6 +72,9 @@
             </properties>
           </leafNode>
           #include <include/interface-mtu-68-16000.xml.i>
+          <leafNode name="mtu">
+            <defaultValue>1488</defaultValue>
+          </leafNode>
           <leafNode name="peer-session-id">
             <properties>
               <help>Peer session identifier</help>
diff --git a/interface-definitions/interfaces-macsec.xml.in b/interface-definitions/interfaces-macsec.xml.in
index 4d2581906..94d78c6dd 100644
--- a/interface-definitions/interfaces-macsec.xml.in
+++ b/interface-definitions/interfaces-macsec.xml.in
@@ -110,6 +110,9 @@
           #include <include/interface-description.xml.i>
           #include <include/interface-disable.xml.i>
           #include <include/interface-mtu-68-16000.xml.i>
+          <leafNode name="mtu">
+            <defaultValue>1460</defaultValue>
+          </leafNode>
           #include <include/source-interface-ethernet.xml.i>
           #include <include/interface-vrf.xml.i>
         </children>
diff --git a/interface-definitions/interfaces-pppoe.xml.in b/interface-definitions/interfaces-pppoe.xml.in
index 7dccfbc9c..9bbaae9ea 100644
--- a/interface-definitions/interfaces-pppoe.xml.in
+++ b/interface-definitions/interfaces-pppoe.xml.in
@@ -125,6 +125,9 @@
             </properties>
           </leafNode>
           #include <include/interface-mtu-68-1500.xml.i>
+          <leafNode name="mtu">
+            <defaultValue>1492</defaultValue>
+          </leafNode>
           <leafNode name="no-peer-dns">
             <properties>
               <help>Do not use DNS servers provided by the peer</help>
diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in
index 39e274840..7fa847ab0 100644
--- a/interface-definitions/interfaces-tunnel.xml.in
+++ b/interface-definitions/interfaces-tunnel.xml.in
@@ -22,6 +22,9 @@
           #include <include/interface-disable-link-detect.xml.i>
           #include <include/interface-vrf.xml.i>
           #include <include/interface-mtu-64-8024.xml.i>
+          <leafNode name="mtu">
+            <defaultValue>1476</defaultValue>
+          </leafNode>
           #include <include/interface-ipv4-options.xml.i>
           #include <include/interface-ipv6-options.xml.i>
           <leafNode name="local-ip">
diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in
index 8c76ab60b..f90a86274 100644
--- a/interface-definitions/interfaces-vxlan.xml.in
+++ b/interface-definitions/interfaces-vxlan.xml.in
@@ -41,6 +41,9 @@
           #include <include/source-interface.xml.i>
           #include <include/interface-mac.xml.i>
           #include <include/interface-mtu-1200-16000.xml.i>
+          <leafNode name="mtu">
+            <defaultValue>1450</defaultValue>
+          </leafNode>
           <leafNode name="remote">
             <properties>
               <help>Remote address of VXLAN tunnel</help>
diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in
index acf5082d6..3f56046c4 100644
--- a/interface-definitions/interfaces-wireguard.xml.in
+++ b/interface-definitions/interfaces-wireguard.xml.in
@@ -22,6 +22,9 @@
           #include <include/interface-vrf.xml.i>
           #include <include/port-number.xml.i>
           #include <include/interface-mtu-68-16000.xml.i>
+          <leafNode name="mtu">
+            <defaultValue>1420</defaultValue>
+          </leafNode>
           #include <include/interface-ipv4-options.xml.i>
           #include <include/interface-ipv6-options.xml.i>
           <leafNode name="fwmark">
-- 
cgit v1.2.3