From 80ecb1b7aaab47edeb355c3b74a763e940d88179 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 29 Apr 2022 19:51:50 +0200
Subject: xml: T4047: use full string match in the regex validator

---
 interface-definitions/include/interface/address-ipv4-ipv6-dhcp.xml.i | 2 +-
 interface-definitions/include/interface/adjust-mss.xml.i             | 2 +-
 interface-definitions/include/interface/description.xml.i            | 2 +-
 interface-definitions/include/interface/parameters-flowlabel.xml.i   | 2 +-
 interface-definitions/include/interface/source-validation.xml.i      | 2 +-
 interface-definitions/include/interface/vif-s.xml.i                  | 2 +-
 interface-definitions/include/interface/vif.xml.i                    | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'interface-definitions/include/interface')

diff --git a/interface-definitions/include/interface/address-ipv4-ipv6-dhcp.xml.i b/interface-definitions/include/interface/address-ipv4-ipv6-dhcp.xml.i
index 123590c08..b9dd59bea 100644
--- a/interface-definitions/include/interface/address-ipv4-ipv6-dhcp.xml.i
+++ b/interface-definitions/include/interface/address-ipv4-ipv6-dhcp.xml.i
@@ -23,7 +23,7 @@
     </valueHelp>
     <constraint>
       <validator name="ip-host"/>
-      <regex>^(dhcp|dhcpv6)$</regex>
+      <regex>(dhcp|dhcpv6)</regex>
     </constraint>
     <multi/>
   </properties>
diff --git a/interface-definitions/include/interface/adjust-mss.xml.i b/interface-definitions/include/interface/adjust-mss.xml.i
index 57019f02c..41140ffe1 100644
--- a/interface-definitions/include/interface/adjust-mss.xml.i
+++ b/interface-definitions/include/interface/adjust-mss.xml.i
@@ -16,7 +16,7 @@
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 500-65535"/>
-      <regex>^(clamp-mss-to-pmtu)$</regex>
+      <regex>(clamp-mss-to-pmtu)</regex>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/interface/description.xml.i b/interface-definitions/include/interface/description.xml.i
index 8579cf7d1..de01d22ca 100644
--- a/interface-definitions/include/interface/description.xml.i
+++ b/interface-definitions/include/interface/description.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Interface specific description</help>
     <constraint>
-      <regex>.{1,256}$</regex>
+      <regex>.{1,256}</regex>
     </constraint>
     <constraintErrorMessage>Description too long (limit 256 characters)</constraintErrorMessage>
   </properties>
diff --git a/interface-definitions/include/interface/parameters-flowlabel.xml.i b/interface-definitions/include/interface/parameters-flowlabel.xml.i
index bd0d1e070..b2e88215b 100644
--- a/interface-definitions/include/interface/parameters-flowlabel.xml.i
+++ b/interface-definitions/include/interface/parameters-flowlabel.xml.i
@@ -14,7 +14,7 @@
       <description>Tunnel key, or hex value</description>
     </valueHelp>
     <constraint>
-      <regex>^((0x){0,1}(0?[0-9A-Fa-f]{1,5})|inherit)$</regex>
+      <regex>((0x){0,1}(0?[0-9A-Fa-f]{1,5})|inherit)</regex>
     </constraint>
     <constraintErrorMessage>Must be 'inherit' or a number</constraintErrorMessage>
   </properties>
diff --git a/interface-definitions/include/interface/source-validation.xml.i b/interface-definitions/include/interface/source-validation.xml.i
index f38065f4d..fc9a7d376 100644
--- a/interface-definitions/include/interface/source-validation.xml.i
+++ b/interface-definitions/include/interface/source-validation.xml.i
@@ -18,7 +18,7 @@
       <description>No source validation</description>
     </valueHelp>
     <constraint>
-      <regex>^(strict|loose|disable)$</regex>
+      <regex>(strict|loose|disable)</regex>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/interface/vif-s.xml.i b/interface-definitions/include/interface/vif-s.xml.i
index 3b305618e..c1af9f9e3 100644
--- a/interface-definitions/include/interface/vif-s.xml.i
+++ b/interface-definitions/include/interface/vif-s.xml.i
@@ -35,7 +35,7 @@
           <description>VLAN-tagged frame (IEEE 802.1q), ethertype 0x8100</description>
         </valueHelp>
         <constraint>
-          <regex>^(802.1q|802.1ad)$</regex>
+          <regex>(802.1q|802.1ad)</regex>
         </constraint>
         <constraintErrorMessage>Ethertype must be 802.1ad or 802.1q</constraintErrorMessage>
       </properties>
diff --git a/interface-definitions/include/interface/vif.xml.i b/interface-definitions/include/interface/vif.xml.i
index 4e7f9b3c2..57ef8d64c 100644
--- a/interface-definitions/include/interface/vif.xml.i
+++ b/interface-definitions/include/interface/vif.xml.i
@@ -28,7 +28,7 @@
           <description>Format for qos mapping, e.g.: '0:1 1:6 7:6'</description>
         </valueHelp>
         <constraint>
-          <regex>[:0-7 ]+$</regex>
+          <regex>[:0-7 ]+</regex>
         </constraint>
         <constraintErrorMessage>QoS mapping should be in the format of '0:7 2:3' with numbers 0-9</constraintErrorMessage>
       </properties>
@@ -41,7 +41,7 @@
           <description>Format for qos mapping, e.g.: '0:1 1:6 7:6'</description>
         </valueHelp>
         <constraint>
-          <regex>[:0-7 ]+$</regex>
+          <regex>[:0-7 ]+</regex>
         </constraint>
         <constraintErrorMessage>QoS mapping should be in the format of '0:7 2:3' with numbers 0-9</constraintErrorMessage>
       </properties>
-- 
cgit v1.2.3