container: T7736: give container veths a deterministic host_interface_name

Podman's default "vethN" auto-naming for a container's host-side veth can
collide with VyOS's own "virtual-ethernet vethN" interfaces.

Bump the minimum Podman dependency to 5.8 (which supports "host_interface_name"
network connect option) and use it to name every non-macvlan container network
attachment "veth-<container name>" instead, eliminating the collision by
construction.

Author: c-po

debian/control

@@ -332,7 +332,7 @@ Depends:
   kbd,
 # End "system option keyboard-layout"
 # For "container"
-  podman (>=4.9.5),
+  podman (>=5.8),
   netavark,
   aardvark-dns,
 # iptables is only used for containers now, not the the firewall CLI

src/conf_mode/container.py

@@ -361,7 +361,19 @@ def verify(container):
     return None
 
 
-def generate_run_arguments(name, container_config, host_ident):
+def get_container_host_ifname(name: str) -> str:
+    """
+    Deterministic host-side veth interface name for a container's network
+    attachment (verify() only allows one network per container). Kept
+    within IFNAMSIZ (15 usable characters) and - thanks to the leading
+    "veth-" (a hyphen can never appear in a VyOS "vethN" interface name) -
+    guaranteed to never collide with the VyOS "virtual-ethernet" naming
+    scheme - T7736.
+    """
+    return f'veth-{name}'[:15]
+
+
+def generate_run_arguments(name, container_config, host_ident, network_config):
     image = container_config['image']
     cpu_quota = container_config['cpu_quota']
     memory = container_config['memory']
@@ -511,9 +523,21 @@ def generate_run_arguments(name, container_config, host_ident):
     else:
         ip_param = ''
         addr_info = ''
-        networks = ",".join(container_config['network'])
+        network_opts = []
         for network in container_config['network']:
             network_name = network
+            # T7736: give the host-side veth a name that can never collide
+            # with a VyOS "virtual-ethernet vethN" interface, instead of
+            # leaving it to Podman's own "vethN" auto-naming. Not applicable
+            # to macvlan networks - they attach without a paired host veth.
+            type_config = dict_search(f'{network}.type', network_config)
+            is_macvlan = dict_search('macvlan', type_config) is not None
+            net_opt = network
+            if not is_macvlan:
+                ifname = get_container_host_ifname(name)
+                net_opt += f':host_interface_name={ifname}'
+            network_opts.append(net_opt)
+
             if 'address' not in container_config['network'][network]:
                 continue
             for address in container_config['network'][network]['address']:
@@ -524,6 +548,8 @@ def generate_run_arguments(name, container_config, host_ident):
 
             addr_info = ''.join(container_config['network'][network]['address'])
 
+        networks = ' '.join(f'--network {opt}' for opt in network_opts)
+
         get_mac = dict_search(f'network.{network_name}.mac', container_config)
         if get_mac == 'auto' or get_mac is None:
             mac_add = gen_mac(name, addr_info, host_ident)
@@ -546,7 +572,7 @@ def generate_run_arguments(name, container_config, host_ident):
             delete_cli_node(mac_config_path)
             add_cli_node(mac_config_path, value=mac_add)
 
-        net = f'--net {networks} {ip_param} {mac_address}'
+        net = f'{networks} {ip_param} {mac_address}'
 
     return f'{container_base_cmd} {healthcheck} {net} {entrypoint} {image} {command} {command_arguments}'.strip()
 
@@ -626,12 +652,13 @@ def generate(container):
 
     if 'name' in container:
         host_ident = get_host_identity()
+        network_config = container.get('network', {})
         for name, container_config in container['name'].items():
             if 'disable' in container_config:
                 continue
 
             file_path = os.path.join(systemd_unit_path, f'vyos-container-{name}.service')
-            run_args = generate_run_arguments(name, container_config, host_ident)
+            run_args = generate_run_arguments(name, container_config, host_ident, network_config)
             render(file_path, 'container/systemd-unit.j2', {'name': name, 'run_args': run_args, },
                    formatter=lambda _: _.replace(""", '"').replace("'", "'"))