rosotacom-dev 2.5.dev82__tar.gz → 2.5.dev84__tar.gz

{rosotacom_dev-2.5.dev82 → rosotacom_dev-2.5.dev84}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rosotacom-dev
-Version: 2.5.dev82
+Version: 2.5.dev84
 Summary: Host CLI for ROS OTA communication sessions.
 Author: develNor
 License-Expression: BSD-3-Clause

{rosotacom_dev-2.5.dev82 → rosotacom_dev-2.5.dev84}/src/rosotacom/cli.py

@@ -2437,9 +2437,19 @@ def _ota_stop_parts(
 #: How a benchmark's load maps onto `publish-test-topics` flags. The keys are
 #: `_sized_publisher_param_args`'s own, so a load dict travels from the
 #: benchmark to the peer's publisher without being rewritten on the way.
+#:
+#: `size_pattern` and not `pattern`, and that distinction is the whole reason a
+#: mixed-size load never reached a peer. `parse_size_pattern_load` turns one CLI
+#: string into five keys -- `sizes`, `pattern`, `size_pattern`, and one
+#: `size_<label>` per distinct size -- and only three of them used to cross the
+#: hop. A two-size pattern therefore arrived as `pattern=a*6,b*1` with `size_a`
+#: and no `size_b`, and the publisher died on `Pattern references size 'b' but
+#: it was not provided` inside a detached `docker exec`, which the orchestrator
+#: reported as the topic not advertising. Sending the *source* string instead
+#: cannot lose a size, whatever the pattern turns out to contain.
 _OTA_LOAD_FLAGS: tuple[tuple[str, str], ...] = (
     ("size", "--load-size"),
-    ("pattern", "--load-size-pattern"),
+    ("size_pattern", "--load-size-pattern"),
     ("rate", "--load-rate-hz"),
     ("streams", "--load-streams"),
     ("interval_jitter_ms", "--load-interval-jitter-ms"),
@@ -2469,6 +2479,16 @@ def _ota_publish_parts(
         merged = dict(load or {})
         if "size" not in merged and merged.get("size_a") is not None:
             merged["size"] = merged["size_a"]
+        if merged.get("pattern") and not merged.get("size_pattern"):
+            # Only `parse_size_pattern_load` produces `pattern`, and it always
+            # produces `size_pattern` beside it. A load carrying one without the
+            # other was assembled by hand, and sending the expanded form would
+            # drop every size but the first -- loudly here rather than as a peer
+            # whose publisher will not start.
+            raise RuntimeError(
+                f"load carries pattern {merged['pattern']!r} without the size pattern it came from; "
+                "build it with parse_size_pattern_load so every size reaches the peer."
+            )
         for key, flag in _OTA_LOAD_FLAGS:
             if merged.get(key) is not None:
                 parts.extend([flag, str(merged[key])])
@@ -7158,9 +7178,27 @@ def _smoke_local_domain_id(cfg: dict[str, Any], receiver_peer_key: str) -> str |
     return str(session_gen._parse_optional_domain_id(domain_id, f"peer_settings.{receiver_peer_key}.domain_id"))
 
 
+#: The OTA Cyclone template that carries the local domain as well (#323). A
+#: session on it renders no local profile at all: its local-domain processes
+#: read the OTA file, so that is the file a smoke or probe publisher has to read.
+SCOPED_CYCLONE_OTA_TEMPLATE = "cyclonedds_scoped.xml"
+
+
 def _smoke_local_config_commands(config_container_dir: str, cfg: dict[str, Any], receiver_peer_key: str) -> list[str]:
-    local = _smoke_rmw_spec(cfg).local
+    """The DDS environment a publisher on the local domain needs to be heard.
+
+    It has to be the configuration the session's own local-domain processes use.
+    On CycloneDDS 11 two participants with different configurations on one host
+    and one domain discover and match each other and deliver nothing, so a
+    publisher on the inline default beside a session on the scoped file is heard
+    by its own `ros2 topic list` and by nothing in the session (#346).
+    """
+    spec = _smoke_rmw_spec(cfg)
+    local = spec.local
     if not local.dds_config:
+        if spec.ota.impl == "cyclone" and spec.ota.dds_config == SCOPED_CYCLONE_OTA_TEMPLATE:
+            scoped_file = f"{config_container_dir}/{receiver_peer_key}/ota_dds.xml"
+            return [f"export CYCLONEDDS_URI={shlex.quote(f'file://{scoped_file}')}"]
         return []
     config_file = f"{config_container_dir}/{receiver_peer_key}/local_dds.xml"
     if local.impl == "cyclone":
@@ -7580,6 +7618,33 @@ def _smoke_publish_specs(cfg: dict[str, Any], source_peer_key: str | None = None
     return specs
 
 
+#: Where a detached smoke publisher's own output goes inside its container.
+#: `docker exec -d` returns before the process says anything and keeps nothing,
+#: so without this the only evidence of a publisher that refused to start is the
+#: topic never appearing -- which reads as a broken graph rather than as a bad
+#: parameter. One file per topic, overwritten per attempt.
+_SMOKE_PUBLISHER_LOG_DIR = "/tmp"
+
+
+def _smoke_publisher_log_path(topic: str) -> str:
+    slug = re.sub(r"[^A-Za-z0-9]+", "_", topic).strip("_") or "topic"
+    return f"{_SMOKE_PUBLISHER_LOG_DIR}/rosotacom-smoke-publisher-{slug}.log"
+
+
+def _smoke_publisher_failure_detail(container: str, log_path: str) -> str:
+    """What the publisher said before it stopped, if it said anything."""
+    result = subprocess.run(
+        ["docker", "exec", container, "tail", "-n", "20", log_path],
+        capture_output=True,
+        text=True,
+        check=False,
+    )
+    detail = ((result.stdout or "") + (result.stderr or "")).strip()
+    if not detail:
+        return f" Nothing was written to {log_path} in the container, so it never got as far as starting."
+    return f"\nWhat it wrote to {log_path}:\n{detail}"
+
+
 def _start_smoke_topic_publishers(
     containers: dict[str, str],
     ros_setups: dict[str, str],
@@ -7606,8 +7671,9 @@ def _start_smoke_topic_publishers(
             f"Starting smoke publisher {spec.source_peer_key}->{spec.receiver_peer_key} "
             f"{spec.publish_topic} ({spec.publish_type}) in {container}{offered}"
         )
+        log_path = _smoke_publisher_log_path(spec.publish_topic)
         subprocess.run(
-            ["docker", "exec", "-d", container, "bash", "-c", cmd],
+            ["docker", "exec", "-d", container, "bash", "-c", f"{{ {cmd} ; }} > {shlex.quote(log_path)} 2>&1"],
             capture_output=True,
             text=True,
             check=False,
@@ -7626,6 +7692,7 @@ def _start_smoke_topic_publishers(
             raise RuntimeError(
                 f"Smoke publisher {spec.source_peer_key}->{spec.receiver_peer_key} "
                 f"{spec.publish_topic} ({spec.publish_type}) did not advertise in {container}."
+                + _smoke_publisher_failure_detail(container, log_path)
             )
     return started
 
@@ -7981,7 +8048,21 @@ def _publish_load_override(args: argparse.Namespace) -> dict[str, Any] | None:
         load["size"] = int(args.load_size)
         load["size_a"] = int(args.load_size)
     if getattr(args, "load_size_pattern", None):
-        load["pattern"] = args.load_size_pattern
+        # Re-derived here rather than carried in pieces: the orchestrator sends
+        # the pattern it was given, and this side expands it into `sizes`,
+        # `pattern` and every `size_<label>` the publisher needs. `size_a` from
+        # `--load-size` above is overwritten on purpose -- a pattern names its
+        # own sizes, and the scalar is only a fallback for callers without one.
+        from .benchmark import parse_size_pattern_load
+
+        try:
+            load.update(parse_size_pattern_load(str(args.load_size_pattern)))
+        except ValueError as error:
+            raise RuntimeError(
+                f"--load-size-pattern {args.load_size_pattern!r} is not a size pattern ({error}). "
+                "An orchestrator older than this peer sends the expanded token form here instead of the "
+                "pattern; the two sides have to agree, so bring them to the same rosotacom."
+            ) from error
     if getattr(args, "load_rate_hz", None) is not None:
         load["rate"] = float(args.load_rate_hz)
     if getattr(args, "load_streams", None) is not None:

{rosotacom_dev-2.5.dev82 → rosotacom_dev-2.5.dev84}/src/rosotacom_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rosotacom-dev
-Version: 2.5.dev82
+Version: 2.5.dev84
 Summary: Host CLI for ROS OTA communication sessions.
 Author: develNor
 License-Expression: BSD-3-Clause

rosotacom_dev-2.5.dev84/src/rosotacom_dev.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "2.4",
+  "distance": 84,
+  "node": "g51305dd70566b7be71cd5f797bbf448fc8882554",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-09-14"
+}

{rosotacom_dev-2.5.dev82 → rosotacom_dev-2.5.dev84}/tests/unit/test_cli.py

@@ -2645,6 +2645,35 @@ def test_smoke_ros_setup_keeps_explicit_cyclonedds_config() -> None:
     assert "MaxAutoParticipantIndex" not in setup
 
 
+def test_smoke_ros_setup_follows_a_scoped_cyclone_arrangement_onto_its_ota_file() -> None:
+    cfg = {
+        "peers": {"a": {}, "b": {}},
+        "peer_settings": {"a": {"domain_id": 50}, "b": {"domain_id": 51}},
+        "shared": {"ota_domain_id": 52, "rmw": {"ota": {"cyclone": {"config": "cyclonedds_scoped.xml"}}}},
+    }
+
+    setup = rosotacom._smoke_ros_setup("/config", cfg, "a")
+
+    # The session's local-domain processes read the scoped OTA file; a publisher
+    # on the inline default beside them is heard by nothing on CycloneDDS 11.
+    assert "export CYCLONEDDS_URI=file:///config/a/ota_dds.xml" in setup
+    assert "MaxAutoParticipantIndex" not in setup
+    assert "export ROS_DOMAIN_ID=50" in setup
+
+
+def test_smoke_ros_setup_keeps_the_inline_default_beside_an_unscoped_ota_profile() -> None:
+    cfg = {
+        "peers": {"a": {}, "b": {}},
+        "peer_settings": {"a": {"domain_id": 50}, "b": {"domain_id": 51}},
+        "shared": {"ota_domain_id": 52, "rmw": "cyclone"},
+    }
+
+    setup = rosotacom._smoke_ros_setup("/config", cfg, "a")
+
+    assert "ota_dds.xml" not in setup
+    assert "MaxAutoParticipantIndex>99<" in setup
+
+
 def test_smoke_publish_specs_use_source_target_prefix_and_qos() -> None:
     cfg = {
         "peers": {"a": {}, "b": {}},

{rosotacom_dev-2.5.dev82 → rosotacom_dev-2.5.dev84}/tests/unit/test_ota_benchmark_peer_exec.py

@@ -11,12 +11,16 @@ from __future__ import annotations
 
 import argparse
 
+import pytest
+
+from rosotacom.benchmark import parse_size_pattern_load
 from rosotacom.cli import (
     _ota_instances_rel,
     _ota_publish_parts,
     _profile_directions_for,
     _publish_load_override,
 )
+from rosotacom.cli_benchmark import _sized_publisher_param_args
 
 
 class _Target:
@@ -72,11 +76,67 @@ def test_the_benchmark_load_reaches_the_peer_command():
     assert "--load-streams" in parts and parts[parts.index("--load-streams") + 1] == "2"
 
 
-def test_a_size_pattern_travels_as_itself():
-    parts = _ota_publish_parts(_Target(), "a", [], load={"pattern": "a*4,b*1", "size_a": 5000})
-    assert parts[parts.index("--load-size-pattern") + 1] == "a*4,b*1"
+def test_a_size_pattern_travels_as_the_string_it_was_given():
+    """The source pattern, not the expanded token form it was compiled into.
+
+    `parse_size_pattern_load` turns one string into `sizes`, `pattern`,
+    `size_pattern` and a `size_<label>` per distinct size, and only three of
+    those used to cross the hop. A two-size pattern arrived as `a*6,b*1` with a
+    `size_a` and no `size_b`, so the peer's publisher died on `Pattern
+    references size 'b' but it was not provided` -- inside a detached
+    `docker exec`, which the orchestrator could only report as the topic never
+    advertising. Sending the source string cannot lose a size.
+    """
+    load = parse_size_pattern_load("6x200B+1x28000B")
+    parts = _ota_publish_parts(_Target(), "a", [], load=load)
+
+    assert parts[parts.index("--load-size-pattern") + 1] == "6x200B+1x28000B"
+    assert "a*6,b*1" not in parts
     # `size_a` is the pattern's own base size and must reach the peer as --load-size.
-    assert parts[parts.index("--load-size") + 1] == "5000"
+    assert parts[parts.index("--load-size") + 1] == "200"
+
+
+def test_a_hand_built_pattern_load_is_refused_rather_than_silently_truncated():
+    with pytest.raises(RuntimeError, match="without the size pattern it came from"):
+        _ota_publish_parts(_Target(), "a", [], load={"pattern": "a*4,b*1", "size_a": 5000})
+
+
+def test_every_size_of_a_pattern_survives_the_round_trip_to_the_publisher():
+    """Orchestrator load -> peer flags -> peer load -> publisher parameters.
+
+    The end the defect lived at: each step looked right on its own, and only
+    the whole chain shows that the second size never arrives.
+    """
+    parts = _ota_publish_parts(_Target(), "a", [], load=parse_size_pattern_load("6x200B+1x28000B"))
+    args = argparse.Namespace(
+        load_size=int(parts[parts.index("--load-size") + 1]),
+        load_size_pattern=parts[parts.index("--load-size-pattern") + 1],
+        load_rate_hz=None,
+        load_streams=None,
+        load_interval_jitter_ms=None,
+        load_interval_jitter_seed=None,
+    )
+    peer_load = _publish_load_override(args)
+    assert peer_load is not None
+
+    params = _sized_publisher_param_args("/bench_capacity", dict(peer_load))
+
+    assert "size_a:=200" in params
+    assert "size_b:=28000" in params
+    assert "pattern:=a*6,b*1" in params
+
+
+def test_a_peer_newer_than_its_orchestrator_says_so_instead_of_failing_obscurely():
+    args = argparse.Namespace(
+        load_size=5000,
+        load_size_pattern="a*4,b*1",
+        load_rate_hz=None,
+        load_streams=None,
+        load_interval_jitter_ms=None,
+        load_interval_jitter_seed=None,
+    )
+    with pytest.raises(RuntimeError, match="same rosotacom"):
+        _publish_load_override(args)
 
 
 def test_no_load_leaves_the_session_to_say_what_it_expects():

rosotacom_dev-2.5.dev82/src/rosotacom_dev.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "2.4",
-  "distance": 82,
-  "node": "g0bd86d806f93ae00ec7f7009dd35fe5a018852e8",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-09-01"
-}