Merge pull request vyos#4232 from nvollmar/T6927

T6927: adds option to set container name server

smoketest/scripts/cli/test_container.py

@@ -98,11 +98,21 @@ def test_basic(self):
 
     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}')

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