summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-05-09 11:29:08 +0200
committerChristian Poessinger <christian@poessinger.com>2021-05-09 11:29:08 +0200
commitf69b3041b9994c50ca2d4b137af2a23a354ceb01 (patch)
treeec109e4540fb8a2e80b7d93d99d9c79cbafea0e2 /interface-definitions
parentb7f4405e4d205c1e3a65e3b1c4295a934b6b974b (diff)
downloadvyos-1x-f69b3041b9994c50ca2d4b137af2a23a354ceb01.tar.gz
vyos-1x-f69b3041b9994c50ca2d4b137af2a23a354ceb01.zip
policy: T3531: Allow prefix-list names to contain an underscore
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i16
-rw-r--r--interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i16
-rw-r--r--interface-definitions/policy.xml.in12
3 files changed, 42 insertions, 2 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 f4710e9aa..de42eeac9 100644
--- a/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i
+++ b/interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i
@@ -10,6 +10,14 @@
<completionHelp>
<path>policy prefix-list</path>
</completionHelp>
+ <valueHelp>
+ <format>txt</format>
+ <description>Name of IPv4 prefix-list</description>
+ </valueHelp>
+ <constraint>
+ <regex>^[-_a-zA-Z0-9]+$</regex>
+ </constraint>
+ <constraintErrorMessage>Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
</properties>
</leafNode>
<leafNode name="import">
@@ -18,6 +26,14 @@
<completionHelp>
<path>policy prefix-list</path>
</completionHelp>
+ <valueHelp>
+ <format>txt</format>
+ <description>Name of IPv4 prefix-list</description>
+ </valueHelp>
+ <constraint>
+ <regex>^[-_a-zA-Z0-9]+$</regex>
+ </constraint>
+ <constraintErrorMessage>Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores</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 bdb591290..2bf4753be 100644
--- a/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i
+++ b/interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i
@@ -10,6 +10,14 @@
<completionHelp>
<path>policy prefix-list6</path>
</completionHelp>
+ <valueHelp>
+ <format>txt</format>
+ <description>Name of IPv6 prefix-list</description>
+ </valueHelp>
+ <constraint>
+ <regex>^[-_a-zA-Z0-9]+$</regex>
+ </constraint>
+ <constraintErrorMessage>Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
</properties>
</leafNode>
<leafNode name="import">
@@ -18,6 +26,14 @@
<completionHelp>
<path>policy prefix-list6</path>
</completionHelp>
+ <valueHelp>
+ <format>txt</format>
+ <description>Name of IPv6 prefix-list</description>
+ </valueHelp>
+ <constraint>
+ <regex>^[-_a-zA-Z0-9]+$</regex>
+ </constraint>
+ <constraintErrorMessage>Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
</properties>
</leafNode>
</children>
diff --git a/interface-definitions/policy.xml.in b/interface-definitions/policy.xml.in
index fd337396b..900fac27e 100644
--- a/interface-definitions/policy.xml.in
+++ b/interface-definitions/policy.xml.in
@@ -321,8 +321,12 @@
<help>IP prefix-list filter</help>
<valueHelp>
<format>txt</format>
- <description>Prefix list name</description>
+ <description>Name of IPv4 prefix-list</description>
</valueHelp>
+ <constraint>
+ <regex>^[-_a-zA-Z0-9]+$</regex>
+ </constraint>
+ <constraintErrorMessage>Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
</properties>
<children>
#include <include/policy/description.xml.i>
@@ -385,8 +389,12 @@
<help>IPv6 prefix-list filter</help>
<valueHelp>
<format>txt</format>
- <description>Prefix list name</description>
+ <description>Name of IPv6 prefix-list</description>
</valueHelp>
+ <constraint>
+ <regex>^[-_a-zA-Z0-9]+$</regex>
+ </constraint>
+ <constraintErrorMessage>Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
</properties>
<children>
#include <include/policy/description.xml.i>