net: allow to specify the bridge iface

Before this modification, '-n bridge' required an interface called 'virbr0'. That's probably OK when only one interface is required, but not when multiple interfaces are. Instead of incrementing the index at the end of 'virbr', the option can now receive a specified bridge interface for more flexibility, e.g. -n bridge=br0 -n bridge=br1 Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>
arighi · Nov 27, 2024 · 4a8d556 · 4a8d556
1 parent 7603efb
commit 4a8d556
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/virtme/commands/run.py b/virtme/commands/run.py
@@ -121,8 +121,7 @@ def make_parser() -> argparse.ArgumentParser:
         action="append",
         const="user",
         nargs="?",
-        choices=["user", "bridge", "loop"],
-        help="Enable basic network access.",
+        help="Enable basic network access: user, bridge(=<br>), loop.",
     )
     g.add_argument(
         "--balloon",
@@ -1338,8 +1337,12 @@ def do_script(shellcmd: str, ret_path=None, show_boot_console=False) -> None:
             if net == "user":
                 qemuargs.extend(["-netdev", "user,id=n%d" % index])
                 extend_dhcp = True
-            elif net == "bridge":
-                qemuargs.extend(["-netdev", "bridge,id=n%d,br=virbr0" % index])
+            elif net == "bridge" or net.startswith("bridge="):
+                if len(net) > 7 and net[6] == '=':
+                    bridge = net[7:]
+                else:
+                    bridge = "virbr0"
+                qemuargs.extend(["-netdev", "bridge,id=n%d,br=%s" % (index, bridge)])
                 extend_dhcp = True
             elif net == "loop":
                 hubid = index
@@ -1348,7 +1351,7 @@ def do_script(shellcmd: str, ret_path=None, show_boot_console=False) -> None:
                 qemuargs.extend(["-device", "%s,netdev=n%d" % (arch.virtio_dev_type("net"), index)])
                 qemuargs.extend(["-netdev", "hubport,id=n%d,hubid=%d" % (index, hubid)])
             else:
-                assert False
+                arg_fail("--net: invalid choice: '%s' (choose from user, bridge(=<br>), loop)" % net)
             index += 1
         if extend_dhcp:
             kernelargs.extend(["virtme.dhcp"])

diff --git a/virtme_ng/run.py b/virtme_ng/run.py
@@ -349,8 +349,7 @@ def make_parser():
         "--network",
         "-n",
         action="append",
-        choices=['user', 'bridge', 'loop'],
-        help="Enable network access",
+        help="Enable network access: user, bridge(=<br>), loop",
     )
 
     parser.add_argument(