From 57490fa69f7e70f5e14ac66b327bc67db2311e62 Mon Sep 17 00:00:00 2001
From: Nataliia Solomko <natalirs1985@gmail.com>
Date: Tue, 28 Jan 2025 14:43:48 +0200
Subject: T7076: VPP add check for interface to xml

---
 interface-definitions/vpp.xml.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/vpp.xml.in b/interface-definitions/vpp.xml.in
index 4c25c10f7..2b61ac994 100644
--- a/interface-definitions/vpp.xml.in
+++ b/interface-definitions/vpp.xml.in
@@ -450,8 +450,11 @@
                 <format>ethN</format>
                 <description>Interface name</description>
               </valueHelp>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces --type ethernet</script>
+              </completionHelp>
               <constraint>
-                <regex>((eth|lan)[0-9]+|(eno|ens|enp|enx).+)</regex>
+                <validator name="ethernet-interface"/>
               </constraint>
               <constraintErrorMessage>Invalid interface name</constraintErrorMessage>
             </properties>
-- 
cgit v1.2.3


From ecf1ab1459f75c44519faef382be39a62168ad96 Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Fri, 31 Jan 2025 17:30:46 +0000
Subject: Set priority 308 for kernet-interfaces

---
 interface-definitions/vpp.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/vpp.xml.in b/interface-definitions/vpp.xml.in
index 4c25c10f7..dfaef3d24 100644
--- a/interface-definitions/vpp.xml.in
+++ b/interface-definitions/vpp.xml.in
@@ -847,7 +847,7 @@
     <tagNode name="kernel-interfaces" owner="${vyos_conf_scripts_dir}/vpp_kernel-interfaces.py">
       <properties>
         <help>VPP kernel interface settings</help>
-        <priority>305</priority>
+        <priority>308</priority>
         <valueHelp>
           <format>vpptapN</format>
           <description>Kernel interface name</description>
-- 
cgit v1.2.3