summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJernej Jakob <jernej.jakob@gmail.com>2019-06-16 21:59:01 +0200
committerChristian Poessinger <christian@poessinger.com>2019-06-16 22:54:54 +0200
commit6a6634b02d73cc93cd7368cf2290940b57fae9c7 (patch)
tree2761ebbdbdd12a01c6f1a6628aa730f4bda2ef65
parent87df87e3983e120ad171ae9dc2966309fc14fcd8 (diff)
downloadvyos-1x-6a6634b02d73cc93cd7368cf2290940b57fae9c7.tar.gz
vyos-1x-6a6634b02d73cc93cd7368cf2290940b57fae9c7.zip
T1439: move DUID validator to regex
-rw-r--r--interface-definitions/dhcpv6-server.xml2
-rwxr-xr-xsrc/validators/dhcpv6-client-id28
2 files changed, 1 insertions, 29 deletions
diff --git a/interface-definitions/dhcpv6-server.xml b/interface-definitions/dhcpv6-server.xml
index b1e5c8d6c..09ffe67ed 100644
--- a/interface-definitions/dhcpv6-server.xml
+++ b/interface-definitions/dhcpv6-server.xml
@@ -298,7 +298,7 @@
<description>DUID: colon-separated hex list (as used by isc-dhcp option dhcpv6.client-id)</description>
</valueHelp>
<constraint>
- <validator name="dhcpv6-client-id"/>
+ <regex>^([0-9A-Fa-f]{1,2}[:])*([0-9A-Fa-f]{1,2})$</regex>
</constraint>
</properties>
</leafNode>
diff --git a/src/validators/dhcpv6-client-id b/src/validators/dhcpv6-client-id
deleted file mode 100755
index a8c3e60b6..000000000
--- a/src/validators/dhcpv6-client-id
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2019 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:
- pattern = "^([0-9A-Fa-f]{1,2}[:])*([0-9A-Fa-f]{1,2})$"
- if re.match(pattern, sys.argv[1]):
- sys.exit(0)
- else:
- sys.exit(1)
-