T5195: move helpers from vyos.validate to vyos.utils package

2 files changed, 22 insertions, 23 deletions

diff --git a/src/tests/test_util.py b/src/tests/test_util.py
index 27ee648d4..9ae329ced 100644
--- a/src/tests/test_util.py
+++ b/src/tests/test_util.py
@@ -15,8 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from unittest import TestCase
-
-class TestVyOSUtil(TestCase):
+class TestVyOSUtils(TestCase):
     def test_key_mangling(self):
         from vyos.utils.dict import mangle_dict_keys
         data = {"foo-bar": {"baz-quux": None}}
diff --git a/src/tests/test_validate.py b/src/tests/test_validate.py
index 68a257d25..5a6dc2586 100644
--- a/src/tests/test_validate.py
+++ b/src/tests/test_validate.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020 VyOS maintainers and contributors
+# Copyright (C) 2020-2023 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
@@ -14,37 +14,37 @@
 # 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 vyos.validate
+import vyos.utils.network
 from unittest import TestCase
 
-class TestVyOSValidate(TestCase):
+class TestVyOSUtilsNetwork(TestCase):
     def setUp(self):
         pass
 
     def test_is_addr_assigned(self):
-        self.assertTrue(vyos.validate.is_addr_assigned('127.0.0.1'))
-        self.assertTrue(vyos.validate.is_addr_assigned('::1'))
-        self.assertFalse(vyos.validate.is_addr_assigned('127.251.255.123'))
+        self.assertTrue(vyos.utils.network.is_addr_assigned('127.0.0.1'))
+        self.assertTrue(vyos.utils.network.is_addr_assigned('::1'))
+        self.assertFalse(vyos.utils.network.is_addr_assigned('127.251.255.123'))
 
     def test_is_ipv6_link_local(self):
-        self.assertFalse(vyos.validate.is_ipv6_link_local('169.254.0.1'))
-        self.assertTrue(vyos.validate.is_ipv6_link_local('fe80::'))
-        self.assertTrue(vyos.validate.is_ipv6_link_local('fe80::affe:1'))
-        self.assertTrue(vyos.validate.is_ipv6_link_local('fe80::affe:1%eth0'))
-        self.assertFalse(vyos.validate.is_ipv6_link_local('2001:db8::'))
-        self.assertFalse(vyos.validate.is_ipv6_link_local('2001:db8::%eth0'))
-        self.assertFalse(vyos.validate.is_ipv6_link_local('VyOS'))
-        self.assertFalse(vyos.validate.is_ipv6_link_local('::1'))
-        self.assertFalse(vyos.validate.is_ipv6_link_local('::1%lo'))
+        self.assertFalse(vyos.utils.network.is_ipv6_link_local('169.254.0.1'))
+        self.assertTrue(vyos.utils.network.is_ipv6_link_local('fe80::'))
+        self.assertTrue(vyos.utils.network.is_ipv6_link_local('fe80::affe:1'))
+        self.assertTrue(vyos.utils.network.is_ipv6_link_local('fe80::affe:1%eth0'))
+        self.assertFalse(vyos.utils.network.is_ipv6_link_local('2001:db8::'))
+        self.assertFalse(vyos.utils.network.is_ipv6_link_local('2001:db8::%eth0'))
+        self.assertFalse(vyos.utils.network.is_ipv6_link_local('VyOS'))
+        self.assertFalse(vyos.utils.network.is_ipv6_link_local('::1'))
+        self.assertFalse(vyos.utils.network.is_ipv6_link_local('::1%lo'))
 
     def test_is_ipv6_link_local(self):
-        self.assertTrue(vyos.validate.is_loopback_addr('127.0.0.1'))
-        self.assertTrue(vyos.validate.is_loopback_addr('127.0.1.1'))
-        self.assertTrue(vyos.validate.is_loopback_addr('127.1.1.1'))
-        self.assertTrue(vyos.validate.is_loopback_addr('::1'))
+        self.assertTrue(vyos.utils.network.is_loopback_addr('127.0.0.1'))
+        self.assertTrue(vyos.utils.network.is_loopback_addr('127.0.1.1'))
+        self.assertTrue(vyos.utils.network.is_loopback_addr('127.1.1.1'))
+        self.assertTrue(vyos.utils.network.is_loopback_addr('::1'))
 
-        self.assertFalse(vyos.validate.is_loopback_addr('::2'))
-        self.assertFalse(vyos.validate.is_loopback_addr('192.0.2.1'))
+        self.assertFalse(vyos.utils.network.is_loopback_addr('::2'))
+        self.assertFalse(vyos.utils.network.is_loopback_addr('192.0.2.1'))