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:
@@ -704,3 +704,157 @@ async def test_container_stats_no_precpu_graceful():
|
||||
|
||||
result = await tools["container_stats"]("myapp")
|
||||
assert "0.00%" in result # graceful fallback to 0
|
||||
|
||||
|
||||
# ──────────────────────────────────────────────────────────────────────────────
|
||||
# Lifecycle: start / stop / restart / pause / unpause
|
||||
# ──────────────────────────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
# Tools that don't have a confirmation gate
|
||||
_NO_CONFIRM_LIFECYCLE = [
|
||||
("start_container", "start", "Started"),
|
||||
("unpause_container", "unpause", "Unpaused"),
|
||||
]
|
||||
|
||||
# Tools that require confirmed=True
|
||||
_CONFIRM_LIFECYCLE = [
|
||||
("stop_container", "stop", "Stopped", "stop"),
|
||||
("restart_container", "restart", "Restarted", "restart"),
|
||||
("pause_container", "pause", "Paused", "pause"),
|
||||
]
|
||||
|
||||
|
||||
@pytest.mark.parametrize("tool_name, dsm_method, success_word", _NO_CONFIRM_LIFECYCLE)
|
||||
@pytest.mark.asyncio
|
||||
async def test_lifecycle_no_confirm_calls_dsm(tool_name, dsm_method, success_word):
|
||||
"""start_container and unpause_container call DSM directly with json-encoded name."""
|
||||
from mcp_synology_container.modules.containers import register_containers
|
||||
|
||||
client = AsyncMock()
|
||||
client.request.return_value = {}
|
||||
|
||||
mcp, tools = make_mock_mcp()
|
||||
register_containers(mcp, make_config(), client)
|
||||
|
||||
result = await tools[tool_name]("myapp_web")
|
||||
|
||||
# Find the matching lifecycle call (a list() may also occur via _resolve_container_name)
|
||||
calls = [c for c in client.request.call_args_list if c.args[1] == dsm_method]
|
||||
assert len(calls) == 1
|
||||
call = calls[0]
|
||||
assert call.args[0] == "SYNO.Docker.Container"
|
||||
assert call.kwargs["version"] == 1
|
||||
assert call.kwargs["params"] == {"name": '"myapp_web"'}
|
||||
assert success_word in result
|
||||
assert "myapp_web" in result
|
||||
|
||||
|
||||
@pytest.mark.parametrize("tool_name, dsm_method, success_word, _action", _CONFIRM_LIFECYCLE)
|
||||
@pytest.mark.asyncio
|
||||
async def test_lifecycle_confirmed_calls_dsm(tool_name, dsm_method, success_word, _action):
|
||||
"""stop/restart/pause call DSM with confirmed=True using json-encoded name."""
|
||||
from mcp_synology_container.modules.containers import register_containers
|
||||
|
||||
client = AsyncMock()
|
||||
client.request.return_value = {}
|
||||
|
||||
mcp, tools = make_mock_mcp()
|
||||
register_containers(mcp, make_config(), client)
|
||||
|
||||
result = await tools[tool_name]("myapp_web", confirmed=True)
|
||||
|
||||
calls = [c for c in client.request.call_args_list if c.args[1] == dsm_method]
|
||||
assert len(calls) == 1
|
||||
call = calls[0]
|
||||
assert call.args[0] == "SYNO.Docker.Container"
|
||||
assert call.kwargs["version"] == 1
|
||||
assert call.kwargs["params"] == {"name": '"myapp_web"'}
|
||||
assert success_word in result
|
||||
assert "myapp_web" in result
|
||||
|
||||
|
||||
@pytest.mark.parametrize("tool_name, _dsm_method, _success_word, action", _CONFIRM_LIFECYCLE)
|
||||
@pytest.mark.asyncio
|
||||
async def test_lifecycle_preview_without_confirmation(
|
||||
tool_name, _dsm_method, _success_word, action
|
||||
):
|
||||
"""stop/restart/pause without confirmed=True must NOT call DSM."""
|
||||
from mcp_synology_container.modules.containers import register_containers
|
||||
|
||||
client = AsyncMock()
|
||||
|
||||
mcp, tools = make_mock_mcp()
|
||||
register_containers(mcp, make_config(), client)
|
||||
|
||||
result = await tools[tool_name]("myapp_web")
|
||||
assert "Preview" in result
|
||||
assert action in result
|
||||
assert "myapp_web" in result
|
||||
assert "confirmed=True" in result
|
||||
client.request.assert_not_called()
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"tool_name, dsm_method, kwargs",
|
||||
[
|
||||
("start_container", "start", {}),
|
||||
("unpause_container", "unpause", {}),
|
||||
("stop_container", "stop", {"confirmed": True}),
|
||||
("restart_container", "restart", {"confirmed": True}),
|
||||
("pause_container", "pause", {"confirmed": True}),
|
||||
],
|
||||
)
|
||||
@pytest.mark.asyncio
|
||||
async def test_lifecycle_resolves_hash_prefix(tool_name, dsm_method, kwargs):
|
||||
"""All lifecycle tools resolve 'jenkins' to 'f93cb8b504f7_jenkins' for the DSM call."""
|
||||
from mcp_synology_container.modules.containers import register_containers
|
||||
|
||||
async def mock_request(api, method, **kw):
|
||||
if api == "SYNO.Docker.Container" and method == "list":
|
||||
return HASH_PREFIXED_CONTAINERS_DATA
|
||||
if api == "SYNO.Docker.Container" and method == dsm_method:
|
||||
assert kw["params"]["name"] == '"f93cb8b504f7_jenkins"'
|
||||
assert kw["version"] == 1
|
||||
return {}
|
||||
return {}
|
||||
|
||||
client = AsyncMock()
|
||||
client.request.side_effect = mock_request
|
||||
|
||||
mcp, tools = make_mock_mcp()
|
||||
register_containers(mcp, make_config(), client)
|
||||
|
||||
# User passes the clean name; resolved to the hash-prefixed name for DSM,
|
||||
# but the display name in the success message must be hash-stripped.
|
||||
result = await tools[tool_name]("jenkins", **kwargs)
|
||||
assert "jenkins" in result
|
||||
assert "f93cb8b504f7" not in result
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"tool_name, kwargs, error_verb",
|
||||
[
|
||||
("start_container", {}, "starting"),
|
||||
("unpause_container", {}, "unpausing"),
|
||||
("stop_container", {"confirmed": True}, "stopping"),
|
||||
("restart_container", {"confirmed": True}, "restarting"),
|
||||
("pause_container", {"confirmed": True}, "pausing"),
|
||||
],
|
||||
)
|
||||
@pytest.mark.asyncio
|
||||
async def test_lifecycle_api_error(tool_name, kwargs, error_verb):
|
||||
"""API errors during lifecycle ops return a human-readable error message."""
|
||||
from mcp_synology_container.dsm_client import SynologyError
|
||||
from mcp_synology_container.modules.containers import register_containers
|
||||
|
||||
client = AsyncMock()
|
||||
client.request.side_effect = SynologyError("API error", code=102)
|
||||
|
||||
mcp, tools = make_mock_mcp()
|
||||
register_containers(mcp, make_config(), client)
|
||||
|
||||
result = await tools[tool_name]("myapp_web", **kwargs)
|
||||
assert "Error" in result
|
||||
assert error_verb in result
|
||||
assert "myapp_web" in result
|
||||
|
||||
Reference in New Issue
Block a user