4 files changed, 148 insertions, 0 deletions
diff --git a/smoketest/scripts/cli/base_accel_ppp_test.py b/smoketest/scripts/cli/base_accel_ppp_test.py
index 383adc445..ab723e707 100644
--- a/smoketest/scripts/cli/base_accel_ppp_test.py
+++ b/smoketest/scripts/cli/base_accel_ppp_test.py
@@ -367,6 +367,27 @@ class BasicAccelPPPTest:
                 ]
             )
 
+            self.set(
+                [
+                    "authentication",
+                    "radius",
+                    "server",
+                    radius_server,
+                    "backup",
+                ]
+            )
+
+            self.set(
+                [
+                    "authentication",
+                    "radius",
+                    "server",
+                    radius_server,
+                    "priority",
+                    "10",
+                ]
+            )
+
             # commit changes
             self.cli_commit()
 
@@ -379,6 +400,8 @@ class BasicAccelPPPTest:
             self.assertEqual(f"acct-port=0", server[3])
             self.assertEqual(f"req-limit=0", server[4])
             self.assertEqual(f"fail-time=0", server[5])
+            self.assertIn('weight=10', server)
+            self.assertIn('backup', server)
 
         def test_accel_ipv4_pool(self):
             self.basic_config(is_gateway=False, is_client_pool=False)
diff --git a/smoketest/scripts/cli/test_cgnat.py b/smoketest/scripts/cli/test_cgnat.py
new file mode 100755
index 000000000..c65c58820
--- /dev/null
+++ b/smoketest/scripts/cli/test_cgnat.py
@@ -0,0 +1,99 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2024 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 os
+import unittest
+
+from base_vyostest_shim import VyOSUnitTestSHIM
+from vyos.configsession import ConfigSessionError
+
+
+base_path = ['nat', 'cgnat']
+nftables_cgnat_config = '/run/nftables-cgnat.nft'
+
+
+class TestCGNAT(VyOSUnitTestSHIM.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestCGNAT, cls).setUpClass()
+
+        # ensure we can also run this test on a live system - so lets clean
+        # out the current configuration :)
+        cls.cli_delete(cls, base_path)
+
+    def tearDown(self):
+        self.cli_delete(base_path)
+        self.cli_commit()
+        self.assertFalse(os.path.exists(nftables_cgnat_config))
+
+    def test_cgnat(self):
+        internal_name = 'vyos-int-01'
+        external_name = 'vyos-ext-01'
+        internal_net = '100.64.0.0/29'
+        external_net = '192.0.2.1-192.0.2.2'
+        external_ports = '40000-60000'
+        ports_per_subscriber = '5000'
+        rule = '100'
+
+        nftables_search = [
+            ['map tcp_nat_map'],
+            ['map udp_nat_map'],
+            ['map icmp_nat_map'],
+            ['map other_nat_map'],
+            ['100.64.0.0 : 192.0.2.1 . 40000-44999'],
+            ['100.64.0.1 : 192.0.2.1 . 45000-49999'],
+            ['100.64.0.2 : 192.0.2.1 . 50000-54999'],
+            ['100.64.0.3 : 192.0.2.1 . 55000-59999'],
+            ['100.64.0.4 : 192.0.2.2 . 40000-44999'],
+            ['100.64.0.5 : 192.0.2.2 . 45000-49999'],
+            ['100.64.0.6 : 192.0.2.2 . 50000-54999'],
+            ['100.64.0.7 : 192.0.2.2 . 55000-59999'],
+            ['chain POSTROUTING'],
+            ['type nat hook postrouting priority srcnat'],
+            ['ip protocol tcp counter snat ip to ip saddr map @tcp_nat_map'],
+            ['ip protocol udp counter snat ip to ip saddr map @udp_nat_map'],
+            ['ip protocol icmp counter snat ip to ip saddr map @icmp_nat_map'],
+            ['counter snat ip to ip saddr map @other_nat_map'],
+        ]
+
+        self.cli_set(base_path + ['pool', 'external', external_name, 'external-port-range', external_ports])
+        self.cli_set(base_path + ['pool', 'external', external_name, 'range', external_net])
+
+        # allocation out of the available ports
+        with self.assertRaises(ConfigSessionError):
+            self.cli_set(base_path + ['pool', 'external', external_name, 'per-user-limit', 'port', '8000'])
+            self.cli_commit()
+        self.cli_set(base_path + ['pool', 'external', external_name, 'per-user-limit', 'port', ports_per_subscriber])
+
+        # internal pool not set
+        with self.assertRaises(ConfigSessionError):
+            self.cli_commit()
+        self.cli_set(base_path + ['pool', 'internal', internal_name, 'range', internal_net])
+
+        self.cli_set(base_path + ['rule', rule, 'source', 'pool', internal_name])
+        # non-exist translation pool
+        with self.assertRaises(ConfigSessionError):
+            self.cli_set(base_path + ['rule', rule, 'translation', 'pool', 'fake-pool'])
+            self.cli_commit()
+
+        self.cli_set(base_path + ['rule', rule, 'translation', 'pool', external_name])
+        self.cli_commit()
+
+        self.verify_nftables(nftables_search, 'ip cgnat', inverse=False, args='-s')
+
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)
diff --git a/smoketest/scripts/cli/test_protocols_ospf.py b/smoketest/scripts/cli/test_protocols_ospf.py
index 1b9cc50fe..585c1dc89 100755
--- a/smoketest/scripts/cli/test_protocols_ospf.py
+++ b/smoketest/scripts/cli/test_protocols_ospf.py
@@ -16,6 +16,7 @@
 
 import unittest
 
+from time import sleep
 from base_vyostest_shim import VyOSUnitTestSHIM
 
 from vyos.configsession import ConfigSessionError
@@ -480,6 +481,8 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase):
         # Commit main OSPF changes
         self.cli_commit()
 
+        sleep(10)
+
         # Verify main OSPF changes
         frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
         self.assertIn(f'router ospf', frrconfig)
diff --git a/smoketest/scripts/cli/test_vpn_l2tp.py b/smoketest/scripts/cli/test_vpn_l2tp.py
index 8c4e53895..07a7e2906 100755
--- a/smoketest/scripts/cli/test_vpn_l2tp.py
+++ b/smoketest/scripts/cli/test_vpn_l2tp.py
@@ -95,6 +95,29 @@ class TestVPNL2TPServer(BasicAccelPPPTest.TestCase):
         self.cli_set(base_path + ['authentication', 'protocols', 'chap'])
         self.cli_commit()
 
+    def test_l2tp_radius_server(self):
+        base_path = ['vpn', 'l2tp', 'remote-access']
+        radius_server = "192.0.2.22"
+        radius_key = "secretVyOS"
+
+        self.cli_set(base_path + ['authentication', 'mode', 'radius'])
+        self.cli_set(base_path + ['gateway-address', '192.0.2.1'])
+        self.cli_set(base_path + ['client-ip-pool', 'SIMPLE-POOL', 'range', '192.0.2.0/24'])
+        self.cli_set(base_path + ['default-pool', 'SIMPLE-POOL'])
+        self.cli_set(base_path + ['authentication', 'radius', 'server', radius_server, 'key', radius_key])
+        self.cli_set(base_path + ['authentication', 'radius', 'server', radius_server, 'priority', '10'])
+        self.cli_set(base_path + ['authentication', 'radius', 'server', radius_server, 'backup'])
+
+        # commit changes
+        self.cli_commit()
+
+        # Validate configuration values
+        conf = ConfigParser(allow_no_value=True)
+        conf.read(self._config_file)
+        server = conf["radius"]["server"].split(",")
+        self.assertIn('weight=10', server)
+        self.assertIn('backup', server)
+
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)