T6701: Added ability to disable the container DNS plugin

interface-definitions/container.xml.in

@@ -519,6 +519,12 @@
               <multi/>
             </properties>
           </leafNode>
+          <leafNode name="no-name-server">
+            <properties>
+              <help>Disable Domain Name System (DNS) plugin for this network</help>
+              <valueless/>
+            </properties>
+          </leafNode>
           #include <include/interface/vrf.xml.i>
         </children>
       </tagNode>

smoketest/scripts/cli/test_container.py

@@ -45,7 +45,7 @@
         # Load image for smoketest provided in vyos-build
         try:
             cmd(f'cat {busybox_image_path} | sudo podman load')
         except:
             cls.skipTest(cls, reason='busybox image not available')
 
         # ensure we can also run this test on a live system - so lets clean
@@ -208,6 +208,22 @@
             self.assertEqual(c['NetworkSettings']['Networks'][net_name]['Gateway']          , str(ip_interface(prefix4).ip + 1))
             self.assertEqual(c['NetworkSettings']['Networks'][net_name]['IPAddress']        , str(ip_interface(prefix4).ip + ii))
 
+    def test_no_name_server(self):
+        prefix = '192.0.2.0/24'
+        base_name = 'ipv4'
+        net_name = 'NET01'
+
+        self.cli_set(base_path + ['network', net_name, 'prefix', prefix])
+        self.cli_set(base_path + ['network', net_name, 'no-name-server'])
+
+        name = f'{base_name}-2'
+        self.cli_set(base_path + ['name', name, 'image', cont_image])
+        self.cli_set(base_path + ['name', name, 'network', net_name, 'address', str(ip_interface(prefix).ip + 2)])
+        self.cli_commit()
+
+        n = cmd_to_json(f'sudo podman network inspect {net_name}')
+        self.assertEqual(n['dns_enabled'], False)
+
     def test_uid_gid(self):
         cont_name = 'uid-test'
         gid = '100'

src/conf_mode/container.py

@@ -98,10 +98,10 @@
 
     # Delete container network, delete containers
     tmp = node_changed(conf, base + ['network'])
     if tmp: container.update({'network_remove': tmp})
 
     tmp = node_changed(conf, base + ['name'])
     if tmp: container.update({'container_remove': tmp})
 
     return container
 
@@ -157,13 +157,13 @@
                             try:
                                 network = [x for x in container['network'][network_name]['prefix'] if is_ipv4(x)][0]
                                 cnt_ipv4 += 1
                             except:
                                 raise ConfigError(f'Network "{network_name}" does not contain an IPv4 prefix!')
                         elif is_ipv6(address):
                             try:
                                 network = [x for x in container['network'][network_name]['prefix'] if is_ipv6(x)][0]
                                 cnt_ipv6 += 1
                             except:
                                 raise ConfigError(f'Network "{network_name}" does not contain an IPv6 prefix!')
 
                         # Specified container IP address must belong to network prefix
@@ -223,7 +223,7 @@
             if 'port' in container_config:
                 for tmp in container_config['port']:
                     if not {'source', 'destination'} <= set(container_config['port'][tmp]):
                         raise ConfigError(f'Both "source" and "destination" must be specified for a port mapping!')
 
             # If 'allow-host-networks' or 'network' not set.
             if 'allow_host_networks' not in container_config and 'network' not in container_config:
@@ -236,7 +236,7 @@
 
             # gid cannot be set without uid
             if 'gid' in container_config and 'uid' not in container_config:
                 raise ConfigError(f'Cannot set "gid" without "uid" for container')
 
     # Add new network
     if 'network' in container:
@@ -421,6 +421,10 @@
                     'driver': 'host-local'
                 }
             }
+
+            if 'no_name_server' in network_config:
+                tmp['dns_enabled'] = False
+
             for prefix in network_config['prefix']:
                 net = {'subnet': prefix, 'gateway': inc_ip(prefix, 1)}
                 tmp['subnets'].append(net)