From 6da2d56d7d7d1235fd336a378addefdb98444c13 Mon Sep 17 00:00:00 2001
From: Brooks Swinnerton <bswinnerton@gmail.com>
Date: Wed, 7 Nov 2018 20:53:07 -0500
Subject: T979: Allow spaces in wireguard interface descrs
Previous to this commit, setting a Wireguard interface description would
result in a validation error similar to the following:
```
brooks@border# set interfaces wireguard wg0 description "Tunnel"
[edit]
brooks@border# set interfaces wireguard wg0 description "Tunnel tunnel
tunnel"
interface description is too long (limit 100 characters)
Value validation failed
Set failed
[edit]
```
This commit makes the regex less restrictive up to 100 characters.
---
interface-definitions/wireguard.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/interface-definitions/wireguard.xml b/interface-definitions/wireguard.xml
index 3bf7bcd33..1ead24c0d 100644
--- a/interface-definitions/wireguard.xml
+++ b/interface-definitions/wireguard.xml
@@ -18,7 +18,7 @@
<children>
<leafNode name="address">
<properties>
- <help>IP address</help>
+ <help>IP address</help>
<valueHelp>
<format>ipv4net</format>
<description>IPv4 address and prefix length</description>
@@ -34,7 +34,7 @@
<properties>
<help>description</help>
<constraint>
- <regex>[^ ]{1,100}$</regex>
+ <regex>^.{1,100}$</regex>
</constraint>
<constraintErrorMessage>interface description is too long (limit 100 characters)</constraintErrorMessage>
</properties>
@@ -110,7 +110,7 @@
<properties>
<help>how often send keep alives in seconds</help>
<constraint>
- <validator name="numeric" argument="--range 1-65535"/>
+ <validator name="numeric" argument="--range 1-65535"/>
</constraint>
</properties>
</leafNode>
--
cgit v1.2.3
From 30a0cc8b16f33a1539d05c289119255ca519cf8c Mon Sep 17 00:00:00 2001
From: Brooks Swinnerton <bswinnerton@gmail.com>
Date: Wed, 7 Nov 2018 21:04:49 -0500
Subject: Add back trailing whitespace for smaller diff
---
interface-definitions/wireguard.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface-definitions/wireguard.xml b/interface-definitions/wireguard.xml
index 1ead24c0d..b0923bbe0 100644
--- a/interface-definitions/wireguard.xml
+++ b/interface-definitions/wireguard.xml
@@ -18,7 +18,7 @@
<children>
<leafNode name="address">
<properties>
- <help>IP address</help>
+ <help>IP address</help>
<valueHelp>
<format>ipv4net</format>
<description>IPv4 address and prefix length</description>
@@ -110,7 +110,7 @@
<properties>
<help>how often send keep alives in seconds</help>
<constraint>
- <validator name="numeric" argument="--range 1-65535"/>
+ <validator name="numeric" argument="--range 1-65535"/>
</constraint>
</properties>
</leafNode>
--
cgit v1.2.3