summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsdc <taras@sentrium.io>2019-10-28 17:41:15 +0200
committerzsdc <taras@sentrium.io>2019-10-28 17:41:15 +0200
commit8ae02a738df9746ad648a9611ae03e62b5af9e5d (patch)
tree43e7493b9911f6da53d82ca371451bbf7eb64844
parent3cacaf94f05fe92d5eda1574a07e5fd49881d97d (diff)
downloadvyos-1x-8ae02a738df9746ad648a9611ae03e62b5af9e5d.tar.gz
vyos-1x-8ae02a738df9746ad648a9611ae03e62b5af9e5d.zip
[XML templates] T1772: Changed old hacks to proper regex, according to the fix
-rw-r--r--interface-definitions/https.xml2
-rw-r--r--interface-definitions/interfaces-bonding.xml2
-rw-r--r--interface-definitions/snmp.xml4
3 files changed, 4 insertions, 4 deletions
diff --git a/interface-definitions/https.xml b/interface-definitions/https.xml
index 2fb3bf082..403d4ecb0 100644
--- a/interface-definitions/https.xml
+++ b/interface-definitions/https.xml
@@ -27,7 +27,7 @@
<constraint>
<validator name="ipv4-address"/>
<validator name="ipv6-address"/>
- <regex>^\\*$</regex>
+ <regex>^\*$</regex>
</constraint>
</properties>
<children>
diff --git a/interface-definitions/interfaces-bonding.xml b/interface-definitions/interfaces-bonding.xml
index c71482d9c..ba1acfff6 100644
--- a/interface-definitions/interfaces-bonding.xml
+++ b/interface-definitions/interfaces-bonding.xml
@@ -159,7 +159,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>
diff --git a/interface-definitions/snmp.xml b/interface-definitions/snmp.xml
index 1634bfb64..c5f424e6f 100644
--- a/interface-definitions/snmp.xml
+++ b/interface-definitions/snmp.xml
@@ -604,7 +604,7 @@
<properties>
<help>Specifies the oid</help>
<constraint>
- <regex>^[0-9]+(\\.[0-9]+)*$</regex>
+ <regex>^[0-9]+(\.[0-9]+)*$</regex>
</constraint>
<constraintErrorMessage>OID must start from a number</constraintErrorMessage>
</properties>
@@ -618,7 +618,7 @@
<properties>
<help>Defines a bit-mask that is indicating which subidentifiers of the associated subtree OID should be regarded as significant</help>
<constraint>
- <regex>^[0-9a-f]{2}([\\.:][0-9a-f]{2})*$</regex>
+ <regex>^[0-9a-f]{2}([\.:][0-9a-f]{2})*$</regex>
</constraint>
<constraintErrorMessage>MASK is a list of hex octets, separated by '.' or ':'</constraintErrorMessage>
</properties>