9 files changed, 47 insertions, 18 deletions
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py
index 1978adff5..957f72ed5 100755
--- a/src/conf_mode/protocols_bgp.py
+++ b/src/conf_mode/protocols_bgp.py
@@ -33,7 +33,7 @@ def get_config():
     base = ['protocols', 'nbgp']
     bgp = conf.get_config_dict(base, key_mangling=('-', '_'))
     if not conf.exists(base):
-        return None
+        bgp = {}
 
     from pprint import pprint
     pprint(bgp)
@@ -44,10 +44,16 @@ def verify(bgp):
     if not bgp:
         return None
 
+    # Check if declared more than one ASN
+    for asn in bgp['nbgp'].items():
+        if len(bgp['nbgp']) > 1:
+            raise ConfigError('Only one bgp ASN process can be definded')
+
     return None
 
 def generate(bgp):
     if not bgp:
+        bgp['new_frr_config'] = ''
         return None
 
     # render(config) not needed, its only for debug
@@ -58,9 +64,6 @@ def generate(bgp):
     return None
 
 def apply(bgp):
-    if bgp is None:
-        return None
-
     # Save original configration prior to starting any commit actions
     bgp['original_config'] = frr.get_configuration(daemon='bgpd')
     bgp['modified_config'] = frr.replace_section(bgp['original_config'], bgp['new_frr_config'], from_re='router bgp .*')
diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py
index 48d887abe..465986d5b 100755
--- a/src/conf_mode/vpn_l2tp.py
+++ b/src/conf_mode/vpn_l2tp.py
@@ -162,6 +162,9 @@ def get_config(config=None):
 
             conf.set_level(base_path + ['authentication', 'radius', 'server', server])
 
+            if conf.exists(['disable-accounting']):
+                radius['acct_port'] = '0'
+
             if conf.exists(['fail-time']):
                 radius['fail_time'] = conf.return_value(['fail-time'])
 
diff --git a/src/conf_mode/vpn_pptp.py b/src/conf_mode/vpn_pptp.py
index 306d05c60..3125ee9d0 100755
--- a/src/conf_mode/vpn_pptp.py
+++ b/src/conf_mode/vpn_pptp.py
@@ -121,6 +121,9 @@ def get_config(config=None):
 
             conf.set_level(base_path + ['authentication', 'radius', 'server', server])
 
+            if conf.exists(['disable-accounting']):
+                radius['acct_port'] = '0'
+
             if conf.exists(['fail-time']):
                 radius['fail_time'] = conf.return_value(['fail-time'])
 
diff --git a/src/tests/helper.py b/src/tests/helper.py
index a7e4f201c..f7033148a 100644
--- a/src/tests/helper.py
+++ b/src/tests/helper.py
@@ -13,13 +13,10 @@
 #
 # 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 importlib.util
 
-
 def prepare_module(file_path='', module_name=''):
     spec = importlib.util.spec_from_file_location(module_name, file_path)
     module = importlib.util.module_from_spec(spec)
diff --git a/src/tests/test_config_parser.py b/src/tests/test_config_parser.py
index 5b922e2dd..6e0a071f8 100644
--- a/src/tests/test_config_parser.py
+++ b/src/tests/test_config_parser.py
@@ -15,11 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import tempfile
-import unittest
+import vyos.configtree
 
 from unittest import TestCase
-import vyos.configtree
 
 class TestConfigParser(TestCase):
     def setUp(self):
diff --git a/src/tests/test_find_device_file.py b/src/tests/test_find_device_file.py
index 8cf50b32d..43c80dc76 100755
--- a/src/tests/test_find_device_file.py
+++ b/src/tests/test_find_device_file.py
@@ -14,9 +14,7 @@
 # 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 unittest
 from unittest import TestCase
-
 from vyos.util import find_device_file
 
 class TestDeviceFile(TestCase):
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')
+
diff --git a/src/tests/test_util.py b/src/tests/test_util.py
index 09bf947b8..f7405cbde 100644
--- a/src/tests/test_util.py
+++ b/src/tests/test_util.py
@@ -14,10 +14,8 @@
 # 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 unittest
 from unittest import TestCase
-
-import vyos.util
+from vyos.util import mangle_dict_keys
 
 
 class TestVyOSUtil(TestCase):
@@ -27,6 +25,6 @@ class TestVyOSUtil(TestCase):
     def test_key_mangline(self):
         data = {"foo-bar": {"baz-quux": None}}
         expected_data = {"foo_bar": {"baz_quux": None}}
-        new_data = vyos.util.mangle_dict_keys(data, '-', '_')
+        new_data = mangle_dict_keys(data, '-', '_')
         self.assertEqual(new_data, expected_data)
 
diff --git a/src/tests/test_vyos_dict_search.py b/src/tests/test_vyos_dict_search.py
index ef338d46f..cba6562da 100644
--- a/src/tests/test_vyos_dict_search.py
+++ b/src/tests/test_vyos_dict_search.py
@@ -14,9 +14,7 @@
 # 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 unittest
 from unittest import TestCase
-
 from vyos.util import vyos_dict_search
 
 data = {