From 3f44a6e920100d9530b653fa08d18ec09d1c8231 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 8 Apr 2020 21:28:04 +0200
Subject: wireguard: T2244: split port configuration to XML include file

---
 interface-definitions/include/port-number.xml.i   | 12 +++++++++++
 interface-definitions/interfaces-wireguard.xml.in | 26 ++---------------------
 2 files changed, 14 insertions(+), 24 deletions(-)
 create mode 100644 interface-definitions/include/port-number.xml.i

diff --git a/interface-definitions/include/port-number.xml.i b/interface-definitions/include/port-number.xml.i
new file mode 100644
index 000000000..78eb4b7af
--- /dev/null
+++ b/interface-definitions/include/port-number.xml.i
@@ -0,0 +1,12 @@
+<leafNode name="port">
+  <properties>
+    <help>Port number used to establish connection</help>
+    <valueHelp>
+      <format>1-65535</format>
+      <description>Numeric IP port</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-65535"/>
+    </constraint>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in
index 519aeb57a..9db608afb 100644
--- a/interface-definitions/interfaces-wireguard.xml.in
+++ b/interface-definitions/interfaces-wireguard.xml.in
@@ -20,18 +20,7 @@
           #include <include/interface-description.xml.i>
           #include <include/interface-disable.xml.i>
           #include <include/interface-vrf.xml.i>
-          <leafNode name="port">
-            <properties>
-              <help>Local port to listen for incoming connections</help>
-              <valueHelp>
-                <format>1-65535</format>
-                <description>Numeric IP port</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 1-65535"/>
-              </constraint>
-            </properties>
-          </leafNode>
+          #include <include/port-number.xml.i>
           #include <include/interface-mtu-68-9000.xml.i>
           <leafNode name="fwmark">
             <properties>
@@ -107,18 +96,7 @@
                   </constraint>
                 </properties>
               </leafNode>
-              <leafNode name="port">
-                <properties>
-                  <help>Port number on tunnel remote end</help>
-                  <valueHelp>
-                    <format>1-65535</format>
-                    <description>Numeric IP port</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-65535"/>
-                  </constraint>
-                </properties>
-              </leafNode>
+              #include <include/port-number.xml.i>
               <leafNode name="persistent-keepalive">
                 <properties>
                   <help>how often send keep alives in seconds</help>
-- 
cgit v1.2.3