From 58b29610221a8f80bea1cfacbd2112f3690fe734 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Fri, 24 Mar 2023 08:47:28 +0100
Subject: xml: T5109: use common include file for alpha-numeric, hyphen and
 underscore regex

---
 interface-definitions/include/bgp/afi-ipv4-prefix-list.xml.i   |  4 ++--
 interface-definitions/include/bgp/afi-ipv6-prefix-list.xml.i   |  4 ++--
 interface-definitions/include/bgp/protocol-common-config.xml.i |  2 +-
 .../include/constraint/alpha-numeric-hyphen-underscore.xml.in  |  3 +++
 interface-definitions/policy.xml.in                            |  8 ++++----
 interface-definitions/service-monitoring-telegraf.xml.in       | 10 +++++-----
 6 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 interface-definitions/include/constraint/alpha-numeric-hyphen-underscore.xml.in

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 34b5ec7d7..ee902b0b6 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 @@
           <description>Name of IPv4 prefix-list</description>
         </valueHelp>
         <constraint>
-          <regex>[-_a-zA-Z0-9]+</regex>
+          #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
         </constraint>
         <constraintErrorMessage>Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
       </properties>
@@ -31,7 +31,7 @@
           <description>Name of IPv4 prefix-list</description>
         </valueHelp>
         <constraint>
-          <regex>[-_a-zA-Z0-9]+</regex>
+          #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
         </constraint>
         <constraintErrorMessage>Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
       </properties>
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 06c661a90..da966f193 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 @@
           <description>Name of IPv6 prefix-list</description>
         </valueHelp>
         <constraint>
-          <regex>[-_a-zA-Z0-9]+</regex>
+          #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
         </constraint>
         <constraintErrorMessage>Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
       </properties>
@@ -31,7 +31,7 @@
           <description>Name of IPv6 prefix-list</description>
         </valueHelp>
         <constraint>
-          <regex>[-_a-zA-Z0-9]+</regex>
+          #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
         </constraint>
         <constraintErrorMessage>Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
       </properties>
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index 7a3617044..9435b45fd 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -1497,7 +1497,7 @@
   <properties>
     <help>Name of peer-group</help>
     <constraint>
-      <regex>[-_a-zA-Z0-9]+</regex>
+      #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
     </constraint>
   </properties>
   <children>
diff --git a/interface-definitions/include/constraint/alpha-numeric-hyphen-underscore.xml.in b/interface-definitions/include/constraint/alpha-numeric-hyphen-underscore.xml.in
new file mode 100644
index 000000000..eb568d7d9
--- /dev/null
+++ b/interface-definitions/include/constraint/alpha-numeric-hyphen-underscore.xml.in
@@ -0,0 +1,3 @@
+<!-- include start from include/constraint/alpha-numeric-hyphen-underscore.xml.in -->
+<regex>[-_a-zA-Z0-9]+</regex>
+<!-- include end -->
diff --git a/interface-definitions/policy.xml.in b/interface-definitions/policy.xml.in
index b3745fda0..66608be6f 100644
--- a/interface-definitions/policy.xml.in
+++ b/interface-definitions/policy.xml.in
@@ -242,7 +242,7 @@
             <description>BGP extended community-list name</description>
           </valueHelp>
           <constraint>
-            <regex>[-_a-zA-Z0-9]+</regex>
+            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
           </constraint>
           <constraintErrorMessage>Should be an alphanumeric name</constraintErrorMessage>
         </properties>
@@ -291,7 +291,7 @@
             <description>BGP large-community-list name</description>
           </valueHelp>
           <constraint>
-            <regex>[-_a-zA-Z0-9]+</regex>
+            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
           </constraint>
           <constraintErrorMessage>Should be an alphanumeric name</constraintErrorMessage>
         </properties>
@@ -340,7 +340,7 @@
             <description>Name of IPv4 prefix-list</description>
           </valueHelp>
           <constraint>
-            <regex>[-_a-zA-Z0-9]+</regex>
+            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
           </constraint>
           <constraintErrorMessage>Name of prefix-list can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
         </properties>
@@ -408,7 +408,7 @@
             <description>Name of IPv6 prefix-list</description>
           </valueHelp>
           <constraint>
-            <regex>[-_a-zA-Z0-9]+</regex>
+            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
           </constraint>
           <constraintErrorMessage>Name of prefix-list6 can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
         </properties>
diff --git a/interface-definitions/service-monitoring-telegraf.xml.in b/interface-definitions/service-monitoring-telegraf.xml.in
index f50e5e334..5ba932400 100644
--- a/interface-definitions/service-monitoring-telegraf.xml.in
+++ b/interface-definitions/service-monitoring-telegraf.xml.in
@@ -74,7 +74,7 @@
                         <properties>
                           <help>Application client id</help>
                           <constraint>
-                            <regex>[-_a-zA-Z0-9]+</regex>
+                            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
                           </constraint>
                           <constraintErrorMessage>Client-id is limited to alphanumerical characters and can contain hyphen and underscores</constraintErrorMessage>
                         </properties>
@@ -83,7 +83,7 @@
                         <properties>
                           <help>Application client secret</help>
                           <constraint>
-                            <regex>[-_a-zA-Z0-9]+</regex>
+                            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
                           </constraint>
                           <constraintErrorMessage>Client-secret is limited to alphanumerical characters and can contain hyphen and underscores</constraintErrorMessage>
                         </properties>
@@ -92,7 +92,7 @@
                         <properties>
                           <help>Set tenant id</help>
                           <constraint>
-                            <regex>[-_a-zA-Z0-9]+</regex>
+                            #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
                           </constraint>
                           <constraintErrorMessage>Tenant-id is limited to alphanumerical characters and can contain hyphen and underscores</constraintErrorMessage>
                         </properties>
@@ -107,7 +107,7 @@
                         <description>Remote database name</description>
                       </valueHelp>
                       <constraint>
-                        <regex>[-_a-zA-Z0-9]+</regex>
+                        #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
                       </constraint>
                       <constraintErrorMessage>Database is limited to alphanumerical characters and can contain hyphen and underscores</constraintErrorMessage>
                     </properties>
@@ -140,7 +140,7 @@
                         <description>Table name</description>
                       </valueHelp>
                       <constraint>
-                        <regex>[-_a-zA-Z0-9]+</regex>
+                        #include <include/constraint/alpha-numeric-hyphen-underscore.xml.in>
                       </constraint>
                       <constraintErrorMessage>Table is limited to alphanumerical characters and can contain hyphen and underscores</constraintErrorMessage>
                     </properties>
-- 
cgit v1.2.3