fix(controller): re-arm window_drop and expose kernel_datapath

Three fixes from live-calibrating the kernel impairment filters on an
isolated instance (Docker-to-Docker veth link, per-sequence evidence):

- update_filters skipped an unchanged filters dict as a no-op, so a
  one-shot window_drop outage that had already passed could never be
  re-armed: re-applying the same values produced no datapath command at
  all. A PUT still carrying window_drop now reconciles, restarting the
  schedule from the apply as documented. Measured: identical re-apply
  moves the outage window from seq 50-70 to 70-91 (arm at +8s of the
  new apply).

- gemodel parameter semantics were documented backwards in the
  validation rules, available_filters, the MCP/copilot descriptions and
  the feature docs. Measured against the kernel (per-direction counters,
  offered = sent + dropped): p is the good-to-bad transition chance, r
  the bad-to-good transition, 1-h the loss chance in the bad state (the
  good state loses nothing) - mean one-way loss p/(p+r)*(1-h), e.g.
  [10,30,100] -> 24.8%/25.7% measured vs 25% predicted, [5,45,100] ->
  10.8% both ways vs 10%.

- kernel_datapath was silently stripped from every REST/MCP link payload
  by the response model (LinkBase carried no such field), so clients
  could not tell a kernel link from a relay one.

Also verified on the same setup: the 3-argument window_drop form works
exactly as specified ([3000,5000,100] -> a single seq 31-55 outage,
[20000,6000,100] -> seq 115-144), and both generations of the command
builder emit the parameters unpadded.

Adds an API test for the field and controller tests for the no-op skip
and the window_drop re-arm exemption.
This commit is contained in:
YueGuobin committed 2026-10-06 00:21:08 +08:00
1 parent 5ac1521217
commit 1db9f171ca
9 files changed
+126 -16

No files matched your search

+27
View File
@@ -139,9 +139,36 @@ class TestLinkRoutes:
assert mock.called
link_id = response.json()["link_id"]
assert response.json()["nodes"][0]["label"]["x"] == 42
# the runtime datapath fact survives the response model on both POST and GET
assert response.json()["kernel_datapath"] is False
response = await client.get(app.url_path_for("get_link", project_id=project.id, link_id=link_id))
assert response.status_code == status.HTTP_200_OK
assert response.json()["nodes"][0]["label"]["x"] == 42
assert response.json()["kernel_datapath"] is False
async def test_get_link_kernel_datapath(
self, app: FastAPI, client: AsyncClient, project: Project, nodes: Tuple[Node, Node]
) -> None:
"""A kernel-wired link reports kernel_datapath true (was dropped by the schema)."""
node1, node2 = nodes
with asyncio_patch("gns3server.controller.udp_link.UDPLink.create"):
response = await client.post(
app.url_path_for("create_link", project_id=project.id),
json={
"nodes": [
{"node_id": node1.id, "adapter_number": 0, "port_number": 3},
{"node_id": node2.id, "adapter_number": 2, "port_number": 4},
]
},
)
link_id = response.json()["link_id"]
link = project.get_link(link_id)
link._link_data = [{"type": "nio_bridge"}]
response = await client.get(app.url_path_for("get_link", project_id=project.id, link_id=link_id))
assert response.status_code == status.HTTP_200_OK
assert response.json()["kernel_datapath"] is True
async def test_update_link_suspend(
self, app: FastAPI, client: AsyncClient, project: Project, nodes: Tuple[Node, Node]
+52
View File
@@ -361,6 +361,58 @@ async def test_update_filters(project, compute):
assert link.update.called
@pytest.mark.asyncio
async def test_update_filters_unchanged_is_noop(project, compute):
"""Re-sending an identical filters dict skips the datapath reconcile."""
node1 = Node(project, compute, "node1", node_type="qemu")
node1._ports = [EthernetPort("E0", 0, 0, 4)]
node2 = Node(project, compute, "node2", node_type="qemu")
node2._ports = [EthernetPort("E0", 0, 0, 4)]
link = Link(project)
link.create = AsyncioMagicMock()
link._project.emit_notification = MagicMock()
project.dump = AsyncioMagicMock()
await link.add_node(node1, 0, 4)
await link.add_node(node2, 0, 4)
link.update = AsyncioMagicMock()
await link.update_filters({"packet_loss": [10]})
assert link.update.call_count == 1
await link.update_filters({"packet_loss": [10]})
assert link.update.call_count == 1
@pytest.mark.asyncio
async def test_update_filters_unchanged_window_drop_still_reconciles(project, compute):
"""
window_drop's outage schedule is measured from the apply, so an
unchanged re-send must re-arm it instead of being skipped as a no-op.
"""
node1 = Node(project, compute, "node1", node_type="qemu")
node1._ports = [EthernetPort("E0", 0, 0, 4)]
node2 = Node(project, compute, "node2", node_type="qemu")
node2._ports = [EthernetPort("E0", 0, 0, 4)]
link = Link(project)
link.create = AsyncioMagicMock()
link._project.emit_notification = MagicMock()
project.dump = AsyncioMagicMock()
await link.add_node(node1, 0, 4)
await link.add_node(node2, 0, 4)
# window_drop is kernel-only: this synthetic link has no real wiring,
# so declare the kernel datapath the way _link_data does at runtime
link._link_data = [{"type": "nio_bridge"}]
link.update = AsyncioMagicMock()
await link.update_filters({"window_drop": [3000, 5000, 100]})
assert link.update.call_count == 1
await link.update_filters({"window_drop": [3000, 5000, 100]})
assert link.update.call_count == 2
@pytest.mark.asyncio
async def test_available_filters(project, compute):
+1 -1
View File
@@ -308,7 +308,7 @@ class TestNetemExtensionFilters:
validate_all_filters({"gemodel": [100, 0, 30], "packet_loss": [10]})
def test_gemodel_invalid_range(self):
with pytest.raises(FilterValidationError, match="bad-state"):
with pytest.raises(FilterValidationError, match="good-to-bad"):
validate_filter_parameters("gemodel", [101, 0, 30])
def test_duplicate_valid(self):