From 80ecb1b7aaab47edeb355c3b74a763e940d88179 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 29 Apr 2022 19:51:50 +0200 Subject: xml: T4047: use full string match in the regex validator --- .../include/accel-ppp/auth-mode.xml.i | 2 +- .../include/accel-ppp/auth-protocols.xml.i | 2 +- .../include/accel-ppp/ppp-mppe.xml.i | 2 +- .../include/accel-ppp/ppp-options-ipv4.xml.i | 2 +- .../include/accel-ppp/ppp-options-ipv6.xml.i | 2 +- .../include/bgp/afi-ipv4-prefix-list.xml.i | 4 ++-- .../include/bgp/afi-ipv6-prefix-list.xml.i | 4 ++-- interface-definitions/include/bgp/afi-label.xml.i | 2 +- interface-definitions/include/bgp/afi-rd.xml.i | 2 +- .../include/bgp/afi-route-map-export-import.xml.i | 4 ++-- .../bgp/neighbor-afi-ipv4-ipv6-common.xml.i | 8 ++++---- .../include/bgp/neighbor-graceful-restart.xml.i | 2 +- .../include/bgp/protocol-common-config.xml.i | 4 ++-- interface-definitions/include/bgp/remote-as.xml.i | 2 +- .../firewall/action-accept-drop-reject.xml.i | 2 +- .../include/firewall/action.xml.i | 2 +- .../include/firewall/common-rule.xml.i | 22 +++++++++++----------- .../include/firewall/icmp-type-name.xml.i | 2 +- .../include/firewall/icmpv6-type-name.xml.i | 2 +- .../include/firewall/name-default-action.xml.i | 2 +- .../include/interface/address-ipv4-ipv6-dhcp.xml.i | 2 +- .../include/interface/adjust-mss.xml.i | 2 +- .../include/interface/description.xml.i | 2 +- .../include/interface/parameters-flowlabel.xml.i | 2 +- .../include/interface/source-validation.xml.i | 2 +- .../include/interface/vif-s.xml.i | 2 +- interface-definitions/include/interface/vif.xml.i | 4 ++-- .../include/ipsec/local-address.xml.i | 2 +- .../include/nat-translation-options.xml.i | 4 ++-- .../include/ospf/authentication.xml.i | 4 ++-- .../include/ospf/protocol-common-config.xml.i | 14 +++++++------- .../include/ospfv3/protocol-common-config.xml.i | 2 +- interface-definitions/include/policy/action.xml.i | 2 +- .../include/policy/route-common-rule-ipv6.xml.i | 14 +++++++------- .../include/policy/route-common-rule.xml.i | 12 ++++++------ .../include/policy/route-rule-action.xml.i | 2 +- interface-definitions/include/route-map.xml.i | 2 +- .../include/routing-passive-interface.xml.i | 2 +- .../include/snmp/access-mode.xml.i | 2 +- .../include/snmp/authentication-type.xml.i | 2 +- .../include/snmp/privacy-type.xml.i | 2 +- interface-definitions/include/snmp/protocol.xml.i | 2 +- interface-definitions/include/ssh-user.xml.i | 2 +- .../include/static/static-route-vrf.xml.i | 2 +- .../include/vpn-ipsec-encryption.xml.i | 2 +- interface-definitions/include/vpn-ipsec-hash.xml.i | 2 +- .../include/webproxy-url-filtering.xml.i | 2 +- 47 files changed, 84 insertions(+), 84 deletions(-) (limited to 'interface-definitions/include') 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 @@ Use RADIUS server for user autentication - ^(local|radius)$ + (local|radius) local radius 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 @@ Authentication via MS-CHAPv2 (Microsoft Challenge Handshake Authentication Protocol, version 2) - ^(pap|chap|mschap|mschap-v2)$ + (pap|chap|mschap|mschap-v2) 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 @@ drop all mppe - ^(require|prefer|deny)$ + (require|prefer|deny) prefer 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 @@ IPv4 negotiation algorithm - ^(deny|allow)$ + (deny|allow) invalid value 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 @@ IPv6 (IPCP6) negotiation algorithm - ^(deny|allow|prefer|require)$ + (deny|allow|prefer|require) invalid value 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 @@ Name of IPv4 prefix-list - ^[-_a-zA-Z0-9]+$ + [-_a-zA-Z0-9]+ Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores @@ -31,7 +31,7 @@ Name of IPv4 prefix-list - ^[-_a-zA-Z0-9]+$ + [-_a-zA-Z0-9]+ Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores 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 @@ Name of IPv6 prefix-list - ^[-_a-zA-Z0-9]+$ + [-_a-zA-Z0-9]+ Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores @@ -31,7 +31,7 @@ Name of IPv6 prefix-list - ^[-_a-zA-Z0-9]+$ + [-_a-zA-Z0-9]+ Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores 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 @@ - ^(auto)$ + (auto) 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 @@ Route Distinguisher, (x.x.x.x:yyy|xxxx:yyyy) - ^((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}$ + ((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} 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 @@ Route map name - ^[-_a-zA-Z0-9.]+$ + [-_a-zA-Z0-9.]+ Name of route-map can only contain alpha-numeric letters, hyphen and underscores @@ -26,7 +26,7 @@ Route map name - ^[-_a-zA-Z0-9.]+$ + [-_a-zA-Z0-9.]+ Name of route-map can only contain alpha-numeric letters, hyphen and underscores 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 @@ Route map name - ^[-_a-zA-Z0-9.]+$ + [-_a-zA-Z0-9.]+ Name of route-map can only contain alpha-numeric letters, hyphen and underscores @@ -43,7 +43,7 @@ Route map name - ^[-_a-zA-Z0-9.]+$ + [-_a-zA-Z0-9.]+ Name of route-map can only contain alpha-numeric letters, hyphen and underscores @@ -59,7 +59,7 @@ Route map name - ^[-_a-zA-Z0-9.]+$ + [-_a-zA-Z0-9.]+ Name of route-map can only contain alpha-numeric letters, hyphen and underscores @@ -177,7 +177,7 @@ Route map name - ^[-_a-zA-Z0-9.]+$ + [-_a-zA-Z0-9.]+ Name of route-map can only contain alpha-numeric letters, hyphen and underscores 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 @@ Enable BGP graceful restart helper only functionality - ^(enable|disable|restart-helper)$ + (enable|disable|restart-helper) 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 @@ Ignore paths without link bandwidth for ECMP (if other paths have it) - ^(default-weight-for-missing|ignore|skip-missing)$ + (default-weight-for-missing|ignore|skip-missing) @@ -1461,7 +1461,7 @@ Name of peer-group - ^[-_a-zA-Z0-9]+$ + [-_a-zA-Z0-9]+ 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 @@ - ^(external|internal)$ + (external|internal) Invalid AS number 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 @@ Action to reject - ^(accept|drop|reject)$ + (accept|drop|reject) 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 @@ Drop matching entries - ^(accept|reject|drop)$ + (accept|reject|drop) 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 @@ integer/unit (Example: 5/minute) - ^\d+/(second|minute|hour|day)$ + \d+/(second|minute|hour|day) @@ -91,7 +91,7 @@ Disable log - ^(enable|disable)$ + (enable|disable) @@ -163,7 +163,7 @@ Source addresses seen COUNT times in the last hour - ^(second|minute|hour)$ + (second|minute|hour) @@ -215,7 +215,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -234,7 +234,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -253,7 +253,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -272,7 +272,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -292,7 +292,7 @@ Enter date using following notation - YYYY-MM-DD - ^(\d{4}\-\d{2}\-\d{2})$ + (\d{4}\-\d{2}\-\d{2}) @@ -304,7 +304,7 @@ Enter time using using 24 hour notation - hh:mm:ss - ^([0-2][0-9](\:[0-5][0-9]){1,2})$ + ([0-2][0-9](\:[0-5][0-9]){1,2}) @@ -316,7 +316,7 @@ Enter date using following notation - YYYY-MM-DD - ^(\d{4}\-\d{2}\-\d{2})$ + (\d{4}\-\d{2}\-\d{2}) @@ -328,7 +328,7 @@ Enter time using using 24 hour notation - hh:mm:ss - ^([0-2][0-9](\:[0-5][0-9]){1,2})$ + ([0-2][0-9](\:[0-5][0-9]){1,2}) 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 @@ ICMP type 18: address-mask-reply - ^(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)$ + (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) 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 @@ ICMPv6 type 138: router-renumbering - ^(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)$ + (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) 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 @@ Accept if no prior rules are hit - ^(drop|reject|accept)$ + (drop|reject|accept) 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 @@ - ^(dhcp|dhcpv6)$ + (dhcp|dhcpv6) 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 @@ - ^(clamp-mss-to-pmtu)$ + (clamp-mss-to-pmtu) 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 @@ Interface specific description - .{1,256}$ + .{1,256} Description too long (limit 256 characters) 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 @@ Tunnel key, or hex value - ^((0x){0,1}(0?[0-9A-Fa-f]{1,5})|inherit)$ + ((0x){0,1}(0?[0-9A-Fa-f]{1,5})|inherit) Must be 'inherit' or a number 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 @@ No source validation - ^(strict|loose|disable)$ + (strict|loose|disable) 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 @@ VLAN-tagged frame (IEEE 802.1q), ethertype 0x8100 - ^(802.1q|802.1ad)$ + (802.1q|802.1ad) Ethertype must be 802.1ad or 802.1q 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 @@ Format for qos mapping, e.g.: '0:1 1:6 7:6' - [:0-7 ]+$ + [:0-7 ]+ QoS mapping should be in the format of '0:7 2:3' with numbers 0-9 @@ -41,7 +41,7 @@ Format for qos mapping, e.g.: '0:1 1:6 7:6' - [:0-7 ]+$ + [:0-7 ]+ QoS mapping should be in the format of '0:7 2:3' with numbers 0-9 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 @@ - ^(any)$ + (any) 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 @@ Random source or destination address allocation for each connection - ^(persistent|random)$ + (persistent|random) random @@ -43,7 +43,7 @@ Do not apply port randomization - ^(random|fully-random|none)$ + (random|fully-random|none) none 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 @@ MD5 Key (16 characters or less) - ^[^[:space:]]{1,16}$ + [^[:space:]]{1,16} Password must be 16 characters or less @@ -46,7 +46,7 @@ Plain text password (8 characters or less) - ^[^[:space:]]{1,8}$ + [^[:space:]]{1,8} Password must be 8 characters or less 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 @@ Filter static routes - ^(bgp|connected|isis|kernel|rip|static)$ + (bgp|connected|isis|kernel|rip|static) Must be bgp, connected, kernel, rip, or static @@ -123,7 +123,7 @@ Never translate LSA types - ^(always|candidate|never)$ + (always|candidate|never) candidate @@ -172,7 +172,7 @@ Use MD5 authentication - ^(plaintext-password|md5)$ + (plaintext-password|md5) @@ -252,7 +252,7 @@ Enable shortcutting mode - ^(default|disable|enable)$ + (default|disable|enable) @@ -432,7 +432,7 @@ Point-to-point network type - ^(broadcast|non-broadcast|point-to-multipoint|point-to-point)$ + (broadcast|non-broadcast|point-to-multipoint|point-to-point) Must be broadcast, non-broadcast, point-to-multipoint or point-to-point @@ -586,7 +586,7 @@ Standard ABR type - ^(cisco|ibm|shortcut|standard)$ + (cisco|ibm|shortcut|standard) cisco @@ -617,7 +617,7 @@ Default to suppress routing updates on all interfaces - ^(default)$ + (default) 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 @@ Point-to-point network type - ^(broadcast|point-to-point)$ + (broadcast|point-to-point) Must be broadcast or point-to-point 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 @@ Deny matching entries - ^(permit|deny)$ + (permit|deny) 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 @@ Disable log - ^(enable|disable)$ + (enable|disable) @@ -196,7 +196,7 @@ - ^(main)$ + (main) @@ -260,7 +260,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -279,7 +279,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -298,7 +298,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -317,7 +317,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -543,7 +543,7 @@ ICMP type/code name - ^(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)$ + (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) 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 @@ Disable log - ^(enable|disable)$ + (enable|disable) @@ -196,7 +196,7 @@ - ^(main)$ + (main) @@ -260,7 +260,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -279,7 +279,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -298,7 +298,7 @@ Disable - ^(enable|disable)$ + (enable|disable) @@ -317,7 +317,7 @@ Disable - ^(enable|disable)$ + (enable|disable) 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 @@ Drop matching entries - ^(drop)$ + (drop) 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 @@ Route map name - ^[-_a-zA-Z0-9.]+$ + [-_a-zA-Z0-9.]+ Name of route-map can only contain alpha-numeric letters, hyphen and underscores 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 @@ Default to suppress routing updates on all interfaces - ^(default)$ + (default) 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 @@ read write - ^(ro|rw)$ + (ro|rw) Authorization type must be either 'rw' or 'ro' 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 @@ Secure Hash Algorithm - ^(md5|sha)$ + (md5|sha) md5 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 @@ Advanced Encryption Standard - ^(des|aes)$ + (des|aes) des 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 @@ Listen protocol TCP - ^(udp|tcp)$ + (udp|tcp) udp 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 @@ Allow specific users to login - ^[-_a-zA-Z0-9.]{1,100} + [-_a-zA-Z0-9.]{1,100} Illegal characters or more than 100 characters 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 @@ Name of VRF to leak to - ^(default)$ + (default) 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 @@ 256 bit ChaCha20/Poly1305 with 128 bit ICV - ^(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)$ + (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) aes128 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 @@ 256-bit AES-GMAC - ^(md5|md5_128|sha1|sha1_160|sha256|sha256_96|sha384|sha512|aesxcbc|aescmac|aes128gmac|aes192gmac|aes256gmac)$ + (md5|md5_128|sha1|sha1_160|sha256|sha256_96|sha384|sha512|aesxcbc|aescmac|aes128gmac|aes192gmac|aes256gmac) sha1 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 @@ Default filter action is block - ^(allow|block)$ + (allow|block) -- cgit v1.2.3