summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/templates/frr/bgp.frr.tmpl1
-rw-r--r--data/templates/frr/isis.frr.tmpl1
-rw-r--r--data/templates/frr/ospf.frr.tmpl1
-rw-r--r--data/templates/frr/ospfv3.frr.tmpl1
-rw-r--r--data/templates/frr/rip.frr.tmpl1
-rw-r--r--data/templates/frr/ripng.frr.tmpl1
-rw-r--r--interface-definitions/dhcp-server.xml.in2
-rw-r--r--interface-definitions/flow-accounting-conf.xml.in8
-rw-r--r--interface-definitions/include/accel-ppp/auth-mode.xml.i2
-rw-r--r--interface-definitions/include/accel-ppp/auth-protocols.xml.i2
-rw-r--r--interface-definitions/include/interface/address-ipv4-ipv6-dhcp.xml.i2
-rw-r--r--interface-definitions/include/interface/vif-s.xml.i2
-rw-r--r--interface-definitions/include/isis/isis-common-config.xml.i6
-rw-r--r--interface-definitions/interfaces-bonding.xml.in4
-rw-r--r--interface-definitions/interfaces-ethernet.xml.in4
-rw-r--r--interface-definitions/interfaces-l2tpv3.xml.in2
-rw-r--r--interface-definitions/interfaces-pppoe.xml.in2
-rw-r--r--interface-definitions/interfaces-pseudo-ethernet.xml.in2
-rw-r--r--interface-definitions/nat.xml.in2
-rw-r--r--interface-definitions/nat66.xml.in4
-rw-r--r--interface-definitions/salt-minion.xml.in2
-rw-r--r--interface-definitions/service-ids-ddos-protection.xml.in2
-rw-r--r--interface-definitions/service_ipoe-server.xml.in6
-rw-r--r--interface-definitions/service_pppoe-server.xml.in6
-rw-r--r--interface-definitions/service_router-advert.xml.in2
-rw-r--r--interface-definitions/system-console.xml.in2
-rw-r--r--interface-definitions/system-ip.xml.in2
-rw-r--r--interface-definitions/system-ipv6.xml.in2
-rw-r--r--interface-definitions/system-syslog.xml.in22
-rw-r--r--interface-definitions/vpn_l2tp.xml.in4
-rw-r--r--interface-definitions/vpn_openconnect.xml.in2
-rw-r--r--interface-definitions/vpn_pptp.xml.in2
-rw-r--r--interface-definitions/vrrp.xml.in2
33 files changed, 50 insertions, 56 deletions
diff --git a/data/templates/frr/bgp.frr.tmpl b/data/templates/frr/bgp.frr.tmpl
index cc7f79a6c..dafe45f59 100644
--- a/data/templates/frr/bgp.frr.tmpl
+++ b/data/templates/frr/bgp.frr.tmpl
@@ -459,7 +459,6 @@ router bgp {{ local_as }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none
{% if timers is defined and timers.keepalive is defined and timers.holdtime is defined %}
timers bgp {{ timers.keepalive }} {{ timers.holdtime }}
{% endif %}
- exit
!
{% if route_map is defined and route_map is not none %}
ip protocol bgp route-map {{ route_map }}
diff --git a/data/templates/frr/isis.frr.tmpl b/data/templates/frr/isis.frr.tmpl
index 46400664f..c8e11399e 100644
--- a/data/templates/frr/isis.frr.tmpl
+++ b/data/templates/frr/isis.frr.tmpl
@@ -173,7 +173,6 @@ interface {{ iface }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
{% endif %}
{% endfor %}
{% endif %}
- exit
!
{% if route_map is defined and route_map is not none %}
ip protocol isis route-map {{ route_map }}
diff --git a/data/templates/frr/ospf.frr.tmpl b/data/templates/frr/ospf.frr.tmpl
index fd2082d5c..a47c64c89 100644
--- a/data/templates/frr/ospf.frr.tmpl
+++ b/data/templates/frr/ospf.frr.tmpl
@@ -176,7 +176,6 @@ router ospf {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
{# Timer values have default values #}
timers throttle spf {{ timers.throttle.spf.delay }} {{ timers.throttle.spf.initial_holdtime }} {{ timers.throttle.spf.max_holdtime }}
{% endif %}
- exit
!
{% if route_map is defined and route_map is not none %}
ip protocol ospf route-map {{ route_map }}
diff --git a/data/templates/frr/ospfv3.frr.tmpl b/data/templates/frr/ospfv3.frr.tmpl
index 34b22a3e3..d08972a80 100644
--- a/data/templates/frr/ospfv3.frr.tmpl
+++ b/data/templates/frr/ospfv3.frr.tmpl
@@ -81,5 +81,4 @@ router ospf6
redistribute {{ protocol }} {{ 'route-map ' + options.route_map if options.route_map is defined }}
{% endfor %}
{% endif %}
- exit
!
diff --git a/data/templates/frr/rip.frr.tmpl b/data/templates/frr/rip.frr.tmpl
index 748dfb126..cabc236f0 100644
--- a/data/templates/frr/rip.frr.tmpl
+++ b/data/templates/frr/rip.frr.tmpl
@@ -89,7 +89,6 @@ router rip
{% endif %}
{% endif %}
{% include 'frr/rip_ripng.frr.j2' %}
- exit
!
{% if route_map is defined and route_map is not none %}
ip protocol rip route-map {{ route_map }}
diff --git a/data/templates/frr/ripng.frr.tmpl b/data/templates/frr/ripng.frr.tmpl
index c92946bb3..25df15121 100644
--- a/data/templates/frr/ripng.frr.tmpl
+++ b/data/templates/frr/ripng.frr.tmpl
@@ -57,5 +57,4 @@ router ripng
{% endif %}
{% endif %}
{% include 'frr/rip_ripng.frr.j2' %}
- exit
!
diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in
index 28b61e92d..015500043 100644
--- a/interface-definitions/dhcp-server.xml.in
+++ b/interface-definitions/dhcp-server.xml.in
@@ -198,7 +198,7 @@
<list>primary secondary</list>
</completionHelp>
<constraint>
- <regex>(primary|secondary)</regex>
+ <regex>^(primary|secondary)$</regex>
</constraint>
<constraintErrorMessage>Invalid DHCP failover peer status</constraintErrorMessage>
</properties>
diff --git a/interface-definitions/flow-accounting-conf.xml.in b/interface-definitions/flow-accounting-conf.xml.in
index 830078abe..b3980d9e2 100644
--- a/interface-definitions/flow-accounting-conf.xml.in
+++ b/interface-definitions/flow-accounting-conf.xml.in
@@ -39,9 +39,6 @@
<completionHelp>
<list>auth authpriv cron daemon kern lpr mail mark news protocols security syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 all</list>
</completionHelp>
- <constraint>
- <regex>auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all</regex>
- </constraint>
<valueHelp>
<format>auth</format>
<description>Authentication and authorization</description>
@@ -134,6 +131,9 @@
<format>all</format>
<description>Authentication and authorization</description>
</valueHelp>
+ <constraint>
+ <regex>^(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)$</regex>
+ </constraint>
</properties>
</leafNode>
<leafNode name="interface">
@@ -381,7 +381,7 @@
</valueHelp>
<constraint>
<validator name="ipv4-address"/>
- <regex>auto$</regex>
+ <regex>^auto$</regex>
</constraint>
</properties>
</leafNode>
diff --git a/interface-definitions/include/accel-ppp/auth-mode.xml.i b/interface-definitions/include/accel-ppp/auth-mode.xml.i
index c1a87cfe3..a7711b675 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 d43266152..480747f53 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/interface/address-ipv4-ipv6-dhcp.xml.i b/interface-definitions/include/interface/address-ipv4-ipv6-dhcp.xml.i
index b9dd59bea..123590c08 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/vif-s.xml.i b/interface-definitions/include/interface/vif-s.xml.i
index 045fd3e24..17d1746be 100644
--- a/interface-definitions/include/interface/vif-s.xml.i
+++ b/interface-definitions/include/interface/vif-s.xml.i
@@ -29,7 +29,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/isis/isis-common-config.xml.i b/interface-definitions/include/isis/isis-common-config.xml.i
index 8b753b082..2caafc1a6 100644
--- a/interface-definitions/include/isis/isis-common-config.xml.i
+++ b/interface-definitions/include/isis/isis-common-config.xml.i
@@ -140,7 +140,7 @@
<description>Act as an area router</description>
</valueHelp>
<constraint>
- <regex>(level-1|level-1-2|level-2)</regex>
+ <regex>^(level-1|level-1-2|level-2)$</regex>
</constraint>
</properties>
</leafNode>
@@ -211,7 +211,7 @@
<description>Use new style of TLVs to carry wider metric</description>
</valueHelp>
<constraint>
- <regex>(narrow|transition|wide)</regex>
+ <regex>^(narrow|transition|wide)$</regex>
</constraint>
</properties>
</leafNode>
@@ -644,7 +644,7 @@
<description>Level-2 only adjacencies are formed</description>
</valueHelp>
<constraint>
- <regex>(level-1|level-1-2|level-2-only)</regex>
+ <regex>^(level-1|level-1-2|level-2-only)$</regex>
</constraint>
</properties>
</leafNode>
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index 4382433b2..846f6eb54 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -75,7 +75,7 @@
<description>combine IP address and port to make hash</description>
</valueHelp>
<constraint>
- <regex>(layer2\+3|layer3\+4|layer2)</regex>
+ <regex>^(layer2\+3|layer3\+4|layer2)$</regex>
</constraint>
<constraintErrorMessage>hash-policy must be layer2 layer2+3 or layer3+4</constraintErrorMessage>
</properties>
@@ -132,7 +132,7 @@
<description>Distribute based on MAC address</description>
</valueHelp>
<constraint>
- <regex>(802.3ad|active-backup|broadcast|round-robin|transmit-load-balance|adaptive-load-balance|xor-hash)</regex>
+ <regex>^(802.3ad|active-backup|broadcast|round-robin|transmit-load-balance|adaptive-load-balance|xor-hash)$</regex>
</constraint>
<constraintErrorMessage>mode must be 802.3ad, active-backup, broadcast, round-robin, transmit-load-balance, adaptive-load-balance, or xor</constraintErrorMessage>
</properties>
diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index 8e426b1af..fff8db2d1 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -50,7 +50,7 @@
<description>Full duplex</description>
</valueHelp>
<constraint>
- <regex>(auto|half|full)</regex>
+ <regex>^(auto|half|full)$</regex>
</constraint>
<constraintErrorMessage>duplex must be auto, half or full</constraintErrorMessage>
</properties>
@@ -157,7 +157,7 @@
<description>100 Gbit/sec</description>
</valueHelp>
<constraint>
- <regex>(auto|10|100|1000|2500|5000|10000|25000|40000|50000|100000)</regex>
+ <regex>^(auto|10|100|1000|2500|5000|10000|25000|40000|50000|100000)$</regex>
</constraint>
<constraintErrorMessage>Speed must be auto, 10, 100, 1000, 2500, 5000, 10000, 25000, 40000, 50000 or 100000</constraintErrorMessage>
</properties>
diff --git a/interface-definitions/interfaces-l2tpv3.xml.in b/interface-definitions/interfaces-l2tpv3.xml.in
index 831b9b47a..ffb57203e 100644
--- a/interface-definitions/interfaces-l2tpv3.xml.in
+++ b/interface-definitions/interfaces-l2tpv3.xml.in
@@ -47,7 +47,7 @@
<description>IP encapsulation</description>
</valueHelp>
<constraint>
- <regex>(udp|ip)</regex>
+ <regex>^(udp|ip)$</regex>
</constraint>
<constraintErrorMessage>Encapsulation must be UDP or IP</constraintErrorMessage>
</properties>
diff --git a/interface-definitions/interfaces-pppoe.xml.in b/interface-definitions/interfaces-pppoe.xml.in
index a8e371f85..8c2b50eba 100644
--- a/interface-definitions/interfaces-pppoe.xml.in
+++ b/interface-definitions/interfaces-pppoe.xml.in
@@ -50,7 +50,7 @@
<list>auto none force</list>
</completionHelp>
<constraint>
- <regex>(auto|none|force)</regex>
+ <regex>^(auto|none|force)$</regex>
</constraint>
<constraintErrorMessage>PPPoE default-route option must be 'auto', 'none', or 'force'</constraintErrorMessage>
<valueHelp>
diff --git a/interface-definitions/interfaces-pseudo-ethernet.xml.in b/interface-definitions/interfaces-pseudo-ethernet.xml.in
index 9e3e0cb26..136841290 100644
--- a/interface-definitions/interfaces-pseudo-ethernet.xml.in
+++ b/interface-definitions/interfaces-pseudo-ethernet.xml.in
@@ -50,7 +50,7 @@
<description>Promicious mode passthrough of underlying device</description>
</valueHelp>
<constraint>
- <regex>(private|vepa|bridge|passthru)</regex>
+ <regex>^(private|vepa|bridge|passthru)$</regex>
</constraint>
<constraintErrorMessage>mode must be private, vepa, bridge or passthru</constraintErrorMessage>
</properties>
diff --git a/interface-definitions/nat.xml.in b/interface-definitions/nat.xml.in
index 3cff8abc9..9862f49b2 100644
--- a/interface-definitions/nat.xml.in
+++ b/interface-definitions/nat.xml.in
@@ -96,7 +96,7 @@
<validator name="ipv4-prefix"/>
<validator name="ipv4-address"/>
<validator name="ipv4-range"/>
- <regex>(masquerade)</regex>
+ <regex>^(masquerade)$</regex>
</constraint>
</properties>
</leafNode>
diff --git a/interface-definitions/nat66.xml.in b/interface-definitions/nat66.xml.in
index d5e1226f9..7b1ec3706 100644
--- a/interface-definitions/nat66.xml.in
+++ b/interface-definitions/nat66.xml.in
@@ -94,7 +94,7 @@
<constraint>
<validator name="ipv6-address"/>
<validator name="ipv6-prefix"/>
- <regex>(masquerade)</regex>
+ <regex>^(masquerade)$</regex>
</constraint>
</properties>
</leafNode>
@@ -144,7 +144,7 @@
<help>Inbound interface of NAT66 traffic</help>
<completionHelp>
<list>any</list>
- <script>${vyos_completion_dir}/list_interfaces.py</script>
+ <script>${vyos_completion_dir}/list_interfaces.py</script>
</completionHelp>
</properties>
</leafNode>
diff --git a/interface-definitions/salt-minion.xml.in b/interface-definitions/salt-minion.xml.in
index c43374a0a..d3b022d12 100644
--- a/interface-definitions/salt-minion.xml.in
+++ b/interface-definitions/salt-minion.xml.in
@@ -15,7 +15,7 @@
<list>md5 sha1 sha224 sha256 sha384 sha512</list>
</completionHelp>
<constraint>
- <regex>(md5|sha1|sha224|sha256|sha384|sha512)</regex>
+ <regex>^(md5|sha1|sha224|sha256|sha384|sha512)$</regex>
</constraint>
</properties>
</leafNode>
diff --git a/interface-definitions/service-ids-ddos-protection.xml.in b/interface-definitions/service-ids-ddos-protection.xml.in
index 5e65d3106..ff4c1c24e 100644
--- a/interface-definitions/service-ids-ddos-protection.xml.in
+++ b/interface-definitions/service-ids-ddos-protection.xml.in
@@ -25,7 +25,7 @@
<list>in out</list>
</completionHelp>
<constraint>
- <regex>(in|out)</regex>
+ <regex>^(in|out)$</regex>
</constraint>
<multi/>
</properties>
diff --git a/interface-definitions/service_ipoe-server.xml.in b/interface-definitions/service_ipoe-server.xml.in
index d0a05aea6..7c575ba77 100644
--- a/interface-definitions/service_ipoe-server.xml.in
+++ b/interface-definitions/service_ipoe-server.xml.in
@@ -23,7 +23,7 @@
<list>L2 L3</list>
</completionHelp>
<constraint>
- <regex>(L2|L3)</regex>
+ <regex>^(L2|L3)$</regex>
</constraint>
<valueHelp>
<format>L2</format>
@@ -42,7 +42,7 @@
<list>shared vlan</list>
</completionHelp>
<constraint>
- <regex>(shared|vlan)</regex>
+ <regex>^(shared|vlan)$</regex>
</constraint>
<valueHelp>
<format>shared</format>
@@ -125,7 +125,7 @@
<list>local radius noauth</list>
</completionHelp>
<constraint>
- <regex>(local|radius|noauth)</regex>
+ <regex>^(local|radius|noauth)$</regex>
</constraint>
<valueHelp>
<format>local</format>
diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in
index 1d3e8ba29..dc8af67af 100644
--- a/interface-definitions/service_pppoe-server.xml.in
+++ b/interface-definitions/service_pppoe-server.xml.in
@@ -38,7 +38,7 @@
<list>ifname ifname:mac</list>
</completionHelp>
<constraint>
- <regex>(ifname|ifname:mac)</regex>
+ <regex>^(ifname|ifname:mac)$</regex>
</constraint>
<constraintErrorMessage>Invalid Called-Station-Id format</constraintErrorMessage>
<valueHelp>
@@ -168,7 +168,7 @@
<properties>
<help>IPv4 (IPCP) negotiation algorithm</help>
<constraint>
- <regex>(deny|allow|prefer|require)</regex>
+ <regex>^(deny|allow|prefer|require)$</regex>
</constraint>
<constraintErrorMessage>invalid value</constraintErrorMessage>
<valueHelp>
@@ -196,7 +196,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/service_router-advert.xml.in b/interface-definitions/service_router-advert.xml.in
index 94255aeb2..47ac4e25d 100644
--- a/interface-definitions/service_router-advert.xml.in
+++ b/interface-definitions/service_router-advert.xml.in
@@ -215,7 +215,7 @@
</valueHelp>
<constraint>
<validator name="numeric" argument="--range 0-4294967295"/>
- <regex>(infinity)</regex>
+ <regex>^(infinity)$</regex>
</constraint>
</properties>
<defaultValue>2592000</defaultValue>
diff --git a/interface-definitions/system-console.xml.in b/interface-definitions/system-console.xml.in
index 71e63d0cb..88f7f82a9 100644
--- a/interface-definitions/system-console.xml.in
+++ b/interface-definitions/system-console.xml.in
@@ -71,7 +71,7 @@
<description>115200 bps</description>
</valueHelp>
<constraint>
- <regex>(1200|2400|4800|9600|19200|38400|57600|115200)</regex>
+ <regex>^(1200|2400|4800|9600|19200|38400|57600|115200)$</regex>
</constraint>
</properties>
</leafNode>
diff --git a/interface-definitions/system-ip.xml.in b/interface-definitions/system-ip.xml.in
index 0bd461042..86fbe5701 100644
--- a/interface-definitions/system-ip.xml.in
+++ b/interface-definitions/system-ip.xml.in
@@ -20,7 +20,7 @@
<list>1024 2048 4096 8192 16384 32768</list>
</completionHelp>
<constraint>
- <regex>(1024|2048|4096|8192|16384|32768)</regex>
+ <regex>^(1024|2048|4096|8192|16384|32768)$</regex>
</constraint>
</properties>
<defaultValue>8192</defaultValue>
diff --git a/interface-definitions/system-ipv6.xml.in b/interface-definitions/system-ipv6.xml.in
index 6ead747a1..5ee7adf54 100644
--- a/interface-definitions/system-ipv6.xml.in
+++ b/interface-definitions/system-ipv6.xml.in
@@ -45,7 +45,7 @@
<list>1024 2048 4096 8192 16384 32768</list>
</completionHelp>
<constraint>
- <regex>(1024|2048|4096|8192|16384|32768)</regex>
+ <regex>^(1024|2048|4096|8192|16384|32768)$</regex>
</constraint>
</properties>
</leafNode>
diff --git a/interface-definitions/system-syslog.xml.in b/interface-definitions/system-syslog.xml.in
index c58922a3d..f3dcae2f3 100644
--- a/interface-definitions/system-syslog.xml.in
+++ b/interface-definitions/system-syslog.xml.in
@@ -28,7 +28,7 @@
<list>auth authpriv cron daemon kern lpr mail mark news protocols security syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 all</list>
</completionHelp>
<constraint>
- <regex>(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)</regex>
+ <regex>^(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)$</regex>
</constraint>
<constraintErrorMessage>Invalid facility type</constraintErrorMessage>
<valueHelp>
@@ -132,7 +132,7 @@
<list>emerg alert crit err warning notice info debug all</list>
</completionHelp>
<constraint>
- <regex>(emerg|alert|crit|err|warning|notice|info|debug|all)</regex>
+ <regex>^(emerg|alert|crit|err|warning|notice|info|debug|all)$</regex>
</constraint>
<constraintErrorMessage>Invalid loglevel</constraintErrorMessage>
<valueHelp>
@@ -215,7 +215,7 @@
<list>auth authpriv cron daemon kern lpr mail mark news protocols security syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 all</list>
</completionHelp>
<constraint>
- <regex>(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)</regex>
+ <regex>^(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)$</regex>
</constraint>
<constraintErrorMessage>Invalid facility type</constraintErrorMessage>
<valueHelp>
@@ -327,7 +327,7 @@
<list>udp tcp</list>
</completionHelp>
<constraint>
- <regex>(udp|tcp)</regex>
+ <regex>^(udp|tcp)$</regex>
</constraint>
<constraintErrorMessage>invalid protocol name</constraintErrorMessage>
</properties>
@@ -339,7 +339,7 @@
<list>emerg alert crit err warning notice info debug all</list>
</completionHelp>
<constraint>
- <regex>(emerg|alert|crit|err|warning|notice|info|debug|all)</regex>
+ <regex>^(emerg|alert|crit|err|warning|notice|info|debug|all)$</regex>
</constraint>
<constraintErrorMessage>Invalid loglevel</constraintErrorMessage>
<valueHelp>
@@ -434,7 +434,7 @@
<list>auth authpriv cron daemon kern lpr mail mark news protocols security syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 all</list>
</completionHelp>
<constraint>
- <regex>(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)</regex>
+ <regex>^(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)$</regex>
</constraint>
<constraintErrorMessage>Invalid facility type</constraintErrorMessage>
<valueHelp>
@@ -538,7 +538,7 @@
<list>emerg alert crit err warning notice info debug all</list>
</completionHelp>
<constraint>
- <regex>(emerg|alert|crit|err|warning|notice|info|debug|all)</regex>
+ <regex>^(emerg|alert|crit|err|warning|notice|info|debug|all)$</regex>
</constraint>
<constraintErrorMessage>Invalid loglevel</constraintErrorMessage>
<valueHelp>
@@ -645,7 +645,7 @@
<list>auth authpriv cron daemon kern lpr mail mark news protocols security syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 all</list>
</completionHelp>
<constraint>
- <regex>(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)</regex>
+ <regex>^(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)$</regex>
</constraint>
<constraintErrorMessage>Invalid facility type</constraintErrorMessage>
<valueHelp>
@@ -749,7 +749,7 @@
<list>emerg alert crit err warning notice info debug all</list>
</completionHelp>
<constraint>
- <regex>(emerg|alert|crit|err|warning|notice|info|debug|all)</regex>
+ <regex>^(emerg|alert|crit|err|warning|notice|info|debug|all)$</regex>
</constraint>
<constraintErrorMessage>Invalid loglevel</constraintErrorMessage>
<valueHelp>
@@ -806,7 +806,7 @@
<list>auth authpriv cron daemon kern lpr mail mark news protocols security syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7 all</list>
</completionHelp>
<constraint>
- <regex>(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)</regex>
+ <regex>^(auth|authpriv|cron|daemon|kern|lpr|mail|mark|news|protocols|security|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7|all)$</regex>
</constraint>
<constraintErrorMessage>Invalid facility type</constraintErrorMessage>
<valueHelp>
@@ -910,7 +910,7 @@
<list>emerg alert crit err warning notice info debug all</list>
</completionHelp>
<constraint>
- <regex>(emerg|alert|crit|err|warning|notice|info|debug|all)</regex>
+ <regex>^(emerg|alert|crit|err|warning|notice|info|debug|all)$</regex>
</constraint>
<constraintErrorMessage>Invalid loglevel</constraintErrorMessage>
<valueHelp>
diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in
index 2d8a8503d..5bdebcb05 100644
--- a/interface-definitions/vpn_l2tp.xml.in
+++ b/interface-definitions/vpn_l2tp.xml.in
@@ -63,7 +63,7 @@
<description>Use X.509 certificate for IPsec authentication</description>
</valueHelp>
<constraint>
- <regex>(pre-shared-secret|x509)</regex>
+ <regex>^(pre-shared-secret|x509)$</regex>
</constraint>
<completionHelp>
<list>pre-shared-secret x509</list>
@@ -201,7 +201,7 @@
<description>Require the peer to authenticate itself using 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>
<completionHelp>
<list>pap chap mschap mschap-v2</list>
diff --git a/interface-definitions/vpn_openconnect.xml.in b/interface-definitions/vpn_openconnect.xml.in
index f64aa7f23..1a9d39a12 100644
--- a/interface-definitions/vpn_openconnect.xml.in
+++ b/interface-definitions/vpn_openconnect.xml.in
@@ -25,7 +25,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/vpn_pptp.xml.in b/interface-definitions/vpn_pptp.xml.in
index 7cf584a18..91c8cd76f 100644
--- a/interface-definitions/vpn_pptp.xml.in
+++ b/interface-definitions/vpn_pptp.xml.in
@@ -86,7 +86,7 @@
<description>ask client for mppe, if it rejects drop connection</description>
</valueHelp>
<constraint>
- <regex>(deny|prefer|require)</regex>
+ <regex>^(deny|prefer|require)$</regex>
</constraint>
<completionHelp>
<list>deny prefer require</list>
diff --git a/interface-definitions/vrrp.xml.in b/interface-definitions/vrrp.xml.in
index 3c4c9b83c..bb551296f 100644
--- a/interface-definitions/vrrp.xml.in
+++ b/interface-definitions/vrrp.xml.in
@@ -61,7 +61,7 @@
<list>plaintext-password ah</list>
</completionHelp>
<constraint>
- <regex>(plaintext-password|ah)</regex>
+ <regex>^(plaintext-password|ah)$</regex>
</constraint>
<constraintErrorMessage>Authentication type must be plaintext-password or ah</constraintErrorMessage>
</properties>