From 294b14c3c8b9b64b780375c145b621675842031e Mon Sep 17 00:00:00 2001
From: Jernej Jakob <jernej.jakob@gmail.com>
Date: Sun, 16 Jun 2019 21:59:01 +0200
Subject: T1439: move DUID validator to regex

(cherry picked from commit 6a6634b02d73cc93cd7368cf2290940b57fae9c7)
---
 interface-definitions/dhcpv6-server.xml |  2 +-
 src/validators/dhcpv6-client-id         | 28 ----------------------------
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100755 src/validators/dhcpv6-client-id

diff --git a/interface-definitions/dhcpv6-server.xml b/interface-definitions/dhcpv6-server.xml
index 79b39cfa1..c9407d0a9 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)
-
-- 
cgit v1.2.3