diff options
| author | Nicolas Vollmar <nvo@scaling.ch> | 2024-12-10 06:13:32 +0100 |
|---|---|---|
| committer | Nicolas Vollmar <nvollmar@gmail.com> | 2024-12-10 21:30:48 +0100 |
| commit | 2de9fc6c1c0ee4fb814bb48cfe8b260453f80436 (patch) | |
| tree | eb092c94e07493a9d63d561f9ebd665f8d36bdbb | |
| parent | 3ed6f02a66fd9d02a4cc3c45b2605cb3d8ad0d2e (diff) | |
| download | vyos-1x-2de9fc6c1c0ee4fb814bb48cfe8b260453f80436.tar.gz vyos-1x-2de9fc6c1c0ee4fb814bb48cfe8b260453f80436.zip | |
T6927: add name server validation
| -rwxr-xr-x | smoketest/scripts/cli/test_container.py | 12 | ||||
| -rwxr-xr-x | src/conf_mode/container.py | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/smoketest/scripts/cli/test_container.py b/smoketest/scripts/cli/test_container.py index 5d574ab7d..51559a7c6 100755 --- a/smoketest/scripts/cli/test_container.py +++ b/smoketest/scripts/cli/test_container.py @@ -98,11 +98,21 @@ class TestContainer(VyOSUnitTestSHIM.TestCase): def test_name_server(self): cont_name = 'dns-test' + net_name = 'net-test' name_server = '192.168.0.1' - self.cli_set(base_path + ['name', cont_name, 'allow-host-networks']) + 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}') diff --git a/src/conf_mode/container.py b/src/conf_mode/container.py index 4d3962029..594de3eb0 100755 --- a/src/conf_mode/container.py +++ b/src/conf_mode/container.py @@ -148,6 +148,9 @@ def verify(container): if network_name not in container.get('network', {}): raise ConfigError(f'Container network "{network_name}" does not exist!') + if 'name_server' in container_config and 'no_name_server' not in container['network'][network_name]: + raise ConfigError(f'Setting name server has no effect when attached container network has DNS enabled!') + if 'address' in container_config['network'][network_name]: cnt_ipv4 = 0 cnt_ipv6 = 0 |