summaryrefslogtreecommitdiff
path: root/interface-definitions/include/firewall/mac-address.xml.i
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-11-03 17:47:55 +0100
committerChristian Poessinger <christian@poessinger.com>2022-11-03 18:04:12 +0100
commit3f5464d0ee857d204dc58867065380340008f79b (patch)
tree411a2022522ede95bcf1f80558b52ce0cb0ad743 /interface-definitions/include/firewall/mac-address.xml.i
parent81a70033cc9552e7bcc9f6aa6cc092b4e64b6b7c (diff)
downloadvyos-1x-3f5464d0ee857d204dc58867065380340008f79b.tar.gz
vyos-1x-3f5464d0ee857d204dc58867065380340008f79b.zip
validators: T4795: migrate mac-address python validator to validate-value
Instead of spawning the Python interpreter for every mac-address to validate, rather use the base validate-value OCaml implementation which is much faster. This removes redundant code and also makes the CLI more responsive. Validator is moved out to a dedicated file instead of using XML inlined <regex> for the reason of re-usability. So if that regex needs to be touched again - it can all happen in one single file.
Diffstat (limited to 'interface-definitions/include/firewall/mac-address.xml.i')
-rw-r--r--interface-definitions/include/firewall/mac-address.xml.i5
1 files changed, 3 insertions, 2 deletions
diff --git a/interface-definitions/include/firewall/mac-address.xml.i b/interface-definitions/include/firewall/mac-address.xml.i
index 83aaf1ce1..db3e1e312 100644
--- a/interface-definitions/include/firewall/mac-address.xml.i
+++ b/interface-definitions/include/firewall/mac-address.xml.i
@@ -3,7 +3,7 @@
<properties>
<help>MAC address</help>
<valueHelp>
- <format>macaddr;</format>
+ <format>macaddr</format>
<description>MAC address to match</description>
</valueHelp>
<valueHelp>
@@ -11,7 +11,8 @@
<description>Match everything except the specified MAC address</description>
</valueHelp>
<constraint>
- <validator name="mac-address-firewall"/>
+ <validator name="mac-address"/>
+ <validator name="mac-address-exclude"/>
</constraint>
</properties>
</leafNode>