feat: v0.4.0 — welle A (8 new tools: container lifecycle, inspect_image, system_overview)
Closes #1, #4, #6, #7. Container lifecycle (#1, #7): - start_container, stop_container, restart_container, pause_container, unpause_container — all via SYNO.Docker.Container with JSON-encoded name parameter, routed through _resolve_container_name for hash- prefix resolution. stop is live-verified; the other four are implemented by symmetry on the same API surface. inspect_image (#4): - Returns full image detail (layers, env, ports, entrypoint/cmd, labels) via SYNO.Docker.Image/get. Accepts name:tag, registry- prefixed names, and bare hashes. Defensive response parsing handles both wrapped (details.*) and flat envelopes. system_overview (#6): - Aggregates CPU %, RAM, network and block I/O across all running containers plus running/stopped counts. No new DSM endpoint — composed from list + stats, reusing the container_stats CPU formula. Per-source errors are non-fatal. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -394,3 +394,209 @@ async def test_system_prune_preview_network_fetch_failure_is_nonfatal() -> None:
|
||||
# Preview still renders; networks count falls back to 0.
|
||||
assert "preview" in result.lower()
|
||||
assert "Unused networks: 0" in result
|
||||
|
||||
|
||||
# ──────────────────────────────────────────────────────────────────────────────
|
||||
# system_overview
|
||||
# ──────────────────────────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
# Two-container stats snapshot used to verify aggregation arithmetic.
|
||||
SAMPLE_STATS_OVERVIEW = {
|
||||
"aaa111": {
|
||||
"id": "aaa111",
|
||||
"name": "/web",
|
||||
"cpu_stats": {
|
||||
"cpu_usage": {"total_usage": 2_000_000_000, "percpu_usage": [1, 2]},
|
||||
"system_cpu_usage": 1_000_000_000_000,
|
||||
"online_cpus": 2,
|
||||
},
|
||||
"precpu_stats": {
|
||||
"cpu_usage": {"total_usage": 1_000_000_000},
|
||||
"system_cpu_usage": 999_000_000_000,
|
||||
},
|
||||
"memory_stats": {"usage": 100 * 1024 * 1024, "limit": 1024 * 1024 * 1024},
|
||||
"networks": {
|
||||
"eth0": {"rx_bytes": 1_000_000, "tx_bytes": 500_000},
|
||||
},
|
||||
"blkio_stats": {
|
||||
"io_service_bytes_recursive": [
|
||||
{"op": "Read", "value": 10 * 1024 * 1024},
|
||||
{"op": "Write", "value": 5 * 1024 * 1024},
|
||||
]
|
||||
},
|
||||
},
|
||||
"bbb222": {
|
||||
"id": "bbb222",
|
||||
"name": "/db",
|
||||
"cpu_stats": {
|
||||
"cpu_usage": {"total_usage": 3_000_000_000, "percpu_usage": [1, 2]},
|
||||
"system_cpu_usage": 1_000_000_000_000,
|
||||
"online_cpus": 2,
|
||||
},
|
||||
"precpu_stats": {
|
||||
"cpu_usage": {"total_usage": 2_000_000_000},
|
||||
"system_cpu_usage": 999_000_000_000,
|
||||
},
|
||||
"memory_stats": {"usage": 200 * 1024 * 1024, "limit": 2 * 1024 * 1024 * 1024},
|
||||
"networks": {
|
||||
"eth0": {"rx_bytes": 2_000_000, "tx_bytes": 1_000_000},
|
||||
},
|
||||
"blkio_stats": {
|
||||
"io_service_bytes_recursive": [
|
||||
{"op": "Read", "value": 20 * 1024 * 1024},
|
||||
{"op": "Write", "value": 7 * 1024 * 1024},
|
||||
]
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_system_overview_aggregates_stats():
|
||||
"""Sums CPU%, memory, net I/O, and block I/O across all containers in stats."""
|
||||
from mcp_synology_container.modules.system import register_system
|
||||
|
||||
client = AsyncMock()
|
||||
|
||||
async def mock_request(api, method, **kwargs):
|
||||
if api == "SYNO.Docker.Container" and method == "list":
|
||||
return SAMPLE_CONTAINERS
|
||||
if api == "SYNO.Docker.Container" and method == "stats":
|
||||
return SAMPLE_STATS_OVERVIEW
|
||||
return {}
|
||||
|
||||
client.request.side_effect = mock_request
|
||||
mcp, tools = make_mock_mcp()
|
||||
register_system(mcp, make_config(), client)
|
||||
|
||||
result = await tools["system_overview"]()
|
||||
|
||||
# Headline section exists
|
||||
assert "Docker System Overview" in result
|
||||
assert "Aggregated" in result
|
||||
|
||||
# CPU per container: (1e9 / 1e9) * 2 * 100 = 200% each → sum ≈ 400%
|
||||
assert "400.00%" in result
|
||||
|
||||
# Memory total usage = 100 MiB + 200 MiB = 300 MiB; limit = 1 GiB + 2 GiB = 3 GiB
|
||||
assert "300 MiB" in result
|
||||
assert "3.0 GiB" in result
|
||||
|
||||
# Net I/O present (rx/tx sums non-zero)
|
||||
assert "Net I/O" in result
|
||||
assert "rx " in result
|
||||
assert "tx " in result
|
||||
|
||||
# Block I/O: read = 30 MiB, write = 12 MiB
|
||||
assert "30 MiB" in result
|
||||
assert "12 MiB" in result
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_system_overview_running_vs_stopped_count():
|
||||
"""Counts running and stopped containers from the list response."""
|
||||
from mcp_synology_container.modules.system import register_system
|
||||
|
||||
client = AsyncMock()
|
||||
|
||||
async def mock_request(api, method, **kwargs):
|
||||
if api == "SYNO.Docker.Container" and method == "list":
|
||||
return SAMPLE_CONTAINERS
|
||||
if api == "SYNO.Docker.Container" and method == "stats":
|
||||
return SAMPLE_STATS_OVERVIEW
|
||||
return {}
|
||||
|
||||
client.request.side_effect = mock_request
|
||||
mcp, tools = make_mock_mcp()
|
||||
register_system(mcp, make_config(), client)
|
||||
|
||||
result = await tools["system_overview"]()
|
||||
|
||||
# SAMPLE_CONTAINERS has 2 running ("web", "db") and 1 stopped ("old")
|
||||
assert "running" in result
|
||||
assert "stopped" in result
|
||||
assert " 2 running" in result
|
||||
assert " 1 stopped" in result
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_system_overview_no_containers():
|
||||
"""Empty container list and empty stats — shows zero counts, no aggregation block."""
|
||||
from mcp_synology_container.modules.system import register_system
|
||||
|
||||
client = AsyncMock()
|
||||
|
||||
async def mock_request(api, method, **kwargs):
|
||||
if api == "SYNO.Docker.Container" and method == "list":
|
||||
return {"containers": []}
|
||||
if api == "SYNO.Docker.Container" and method == "stats":
|
||||
return {}
|
||||
return {}
|
||||
|
||||
client.request.side_effect = mock_request
|
||||
mcp, tools = make_mock_mcp()
|
||||
register_system(mcp, make_config(), client)
|
||||
|
||||
result = await tools["system_overview"]()
|
||||
assert " 0 running" in result
|
||||
assert " 0 stopped" in result
|
||||
# No aggregation block when there are no stats entries
|
||||
assert "Aggregated" not in result
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_system_overview_container_list_error_graceful():
|
||||
"""list fails, stats works → still shows aggregated stats and a warning."""
|
||||
from mcp_synology_container.dsm_client import SynologyError
|
||||
from mcp_synology_container.modules.system import register_system
|
||||
|
||||
client = AsyncMock()
|
||||
|
||||
async def mock_request(api, method, **kwargs):
|
||||
if api == "SYNO.Docker.Container" and method == "list":
|
||||
raise SynologyError("list failed", code=102)
|
||||
if api == "SYNO.Docker.Container" and method == "stats":
|
||||
return SAMPLE_STATS_OVERVIEW
|
||||
return {}
|
||||
|
||||
client.request.side_effect = mock_request
|
||||
mcp, tools = make_mock_mcp()
|
||||
register_system(mcp, make_config(), client)
|
||||
|
||||
result = await tools["system_overview"]()
|
||||
# Counts default to 0 (list failed), but aggregation still runs
|
||||
assert "Warnings" in result
|
||||
assert "list" in result
|
||||
assert "Aggregated" in result
|
||||
assert "400.00%" in result # stats still aggregated
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_system_overview_stats_error_graceful():
|
||||
"""stats fails, list works → still shows counts and a warning."""
|
||||
from mcp_synology_container.dsm_client import SynologyError
|
||||
from mcp_synology_container.modules.system import register_system
|
||||
|
||||
client = AsyncMock()
|
||||
|
||||
async def mock_request(api, method, **kwargs):
|
||||
if api == "SYNO.Docker.Container" and method == "list":
|
||||
return SAMPLE_CONTAINERS
|
||||
if api == "SYNO.Docker.Container" and method == "stats":
|
||||
raise SynologyError("stats failed", code=102)
|
||||
return {}
|
||||
|
||||
client.request.side_effect = mock_request
|
||||
mcp, tools = make_mock_mcp()
|
||||
register_system(mcp, make_config(), client)
|
||||
|
||||
result = await tools["system_overview"]()
|
||||
# Counts still displayed
|
||||
assert " 2 running" in result
|
||||
assert " 1 stopped" in result
|
||||
# Warning surfaced for the stats failure
|
||||
assert "Warnings" in result
|
||||
assert "stats" in result
|
||||
# No aggregation block — stats unavailable
|
||||
assert "Aggregated" not in result
|
||||
|
||||
Reference in New Issue
Block a user