diff options
| -rw-r--r-- | python/vyos/template.py | 4 | ||||
| -rw-r--r-- | src/tests/test_template.py | 31 |
2 files changed, 33 insertions, 2 deletions
diff --git a/python/vyos/template.py b/python/vyos/template.py index c88ab04a0..1f1ddc000 100644 --- a/python/vyos/template.py +++ b/python/vyos/template.py @@ -131,7 +131,7 @@ def vyos_address_from_cidr(text): Example: 192.0.2.0/24 -> 192.0.2.0, 2001:db8::/48 -> 2001:db8:: """ - return ip_network(text).network_address + return str(ip_network(text).network_address) @register_filter("netmask_from_cidr") @@ -140,4 +140,4 @@ def vyos_netmask_from_cidr(text): Example: 192.0.2.0/24 -> 255.255.255.0, 2001:db8::/48 -> ffff:ffff:ffff:: """ - return ip_network(text).netmask + return str(ip_network(text).netmask) diff --git a/src/tests/test_template.py b/src/tests/test_template.py new file mode 100644 index 000000000..0b9f2c3b8 --- /dev/null +++ b/src/tests/test_template.py @@ -0,0 +1,31 @@ +#!/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/>. + +from unittest import TestCase + +from vyos.template import vyos_address_from_cidr +from vyos.template import vyos_netmask_from_cidr + + +class TestTeamplteHelpers(TestCase): + def setUp(self): + pass + + def test_helpers_from_cidr(self): + network = '192.0.2.0/26' + self.assertEqual(vyos_address_from_cidr(network), '192.0.2.0') + self.assertEqual(vyos_netmask_from_cidr(network), '255.255.255.192') + |