From f875731a710eb7fadefd5a73d65e53915477dce8 Mon Sep 17 00:00:00 2001
From: Jernej Jakob <jernej.jakob@gmail.com>
Date: Sun, 16 Jun 2019 17:07:16 +0200
Subject: dhcpv6-server: Add name constraint, clarify help, fix typos

---
 interface-definitions/dhcpv6-server.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/interface-definitions/dhcpv6-server.xml b/interface-definitions/dhcpv6-server.xml
index e63eb2242..bf049cf7a 100644
--- a/interface-definitions/dhcpv6-server.xml
+++ b/interface-definitions/dhcpv6-server.xml
@@ -268,7 +268,7 @@
                   </leafNode>
                   <leafNode name="sntp-server">
                     <properties>
-                      <help>IPv6 address of an SNTP Server for client to use</help>
+                      <help>IPv6 address of an SNTP server for client to use</help>
                       <constraint>
                         <validator name="ipv6-address"/>
                       </constraint>
@@ -278,25 +278,29 @@
                   <tagNode name="static-mapping">
                     <properties>
                       <help>Name of static mapping</help>
+                      <constraint>
+                        <regex>^[-_a-zA-Z0-9.]+$</regex>
+                      </constraint>
+                      <constraintErrorMessage>Invalid static-mapping name</constraintErrorMessage>
                     </properties>
                     <children>
                       <leafNode name="disable">
                         <properties>
-                          <help>Option to disable static-mapping</help>
+                          <help>Option to disable static mapping</help>
                           <valueless/>
                         </properties>
                       </leafNode>
                       <leafNode name="identifier">
                         <properties>
-                          <help>Client identifier for this static mapping</help>
+                          <help>Client identifier (DUID) for this static mapping [REQUIRED]</help>
                         </properties>
                       </leafNode>
                       <leafNode name="ipv6-address">
                         <properties>
-                          <help>Client IPv5 address for this static mapping</help>
+                          <help>Client IPv6 address for this static mapping [REQUIRED]</help>
                           <valueHelp>
                             <format>ipv6</format>
-                            <description>IPv6 address for this tatic mapping</description>
+                            <description>IPv6 address for this static mapping [REQUIRED]</description>
                           </valueHelp>
                           <constraint>
                             <validator name="ipv6-address"/>
-- 
cgit v1.2.3