From 8e66b803f020ed25cd6066d86d3e66e324b27e5f Mon Sep 17 00:00:00 2001
From: hagbard <vyosdev@derith.de>
Date: Wed, 22 Aug 2018 12:32:37 -0700
Subject: T791: interface implementation

---
 interface-definitions/wireguard.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/interface-definitions/wireguard.xml b/interface-definitions/wireguard.xml
index 1437e9f0c..70bde6088 100644
--- a/interface-definitions/wireguard.xml
+++ b/interface-definitions/wireguard.xml
@@ -49,6 +49,24 @@
           </leafNode>
           <tagNode name="peer">
             <properties>
+<<<<<<< HEAD
+              <help>peer alias</help>
+              <constraint>
+                <regex>^[0-9a-zA-Z]{1,100}</regex>
+              </constraint>
+              <constraintErrorMessage>input limited to 100 alphanumerical characters</constraintErrorMessage>
+            </properties>
+            <children>
+              <leafNode name="peer-pubkey">
+                <properties>
+                  <help>base64 encoded public key</help>
+                  <constraint>
+                    <regex>^[0-9a-zA-Z\+/]{43}=$</regex>
+                  </constraint>
+                  <constraintErrorMessage>Key is not valid 44-character (32-bytes) base64</constraintErrorMessage>
+                </properties>
+              </leafNode>
+=======
               <help>Base64 encoded public key</help>
               <constraint>
                 <regex>^[0-9a-zA-Z\+/]{43}=$</regex>
@@ -56,18 +74,24 @@
               <constraintErrorMessage>Key is not valid 44-character (32-bytes) base64</constraintErrorMessage>
             </properties>
             <children>
+>>>>>>> upstream/current
               <leafNode name="allowed-ips">
                 <properties>
                   <help>IP addresses allowed to traverse the peer</help>
                 <multi/>
                 </properties>
               </leafNode>
+<<<<<<< HEAD
+=======
               <!--  check format IP:port -->
+>>>>>>> upstream/current
               <leafNode name="endpoint">
                 <properties>
                   <help>Remote endpoint</help>
                 </properties>
               </leafNode>
+<<<<<<< HEAD
+=======
               <leafNode name="persistent-keepalive">
                 <properties>
                   <help>how often send keep alives in seconds</help>
@@ -77,6 +101,7 @@
                   <constraintErrorMessage>keepliave timer has to be between 1 and 99999 seconds</constraintErrorMessage>
                 </properties>
               </leafNode>
+>>>>>>> upstream/current
 
             </children>
           </tagNode>
-- 
cgit v1.2.3