summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-11-03 17:40:12 +0100
committerChristian Poessinger <christian@poessinger.com>2022-11-03 17:40:12 +0100
commit6f37744ad45a5f4cd585fa7c981833a9ebe5e437 (patch)
tree1efc49e712e0c314f16fb54df3340230b133af78
parent4ae434d50337b6a1543176b0b86e938fc0663626 (diff)
downloadvyos-1x-6f37744ad45a5f4cd585fa7c981833a9ebe5e437.tar.gz
vyos-1x-6f37744ad45a5f4cd585fa7c981833a9ebe5e437.zip
xml: T4795: superseed allowed-vlan validator by numeric range validator
Reduce CPU time when spawning the python interpreter. Same can be done by the numeric validator.
-rw-r--r--interface-definitions/interfaces-bridge.xml.in2
-rwxr-xr-xsrc/validators/allowed-vlan19
2 files changed, 1 insertions, 20 deletions
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index 1e11cd4c6..d633077d9 100644
--- a/interface-definitions/interfaces-bridge.xml.in
+++ b/interface-definitions/interfaces-bridge.xml.in
@@ -151,7 +151,7 @@
<description>VLAN id range allowed on this interface (use '-' as delimiter)</description>
</valueHelp>
<constraint>
- <validator name="allowed-vlan"/>
+ <validator name="numeric" argument="--allow-range --range 1-4094"/>
</constraint>
<constraintErrorMessage>not a valid VLAN ID value or range</constraintErrorMessage>
<multi/>
diff --git a/src/validators/allowed-vlan b/src/validators/allowed-vlan
deleted file mode 100755
index 11389390b..000000000
--- a/src/validators/allowed-vlan
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /usr/bin/python3
-
-import sys
-import re
-
-if __name__ == '__main__':
- if len(sys.argv)>1:
- allowed_vlan = sys.argv[1]
- if re.search('[0-9]{1,4}-[0-9]{1,4}', allowed_vlan):
- for tmp in allowed_vlan.split('-'):
- if int(tmp) not in range(1, 4095):
- sys.exit(1)
- else:
- if int(allowed_vlan) not in range(1, 4095):
- sys.exit(1)
- else:
- sys.exit(2)
-
- sys.exit(0)