Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
migrate e2e to socket
Antonio Ojea02865f377dba
diff --git a/tests/e2e/policy.bats b/tests/e2e/policy.batsindex 297b8a47..057a038f 100644--- a/tests/e2e/policy.bats+++ b/tests/e2e/policy.bats@@ -131,7 +131,7 @@ mesh_call_remote_tool() {local args="{\"peer_id\":\"${target_peer_id}\",\"tool_name\":\"${tool_name}\",\"arguments\":\"{}\"}"- docker run --rm -v "${MESH_SOCKET_DIR}:/sockets" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -socket "/sockets/node-${caller_idx}.sock" -tool "call_remote_tool" -args "${args}"+ docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-${caller_idx}:8080/" -tool "call_remote_tool" -args "${args}"}setup() {@@ -206,7 +206,6 @@ EOF"--name "${MESH_PREFIX}-node-1" \--network "${MESH_NETWORK}" \--network-alias "sam-node-1" \- -v "${MESH_SOCKET_DIR}:/sockets" \-v "${POLICY_VOL}:/etc/sam" \"sam-node:local" \run \@@ -216,7 +215,7 @@ EOF"--token-url "http://mock-oidc:18080/token" \--listen "/ip4/0.0.0.0/udp/5001/quic-v1" \--listen "/ip4/0.0.0.0/tcp/5002" \- --mcp-socket "/sockets/node-1.sock" \+ --mcp-addr "0.0.0.0:8080" \--mesh "e2e-mesh" \--local-policy "/etc/sam/local_policy.yaml" >/dev/null@@ -239,7 +238,7 @@ EOF"for ((i=0; i<30; i++)); dolocal output- output="$(docker run --rm -v "${MESH_SOCKET_DIR}:/sockets" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -socket "/sockets/node-2.sock" 2>/dev/null)"+ output="$(docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-2:8080/" 2>/dev/null)"TARGET_PEER_ID=$(echo "${output}" | grep -oE '12D3Koo[a-zA-Z0-9]+' | grep -v "${hub_id}" | grep -v "${node2_id}" | head -n 1)if [[ -n "${TARGET_PEER_ID}" ]]; thenbreak@@ -254,7 +253,7 @@ EOF"# Explicitly connect Node 2 to Node 1 to avoid "no addresses" errorlocal node1_addr="/dns4/sam-node-1/tcp/5002/p2p/${TARGET_PEER_ID}"- docker run --rm -v "${MESH_SOCKET_DIR}:/sockets" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -socket "/sockets/node-2.sock" -tool "connect_peer" -args "{\"peer_addr\":\"${node1_addr}\"}" >/dev/null+ docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-2:8080/" -tool "connect_peer" -args "{\"peer_addr\":\"${node1_addr}\"}" >/dev/null}teardown() {diff --git a/tests/e2e/python_sdk_test.bats b/tests/e2e/python_sdk_test.batsindex 182e5b79..33ed26ee 100644--- a/tests/e2e/python_sdk_test.bats+++ b/tests/e2e/python_sdk_test.bats@@ -38,31 +38,33 @@ teardown() {-v "$(pwd)/sam-mcp-python:/sam-mcp-python" \-e PYTHONPATH=/sam-mcp-python/src \python:3.12 \- python3 -c "+ bash -c 'pip install mcp >/dev/null && python3 -c "import asynciofrom sam_mcp.client import SamClientimport osimport sysasync def main():- os.environ['SAM_MCP_URL'] = 'http://sam-node-1:8080/'+ os.environ[\"SAM_MCP_URL\"] = \"http://sam-node-1:8080/\"try:async with SamClient() as client:# Test get_toolstools = await client.get_tools()- print(f'TOOLS_COUNT:{len(tools)}')+ print(f\"TOOLS_COUNT:{len(tools)}\")# Test call_tool (get_mesh_info is a standard tool in sam-node)- result = await client.call_tool('get_mesh_info', {})- print(f'CALL_RESULT:{result}')+ result = await client.call_tool(\"get_mesh_info\", {})+ print(f\"CALL_RESULT:{result}\")sys.exit(0)- except Exception as e:- print(f'ERROR:{e}')+ except BaseException as e:+ import traceback+ print(f\"ERROR:{e}\")+ traceback.print_exc()sys.exit(1)asyncio.run(main())-"+"'echo "Python SDK output: $output"[[ "$status" -eq 0 ]][[ "$output" == *"TOOLS_COUNT:"* ]]diff --git a/tests/e2e/revocation_test.bats b/tests/e2e/revocation_test.batsindex 89dda035..dc32ebb8 100644--- a/tests/e2e/revocation_test.bats+++ b/tests/e2e/revocation_test.bats@@ -75,7 +75,7 @@ teardown() {# Explicitly connect Node 1 to Node 2echo "[$(date +%T)] Explicitly connecting Node 1 to Node 2"local node2_addr="/dns4/sam-node-2/tcp/5002/p2p/${node2_peer_id}"- run docker run --rm -v "${MESH_SOCKET_DIR}:/sockets" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -socket "/sockets/node-1.sock" -tool "connect_peer" -args "{\"peer_addr\":\"${node2_addr}\"}"+ run docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-1:8080/" -tool "connect_peer" -args "{\"peer_addr\":\"${node2_addr}\"}"[[ "$status" -eq 0 ]]# Verify Node 1 connects to Node 2@@ -117,7 +117,7 @@ teardown() {# Verify Node 1 cannot reconnect to Node 2echo "[$(date +%T)] Attempting to reconnect (should fail)"local node2_addr="/dns4/sam-node-2/tcp/5002/p2p/${node2_peer_id}"- run docker run --rm -v "${MESH_SOCKET_DIR}:/sockets" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -socket "/sockets/node-1.sock" -tool "connect_peer" -args "{\"peer_addr\":\"${node2_addr}\"}"+ run docker run --rm --network "${MESH_NETWORK}" -v "$(pwd)/bin/mcp-client:/mcp-client" python:3.12 /mcp-client -url "http://sam-node-1:8080/" -tool "connect_peer" -args "{\"peer_addr\":\"${node2_addr}\"}"echo "Reconnect output: $output"[[ "$output" == *"gater disallows connection"* ]]}