Skip to content

Agent Mesh

test(sam-node): hardcode 2s discovery interval in E2E container mesh library and update integration/E2E tests to 2s

Antonio Ojeac131b6369d03
diff --git a/cmd/sam-node/main.go b/cmd/sam-node/main.go
index e6027520..9c6f283d 100644
--- a/cmd/sam-node/main.go
+++ b/cmd/sam-node/main.go
@@ -40,7 +40,7 @@ import (
const (
DefaultMeshName = "public-mesh"
- DefaultDiscoveryInterval = "2s"
+ DefaultDiscoveryInterval = "30s"
DefaultHubURL = "http://localhost:8080"
DefaultConfigFile = "sam-node.yaml"
diff --git a/tests/e2e/datapath.bats b/tests/e2e/datapath.bats
index aad389b1..fa31fd37 100644
--- a/tests/e2e/datapath.bats
+++ b/tests/e2e/datapath.bats
@@ -24,7 +24,7 @@ teardown() {
# Start Node 1
echo "[$(date +%T)] Starting Node 1"
- run mesh_start_node 1 "--discovery-interval 100ms --log-level debug"
+ run mesh_start_node 1 "--log-level debug"
[[ "$status" -eq 0 ]]
local node1_name="${MESH_PREFIX}-node-1"
mesh_wait_for_log "${node1_name}" "SAM Node Online" 20
@@ -35,7 +35,7 @@ teardown() {
# Start Node 2
echo "[$(date +%T)] Starting Node 2"
- run mesh_start_node 2 "--discovery-interval 100ms --log-level debug"
+ run mesh_start_node 2 "--log-level debug"
[[ "$status" -eq 0 ]]
local node2_name="${MESH_PREFIX}-node-2"
mesh_wait_for_log "${node2_name}" "SAM Node Online" 20
diff --git a/tests/e2e/docs_snippets.bats b/tests/e2e/docs_snippets.bats
index fdb3d233..218ef367 100644
--- a/tests/e2e/docs_snippets.bats
+++ b/tests/e2e/docs_snippets.bats
@@ -21,7 +21,7 @@ teardown() {
run mesh_start_hub
[[ "$status" -eq 0 ]]
- run mesh_start_node 1 "--discovery-interval 100ms --log-level debug"
+ run mesh_start_node 1 "--log-level debug"
[[ "$status" -eq 0 ]]
local node1_name="${MESH_PREFIX}-node-1"
diff --git a/tests/e2e/find_remote_tools.bats b/tests/e2e/find_remote_tools.bats
index 01387d51..9710e70f 100644
--- a/tests/e2e/find_remote_tools.bats
+++ b/tests/e2e/find_remote_tools.bats
@@ -39,7 +39,7 @@ teardown() {
mesh_start_hub
echo "[$(date +%T)] Starting Node 1"
- run mesh_start_node 1 "--discovery-interval 100ms --log-level debug"
+ run mesh_start_node 1 "--log-level debug"
[[ "$status" -eq 0 ]]
mesh_wait_for_log "${MESH_PREFIX}-node-1" "SAM Node Online" 60
mesh_wait_for_mcp_ready 1 20
@@ -49,7 +49,7 @@ teardown() {
echo "[$(date +%T)] Starting Node 2 with calculator service"
run mesh_start_node 2 \
- "--discovery-interval 100ms --log-level debug" \
+ "--log-level debug" \
"tests/e2e/docker/calc-mcp/sam-node-config.yaml"
[[ "$status" -eq 0 ]]
mesh_wait_for_log "${MESH_PREFIX}-node-2" "SAM Node Online" 20
@@ -93,7 +93,7 @@ teardown() {
mesh_start_hub
echo "[$(date +%T)] Starting Node 1"
- run mesh_start_node 1 "--discovery-interval 100ms --log-level debug"
+ run mesh_start_node 1 "--log-level debug"
[[ "$status" -eq 0 ]]
mesh_wait_for_log "${MESH_PREFIX}-node-1" "SAM Node Online" 60
mesh_wait_for_mcp_ready 1 20
@@ -103,7 +103,7 @@ teardown() {
echo "[$(date +%T)] Starting Node 2 with calculator service"
run mesh_start_node 2 \
- "--discovery-interval 100ms --log-level debug" \
+ "--log-level debug" \
"tests/e2e/docker/calc-mcp/sam-node-config.yaml"
[[ "$status" -eq 0 ]]
mesh_wait_for_log "${MESH_PREFIX}-node-2" "SAM Node Online" 20
@@ -144,7 +144,7 @@ teardown() {
mesh_start_hub
echo "[$(date +%T)] Starting Node 1"
- run mesh_start_node 1 "--discovery-interval 100ms --log-level debug"
+ run mesh_start_node 1 "--log-level debug"
[[ "$status" -eq 0 ]]
mesh_wait_for_log "${MESH_PREFIX}-node-1" "SAM Node Online" 60
mesh_wait_for_mcp_ready 1 20
@@ -154,7 +154,7 @@ teardown() {
echo "[$(date +%T)] Starting Node 2 with calculator service"
run mesh_start_node 2 \
- "--discovery-interval 100ms --log-level debug" \
+ "--log-level debug" \
"tests/e2e/docker/calc-mcp/sam-node-config.yaml"
[[ "$status" -eq 0 ]]
mesh_wait_for_log "${MESH_PREFIX}-node-2" "SAM Node Online" 20
@@ -209,7 +209,7 @@ teardown() {
mesh_start_hub
echo "[$(date +%T)] Starting Node 1"
- run mesh_start_node 1 "--discovery-interval 100ms --log-level debug"
+ run mesh_start_node 1 "--log-level debug"
[[ "$status" -eq 0 ]]
mesh_wait_for_log "${MESH_PREFIX}-node-1" "SAM Node Online" 60
mesh_wait_for_mcp_ready 1 20
@@ -219,7 +219,7 @@ teardown() {
echo "[$(date +%T)] Starting Node 2 with calculator service"
run mesh_start_node 2 \
- "--discovery-interval 100ms --log-level debug" \
+ "--log-level debug" \
"tests/e2e/docker/calc-mcp/sam-node-config.yaml"
[[ "$status" -eq 0 ]]
mesh_wait_for_log "${MESH_PREFIX}-node-2" "SAM Node Online" 20
diff --git a/tests/e2e/lib/container_mesh.bash b/tests/e2e/lib/container_mesh.bash
index ff19da32..79c7dabd 100644
--- a/tests/e2e/lib/container_mesh.bash
+++ b/tests/e2e/lib/container_mesh.bash
@@ -262,6 +262,7 @@ if [[ -z "${MESH_HELPERS_LOADED:-}" ]]; then
"${MESH_RUNTIME_IMAGE}" \
/usr/local/bin/sam-node run \
${flags} \
+ --discovery-interval 2s \
--hub "http://sam-hub:9090" \
--client-id "sam-mesh-audience" \
--client-secret "sam-e2e-secret" \
diff --git a/tests/e2e/python_sdk_test.bats b/tests/e2e/python_sdk_test.bats
index 63637099..36085352 100644
--- a/tests/e2e/python_sdk_test.bats
+++ b/tests/e2e/python_sdk_test.bats
@@ -21,7 +21,7 @@ teardown() {
run mesh_start_hub
[[ "$status" -eq 0 ]]
- run mesh_start_node 1 "--discovery-interval 100ms --log-level debug"
+ run mesh_start_node 1 "--log-level debug"
[[ "$status" -eq 0 ]]
local node1_name="${MESH_PREFIX}-node-1"
diff --git a/tests/e2e/revocation_test.bats b/tests/e2e/revocation_test.bats
index 73a7ef38..b6939f36 100644
--- a/tests/e2e/revocation_test.bats
+++ b/tests/e2e/revocation_test.bats
@@ -42,7 +42,7 @@ teardown() {
# Start Node 1
echo "[$(date +%T)] Starting Node 1"
- run mesh_start_node 1 "--discovery-interval 100ms --log-level debug"
+ run mesh_start_node 1 "--log-level debug"
[[ "$status" -eq 0 ]]
local node1_name="${MESH_PREFIX}-node-1"
mesh_wait_for_log "${node1_name}" "SAM Node Online" 20
@@ -53,7 +53,7 @@ teardown() {
# Start Node 2
echo "[$(date +%T)] Starting Node 2"
- run mesh_start_node 2 "--discovery-interval 100ms --log-level debug"
+ run mesh_start_node 2 "--log-level debug"
[[ "$status" -eq 0 ]]
local node2_name="${MESH_PREFIX}-node-2"
mesh_wait_for_log "${node2_name}" "SAM Node Online" 20
diff --git a/tests/e2e/services.bats b/tests/e2e/services.bats
index 8a29102e..b250b8bd 100644
--- a/tests/e2e/services.bats
+++ b/tests/e2e/services.bats
@@ -38,7 +38,7 @@ teardown() {
mesh_start_hub
echo "[$(date +%T)] Starting Node 1"
- run mesh_start_node 1 "--discovery-interval 100ms --log-level debug"
+ run mesh_start_node 1 "--log-level debug"
[[ "$status" -eq 0 ]]
local node1_name="${MESH_PREFIX}-node-1"
mesh_wait_for_log "${node1_name}" "SAM Node Online" 60
@@ -49,7 +49,7 @@ teardown() {
echo "[$(date +%T)] Starting Node 2 (with calculator service config)"
run mesh_start_node 2 \
- "--discovery-interval 100ms --log-level debug" \
+ "--log-level debug" \
"tests/e2e/docker/calc-mcp/sam-node-config.yaml"
[[ "$status" -eq 0 ]]
local node2_name="${MESH_PREFIX}-node-2"