summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-08-23 18:19:19 +0200
committerGitHub <noreply@github.com>2023-08-23 18:19:19 +0200
commitb88b11ee73601155a485956be80971a697a7f4d6 (patch)
tree92ca66f39d8a56fad5d834cdaa839311f82643ca /interface-definitions
parent8c7fbec24f8bfe064d8ad804951f5ae59b54748f (diff)
parent524b517c53d18b0b50e7ddc83da4baec63172bb8 (diff)
downloadvyos-1x-b88b11ee73601155a485956be80971a697a7f4d6.tar.gz
vyos-1x-b88b11ee73601155a485956be80971a697a7f4d6.zip
Merge pull request #2142 from nicolas-fort/T5450
T5450: allow inverted matcher for interface and interface-group
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/include/constraint/interface-name-with-wildcard-and-inverted.xml.i4
-rw-r--r--interface-definitions/include/firewall/match-interface.xml.i20
2 files changed, 22 insertions, 2 deletions
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