diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-03-04 19:10:23 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-03-04 21:43:59 +0100 |
| commit | 45904fcd80beaed93e3737d0f78b7f081234fc07 (patch) | |
| tree | b6d0bc3ef6ce360651b76f6b194d976f281cca5e | |
| parent | 665d1c5bdb24aa0aef79405dc2f2962b930fb9b3 (diff) | |
| download | vyos-1x-45904fcd80beaed93e3737d0f78b7f081234fc07.tar.gz vyos-1x-45904fcd80beaed93e3737d0f78b7f081234fc07.zip | |
vrf: T31: use embedded regex on 'vrf name' instead of python script
| -rw-r--r-- | interface-definitions/vrf.xml.in | 8 | ||||
| -rwxr-xr-x | src/validators/interface-name | 29 |
2 files changed, 4 insertions, 33 deletions
diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in index e270e8b90..1fb878f44 100644 --- a/interface-definitions/vrf.xml.in +++ b/interface-definitions/vrf.xml.in @@ -22,14 +22,14 @@ </node> <tagNode name="name"> <properties> - <help>Virtual Routing and Forwarding</help> + <help>VRF instance name</help> <constraint> - <validator name="interface-name"/> + <regex>[^/\s]{1,16}$</regex> </constraint> - <constraintErrorMessage>VRF name not allowed or to long</constraintErrorMessage> + <constraintErrorMessage>VRF instance name must be 16 characters or less</constraintErrorMessage> <valueHelp> <format>name</format> - <description>the vrf name must not contain '/' and be 16 characters or less</description> + <description>Instance name</description> </valueHelp> </properties> <children> diff --git a/src/validators/interface-name b/src/validators/interface-name deleted file mode 100755 index 49a833f39..000000000 --- a/src/validators/interface-name +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python3 -# -# Copyright (C) 2018 VyOS maintainers and contributors -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 or later as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# - -import sys -import re - -if len(sys.argv) == 2: - # https://unix.stackexchange.com/questions/451368/allowed-chars-in-linux-network-interface-names - pattern = "^([^/\s]{1,16}$)$" - if re.match(pattern, sys.argv[1]): - sys.exit(0) - else: - sys.exit(1) - |