diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-10-16 18:04:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-10-16 18:04:15 +0200 |
| commit | 1f482caab97b76e3acb4e675f15011649821a4c2 (patch) | |
| tree | 98d8b7eefb12e6e481c7e15761978a46e0a55dfd /interface-definitions/include | |
| parent | 8302a96fd1b45afcd8550883b729d4907a723e0f (diff) | |
| parent | 6e3598a23b22462c59635cac4f367987c253277b (diff) | |
| download | vyos-1x-1f482caab97b76e3acb4e675f15011649821a4c2.tar.gz vyos-1x-1f482caab97b76e3acb4e675f15011649821a4c2.zip | |
Merge pull request #5560 from alexandr-san4ez/T9346-rolling_validation-fix
policy: T9346: Allow dot in `prefix-list` and `prefix-list6` names
Diffstat (limited to 'interface-definitions/include')
4 files changed, 13 insertions, 10 deletions
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 0f760daae..a8fffbc39 100644 --- a/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i +++ b/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i @@ -15,9 +15,9 @@ <description>Name of IPv4 prefix-list</description> </valueHelp> <constraint> - #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i> + #include <include/policy/prefix-list-name.xml.i> </constraint> - <constraintErrorMessage>Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage> + <constraintErrorMessage>Name of prefix-list can only contain alpha-numeric letters, hyphen, underscore and dot</constraintErrorMessage> </properties> </leafNode> <leafNode name="import"> @@ -31,9 +31,9 @@ <description>Name of IPv4 prefix-list</description> </valueHelp> <constraint> - #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i> + #include <include/policy/prefix-list-name.xml.i> </constraint> - <constraintErrorMessage>Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage> + <constraintErrorMessage>Name of prefix-list can only contain alpha-numeric letters, hyphen, underscore and dot</constraintErrorMessage> </properties> </leafNode> </children> 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 268d9cbc0..a3cbf29bb 100644 --- a/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i +++ b/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i @@ -15,9 +15,9 @@ <description>Name of IPv6 prefix-list</description> </valueHelp> <constraint> - #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i> + #include <include/policy/prefix-list-name.xml.i> </constraint> - <constraintErrorMessage>Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage> + <constraintErrorMessage>Name of prefix-list6 can only contain alpha-numeric letters, hyphen, underscore and dot</constraintErrorMessage> </properties> </leafNode> <leafNode name="import"> @@ -31,9 +31,9 @@ <description>Name of IPv6 prefix-list</description> </valueHelp> <constraint> - #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i> + #include <include/policy/prefix-list-name.xml.i> </constraint> - <constraintErrorMessage>Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage> + <constraintErrorMessage>Name of prefix-list6 can only contain alpha-numeric letters, hyphen, underscore and dot</constraintErrorMessage> </properties> </leafNode> </children> diff --git a/interface-definitions/include/isis/lfa-remote.xml.i b/interface-definitions/include/isis/lfa-remote.xml.i index 8434e35bf..7495666c7 100644 --- a/interface-definitions/include/isis/lfa-remote.xml.i +++ b/interface-definitions/include/isis/lfa-remote.xml.i @@ -15,9 +15,9 @@ <description>Name of IPv4/IPv6 prefix-list</description> </valueHelp> <constraint> - #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i> + #include <include/policy/prefix-list-name.xml.i> </constraint> - <constraintErrorMessage>Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage> + <constraintErrorMessage>Name of prefix-list can only contain alpha-numeric letters, hyphen, underscore and dot</constraintErrorMessage> </properties> <children> #include <include/isis/level-1-2-leaf.xml.i> diff --git a/interface-definitions/include/policy/prefix-list-name.xml.i b/interface-definitions/include/policy/prefix-list-name.xml.i new file mode 100644 index 000000000..40d4abc97 --- /dev/null +++ b/interface-definitions/include/policy/prefix-list-name.xml.i @@ -0,0 +1,3 @@ +<!-- include start from policy/prefix-list-name.xml.i --> +<regex>[-_a-zA-Z0-9.]+</regex> +<!-- include end --> |