From 524b517c53d18b0b50e7ddc83da4baec63172bb8 Mon Sep 17 00:00:00 2001
From: Nicolas Fort <nicolasfort1988@gmail.com>
Date: Mon, 14 Aug 2023 10:13:39 -0300
Subject: T5450: update smoketest and interface definition in order to work
 with new firewall cli

---
 .../interface-name-with-wildcard-and-inverted.xml.i  |  4 ++++
 .../include/firewall/match-interface.xml.i           | 20 ++++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 interface-definitions/include/constraint/interface-name-with-wildcard-and-inverted.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/constraint/interface-name-with-wildcard-and-inverted.xml.i b/interface-definitions/include/constraint/interface-name-with-wildcard-and-inverted.xml.i
new file mode 100644
index 000000000..6a39041a3
--- /dev/null
+++ b/interface-definitions/include/constraint/interface-name-with-wildcard-and-inverted.xml.i
@@ -0,0 +1,4 @@
+<!-- include start from constraint/interface-name-with-wildcard-and-inverted.xml.i -->
+<regex>(\!?)(bond|br|dum|en|ersp|eth|gnv|ifb|lan|l2tp|l2tpeth|macsec|peth|ppp|pppoe|pptp|sstp|tun|veth|vti|vtun|vxlan|wg|wlan|wwan)([0-9]?)(\*?)(.+)?|(\!?)lo</regex>
+<validator name="file-path --lookup-path /sys/class/net --directory"/>
+<!-- include end -->
\ No newline at end of file
diff --git a/interface-definitions/include/firewall/match-interface.xml.i b/interface-definitions/include/firewall/match-interface.xml.i
index a62bf8d89..7810f88ab 100644
--- a/interface-definitions/include/firewall/match-interface.xml.i
+++ b/interface-definitions/include/firewall/match-interface.xml.i
@@ -7,10 +7,18 @@
     </completionHelp>
     <valueHelp>
       <format>txt</format>
-      <description>Interface name, wildcard (*) supported</description>
+      <description>Interface name</description>
+    </valueHelp>
+    <valueHelp>
+      <format>txt*</format>
+      <description>Interface name with wildcard</description>
+    </valueHelp>
+    <valueHelp>
+      <format>!txt</format>
+      <description>Inverted interface name to match</description>
     </valueHelp>
     <constraint>
-      #include <include/constraint/interface-name-with-wildcard.xml.i>
+      #include <include/constraint/interface-name-with-wildcard-and-inverted.xml.i>
     </constraint>
   </properties>
 </leafNode>
@@ -20,6 +28,14 @@
     <completionHelp>
       <path>firewall group interface-group</path>
     </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Interface-group name to match</description>
+    </valueHelp>
+    <valueHelp>
+      <format>!txt</format>
+      <description>Inverted interface-group name to match</description>
+    </valueHelp>
   </properties>
 </leafNode>
 <!-- include end -->
\ No newline at end of file
-- 
cgit v1.2.3