xml: T4047: use full string match in the regex validator

47 files changed, 84 insertions, 84 deletions

diff --git a/interface-definitions/include/accel-ppp/auth-mode.xml.i b/interface-definitions/include/accel-ppp/auth-mode.xml.i
index a7711b675..c1a87cfe3 100644
--- a/interface-definitions/include/accel-ppp/auth-mode.xml.i
+++ b/interface-definitions/include/accel-ppp/auth-mode.xml.i
@@ -11,7 +11,7 @@
       <description>Use RADIUS server for user autentication</description>
     </valueHelp>
     <constraint>
-      <regex>^(local|radius)$</regex>
+      <regex>(local|radius)</regex>
     </constraint>
     <completionHelp>
       <list>local radius</list>
diff --git a/interface-definitions/include/accel-ppp/auth-protocols.xml.i b/interface-definitions/include/accel-ppp/auth-protocols.xml.i
index 480747f53..d43266152 100644
--- a/interface-definitions/include/accel-ppp/auth-protocols.xml.i
+++ b/interface-definitions/include/accel-ppp/auth-protocols.xml.i
@@ -22,7 +22,7 @@
       <description>Authentication via MS-CHAPv2 (Microsoft Challenge Handshake Authentication Protocol, version 2)</description>
     </valueHelp>
     <constraint>
-      <regex>^(pap|chap|mschap|mschap-v2)$</regex>
+      <regex>(pap|chap|mschap|mschap-v2)</regex>
     </constraint>
     <multi/>
   </properties>
diff --git a/interface-definitions/include/accel-ppp/ppp-mppe.xml.i b/interface-definitions/include/accel-ppp/ppp-mppe.xml.i
index e8370180b..4c2e84c25 100644
--- a/interface-definitions/include/accel-ppp/ppp-mppe.xml.i
+++ b/interface-definitions/include/accel-ppp/ppp-mppe.xml.i
@@ -18,7 +18,7 @@
       <description>drop all mppe</description>
     </valueHelp>
     <constraint>
-      <regex>^(require|prefer|deny)$</regex>
+      <regex>(require|prefer|deny)</regex>
     </constraint>
   </properties>
   <defaultValue>prefer</defaultValue>
diff --git a/interface-definitions/include/accel-ppp/ppp-options-ipv4.xml.i b/interface-definitions/include/accel-ppp/ppp-options-ipv4.xml.i
index 3e065329d..a45390f43 100644
--- a/interface-definitions/include/accel-ppp/ppp-options-ipv4.xml.i
+++ b/interface-definitions/include/accel-ppp/ppp-options-ipv4.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>IPv4 negotiation algorithm</help>
     <constraint>
-      <regex>^(deny|allow)$</regex>
+      <regex>(deny|allow)</regex>
     </constraint>
     <constraintErrorMessage>invalid value</constraintErrorMessage>
     <valueHelp>
diff --git a/interface-definitions/include/accel-ppp/ppp-options-ipv6.xml.i b/interface-definitions/include/accel-ppp/ppp-options-ipv6.xml.i
index b9fbac5c6..98abc1111 100644
--- a/interface-definitions/include/accel-ppp/ppp-options-ipv6.xml.i
+++ b/interface-definitions/include/accel-ppp/ppp-options-ipv6.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>IPv6 (IPCP6) negotiation algorithm</help>
     <constraint>
-      <regex>^(deny|allow|prefer|require)$</regex>
+      <regex>(deny|allow|prefer|require)</regex>
     </constraint>
     <constraintErrorMessage>invalid value</constraintErrorMessage>
     <valueHelp>
diff --git a/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i b/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i
index de42eeac9..34b5ec7d7 100644
--- a/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i
+++ b/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i
@@ -15,7 +15,7 @@
           <description>Name of IPv4 prefix-list</description>
         </valueHelp>
         <constraint>
-          <regex>^[-_a-zA-Z0-9]+$</regex>
+          <regex>[-_a-zA-Z0-9]+</regex>
         </constraint>
         <constraintErrorMessage>Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
       </properties>
@@ -31,7 +31,7 @@
           <description>Name of IPv4 prefix-list</description>
         </valueHelp>
         <constraint>
-          <regex>^[-_a-zA-Z0-9]+$</regex>
+          <regex>[-_a-zA-Z0-9]+</regex>
         </constraint>
         <constraintErrorMessage>Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
       </properties>
diff --git a/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i b/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i
index 2bf4753be..06c661a90 100644
--- a/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i
+++ b/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i
@@ -15,7 +15,7 @@
           <description>Name of IPv6 prefix-list</description>
         </valueHelp>
         <constraint>
-          <regex>^[-_a-zA-Z0-9]+$</regex>
+          <regex>[-_a-zA-Z0-9]+</regex>
         </constraint>
         <constraintErrorMessage>Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
       </properties>
@@ -31,7 +31,7 @@
           <description>Name of IPv6 prefix-list</description>
         </valueHelp>
         <constraint>
-          <regex>^[-_a-zA-Z0-9]+$</regex>
+          <regex>[-_a-zA-Z0-9]+</regex>
         </constraint>
         <constraintErrorMessage>Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
       </properties>
diff --git a/interface-definitions/include/bgp/afi-label.xml.i b/interface-definitions/include/bgp/afi-label.xml.i
index f7a1f609f..9535d19e8 100644
--- a/interface-definitions/include/bgp/afi-label.xml.i
+++ b/interface-definitions/include/bgp/afi-label.xml.i
@@ -25,7 +25,7 @@
             </valueHelp>
             <constraint>
               <validator name="numeric" argument="--range 0-1048575"/>
-              <regex>^(auto)$</regex>
+              <regex>(auto)</regex>
             </constraint>
           </properties>
         </leafNode>
diff --git a/interface-definitions/include/bgp/afi-rd.xml.i b/interface-definitions/include/bgp/afi-rd.xml.i
index c4d29268c..767502094 100644
--- a/interface-definitions/include/bgp/afi-rd.xml.i
+++ b/interface-definitions/include/bgp/afi-rd.xml.i
@@ -17,7 +17,7 @@
               <description>Route Distinguisher, (x.x.x.x:yyy|xxxx:yyyy)</description>
             </valueHelp>
             <constraint>
-              <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
+              <regex>((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}</regex>
             </constraint>
           </properties>
         </leafNode>
diff --git a/interface-definitions/include/bgp/afi-route-map-export-import.xml.i b/interface-definitions/include/bgp/afi-route-map-export-import.xml.i
index eae10d312..c218937c8 100644
--- a/interface-definitions/include/bgp/afi-route-map-export-import.xml.i
+++ b/interface-definitions/include/bgp/afi-route-map-export-import.xml.i
@@ -10,7 +10,7 @@
       <description>Route map name</description>
     </valueHelp>
     <constraint>
-      <regex>^[-_a-zA-Z0-9.]+$</regex>
+      <regex>[-_a-zA-Z0-9.]+</regex>
     </constraint>
     <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
   </properties>
@@ -26,7 +26,7 @@
       <description>Route map name</description>
     </valueHelp>
     <constraint>
-      <regex>^[-_a-zA-Z0-9.]+$</regex>
+      <regex>[-_a-zA-Z0-9.]+</regex>
     </constraint>
     <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
   </properties>
diff --git a/interface-definitions/include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i b/interface-definitions/include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i
index a56745380..75221a348 100644
--- a/interface-definitions/include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i
+++ b/interface-definitions/include/bgp/neighbor-afi-ipv4-ipv6-common.xml.i
@@ -27,7 +27,7 @@
           <description>Route map name</description>
         </valueHelp>
         <constraint>
-          <regex>^[-_a-zA-Z0-9.]+$</regex>
+          <regex>[-_a-zA-Z0-9.]+</regex>
         </constraint>
         <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
       </properties>
@@ -43,7 +43,7 @@
           <description>Route map name</description>
         </valueHelp>
         <constraint>
-          <regex>^[-_a-zA-Z0-9.]+$</regex>
+          <regex>[-_a-zA-Z0-9.]+</regex>
         </constraint>
         <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
       </properties>
@@ -59,7 +59,7 @@
           <description>Route map name</description>
         </valueHelp>
         <constraint>
-          <regex>^[-_a-zA-Z0-9.]+$</regex>
+          <regex>[-_a-zA-Z0-9.]+</regex>
         </constraint>
         <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
       </properties>
@@ -177,7 +177,7 @@
       <description>Route map name</description>
     </valueHelp>
     <constraint>
-      <regex>^[-_a-zA-Z0-9.]+$</regex>
+      <regex>[-_a-zA-Z0-9.]+</regex>
     </constraint>
     <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
   </properties>
diff --git a/interface-definitions/include/bgp/neighbor-graceful-restart.xml.i b/interface-definitions/include/bgp/neighbor-graceful-restart.xml.i
index 25558cd5c..4399d7988 100644
--- a/interface-definitions/include/bgp/neighbor-graceful-restart.xml.i
+++ b/interface-definitions/include/bgp/neighbor-graceful-restart.xml.i
@@ -18,7 +18,7 @@
       <description>Enable BGP graceful restart helper only functionality</description>
     </valueHelp>
     <constraint>
-      <regex>^(enable|disable|restart-helper)$</regex>
+      <regex>(enable|disable|restart-helper)</regex>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index b59ff0287..abaff5232 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -1106,7 +1106,7 @@
               <description>Ignore paths without link bandwidth for ECMP (if other paths have it)</description>
             </valueHelp>
             <constraint>
-              <regex>^(default-weight-for-missing|ignore|skip-missing)$</regex>
+              <regex>(default-weight-for-missing|ignore|skip-missing)</regex>
             </constraint>
           </properties>
         </leafNode>
@@ -1461,7 +1461,7 @@
   <properties>
     <help>Name of peer-group</help>
     <constraint>
-      <regex>^[-_a-zA-Z0-9]+$</regex>
+      <regex>[-_a-zA-Z0-9]+</regex>
     </constraint>
   </properties>
   <children>
diff --git a/interface-definitions/include/bgp/remote-as.xml.i b/interface-definitions/include/bgp/remote-as.xml.i
index 11eb7c256..58595b3b9 100644
--- a/interface-definitions/include/bgp/remote-as.xml.i
+++ b/interface-definitions/include/bgp/remote-as.xml.i
@@ -19,7 +19,7 @@
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-4294967294"/>
-      <regex>^(external|internal)$</regex>
+      <regex>(external|internal)</regex>
     </constraint>
     <constraintErrorMessage>Invalid AS number</constraintErrorMessage>
   </properties>
diff --git a/interface-definitions/include/firewall/action-accept-drop-reject.xml.i b/interface-definitions/include/firewall/action-accept-drop-reject.xml.i
index 9f8baa884..7fd52319a 100644
--- a/interface-definitions/include/firewall/action-accept-drop-reject.xml.i
+++ b/interface-definitions/include/firewall/action-accept-drop-reject.xml.i
@@ -18,7 +18,7 @@
       <description>Action to reject</description>
     </valueHelp>
     <constraint>
-      <regex>^(accept|drop|reject)$</regex>
+      <regex>(accept|drop|reject)</regex>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/firewall/action.xml.i b/interface-definitions/include/firewall/action.xml.i
index 4ba93e3aa..0f60e3c38 100644
--- a/interface-definitions/include/firewall/action.xml.i
+++ b/interface-definitions/include/firewall/action.xml.i
@@ -18,7 +18,7 @@
       <description>Drop matching entries</description>
     </valueHelp>
     <constraint>
-      <regex>^(accept|reject|drop)$</regex>
+      <regex>(accept|reject|drop)</regex>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/firewall/common-rule.xml.i b/interface-definitions/include/firewall/common-rule.xml.i
index cd80b7e28..cbdfa9dc2 100644
--- a/interface-definitions/include/firewall/common-rule.xml.i
+++ b/interface-definitions/include/firewall/common-rule.xml.i
@@ -70,7 +70,7 @@
           <description>integer/unit (Example: 5/minute)</description>
         </valueHelp>
         <constraint>
-          <regex>^\d+/(second|minute|hour|day)$</regex>
+          <regex>\d+/(second|minute|hour|day)</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -91,7 +91,7 @@
       <description>Disable log</description>
     </valueHelp>
     <constraint>
-      <regex>^(enable|disable)$</regex>
+      <regex>(enable|disable)</regex>
     </constraint>
   </properties>
 </leafNode>
@@ -163,7 +163,7 @@
           <description>Source addresses seen COUNT times in the last hour</description>
         </valueHelp>
         <constraint>
-          <regex>^(second|minute|hour)$</regex>
+          <regex>(second|minute|hour)</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -215,7 +215,7 @@
           <description>Disable</description>
         </valueHelp>
         <constraint>
-          <regex>^(enable|disable)$</regex>
+          <regex>(enable|disable)</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -234,7 +234,7 @@
           <description>Disable</description>
         </valueHelp>
         <constraint>
-          <regex>^(enable|disable)$</regex>
+          <regex>(enable|disable)</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -253,7 +253,7 @@
           <description>Disable</description>
         </valueHelp>
         <constraint>
-          <regex>^(enable|disable)$</regex>
+          <regex>(enable|disable)</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -272,7 +272,7 @@
           <description>Disable</description>
         </valueHelp>
         <constraint>
-          <regex>^(enable|disable)$</regex>
+          <regex>(enable|disable)</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -292,7 +292,7 @@
           <description>Enter date using following notation - YYYY-MM-DD</description>
         </valueHelp>
         <constraint>
-          <regex>^(\d{4}\-\d{2}\-\d{2})$</regex>
+          <regex>(\d{4}\-\d{2}\-\d{2})</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -304,7 +304,7 @@
           <description>Enter time using using 24 hour notation - hh:mm:ss</description>
         </valueHelp>
         <constraint>
-          <regex>^([0-2][0-9](\:[0-5][0-9]){1,2})$</regex>
+          <regex>([0-2][0-9](\:[0-5][0-9]){1,2})</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -316,7 +316,7 @@
           <description>Enter date using following notation - YYYY-MM-DD</description>
         </valueHelp>
         <constraint>
-          <regex>^(\d{4}\-\d{2}\-\d{2})$</regex>
+          <regex>(\d{4}\-\d{2}\-\d{2})</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -328,7 +328,7 @@
           <description>Enter time using using 24 hour notation - hh:mm:ss</description>
         </valueHelp>
         <constraint>
-          <regex>^([0-2][0-9](\:[0-5][0-9]){1,2})$</regex>
+          <regex>([0-2][0-9](\:[0-5][0-9]){1,2})</regex>
         </constraint>
       </properties>
     </leafNode>
diff --git a/interface-definitions/include/firewall/icmp-type-name.xml.i b/interface-definitions/include/firewall/icmp-type-name.xml.i
index f57def3e1..d4197cf82 100644
--- a/interface-definitions/include/firewall/icmp-type-name.xml.i
+++ b/interface-definitions/include/firewall/icmp-type-name.xml.i
@@ -66,7 +66,7 @@
       <description>ICMP type 18: address-mask-reply</description>
     </valueHelp>
     <constraint>
-      <regex>^(echo-reply|destination-unreachable|source-quench|redirect|echo-request|router-advertisement|router-solicitation|time-exceeded|parameter-problem|timestamp-request|timestamp-reply|info-request|info-reply|address-mask-request|address-mask-reply)$</regex>
+      <regex>(echo-reply|destination-unreachable|source-quench|redirect|echo-request|router-advertisement|router-solicitation|time-exceeded|parameter-problem|timestamp-request|timestamp-reply|info-request|info-reply|address-mask-request|address-mask-reply)</regex>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/firewall/icmpv6-type-name.xml.i b/interface-definitions/include/firewall/icmpv6-type-name.xml.i
index b13cf02c4..a2e68abfb 100644
--- a/interface-definitions/include/firewall/icmpv6-type-name.xml.i
+++ b/interface-definitions/include/firewall/icmpv6-type-name.xml.i
@@ -66,7 +66,7 @@
       <description>ICMPv6 type 138: router-renumbering</description>
     </valueHelp>
     <constraint>
-      <regex>^(destination-unreachable|packet-too-big|time-exceeded|echo-request|echo-reply|mld-listener-query|mld-listener-report|mld-listener-reduction|nd-router-solicit|nd-router-advert|nd-neighbor-solicit|nd-neighbor-advert|nd-redirect|parameter-problem|router-renumbering)$</regex>
+      <regex>(destination-unreachable|packet-too-big|time-exceeded|echo-request|echo-reply|mld-listener-query|mld-listener-report|mld-listener-reduction|nd-router-solicit|nd-router-advert|nd-neighbor-solicit|nd-neighbor-advert|nd-redirect|parameter-problem|router-renumbering)</regex>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/firewall/name-default-action.xml.i b/interface-definitions/include/firewall/name-default-action.xml.i
index 8470a29a9..512b0296f 100644
--- a/interface-definitions/include/firewall/name-default-action.xml.i
+++ b/interface-definitions/include/firewall/name-default-action.xml.i
@@ -18,7 +18,7 @@
       <description>Accept if no prior rules are hit</description>
     </valueHelp>
     <constraint>
-      <regex>^(drop|reject|accept)$</regex>
+      <regex>(drop|reject|accept)</regex>
     </constraint>
   </properties>
 </leafNode>
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>
diff --git a/interface-definitions/include/ipsec/local-address.xml.i b/interface-definitions/include/ipsec/local-address.xml.i
index 2de6ecb1f..dc5653ce7 100644
--- a/interface-definitions/include/ipsec/local-address.xml.i
+++ b/interface-definitions/include/ipsec/local-address.xml.i
@@ -20,7 +20,7 @@
     <constraint>
       <validator name="ipv4-address"/>
       <validator name="ipv6-address"/>
-      <regex>^(any)$</regex>
+      <regex>(any)</regex>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/nat-translation-options.xml.i b/interface-definitions/include/nat-translation-options.xml.i
index 925f90106..6b95de045 100644
--- a/interface-definitions/include/nat-translation-options.xml.i
+++ b/interface-definitions/include/nat-translation-options.xml.i
@@ -19,7 +19,7 @@
           <description>Random source or destination address allocation for each connection</description>
         </valueHelp>
         <constraint>
-          <regex>^(persistent|random)$</regex>
+          <regex>(persistent|random)</regex>
         </constraint>
       </properties>
       <defaultValue>random</defaultValue>
@@ -43,7 +43,7 @@
           <description>Do not apply port randomization</description>
         </valueHelp>
         <constraint>
-          <regex>^(random|fully-random|none)$</regex>
+          <regex>(random|fully-random|none)</regex>
         </constraint>
       </properties>
       <defaultValue>none</defaultValue>
diff --git a/interface-definitions/include/ospf/authentication.xml.i b/interface-definitions/include/ospf/authentication.xml.i
index 1e6050b97..8e8cad067 100644
--- a/interface-definitions/include/ospf/authentication.xml.i
+++ b/interface-definitions/include/ospf/authentication.xml.i
@@ -29,7 +29,7 @@
                   <description>MD5 Key (16 characters or less)</description>
                 </valueHelp>
                 <constraint>
-                  <regex>^[^[:space:]]{1,16}$</regex>
+                  <regex>[^[:space:]]{1,16}</regex>
                 </constraint>
                 <constraintErrorMessage>Password must be 16 characters or less</constraintErrorMessage>
               </properties>
@@ -46,7 +46,7 @@
           <description>Plain text password (8 characters or less)</description>
         </valueHelp>
         <constraint>
-          <regex>^[^[:space:]]{1,8}$</regex>
+          <regex>[^[:space:]]{1,8}</regex>
         </constraint>
         <constraintErrorMessage>Password must be 8 characters or less</constraintErrorMessage>
       </properties>
diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i
index 3a3372e47..c156d5b1c 100644
--- a/interface-definitions/include/ospf/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -45,7 +45,7 @@
           <description>Filter static routes</description>
         </valueHelp>
         <constraint>
-          <regex>^(bgp|connected|isis|kernel|rip|static)$</regex>
+          <regex>(bgp|connected|isis|kernel|rip|static)</regex>
         </constraint>
         <constraintErrorMessage>Must be bgp, connected, kernel, rip, or static</constraintErrorMessage>
         <multi/>
@@ -123,7 +123,7 @@
                   <description>Never translate LSA types</description>
                 </valueHelp>
                 <constraint>
-                  <regex>^(always|candidate|never)$</regex>
+                  <regex>(always|candidate|never)</regex>
                 </constraint>
               </properties>
               <defaultValue>candidate</defaultValue>
@@ -172,7 +172,7 @@
           <description>Use MD5 authentication</description>
         </valueHelp>
         <constraint>
-          <regex>^(plaintext-password|md5)$</regex>
+          <regex>(plaintext-password|md5)</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -252,7 +252,7 @@
           <description>Enable shortcutting mode</description>
         </valueHelp>
         <constraint>
-          <regex>^(default|disable|enable)$</regex>
+          <regex>(default|disable|enable)</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -432,7 +432,7 @@
           <description>Point-to-point network type</description>
         </valueHelp>
         <constraint>
-          <regex>^(broadcast|non-broadcast|point-to-multipoint|point-to-point)$</regex>
+          <regex>(broadcast|non-broadcast|point-to-multipoint|point-to-point)</regex>
         </constraint>
         <constraintErrorMessage>Must be broadcast, non-broadcast, point-to-multipoint or point-to-point</constraintErrorMessage>
       </properties>
@@ -586,7 +586,7 @@
           <description>Standard ABR type</description>
         </valueHelp>
         <constraint>
-          <regex>^(cisco|ibm|shortcut|standard)$</regex>
+          <regex>(cisco|ibm|shortcut|standard)</regex>
         </constraint>
       </properties>
       <defaultValue>cisco</defaultValue>
@@ -617,7 +617,7 @@
       <description>Default to suppress routing updates on all interfaces</description>
     </valueHelp>
     <constraint>
-      <regex>^(default)$</regex>
+      <regex>(default)</regex>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/ospfv3/protocol-common-config.xml.i b/interface-definitions/include/ospfv3/protocol-common-config.xml.i
index 792c873c8..630534eea 100644
--- a/interface-definitions/include/ospfv3/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospfv3/protocol-common-config.xml.i
@@ -184,7 +184,7 @@
           <description>Point-to-point network type</description>
         </valueHelp>
         <constraint>
-          <regex>^(broadcast|point-to-point)$</regex>
+          <regex>(broadcast|point-to-point)</regex>
         </constraint>
         <constraintErrorMessage>Must be broadcast or point-to-point</constraintErrorMessage>
       </properties>
diff --git a/interface-definitions/include/policy/action.xml.i b/interface-definitions/include/policy/action.xml.i
index 3b9b458d4..0a3dc158a 100644
--- a/interface-definitions/include/policy/action.xml.i
+++ b/interface-definitions/include/policy/action.xml.i
@@ -14,7 +14,7 @@
       <description>Deny matching entries</description>
     </valueHelp>
     <constraint>
-      <regex>^(permit|deny)$</regex>
+      <regex>(permit|deny)</regex>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/policy/route-common-rule-ipv6.xml.i b/interface-definitions/include/policy/route-common-rule-ipv6.xml.i
index 406125e55..cfeba1a6c 100644
--- a/interface-definitions/include/policy/route-common-rule-ipv6.xml.i
+++ b/interface-definitions/include/policy/route-common-rule-ipv6.xml.i
@@ -91,7 +91,7 @@
       <description>Disable log</description>
     </valueHelp>
     <constraint>
-      <regex>^(enable|disable)$</regex>
+      <regex>(enable|disable)</regex>
     </constraint>
   </properties>
 </leafNode>
@@ -196,7 +196,7 @@
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 1-200"/>
-          <regex>^(main)$</regex>
+          <regex>(main)</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -260,7 +260,7 @@
           <description>Disable</description>
         </valueHelp>
         <constraint>
-          <regex>^(enable|disable)$</regex>
+          <regex>(enable|disable)</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -279,7 +279,7 @@
           <description>Disable</description>
         </valueHelp>
         <constraint>
-          <regex>^(enable|disable)$</regex>
+          <regex>(enable|disable)</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -298,7 +298,7 @@
           <description>Disable</description>
         </valueHelp>
         <constraint>
-          <regex>^(enable|disable)$</regex>
+          <regex>(enable|disable)</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -317,7 +317,7 @@
           <description>Disable</description>
         </valueHelp>
         <constraint>
-          <regex>^(enable|disable)$</regex>
+          <regex>(enable|disable)</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -543,7 +543,7 @@
           <description>ICMP type/code name</description>
         </valueHelp>
         <constraint>
-          <regex>^(any|echo-reply|pong|destination-unreachable|network-unreachable|host-unreachable|protocol-unreachable|port-unreachable|fragmentation-needed|source-route-failed|network-unknown|host-unknown|network-prohibited|host-prohibited|TOS-network-unreachable|TOS-host-unreachable|communication-prohibited|host-precedence-violation|precedence-cutoff|source-quench|redirect|network-redirect|host-redirect|TOS-network-redirect|TOS host-redirect|echo-request|ping|router-advertisement|router-solicitation|time-exceeded|ttl-exceeded|ttl-zero-during-transit|ttl-zero-during-reassembly|parameter-problem|ip-header-bad|required-option-missing|timestamp-request|timestamp-reply|address-mask-request|address-mask-reply|packet-too-big)$</regex>
+          <regex>(any|echo-reply|pong|destination-unreachable|network-unreachable|host-unreachable|protocol-unreachable|port-unreachable|fragmentation-needed|source-route-failed|network-unknown|host-unknown|network-prohibited|host-prohibited|TOS-network-unreachable|TOS-host-unreachable|communication-prohibited|host-precedence-violation|precedence-cutoff|source-quench|redirect|network-redirect|host-redirect|TOS-network-redirect|TOS host-redirect|echo-request|ping|router-advertisement|router-solicitation|time-exceeded|ttl-exceeded|ttl-zero-during-transit|ttl-zero-during-reassembly|parameter-problem|ip-header-bad|required-option-missing|timestamp-request|timestamp-reply|address-mask-request|address-mask-reply|packet-too-big)</regex>
           <validator name="numeric" argument="--range 0-255"/>
         </constraint>
       </properties>
diff --git a/interface-definitions/include/policy/route-common-rule.xml.i b/interface-definitions/include/policy/route-common-rule.xml.i
index 33c4ba77c..5a17dbc95 100644
--- a/interface-definitions/include/policy/route-common-rule.xml.i
+++ b/interface-definitions/include/policy/route-common-rule.xml.i
@@ -91,7 +91,7 @@
       <description>Disable log</description>
     </valueHelp>
     <constraint>
-      <regex>^(enable|disable)$</regex>
+      <regex>(enable|disable)</regex>
     </constraint>
   </properties>
 </leafNode>
@@ -196,7 +196,7 @@
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 1-200"/>
-          <regex>^(main)$</regex>
+          <regex>(main)</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -260,7 +260,7 @@
           <description>Disable</description>
         </valueHelp>
         <constraint>
-          <regex>^(enable|disable)$</regex>
+          <regex>(enable|disable)</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -279,7 +279,7 @@
           <description>Disable</description>
         </valueHelp>
         <constraint>
-          <regex>^(enable|disable)$</regex>
+          <regex>(enable|disable)</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -298,7 +298,7 @@
           <description>Disable</description>
         </valueHelp>
         <constraint>
-          <regex>^(enable|disable)$</regex>
+          <regex>(enable|disable)</regex>
         </constraint>
       </properties>
     </leafNode>
@@ -317,7 +317,7 @@
           <description>Disable</description>
         </valueHelp>
         <constraint>
-          <regex>^(enable|disable)$</regex>
+          <regex>(enable|disable)</regex>
         </constraint>
       </properties>
     </leafNode>
diff --git a/interface-definitions/include/policy/route-rule-action.xml.i b/interface-definitions/include/policy/route-rule-action.xml.i
index 9c880579d..1217055f2 100644
--- a/interface-definitions/include/policy/route-rule-action.xml.i
+++ b/interface-definitions/include/policy/route-rule-action.xml.i
@@ -10,7 +10,7 @@
       <description>Drop matching entries</description>
     </valueHelp>
     <constraint>
-      <regex>^(drop)$</regex>
+      <regex>(drop)</regex>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/route-map.xml.i b/interface-definitions/include/route-map.xml.i
index 88092b7d4..019868373 100644
--- a/interface-definitions/include/route-map.xml.i
+++ b/interface-definitions/include/route-map.xml.i
@@ -10,7 +10,7 @@
       <description>Route map name</description>
     </valueHelp>
     <constraint>
-      <regex>^[-_a-zA-Z0-9.]+$</regex>
+      <regex>[-_a-zA-Z0-9.]+</regex>
     </constraint>
     <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
   </properties>
diff --git a/interface-definitions/include/routing-passive-interface.xml.i b/interface-definitions/include/routing-passive-interface.xml.i
index 43dfb5e44..095b683de 100644
--- a/interface-definitions/include/routing-passive-interface.xml.i
+++ b/interface-definitions/include/routing-passive-interface.xml.i
@@ -15,7 +15,7 @@
       <description>Default to suppress routing updates on all interfaces</description>
     </valueHelp>
     <constraint>
-      <regex>^(default)$</regex>
+      <regex>(default)</regex>
       <validator name="interface-name"/>
     </constraint>
     <multi/>
diff --git a/interface-definitions/include/snmp/access-mode.xml.i b/interface-definitions/include/snmp/access-mode.xml.i
index 71c766774..7469805ac 100644
--- a/interface-definitions/include/snmp/access-mode.xml.i
+++ b/interface-definitions/include/snmp/access-mode.xml.i
@@ -14,7 +14,7 @@
       <description>read write</description>
     </valueHelp>
     <constraint>
-      <regex>^(ro|rw)$</regex>
+      <regex>(ro|rw)</regex>
     </constraint>
     <constraintErrorMessage>Authorization type must be either 'rw' or 'ro'</constraintErrorMessage>
   </properties>
diff --git a/interface-definitions/include/snmp/authentication-type.xml.i b/interface-definitions/include/snmp/authentication-type.xml.i
index ca0bb10a6..047d8cff4 100644
--- a/interface-definitions/include/snmp/authentication-type.xml.i
+++ b/interface-definitions/include/snmp/authentication-type.xml.i
@@ -14,7 +14,7 @@
       <description>Secure Hash Algorithm</description>
     </valueHelp>
     <constraint>
-      <regex>^(md5|sha)$</regex>
+      <regex>(md5|sha)</regex>
     </constraint>
   </properties>
   <defaultValue>md5</defaultValue>
diff --git a/interface-definitions/include/snmp/privacy-type.xml.i b/interface-definitions/include/snmp/privacy-type.xml.i
index 94029a6c6..d5fd1e811 100644
--- a/interface-definitions/include/snmp/privacy-type.xml.i
+++ b/interface-definitions/include/snmp/privacy-type.xml.i
@@ -14,7 +14,7 @@
       <description>Advanced Encryption Standard</description>
     </valueHelp>
     <constraint>
-      <regex>^(des|aes)$</regex>
+      <regex>(des|aes)</regex>
     </constraint>
   </properties>
   <defaultValue>des</defaultValue>
diff --git a/interface-definitions/include/snmp/protocol.xml.i b/interface-definitions/include/snmp/protocol.xml.i
index ebdeef87e..d7e6752ad 100644
--- a/interface-definitions/include/snmp/protocol.xml.i
+++ b/interface-definitions/include/snmp/protocol.xml.i
@@ -14,7 +14,7 @@
       <description>Listen protocol TCP</description>

     </valueHelp>

     <constraint>

-      <regex>^(udp|tcp)$</regex>

+      <regex>(udp|tcp)</regex>

     </constraint>

   </properties>

   <defaultValue>udp</defaultValue>

diff --git a/interface-definitions/include/ssh-user.xml.i b/interface-definitions/include/ssh-user.xml.i
index 17ba05a90..6ac1f35bc 100644
--- a/interface-definitions/include/ssh-user.xml.i
+++ b/interface-definitions/include/ssh-user.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Allow specific users to login</help>
     <constraint>
-      <regex>^[-_a-zA-Z0-9.]{1,100}</regex>
+      <regex>[-_a-zA-Z0-9.]{1,100}</regex>
     </constraint>
     <constraintErrorMessage>Illegal characters or more than 100 characters</constraintErrorMessage>
     <multi/>
diff --git a/interface-definitions/include/static/static-route-vrf.xml.i b/interface-definitions/include/static/static-route-vrf.xml.i
index 69aba253c..e1968f04a 100644
--- a/interface-definitions/include/static/static-route-vrf.xml.i
+++ b/interface-definitions/include/static/static-route-vrf.xml.i
@@ -11,7 +11,7 @@
       <description>Name of VRF to leak to</description>
     </valueHelp>
     <constraint>
-      <regex>^(default)$</regex>
+      <regex>(default)</regex>
       <validator name="vrf-name"/>
     </constraint>
   </properties>
diff --git a/interface-definitions/include/vpn-ipsec-encryption.xml.i b/interface-definitions/include/vpn-ipsec-encryption.xml.i
index eb0678aa9..629e6a0b9 100644
--- a/interface-definitions/include/vpn-ipsec-encryption.xml.i
+++ b/interface-definitions/include/vpn-ipsec-encryption.xml.i
@@ -226,7 +226,7 @@
       <description>256 bit ChaCha20/Poly1305 with 128 bit ICV</description>
     </valueHelp>
     <constraint>
-      <regex>^(null|aes128|aes192|aes256|aes128ctr|aes192ctr|aes256ctr|aes128ccm64|aes192ccm64|aes256ccm64|aes128ccm96|aes192ccm96|aes256ccm96|aes128ccm128|aes192ccm128|aes256ccm128|aes128gcm64|aes192gcm64|aes256gcm64|aes128gcm96|aes192gcm96|aes256gcm96|aes128gcm128|aes192gcm128|aes256gcm128|aes128gmac|aes192gmac|aes256gmac|3des|blowfish128|blowfish192|blowfish256|camellia128|camellia192|camellia256|camellia128ctr|camellia192ctr|camellia256ctr|camellia128ccm64|camellia192ccm64|camellia256ccm64|camellia128ccm96|camellia192ccm96|camellia256ccm96|camellia128ccm128|camellia192ccm128|camellia256ccm128|serpent128|serpent192|serpent256|twofish128|twofish192|twofish256|cast128|chacha20poly1305)$</regex>
+      <regex>(null|aes128|aes192|aes256|aes128ctr|aes192ctr|aes256ctr|aes128ccm64|aes192ccm64|aes256ccm64|aes128ccm96|aes192ccm96|aes256ccm96|aes128ccm128|aes192ccm128|aes256ccm128|aes128gcm64|aes192gcm64|aes256gcm64|aes128gcm96|aes192gcm96|aes256gcm96|aes128gcm128|aes192gcm128|aes256gcm128|aes128gmac|aes192gmac|aes256gmac|3des|blowfish128|blowfish192|blowfish256|camellia128|camellia192|camellia256|camellia128ctr|camellia192ctr|camellia256ctr|camellia128ccm64|camellia192ccm64|camellia256ccm64|camellia128ccm96|camellia192ccm96|camellia256ccm96|camellia128ccm128|camellia192ccm128|camellia256ccm128|serpent128|serpent192|serpent256|twofish128|twofish192|twofish256|cast128|chacha20poly1305)</regex>
     </constraint>
   </properties>
   <defaultValue>aes128</defaultValue>
diff --git a/interface-definitions/include/vpn-ipsec-hash.xml.i b/interface-definitions/include/vpn-ipsec-hash.xml.i
index d6259574a..73d19c24b 100644
--- a/interface-definitions/include/vpn-ipsec-hash.xml.i
+++ b/interface-definitions/include/vpn-ipsec-hash.xml.i
@@ -58,7 +58,7 @@
       <description>256-bit AES-GMAC</description>
     </valueHelp>
     <constraint>
-      <regex>^(md5|md5_128|sha1|sha1_160|sha256|sha256_96|sha384|sha512|aesxcbc|aescmac|aes128gmac|aes192gmac|aes256gmac)$</regex>
+      <regex>(md5|md5_128|sha1|sha1_160|sha256|sha256_96|sha384|sha512|aesxcbc|aescmac|aes128gmac|aes192gmac|aes256gmac)</regex>
     </constraint>
   </properties>
   <defaultValue>sha1</defaultValue>
diff --git a/interface-definitions/include/webproxy-url-filtering.xml.i b/interface-definitions/include/webproxy-url-filtering.xml.i
index 265bbff94..7763cb393 100644
--- a/interface-definitions/include/webproxy-url-filtering.xml.i
+++ b/interface-definitions/include/webproxy-url-filtering.xml.i
@@ -38,7 +38,7 @@
       <description>Default filter action is block</description>
     </valueHelp>
     <constraint>
-      <regex>^(allow|block)$</regex>
+      <regex>(allow|block)</regex>
     </constraint>
   </properties>
 </leafNode>