3 files changed, 61 insertions, 1 deletions
diff --git a/smoketest/scripts/cli/test_container.py b/smoketest/scripts/cli/test_container.py
index 0541384da..51559a7c6 100755
--- a/smoketest/scripts/cli/test_container.py
+++ b/smoketest/scripts/cli/test_container.py
@@ -96,6 +96,31 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
         tmp = cmd(f'sudo podman exec -it {cont_name} sysctl kernel.msgmax')
         self.assertEqual(tmp, 'kernel.msgmax = 4096')
 
+    def test_name_server(self):
+        cont_name = 'dns-test'
+        net_name = 'net-test'
+        name_server = '192.168.0.1'
+        prefix = '192.0.2.0/24'
+
+        self.cli_set(base_path + ['network', net_name, 'prefix', prefix])
+
+        self.cli_set(base_path + ['name', cont_name, 'image', cont_image])
+        self.cli_set(base_path + ['name', cont_name, 'name-server', name_server])
+        self.cli_set(base_path + ['name', cont_name, 'network', net_name, 'address', str(ip_interface(prefix).ip + 2)])
+
+        # verify() - name server has no effect when container network has dns enabled
+        with self.assertRaises(ConfigSessionError):
+            self.cli_commit()
+
+        self.cli_set(base_path + ['network', net_name, 'no-name-server'])
+        self.cli_commit()
+
+        n = cmd_to_json(f'sudo podman inspect {cont_name}')
+        self.assertEqual(n['HostConfig']['Dns'][0], name_server)
+
+        tmp = cmd(f'sudo podman exec -it {cont_name} cat /etc/resolv.conf')
+        self.assertIn(name_server, tmp)
+
     def test_cpu_limit(self):
         cont_name = 'c2'
 
diff --git a/smoketest/scripts/cli/test_service_ipoe-server.py b/smoketest/scripts/cli/test_service_ipoe-server.py
index be03179bf..ab0898d17 100755
--- a/smoketest/scripts/cli/test_service_ipoe-server.py
+++ b/smoketest/scripts/cli/test_service_ipoe-server.py
@@ -260,6 +260,41 @@ delegate={delegate_2_prefix},{delegate_mask},name={pool_name}"""
         tmp = ','.join(vlans)
         self.assertIn(f'{interface},{tmp}', conf['ipoe']['vlan-mon'])
 
+    def test_ipoe_server_static_client_ip(self):
+        mac_address = '08:00:27:2f:d8:06'
+        ip_address = '192.0.2.100'
+
+        # Test configuration of local authentication for PPPoE server
+        self.basic_config()
+        # Rewrite authentication from basic_config
+        self.set(
+            [
+                'authentication',
+                'interface',
+                interface,
+                'mac',
+                mac_address,
+                'static-ip',
+                ip_address,
+            ]
+        )
+        self.set(['authentication', 'mode', 'local'])
+        # commit changes
+        self.cli_commit()
+
+        # Validate configuration values
+        conf = ConfigParser(allow_no_value=True, delimiters='=', strict=False)
+        conf.read(self._config_file)
+
+        # basic verification
+        self.verify(conf)
+
+        # check local users
+        tmp = cmd(f'sudo cat {self._chap_secrets}')
+        regex = f'{interface}\s+\*\s+{mac_address}\s+{ip_address}'
+        tmp = re.findall(regex, tmp)
+        self.assertTrue(tmp)
+
     @unittest.skip("PPP is not a part of IPoE")
     def test_accel_ppp_options(self):
         pass
diff --git a/smoketest/scripts/cli/test_service_ntp.py b/smoketest/scripts/cli/test_service_ntp.py
index 07af4f5eb..469d44eaa 100755
--- a/smoketest/scripts/cli/test_service_ntp.py
+++ b/smoketest/scripts/cli/test_service_ntp.py
@@ -203,7 +203,7 @@ class TestSystemNTP(VyOSUnitTestSHIM.TestCase):
             self.cli_set(base_path + ['server', server, 'ptp'])
 
         self.cli_set(base_path + ['ptp', 'port', ptp_port])
-        self.cli_set(base_path + ['ptp', 'timestamp', 'interface', 'all'])
+        self.cli_set(base_path + ['timestamp', 'interface', 'all'])
 
         # commit changes
         self.cli_commit()