diff options
| author | Nicolas Fort <nicolasfort1988@gmail.com> | 2023-08-14 10:13:39 -0300 |
|---|---|---|
| committer | Nicolas Fort <nicolasfort1988@gmail.com> | 2023-08-23 07:41:19 -0300 |
| commit | 524b517c53d18b0b50e7ddc83da4baec63172bb8 (patch) | |
| tree | 192b33542d7ca90dec6cc3c2ba89fcdabb2ae905 /interface-definitions/include | |
| parent | 50c0bc7b2582618fe340b0ca2da1087933e0c6be (diff) | |
| download | vyos-1x-524b517c53d18b0b50e7ddc83da4baec63172bb8.tar.gz vyos-1x-524b517c53d18b0b50e7ddc83da4baec63172bb8.zip | |
T5450: update smoketest and interface definition in order to work with new firewall cli
Diffstat (limited to 'interface-definitions/include')
| -rw-r--r-- | interface-definitions/include/constraint/interface-name-with-wildcard-and-inverted.xml.i | 4 | ||||
| -rw-r--r-- | interface-definitions/include/firewall/match-interface.xml.i | 20 |
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 |