From 6e3598a23b22462c59635cac4f367987c253277b Mon Sep 17 00:00:00 2001
From: Oleksandr Kuchmystyi <o.kuchmystyi@vyos.io>
Date: Thu, 15 Oct 2026 12:16:39 +0300
Subject: policy: T9346: Allow dot in `prefix-list` and `prefix-list6` names

VyOS 1.3 allowed a dot in `policy prefix-list` and `policy prefix-list6`
names (pattern `^[-_a-zA-Z0-9.]+$`). The XML rewrite dropped the dot from
the allowed characters, so a 1.3 configuration using such names
can no longer be loaded or committed after an
upgrade. FRR itself accepts the dot in prefix-list names.
---
 interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i | 8 ++++----
 interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i | 8 ++++----
 interface-definitions/include/isis/lfa-remote.xml.i          | 4 ++--
 interface-definitions/include/policy/prefix-list-name.xml.i  | 3 +++
 4 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 interface-definitions/include/policy/prefix-list-name.xml.i

(limited to 'interface-definitions/include')

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 -->
-- 
cgit v1.2.3