hector-cli 0.4.0__tar.gz → 0.5.0__tar.gz

{hector_cli-0.4.0 → hector_cli-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hector-cli
-Version: 0.4.0
+Version: 0.5.0
 Summary: YAML-driven Renode + Verilator simulation orchestrator for embedded hardware CI
 Home-page: https://hector-ci.com
 Author: Nemesis
@@ -482,6 +482,10 @@ hector run --renode-args '--console'
 hector run --renode-args '--hide-log --config my.conf'
 ```
 
+#### Container networking
+
+Every container hector starts — the Renode emulation (`run`), robot tests, `shell` tests, `build:` steps and module builds — runs with `--net=host`. GDB servers (`--debug`), `tcp:` mappings and anything a step listens on are reachable from the host on the same port, and steps can reach host services on `localhost`. No port publishing is involved.
+
 #### Running without Docker (`--no-docker`)
 
 Call the locally installed `renode` and `renode-test` binaries directly instead of launching a Docker container. `build:` steps and `shell` tests also run on the host (their `image:` is ignored, with a warning), as do module builds.

{hector_cli-0.4.0 → hector_cli-0.5.0}/README.md

@@ -452,6 +452,10 @@ hector run --renode-args '--console'
 hector run --renode-args '--hide-log --config my.conf'
 ```
 
+#### Container networking
+
+Every container hector starts — the Renode emulation (`run`), robot tests, `shell` tests, `build:` steps and module builds — runs with `--net=host`. GDB servers (`--debug`), `tcp:` mappings and anything a step listens on are reachable from the host on the same port, and steps can reach host services on `localhost`. No port publishing is involved.
+
 #### Running without Docker (`--no-docker`)
 
 Call the locally installed `renode` and `renode-test` binaries directly instead of launching a Docker container. `build:` steps and `shell` tests also run on the host (their `image:` is ignored, with a warning), as do module builds.

{hector_cli-0.4.0 → hector_cli-0.5.0}/hector/core.py

@@ -67,7 +67,7 @@ class Registry:
 # ==========================================================================
 # CONSTANTS
 # ==========================================================================
-TOOL_VERSION = "0.4.0"
+TOOL_VERSION = "0.5.0"
 SUPPORTED_SCHEMA_VERSIONS = {"0.1"}
 
 RENODE_REPO_URL = "https://github.com/renode/renode.git"

{hector_cli-0.4.0 → hector_cli-0.5.0}/hector/docker.py

@@ -60,6 +60,13 @@ def _extra_mounts():
     return args
 
 
+# Every container shares the host's network stack: GDB servers, tcp: mappings and
+# anything a build/test step listens on are reachable from the host as-is, and steps
+# can reach host services (e.g. a local registry or a TCP-mapped UART) on localhost.
+# No -p publishing is needed (Docker ignores it in this mode anyway).
+_HOST_NETWORK = ["--net=host"]
+
+
 def _runtime_flags(runtime):
     """Map aggregated RuntimeOptions (capabilities/devices/root, declared by mappings,
     hubs, modules) to `docker run` flags.
@@ -89,7 +96,7 @@ def run_build(script, image):
         subprocess.run(["bash", "-c", script], check=True)
         return
     subprocess.run(
-        ["docker", "run", "--rm", "-u", "0:0",
+        ["docker", "run", "--rm", *_HOST_NETWORK, "-u", "0:0",
          *_workspace_mount(), *_extra_mounts(), image, "bash", "-c", script],
         check=True,
     )
@@ -128,8 +135,8 @@ def run_in_container(script, image, live=False):
     if core.NO_DOCKER:
         cmd = ["bash", "-c", f"set -ex\n{script}"]
     else:
-        cmd = ["docker", "run", "--rm", *_workspace_mount(), *_extra_mounts(),
-               *_user_flags(), image, "sh", "-c", f"set -ex\n{script}"]
+        cmd = ["docker", "run", "--rm", *_HOST_NETWORK, *_workspace_mount(),
+               *_extra_mounts(), *_user_flags(), image, "sh", "-c", f"set -ex\n{script}"]
     if live:
         proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                 stderr=subprocess.STDOUT, text=True)
@@ -145,7 +152,7 @@ def run_in_container(script, image, live=False):
     return proc.stdout, proc.returncode == 0
 
 
-def build_renode_argv(resc_filename, image, ports=None, extra_args=None, runtime=None):
+def build_renode_argv(resc_filename, image, extra_args=None, runtime=None):
     """Build the exact argv that would run an emulation resc — the local `renode`
     invocation under --no-docker, otherwise the full `docker run ... renode` command.
 
@@ -154,20 +161,18 @@ def build_renode_argv(resc_filename, image, ports=None, extra_args=None, runtime
     runtime: aggregated RuntimeOptions whose docker flags (caps/devices/root) are added."""
     if core.NO_DOCKER:
         return ["renode", resc_filename] + (extra_args or [])
-    cmd = ["docker", "run", "-it", "--rm", *_xdisplay_args(), "--net=host",
-           *_workspace_mount(), *_extra_mounts(), *_user_flags(), *_runtime_flags(runtime)]
-    for port in (ports or []):
-        cmd += ["-p", f"{port}:{port}"]
-    cmd += [image, "renode", resc_filename] + (extra_args or [])
-    return cmd
+    return ["docker", "run", "-it", "--rm", *_xdisplay_args(), *_HOST_NETWORK,
+            *_workspace_mount(), *_extra_mounts(), *_user_flags(), *_runtime_flags(runtime),
+            image, "renode", resc_filename] + (extra_args or [])
 
 
-def run_renode(resc_filename, image, ports=None, extra_args=None, output_dir="results", runtime=None):
-    """Run an emulation resc interactively. In debug mode, expose GDB ports.
+def run_renode(resc_filename, image, extra_args=None, output_dir="results", runtime=None):
+    """Run an emulation resc interactively. GDB ports (--debug) are reachable from the
+    host through the host network.
     runtime: aggregated RuntimeOptions whose docker flags (caps/devices/root) are added."""
     if not core.NO_DOCKER:
         os.makedirs(os.path.join(os.getcwd(), output_dir), exist_ok=True)
-    subprocess.run(build_renode_argv(resc_filename, image, ports, extra_args, runtime))
+    subprocess.run(build_renode_argv(resc_filename, image, extra_args, runtime))
 
 
 def run_renode_test(robot_file_host, image, results_dir_host,
@@ -177,8 +182,7 @@ def run_renode_test(robot_file_host, image, results_dir_host,
     resc_host_path: passed as --variable RESC:<path> so .robot files can load
     the generated emulation script via ${RESC}.
     extra_args: optional list of additional flags forwarded verbatim to renode-test.
-    interactive: attach stdin/tty and add --net=host (useful with Pause Execution
-    or when TCP ports need to be reachable from the host during the test).
+    interactive: attach stdin/tty and X display (useful with Pause Execution).
     """
     os.makedirs(results_dir_host, exist_ok=True)
     if core.NO_DOCKER:
@@ -190,9 +194,8 @@ def run_renode_test(robot_file_host, image, results_dir_host,
         result = subprocess.run(cmd)
         return result.returncode == 0
     flags = ["-it"] if interactive else []
-    net = ["--net=host"] if interactive else []
     display = _xdisplay_args() if interactive else []
-    cmd = ["docker", "run", "--rm", *flags, *net, *display,
+    cmd = ["docker", "run", "--rm", *flags, *_HOST_NETWORK, *display,
            *_workspace_mount(), *_extra_mounts(), *_user_flags(), *_runtime_flags(runtime),
            image, "renode-test", to_container_path(robot_file_host),
            "-r", to_container_path(results_dir_host)]

{hector_cli-0.4.0 → hector_cli-0.5.0}/hector/pipeline.py

@@ -251,8 +251,7 @@ def snapshot_fastpath(args):
                               no_start=getattr(args, "no_start", False)))
     print(f"[SNAP] {args.snapshot}"
           + (f" (+GDB: {debug_config})" if debug_config else ""))
-    run_renode(snap_resc, docker_image, ports=list(debug_config.values()) or None,
-               extra_args=shlex.split(args.renode_args or ""), output_dir=args.output)
+    run_renode(snap_resc, docker_image, extra_args=shlex.split(args.renode_args or ""), output_dir=args.output)
 
 
 def _run_validate():
@@ -524,7 +523,6 @@ def action_simulate(state, cfg, result):
     if not state.resc_filename:
         raise ValueError("`hector run` needs at least one machine in 'machines:'.")
     run_renode(_resolve_active_resc(state, cfg), cfg.docker_image,
-               ports=list(state.debug_config.values()) or None,
                extra_args=cfg.renode_args, output_dir=cfg.output_dir,
                runtime=state.runtime)
 
@@ -536,7 +534,6 @@ def action_export(state, cfg, result):
     if not state.resc_filename:
         raise ValueError("`hector export` needs at least one machine in 'machines:'.")
     argv = build_renode_argv(_resolve_active_resc(state, cfg), cfg.docker_image,
-                             ports=list(state.debug_config.values()) or None,
                              extra_args=cfg.renode_args, runtime=state.runtime)
     line = shlex.join(argv)
     print(line)

{hector_cli-0.4.0 → hector_cli-0.5.0}/hector_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hector-cli
-Version: 0.4.0
+Version: 0.5.0
 Summary: YAML-driven Renode + Verilator simulation orchestrator for embedded hardware CI
 Home-page: https://hector-ci.com
 Author: Nemesis
@@ -482,6 +482,10 @@ hector run --renode-args '--console'
 hector run --renode-args '--hide-log --config my.conf'
 ```
 
+#### Container networking
+
+Every container hector starts — the Renode emulation (`run`), robot tests, `shell` tests, `build:` steps and module builds — runs with `--net=host`. GDB servers (`--debug`), `tcp:` mappings and anything a step listens on are reachable from the host on the same port, and steps can reach host services on `localhost`. No port publishing is involved.
+
 #### Running without Docker (`--no-docker`)
 
 Call the locally installed `renode` and `renode-test` binaries directly instead of launching a Docker container. `build:` steps and `shell` tests also run on the host (their `image:` is ignored, with a warning), as do module builds.

{hector_cli-0.4.0 → hector_cli-0.5.0}/tests/test_docker_argv.py

@@ -37,10 +37,27 @@ def test_docker_argv_core_tokens():
     assert argv[i + 1:i + 3] == ["renode", "job.resc"]
 
 
-def test_docker_argv_publishes_ports():
-    argv = docker.build_renode_argv("j.resc", "img", ports=[3333, 3334])
-    joined = " ".join(argv)
-    assert "-p 3333:3333" in joined and "-p 3334:3334" in joined
+def test_docker_argv_does_not_publish_ports():
+    # Host networking exposes GDB ports directly; -p would be ignored by Docker.
+    argv = docker.build_renode_argv("j.resc", "img")
+    assert "-p" not in argv
+
+
+def test_every_container_uses_host_network(monkeypatch):
+    calls = []
+
+    class _Proc:
+        returncode, stdout = 0, ""
+
+    monkeypatch.setattr(docker.subprocess, "run",
+                        lambda cmd, **kw: calls.append(cmd) or _Proc())
+    monkeypatch.setattr(docker.os, "makedirs", lambda *a, **kw: None)
+    docker.run_build("true", "img")
+    docker.run_in_container("true", "img")
+    docker.run_renode_test("t.robot", "img", "res")
+    docker.run_renode("j.resc", "img")
+    assert len(calls) == 4
+    assert all("--net=host" in cmd for cmd in calls)
 
 
 def test_docker_argv_appends_extra_args_after_resc():