From 96d51fa69fbe072fe5c9e8efd4fa6a89d8a2771a Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 5 Feb 2021 21:01:31 +0100
Subject: xml: add new common "interface-name" validator

---
 interface-definitions/include/bgp-update-source.xml.i |  2 +-
 .../include/static-route-interface.xml.i              | 17 +++++++++++++++++
 .../include/static-route-next-hop-interface.xml.i     | 17 -----------------
 .../include/static-route-next-hop-vrf.xml.i           | 19 -------------------
 interface-definitions/include/static-route-vrf.xml.i  | 19 +++++++++++++++++++
 interface-definitions/include/static-route.xml.i      |  8 ++++----
 interface-definitions/include/static-route6.xml.i     |  8 ++++----
 7 files changed, 45 insertions(+), 45 deletions(-)
 create mode 100644 interface-definitions/include/static-route-interface.xml.i
 delete mode 100644 interface-definitions/include/static-route-next-hop-interface.xml.i
 delete mode 100644 interface-definitions/include/static-route-next-hop-vrf.xml.i
 create mode 100644 interface-definitions/include/static-route-vrf.xml.i

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/bgp-update-source.xml.i b/interface-definitions/include/bgp-update-source.xml.i
index c1db2e2c1..a8b212720 100644
--- a/interface-definitions/include/bgp-update-source.xml.i
+++ b/interface-definitions/include/bgp-update-source.xml.i
@@ -21,7 +21,7 @@
     <constraint>
       <validator name="ipv4-address"/>
       <validator name="ipv6-address"/>
-      <regex>^(br|bond|dum|en|eth|gnv|peth|tun|vti|vxlan|wg|wlan)[0-9]+|lo$</regex>
+      <validator name="interface-name"/>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/static-route-interface.xml.i b/interface-definitions/include/static-route-interface.xml.i
new file mode 100644
index 000000000..0f10837df
--- /dev/null
+++ b/interface-definitions/include/static-route-interface.xml.i
@@ -0,0 +1,17 @@
+<!-- included start from static-route-interface.xml.i -->
+<leafNode name="interface">
+  <properties>
+    <help>Gateway interface name</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_interfaces.py</script>
+    </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Gateway interface name</description>
+    </valueHelp>
+    <constraint>
+      <validator name="interface-name"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/static-route-next-hop-interface.xml.i b/interface-definitions/include/static-route-next-hop-interface.xml.i
deleted file mode 100644
index 01c253597..000000000
--- a/interface-definitions/include/static-route-next-hop-interface.xml.i
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- included start from static-route-next-hop-interface.xml.i -->
-<leafNode name="interface">
-  <properties>
-    <help>Gateway interface name</help>
-    <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
-    </completionHelp>
-    <valueHelp>
-      <format>txt</format>
-      <description>Gateway interface name</description>
-    </valueHelp>
-    <constraint>
-      <regex>^(br|bond|dum|en|eth|gnv|peth|tun|vti|vxlan|wg|wlan)[0-9]+|lo$</regex>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- included end -->
diff --git a/interface-definitions/include/static-route-next-hop-vrf.xml.i b/interface-definitions/include/static-route-next-hop-vrf.xml.i
deleted file mode 100644
index ae2515a12..000000000
--- a/interface-definitions/include/static-route-next-hop-vrf.xml.i
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- included start from static-route-next-hop-vrf.xml.i -->
-<leafNode name="vrf">
-  <properties>
-    <help>VRF to leak route</help>
-    <completionHelp>
-      <list>default</list>
-      <path>vrf name</path>
-    </completionHelp>
-    <valueHelp>
-      <format>txt</format>
-      <description>Name of VRF to leak to</description>
-    </valueHelp>
-    <constraint>
-      <regex>^(default)$</regex>
-      <validator name="vrf-name"/>
-    </constraint>
-  </properties>
-</leafNode>
-<!-- included end -->
diff --git a/interface-definitions/include/static-route-vrf.xml.i b/interface-definitions/include/static-route-vrf.xml.i
new file mode 100644
index 000000000..70f8b0be8
--- /dev/null
+++ b/interface-definitions/include/static-route-vrf.xml.i
@@ -0,0 +1,19 @@
+<!-- included start from static-route-vrf.xml.i -->
+<leafNode name="vrf">
+  <properties>
+    <help>VRF to leak route</help>
+    <completionHelp>
+      <list>default</list>
+      <path>vrf name</path>
+    </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Name of VRF to leak to</description>
+    </valueHelp>
+    <constraint>
+      <regex>^(default)$</regex>
+      <validator name="vrf-name"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/static-route.xml.i b/interface-definitions/include/static-route.xml.i
index 1f79aaca8..6225025ca 100644
--- a/interface-definitions/include/static-route.xml.i
+++ b/interface-definitions/include/static-route.xml.i
@@ -42,13 +42,13 @@
           <description>Gateway interface name</description>
         </valueHelp>
         <constraint>
-          <regex>^(br|bond|dum|en|eth|gnv|peth|tun|vti|vxlan|wg|wlan)[0-9]+|lo$</regex>
+          <validator name="interface-name"/>
         </constraint>
       </properties>
       <children>
         #include <include/generic-disable-node.xml.i>
         #include <include/static-route-distance.xml.i>
-        #include <include/static-route-next-hop-vrf.xml.i>
+        #include <include/static-route-vrf.xml.i>
       </children>
     </tagNode>
     <tagNode name="next-hop">
@@ -65,8 +65,8 @@
       <children>
         #include <include/generic-disable-node.xml.i>
         #include <include/static-route-distance.xml.i>
-        #include <include/static-route-next-hop-interface.xml.i>
-        #include <include/static-route-next-hop-vrf.xml.i>
+        #include <include/static-route-interface.xml.i>
+        #include <include/static-route-vrf.xml.i>
       </children>
     </tagNode>
   </children>
diff --git a/interface-definitions/include/static-route6.xml.i b/interface-definitions/include/static-route6.xml.i
index 1ff6bbead..25d4d22a2 100644
--- a/interface-definitions/include/static-route6.xml.i
+++ b/interface-definitions/include/static-route6.xml.i
@@ -42,13 +42,13 @@
           <description>Gateway interface name</description>
         </valueHelp>
         <constraint>
-          <regex>^(br|bond|dum|en|eth|gnv|peth|tun|vti|vxlan|wg|wlan)[0-9]+|lo$</regex>
+          <validator name="interface-name"/>
         </constraint>
       </properties>
       <children>
         #include <include/generic-disable-node.xml.i>
         #include <include/static-route-distance.xml.i>
-        #include <include/static-route-next-hop-vrf.xml.i>
+        #include <include/static-route-vrf.xml.i>
       </children>
     </tagNode>
     <tagNode name="next-hop">
@@ -65,8 +65,8 @@
       <children>
         #include <include/generic-disable-node.xml.i>
         #include <include/static-route-distance.xml.i>
-        #include <include/static-route-next-hop-interface.xml.i>
-        #include <include/static-route-next-hop-vrf.xml.i>
+        #include <include/static-route-interface.xml.i>
+        #include <include/static-route-vrf.xml.i>
       </children>
     </tagNode>
   </children>
-- 
cgit v1.2.3