vyos.template: provide general is_ip(v4|v6) helpers

We had two places were the is_ip, is_ipv4 and is_ipv6 helpers had been defined.
All places now have been converged into vyos.template as they are used both
in the Jinja2 templates and also in our scripts.

3 files changed, 82 insertions, 59 deletions

diff --git a/src/tests/test_jinja_filters.py b/src/tests/test_jinja_filters.py
index acd7a5952..8a7241fe3 100644
--- a/src/tests/test_jinja_filters.py
+++ b/src/tests/test_jinja_filters.py
@@ -17,13 +17,13 @@
 from unittest import TestCase
 
 from ipaddress import ip_network
-from vyos.template import vyos_address_from_cidr
-from vyos.template import vyos_netmask_from_cidr
-from vyos.template import vyos_ipv4
-from vyos.template import vyos_ipv6
-from vyos.template import vyos_first_host_address
-from vyos.template import vyos_last_host_address
-from vyos.template import vyos_inc_ip
+from vyos.template import address_from_cidr
+from vyos.template import netmask_from_cidr
+from vyos.template import is_ipv4
+from vyos.template import is_ipv6
+from vyos.template import first_host_address
+from vyos.template import last_host_address
+from vyos.template import inc_ip
 
 class TestTeamplteHelpers(TestCase):
     def setUp(self):
@@ -31,39 +31,39 @@ class TestTeamplteHelpers(TestCase):
 
     def test_helpers_from_cidr(self):
         network_v4 = '192.0.2.0/26'
-        self.assertEqual(vyos_address_from_cidr(network_v4), str(ip_network(network_v4).network_address))
-        self.assertEqual(vyos_netmask_from_cidr(network_v4), str(ip_network(network_v4).netmask))
+        self.assertEqual(address_from_cidr(network_v4), str(ip_network(network_v4).network_address))
+        self.assertEqual(netmask_from_cidr(network_v4), str(ip_network(network_v4).netmask))
 
     def test_helpers_ipv4(self):
-        self.assertTrue(vyos_ipv4('192.0.2.1'))
-        self.assertTrue(vyos_ipv4('192.0.2.0/24'))
-        self.assertTrue(vyos_ipv4('192.0.2.1/32'))
-        self.assertTrue(vyos_ipv4('10.255.1.2'))
-        self.assertTrue(vyos_ipv4('10.255.1.0/24'))
-        self.assertTrue(vyos_ipv4('10.255.1.2/32'))
-        self.assertFalse(vyos_ipv4('2001:db8::'))
-        self.assertFalse(vyos_ipv4('2001:db8::1'))
-        self.assertFalse(vyos_ipv4('2001:db8::/64'))
+        self.assertTrue(is_ipv4('192.0.2.1'))
+        self.assertTrue(is_ipv4('192.0.2.0/24'))
+        self.assertTrue(is_ipv4('192.0.2.1/32'))
+        self.assertTrue(is_ipv4('10.255.1.2'))
+        self.assertTrue(is_ipv4('10.255.1.0/24'))
+        self.assertTrue(is_ipv4('10.255.1.2/32'))
+        self.assertFalse(is_ipv4('2001:db8::'))
+        self.assertFalse(is_ipv4('2001:db8::1'))
+        self.assertFalse(is_ipv4('2001:db8::/64'))
 
     def test_helpers_ipv6(self):
-        self.assertFalse(vyos_ipv6('192.0.2.1'))
-        self.assertFalse(vyos_ipv6('192.0.2.0/24'))
-        self.assertFalse(vyos_ipv6('192.0.2.1/32'))
-        self.assertFalse(vyos_ipv6('10.255.1.2'))
-        self.assertFalse(vyos_ipv6('10.255.1.0/24'))
-        self.assertFalse(vyos_ipv6('10.255.1.2/32'))
-        self.assertTrue(vyos_ipv6('2001:db8::'))
-        self.assertTrue(vyos_ipv6('2001:db8::1'))
-        self.assertTrue(vyos_ipv6('2001:db8::1/64'))
-        self.assertTrue(vyos_ipv6('2001:db8::/32'))
-        self.assertTrue(vyos_ipv6('2001:db8::/64'))
+        self.assertFalse(is_ipv6('192.0.2.1'))
+        self.assertFalse(is_ipv6('192.0.2.0/24'))
+        self.assertFalse(is_ipv6('192.0.2.1/32'))
+        self.assertFalse(is_ipv6('10.255.1.2'))
+        self.assertFalse(is_ipv6('10.255.1.0/24'))
+        self.assertFalse(is_ipv6('10.255.1.2/32'))
+        self.assertTrue(is_ipv6('2001:db8::'))
+        self.assertTrue(is_ipv6('2001:db8::1'))
+        self.assertTrue(is_ipv6('2001:db8::1/64'))
+        self.assertTrue(is_ipv6('2001:db8::/32'))
+        self.assertTrue(is_ipv6('2001:db8::/64'))
 
     def test_helpers_first_host_address(self):
-        self.assertEqual(vyos_first_host_address('10.0.0.0/24'), '10.0.0.1')
-        self.assertEqual(vyos_first_host_address('10.0.0.128/25'), '10.0.0.129')
-        self.assertEqual(vyos_first_host_address('10.0.0.200/29'), '10.0.0.201')
+        self.assertEqual(first_host_address('10.0.0.0/24'), '10.0.0.1')
+        self.assertEqual(first_host_address('10.0.0.128/25'), '10.0.0.129')
+        self.assertEqual(first_host_address('10.0.0.200/29'), '10.0.0.201')
 
-        self.assertEqual(vyos_first_host_address('2001:db8::/64'), '2001:db8::')
-        self.assertEqual(vyos_first_host_address('2001:db8::/112'), '2001:db8::')
-        self.assertEqual(vyos_first_host_address('2001:db8::10/112'), '2001:db8::10')
-        self.assertEqual(vyos_first_host_address('2001:db8::100/112'), '2001:db8::100')
+        self.assertEqual(first_host_address('2001:db8::/64'), '2001:db8::')
+        self.assertEqual(first_host_address('2001:db8::/112'), '2001:db8::')
+        self.assertEqual(first_host_address('2001:db8::10/112'), '2001:db8::10')
+        self.assertEqual(first_host_address('2001:db8::100/112'), '2001:db8::100')
diff --git a/src/tests/test_template.py b/src/tests/test_template.py
new file mode 100644
index 000000000..6dc2f075e
--- /dev/null
+++ b/src/tests/test_template.py
@@ -0,0 +1,46 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 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 vyos.template
+from unittest import TestCase
+
+class TestVyOSTemplate(TestCase):
+    def setUp(self):
+        pass
+
+    def test_is_ip(self):
+        self.assertTrue(vyos.template.is_ip('192.0.2.1'))
+        self.assertTrue(vyos.template.is_ip('2001:db8::1'))
+        self.assertFalse(vyos.template.is_ip('VyOS'))
+
+    def test_is_ipv4(self):
+        self.assertTrue(vyos.template.is_ipv4('192.0.2.1'))
+        self.assertTrue(vyos.template.is_ipv4('192.0.2.0/24'))
+        self.assertTrue(vyos.template.is_ipv4('192.0.2.1/32'))
+
+        self.assertFalse(vyos.template.is_ipv4('2001:db8::1'))
+        self.assertFalse(vyos.template.is_ipv4('2001:db8::/64'))
+        self.assertFalse(vyos.template.is_ipv4('VyOS'))
+
+    def test_is_ipv6(self):
+        self.assertTrue(vyos.template.is_ipv6('2001:db8::1'))
+        self.assertTrue(vyos.template.is_ipv6('2001:db8::/64'))
+        self.assertTrue(vyos.template.is_ipv6('2001:db8::1/64'))
+
+        self.assertFalse(vyos.template.is_ipv6('192.0.2.1'))
+        self.assertFalse(vyos.template.is_ipv6('192.0.2.0/24'))
+        self.assertFalse(vyos.template.is_ipv6('192.0.2.1/32'))
+        self.assertFalse(vyos.template.is_ipv6('VyOS'))
diff --git a/src/tests/test_validate.py b/src/tests/test_validate.py
index e9fe185ed..226e856a3 100644
--- a/src/tests/test_validate.py
+++ b/src/tests/test_validate.py
@@ -21,29 +21,6 @@ class TestVyOSValidate(TestCase):
     def setUp(self):
         pass
 
-    def test_is_ip(self):
-        self.assertTrue(vyos.validate.is_ip('192.0.2.1'))
-        self.assertTrue(vyos.validate.is_ip('2001:db8::1'))
-        self.assertFalse(vyos.validate.is_ip('VyOS'))
-
-    def test_is_ipv4(self):
-        self.assertTrue(vyos.validate.is_ipv4('192.0.2.1'))
-        self.assertTrue(vyos.validate.is_ipv4('192.0.2.0/24'))
-        self.assertTrue(vyos.validate.is_ipv4('192.0.2.1/32'))
-
-        self.assertFalse(vyos.validate.is_ipv4('2001:db8::1'))
-        self.assertFalse(vyos.validate.is_ipv4('2001:db8::/64'))
-        self.assertFalse(vyos.validate.is_ipv4('VyOS'))
-
-    def test_is_ipv6(self):
-        self.assertFalse(vyos.validate.is_ipv6('192.0.2.1'))
-        self.assertFalse(vyos.validate.is_ipv6('192.0.2.0/24'))
-        self.assertFalse(vyos.validate.is_ipv6('192.0.2.1/32'))
-        self.assertTrue(vyos.validate.is_ipv6('2001:db8::1'))
-        self.assertTrue(vyos.validate.is_ipv6('2001:db8::/64'))
-        self.assertTrue(vyos.validate.is_ipv6('2001:db8::1/64'))
-        self.assertFalse(vyos.validate.is_ipv6('VyOS'))
-
     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::'))