From 32b6793b210505a2a69dc6f7615ddd5f66ad74b8 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Mon, 14 May 2018 03:20:49 +0200
Subject: T602: replace the now-gone type attribute with proper use of
 constraints in existing interface definitions.

---
 interface-definitions/bcast-relay.xml    | 16 +++++++++++-----
 interface-definitions/cron.xml           |  3 +++
 interface-definitions/dns-forwarding.xml | 16 ++++++++++++----
 interface-definitions/ntp.xml            |  5 ++++-
 interface-definitions/ssh.xml            | 11 ++++++++---
 5 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/interface-definitions/bcast-relay.xml b/interface-definitions/bcast-relay.xml
index e4a009ed4..19f29e340 100644
--- a/interface-definitions/bcast-relay.xml
+++ b/interface-definitions/bcast-relay.xml
@@ -14,11 +14,13 @@
             <properties>
               <help>Unique ID for each UDP port to forward</help>
               <valueHelp>
-                <format>u32:1-99</format>
+                <format>1-99</format>
                 <description>Numerical ID #</description>
               </valueHelp>
-              <type>u32</type>
               <priority>990</priority>
+              <constraint>
+                <validator name="numeric" argument="--range 1-99"/>
+              </constraint>
             </properties>
             <children>
               <leafNode name="address">
@@ -28,7 +30,9 @@
                     <format>ipv4</format>
                     <description>Optional source address for forwarded packets</description>
                   </valueHelp>
-                  <type>ipv4</type>
+                  <constraint>
+                    <validator name="ipv4"/>
+                  </constraint>
                 </properties>
               </leafNode>
               <leafNode name="description">
@@ -49,10 +53,12 @@
                 <properties>
                   <help>Destination or source port to listen and retransmit on [REQUIRED]</help>
                   <valueHelp>
-                    <format>u32:1-65535</format>
+                    <format>1-65535</format>
                     <description>UDP port to listen on</description>
                   </valueHelp>
-                  <type>u32</type>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-65535"/>
+                  </constraint>
                 </properties>
               </leafNode>
             </children>
diff --git a/interface-definitions/cron.xml b/interface-definitions/cron.xml
index a9e9b0401..8e4c1294a 100644
--- a/interface-definitions/cron.xml
+++ b/interface-definitions/cron.xml
@@ -44,6 +44,9 @@
                     <format>&lt;days&gt;d</format>
                     <description>Execution interval in days</description>
                   </valueHelp>
+                  <constraint>
+                    <regex>[1-9]([0-9]+)([mhd]{0,1})</regex>
+                  </constraint>
                 </properties>
               </leafNode>
               <node name="executable">
diff --git a/interface-definitions/dns-forwarding.xml b/interface-definitions/dns-forwarding.xml
index bdb5ddc46..81aa6063d 100644
--- a/interface-definitions/dns-forwarding.xml
+++ b/interface-definitions/dns-forwarding.xml
@@ -17,10 +17,12 @@
                 <properties>
                   <help>DNS forwarding cache size</help>
                   <valueHelp>
-                    <format>u32:0-10000</format>
+                    <format>0-10000</format>
                     <description>DNS forwarding cache size</description>
                   </valueHelp>
-                  <type>u32</type>
+                  <constraint>
+                    <validator name="numeric" argument="--range 0-10000"/>
+                  </constraint>
                 </properties>
               </leafNode>
               <leafNode name="dhcp">
@@ -49,7 +51,10 @@
                         <description>Domain Name Server (DNS) IPv6 address</description>
                       </valueHelp>
                       <multi/>
-                      <type>ipv4,ipv6</type>
+                      <constraint>
+                        <validator name="ipv4-address"/>
+                        <validator name="ipv6-address"/>
+                      </constraint>
                     </properties>
                   </leafNode>
                 </children>
@@ -80,7 +85,10 @@
                     <description>Domain Name Server (DNS) IPv6 address</description>
                   </valueHelp>
                   <multi/>
-                  <type>ipv4,ipv6</type>
+                  <constraint>
+                    <validator name="ipv4-address"/>
+                    <validator name="ipv6-address"/>
+                  </constraint>
                 </properties>
               </leafNode>
               <leafNode name="system">
diff --git a/interface-definitions/ntp.xml b/interface-definitions/ntp.xml
index c756da611..c6fd8aa14 100644
--- a/interface-definitions/ntp.xml
+++ b/interface-definitions/ntp.xml
@@ -55,7 +55,10 @@
                     <description>IPv6 address and prefix length</description>
                   </valueHelp>
                   <multi/>
-                  <type>ipv4net,ipv6net</type>
+                  <constraint>
+                    <validator name="ipv4-address"/>
+                    <validator name="ipv6-address"/>
+                  </constraint>
                 </properties>
               </leafNode>
             </children>
diff --git a/interface-definitions/ssh.xml b/interface-definitions/ssh.xml
index 5ccd3006f..f898f3934 100644
--- a/interface-definitions/ssh.xml
+++ b/interface-definitions/ssh.xml
@@ -80,8 +80,11 @@
                 <format>ipv6</format>
                 <description>IPv6 address to listen for incoming connections</description>
               </valueHelp>
-              <type>ipv4,ipv6</type>
               <multi/>
+              <constraint>
+                <validator name="ipv4-address"/>
+                <validator name="ipv6-address"/>
+              </constraint>
             </properties>
           </leafNode>
           <leafNode name="loglevel">
@@ -121,10 +124,12 @@
             <properties>
               <help>Port for SSH service</help>
               <valueHelp>
-                <format>u32:1-65535</format>
+                <format>1-65535</format>
                 <description>Numeric IP port</description>
               </valueHelp>
-              <type>u32</type>
+              <constraint>
+                <validator name="numeric" argument="--range 1-65535"/>
+              </constraint>
             </properties>
           </leafNode>
         </children>
-- 
cgit v1.2.3