T2431: use native versions of validate-value and numeric validator.

4 files changed, 2 insertions, 124 deletions

diff --git a/debian/control b/debian/control
index 32c0286a4..ab0fc0b29 100644
--- a/debian/control
+++ b/debian/control
@@ -91,6 +91,7 @@ Depends: python3,
   python3-certbot-nginx,
   pppoe,
   salt-minion,
+  vyos-utils,
   ${shlibs:Depends},
   ${misc:Depends}
 Description: VyOS configuration scripts and data
diff --git a/scripts/build-command-templates b/scripts/build-command-templates
index c6534a6d8..767517b29 100755
--- a/scripts/build-command-templates
+++ b/scripts/build-command-templates
@@ -149,7 +149,7 @@ def get_properties(p):
 
         regex_args = " ".join(map(lambda s: "--regex \\\'{0}\\\'".format(s), regexes))
         validator_args = " ".join(map(lambda s: "--exec \\\"{0}\\\"".format(s), validators))
-        validator_script = '${vyos_libexec_dir}/validate-value.py'
+        validator_script = '${vyos_libexec_dir}/validate-value'
         validator_string = "exec \"{0} {1} {2} --value \\\'$VAR(@)\\\'\"; \"{3}\"".format(validator_script, regex_args, validator_args, error_msg)
 
         props["constraint"] = validator_string
diff --git a/src/helpers/validate-value.py b/src/helpers/validate-value.py
deleted file mode 100755
index a58ba61d1..000000000
--- a/src/helpers/validate-value.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env python3
-
-import re
-import os
-import sys
-import argparse
-
-from vyos.util import call
-
-parser = argparse.ArgumentParser()
-parser.add_argument('--regex', action='append')
-parser.add_argument('--exec', action='append')
-parser.add_argument('--value', action='store')
-
-args = parser.parse_args()
-
-debug = False
-
-# Multiple arguments work like logical OR
-
-try:
-    for r in args.regex:
-        if re.fullmatch(r, args.value):
-            sys.exit(0)
-except Exception as exn:
-    if debug:
-        print(exn)
-    else:
-        pass
-
-try:
-    for cmd in args.exec:
-        cmd = "{0} {1}".format(cmd, args.value)
-        if debug:
-            print(cmd)
-        res = call(cmd)
-        if res == 0:
-            sys.exit(0)
-except Exception as exn:
-    if debug:
-        print(exn)
-    else:
-        pass
-
-sys.exit(1)
diff --git a/src/validators/numeric b/src/validators/numeric
deleted file mode 100755
index 2cd5178b9..000000000
--- a/src/validators/numeric
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env python3
-#
-# numeric value validator
-#
-# Copyright (C) 2017 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
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# 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 argparse
-
-parser = argparse.ArgumentParser()
-parser.add_argument("-f", "--float", action="store_true", help="Accept floating point values")
-group = parser.add_mutually_exclusive_group()
-group.add_argument("-r", "--range", type=str, help="Check if the number is within range (inclusive), example: 1024-65535", action='append')
-group.add_argument("-n", "--non-negative", action="store_true", help="Check if the number is non-negative (>= 0)")
-group.add_argument("-p", "--positive", action="store_true", help="Check if the number is positive (> 0)")
-parser.add_argument("number", type=str, help="Number to validate")
-
-args = parser.parse_args()
-
-# Try to load the argument
-number = None
-if args.float:
-    try:
-        number = float(args.number)
-    except:
-        print("{0} is not a valid floating point number".format(args.number), file=sys.stderr)
-        sys.exit(1)
-else:
-    try:
-        number = int(args.number)
-    except:
-        print("{0} is not a valid integer number".format(args.number), file=sys.stderr)
-        sys.exit(1)
-
-if args.range:
-    valid = False
-    for r in args.range:
-        try:
-            list = r.split('-')
-            lower = int(list[0])
-            upper = int(list[1])
-        except:
-            print("{0} is not a valid number range",format(args.range), file=sys.stderr)
-            sys.exit(1)
-
-        if (number >= lower) and (number <= upper):
-            valid = True
-    # end for
-
-    if not valid:
-        if len(args.range) > 1:
-            err_msg = "Number {0} is not in any of the ranges {1}".format(number, args.range)
-        else:
-            err_msg = "Number {0} is not in the range {1}".format(number, args.range[0])
-        print(err_msg, file=sys.stderr)
-        sys.exit(1)
-elif args.non_negative:
-    if number < 0:
-        print("Number should be non-negative", file=sys.stderr)
-        sys.exit(1)
-elif args.positive:
-    if number <= 0:
-        print("Number should be positive", file=sys.stderr)
-        sys.exit(1)
-