From b3f53dc4550f97f93836402478c634c5c64640d8 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Wed, 14 May 2025 11:16:11 +0200 Subject: [PATCH 01/12] testing/btest/Files: Add generic broker/cluster-layout.zeek This is a cluster-layout.zeek template that can be copied into a testing directory if needed. The idea is that a developer sets environment variables within their btest and the Cluster::nodes variable is implicitly extended by appropriate nodes. For example, using @TEST-PORT BROKER_LOGGER1_PORT will add an appropriate logger-1 node to Cluster::nodes, based on the existence of the BROKER_LOGGER1_PORT environment variable. --- .../btest/Files/broker/cluster-layout.zeek | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 testing/btest/Files/broker/cluster-layout.zeek diff --git a/testing/btest/Files/broker/cluster-layout.zeek b/testing/btest/Files/broker/cluster-layout.zeek new file mode 100644 index 0000000000..f495e8da29 --- /dev/null +++ b/testing/btest/Files/broker/cluster-layout.zeek @@ -0,0 +1,85 @@ +# +# Use this file in a test by copying it into the tests directory: +# +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# Then specify @TEST-PORT using the following: +# +# BROKER_MANAGER_PORT +# BROKER_LOGGER1_PORT +# BROKER_LOGGER2_PORT +# BROKER_PROXY1_PORT +# BROKER_PROXY2_PORT +# BROKER_WORKER1_PORT +# BROKER_WORKER2_PORT +# BROKER_WORKER3_PORT +# BROKER_WORKER4_PORT +# +# The existence of the environment variable will add a corresponding node +# to Cluster::nodes. + + +# Redef'ed to F if logger-1 or logger-2 are active. +redef Cluster::manager_is_logger = T; + +# Minimal cluster-layout for two nodes. +redef Cluster::nodes = { + ["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_MANAGER_PORT"))], +}; + +# Depending on what environment variables are set, extend the Cluster::nodes table +# with more nodes. This allows tests to control the contents of Cluster::nodes +# just by using TEST-PORT accordingly to the used environment variables. + +### Loggers +@if ( getenv("BROKER_LOGGER1_PORT") != "" ) +redef Cluster::manager_is_logger = F; +redef Cluster::nodes += { + ["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_LOGGER1_PORT")), $manager="manager"], +}; +@endif + +@if ( getenv("BROKER_LOGGER2_PORT") != "" ) +redef Cluster::manager_is_logger = F; +redef Cluster::nodes += { + ["logger-2"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_LOGGER2_PORT")), $manager="manager"], +}; +@endif + +### Proxies +@if ( getenv("BROKER_PROXY1_PORT") != "" ) +redef Cluster::nodes += { + ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PROXY1_PORT")), $manager="manager"], +}; +@endif + +@if ( getenv("BROKER_PROXY2_PORT") != "" ) +redef Cluster::nodes += { + ["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PROXY2_PORT")), $manager="manager"], +}; +@endif + +### Workers +@if ( getenv("BROKER_WORKER1_PORT") != "" ) +redef Cluster::nodes += { + ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_WORKER1_PORT")), $manager="manager"], +}; +@endif + +@if ( getenv("BROKER_WORKER2_PORT") != "" ) +redef Cluster::nodes += { + ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_WORKER2_PORT")), $manager="manager"], +}; +@endif + +@if ( getenv("BROKER_WORKER3_PORT") != "" ) +redef Cluster::nodes += { + ["worker-3"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_WORKER3_PORT")), $manager="manager"], +}; +@endif + +@if ( getenv("BROKER_WORKER4_PORT") != "" ) +redef Cluster::nodes += { + ["worker-4"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_WORKER4_PORT")), $manager="manager"], +}; +@endif From a15df5fc11a8015287ab9b81bc04353ce5bf8369 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Sun, 18 May 2025 15:11:01 +0200 Subject: [PATCH 02/12] btest/cluster: Use generic cluster-layout.zeek --- .../cluster.broker.logging/manager.out | 4 +- .../test.log.normalized | 132 +++++++++--------- testing/btest/cluster/broker/logging.zeek | 32 ++--- testing/btest/cluster/broker/publish-any.zeek | 13 +- .../websocket/broker/manager-recvs.zeek | 10 +- .../websocket/broker/manager-sends.zeek | 10 +- .../broker/manager-worker-ping-pong.zeek | 12 +- .../websocket/broker/no-subscriptions.zeek | 9 +- .../cluster/websocket/broker/oneshot.zeek | 10 +- 9 files changed, 99 insertions(+), 133 deletions(-) diff --git a/testing/btest/Baseline/cluster.broker.logging/manager.out b/testing/btest/Baseline/cluster.broker.logging/manager.out index 96183afb51..c8c76b1821 100644 --- a/testing/btest/Baseline/cluster.broker.logging/manager.out +++ b/testing/btest/Baseline/cluster.broker.logging/manager.out @@ -6,7 +6,7 @@ B nodes_up, 4 B nodes_up, 5 C cluster_started D send_finish -E node_down, logger -E node_down, proxy +E node_down, logger-1 +E node_down, proxy-1 E node_down, worker-1 E node_down, worker-2 diff --git a/testing/btest/Baseline/cluster.broker.logging/test.log.normalized b/testing/btest/Baseline/cluster.broker.logging/test.log.normalized index fcdbdbbbb5..0ede39fa50 100644 --- a/testing/btest/Baseline/cluster.broker.logging/test.log.normalized +++ b/testing/btest/Baseline/cluster.broker.logging/test.log.normalized @@ -1,37 +1,37 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -logger 1 -logger 10 -logger 11 -logger 12 -logger 13 -logger 14 -logger 15 -logger 16 -logger 17 -logger 18 -logger 19 -logger 2 -logger 20 -logger 21 -logger 22 -logger 23 -logger 24 -logger 25 -logger 26 -logger 27 -logger 28 -logger 29 -logger 3 -logger 30 -logger 31 -logger 32 -logger 33 -logger 4 -logger 5 -logger 6 -logger 7 -logger 8 -logger 9 +logger-1 1 +logger-1 10 +logger-1 11 +logger-1 12 +logger-1 13 +logger-1 14 +logger-1 15 +logger-1 16 +logger-1 17 +logger-1 18 +logger-1 19 +logger-1 2 +logger-1 20 +logger-1 21 +logger-1 22 +logger-1 23 +logger-1 24 +logger-1 25 +logger-1 26 +logger-1 27 +logger-1 28 +logger-1 29 +logger-1 3 +logger-1 30 +logger-1 31 +logger-1 32 +logger-1 33 +logger-1 4 +logger-1 5 +logger-1 6 +logger-1 7 +logger-1 8 +logger-1 9 manager 1 manager 10 manager 11 @@ -65,39 +65,39 @@ manager 6 manager 7 manager 8 manager 9 -proxy 1 -proxy 10 -proxy 11 -proxy 12 -proxy 13 -proxy 14 -proxy 15 -proxy 16 -proxy 17 -proxy 18 -proxy 19 -proxy 2 -proxy 20 -proxy 21 -proxy 22 -proxy 23 -proxy 24 -proxy 25 -proxy 26 -proxy 27 -proxy 28 -proxy 29 -proxy 3 -proxy 30 -proxy 31 -proxy 32 -proxy 33 -proxy 4 -proxy 5 -proxy 6 -proxy 7 -proxy 8 -proxy 9 +proxy-1 1 +proxy-1 10 +proxy-1 11 +proxy-1 12 +proxy-1 13 +proxy-1 14 +proxy-1 15 +proxy-1 16 +proxy-1 17 +proxy-1 18 +proxy-1 19 +proxy-1 2 +proxy-1 20 +proxy-1 21 +proxy-1 22 +proxy-1 23 +proxy-1 24 +proxy-1 25 +proxy-1 26 +proxy-1 27 +proxy-1 28 +proxy-1 29 +proxy-1 3 +proxy-1 30 +proxy-1 31 +proxy-1 32 +proxy-1 33 +proxy-1 4 +proxy-1 5 +proxy-1 6 +proxy-1 7 +proxy-1 8 +proxy-1 9 worker-1 1 worker-1 10 worker-1 11 diff --git a/testing/btest/cluster/broker/logging.zeek b/testing/btest/cluster/broker/logging.zeek index a00e2c3e84..e195ee0b35 100644 --- a/testing/btest/cluster/broker/logging.zeek +++ b/testing/btest/cluster/broker/logging.zeek @@ -1,16 +1,18 @@ # @TEST-DOC: Startup a Broker cluster by hand, testing basic logging and node_up and node_down events on the manager. # -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 -# @TEST-PORT: BROKER_PORT5 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_LOGGER1_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT +# +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . # # @TEST-EXEC: chmod +x ./check-test-log.sh # # @TEST-EXEC: btest-bg-run manager "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=manager zeek -b ../manager.zeek >out" -# @TEST-EXEC: btest-bg-run logger "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=logger zeek -b ../other.zeek >out" -# @TEST-EXEC: btest-bg-run proxy "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=proxy zeek -b ../other.zeek >out" +# @TEST-EXEC: btest-bg-run logger-1 "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=logger-1 zeek -b ../other.zeek >out" +# @TEST-EXEC: btest-bg-run proxy-1 "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=proxy-1 zeek -b ../other.zeek >out" # @TEST-EXEC: btest-bg-run worker-1 "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=worker-1 zeek -b ../other.zeek >out" # @TEST-EXEC: btest-bg-run worker-2 "ZEEKPATH=$ZEEKPATH:.. && CLUSTER_NODE=worker-2 zeek -b ../other.zeek >out" # @@ -19,18 +21,6 @@ # @TEST-EXEC: sort manager/out > manager.out # @TEST-EXEC: btest-diff manager.out -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::manager_is_logger = F; - -redef Cluster::nodes = { - ["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["logger"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager"], - ["proxy"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager"], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT5")), $manager="manager"], -}; -# @TEST-END-FILE - # @TEST-START-FILE common.zeek @load frameworks/cluster/experimental @@ -120,10 +110,10 @@ event finish(name: string) { # @TEST-START-FILE check-test-log.sh #!/bin/sh # -# This script checks logger/test.log until the expected number +# This script checks logger-1/test.log until the expected number # of log entries have been observed and puts a normalized version # into the testing directory for baselining. -TEST_LOG=../logger/test.log +TEST_LOG=../logger-1/test.log if [ ! -f $TEST_LOG ]; then echo "$TEST_LOG not found!" >&2 diff --git a/testing/btest/cluster/broker/publish-any.zeek b/testing/btest/cluster/broker/publish-any.zeek index 3a9289676c..a9f6f147a6 100644 --- a/testing/btest/cluster/broker/publish-any.zeek +++ b/testing/btest/cluster/broker/publish-any.zeek @@ -1,7 +1,9 @@ # @TEST-DOC: Send any values and observe behavior using broker. # -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . # # @TEST-EXEC: zeek -b --parse-only common.zeek manager.zeek worker.zeek # @@ -12,13 +14,6 @@ # @TEST-EXEC: btest-diff ./manager/.stdout # @TEST-EXEC: btest-diff ./worker-1/.stdout -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager"], -}; -# @TEST-END-FILE - # @TEST-START-FILE common.zeek redef Log::default_rotation_interval = 0sec; diff --git a/testing/btest/cluster/websocket/broker/manager-recvs.zeek b/testing/btest/cluster/websocket/broker/manager-recvs.zeek index c67f4425a9..3bc6318c24 100644 --- a/testing/btest/cluster/websocket/broker/manager-recvs.zeek +++ b/testing/btest/cluster/websocket/broker/manager-recvs.zeek @@ -5,9 +5,11 @@ # # @TEST-REQUIRES: python3 -c 'import websockets.sync' # -# @TEST-PORT: BROKER_PORT1 +# @TEST-PORT: BROKER_MANAGER_PORT # @TEST-PORT: WEBSOCKET_PORT # +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# # @TEST-EXEC: cp $FILES/ws/wstest.py . # # @TEST-EXEC: zeek -b --parse-only manager.zeek @@ -22,12 +24,6 @@ # @TEST-EXEC: btest-diff ./client/.stdout # @TEST-EXEC: btest-diff ./client/.stderr -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], -}; -# @TEST-END-FILE - # @TEST-START-FILE manager.zeek redef Log::enable_local_logging = T; redef Log::default_rotation_interval = 0sec; diff --git a/testing/btest/cluster/websocket/broker/manager-sends.zeek b/testing/btest/cluster/websocket/broker/manager-sends.zeek index ff6fb86be2..dd39916b49 100644 --- a/testing/btest/cluster/websocket/broker/manager-sends.zeek +++ b/testing/btest/cluster/websocket/broker/manager-sends.zeek @@ -5,9 +5,11 @@ # # @TEST-REQUIRES: python3 -c 'import websockets.sync' # -# @TEST-PORT: BROKER_PORT1 +# @TEST-PORT: BROKER_MANAGER_PORT # @TEST-PORT: WEBSOCKET_PORT # +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# # @TEST-EXEC: cp $FILES/ws/wstest.py . # # @TEST-EXEC: zeek -b --parse-only manager.zeek @@ -22,12 +24,6 @@ # @TEST-EXEC: btest-diff ./client/.stdout # @TEST-EXEC: btest-diff ./client/.stderr -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], -}; -# @TEST-END-FILE - # @TEST-START-FILE manager.zeek redef Log::enable_local_logging = T; redef Log::default_rotation_interval = 0sec; diff --git a/testing/btest/cluster/websocket/broker/manager-worker-ping-pong.zeek b/testing/btest/cluster/websocket/broker/manager-worker-ping-pong.zeek index 1420733269..614f5a47b2 100644 --- a/testing/btest/cluster/websocket/broker/manager-worker-ping-pong.zeek +++ b/testing/btest/cluster/websocket/broker/manager-worker-ping-pong.zeek @@ -9,9 +9,12 @@ # # @TEST-REQUIRES: python3 -c 'import websockets.sync' # -# @TEST-PORT: BROKER_PORT1 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT # @TEST-PORT: WEBSOCKET_PORT # +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# # @TEST-EXEC: cp $FILES/ws/wstest.py . # # @TEST-EXEC: zeek -b --parse-only manager.zeek @@ -30,13 +33,6 @@ # @TEST-EXEC: btest-diff ./client/.stdout # @TEST-EXEC: btest-diff ./client/.stderr -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $manager="manager"], -}; -# @TEST-END-FILE - # @TEST-START-FILE common.zeek redef Log::enable_local_logging = T; redef Log::default_rotation_interval = 0sec; diff --git a/testing/btest/cluster/websocket/broker/no-subscriptions.zeek b/testing/btest/cluster/websocket/broker/no-subscriptions.zeek index 968e5b40bc..e540085f5d 100644 --- a/testing/btest/cluster/websocket/broker/no-subscriptions.zeek +++ b/testing/btest/cluster/websocket/broker/no-subscriptions.zeek @@ -2,9 +2,11 @@ # # @TEST-REQUIRES: python3 -c 'import websockets.sync' # -# @TEST-PORT: BROKER_PORT1 +# @TEST-PORT: BROKER_MANAGER_PORT # @TEST-PORT: WEBSOCKET_PORT # +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# # @TEST-EXEC: cp $FILES/ws/wstest.py . # # @TEST-EXEC: zeek -b --parse-only manager.zeek @@ -19,11 +21,6 @@ # @TEST-EXEC: btest-diff ./client/.stdout # @TEST-EXEC: btest-diff ./client/.stderr -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], -}; -# @TEST-END-FILE # # @TEST-START-FILE manager.zeek redef exit_only_after_terminate = T; diff --git a/testing/btest/cluster/websocket/broker/oneshot.zeek b/testing/btest/cluster/websocket/broker/oneshot.zeek index c1fcdf3e0c..b029caa814 100644 --- a/testing/btest/cluster/websocket/broker/oneshot.zeek +++ b/testing/btest/cluster/websocket/broker/oneshot.zeek @@ -2,9 +2,11 @@ # # @TEST-REQUIRES: python3 -c 'import websockets.sync' # -# @TEST-PORT: BROKER_PORT1 +# @TEST-PORT: BROKER_MANAGER_PORT # @TEST-PORT: WEBSOCKET_PORT # +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# # @TEST-EXEC: cp $FILES/ws/wstest.py . # # @TEST-EXEC: zeek -b --parse-only manager.zeek @@ -19,12 +21,6 @@ # @TEST-EXEC: btest-diff ./client/.stdout # @TEST-EXEC: btest-diff ./client/.stderr -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], -}; -# @TEST-END-FILE - # @TEST-START-FILE manager.zeek redef exit_only_after_terminate = T; From f9ff396acf1bb7e24de08bb5b3993372deba1585 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Sun, 18 May 2025 15:13:20 +0200 Subject: [PATCH 03/12] btest/broker: Use generic cluster-layout.zeek --- .../manager-1..stdout | 9 --------- .../manager..stdout | 9 +++++++++ .../Baseline/broker.telemetry/manager.out | 6 +++--- .../{worker.out => worker-1.out} | 6 +++--- ...okerstore-backend-delete-composite-key.zeek | 17 ++++++----------- ...rokerstore-backend-simple-incompatible.zeek | 18 ++++++------------ .../brokerstore-backend-simple-reverse.zeek | 18 ++++++------------ .../store/brokerstore-backend-simple.zeek | 18 ++++++------------ .../store/brokerstore-backend-sqlite.zeek | 18 ++++++------------ testing/btest/broker/telemetry.zeek | 18 +++++++----------- 10 files changed, 52 insertions(+), 85 deletions(-) delete mode 100644 testing/btest/Baseline/broker.store.brokerstore-backend-delete-composite-key/manager-1..stdout create mode 100644 testing/btest/Baseline/broker.store.brokerstore-backend-delete-composite-key/manager..stdout rename testing/btest/Baseline/broker.telemetry/{worker.out => worker-1.out} (72%) diff --git a/testing/btest/Baseline/broker.store.brokerstore-backend-delete-composite-key/manager-1..stdout b/testing/btest/Baseline/broker.store.brokerstore-backend-delete-composite-key/manager-1..stdout deleted file mode 100644 index ed85e1d88c..0000000000 --- a/testing/btest/Baseline/broker.store.brokerstore-backend-delete-composite-key/manager-1..stdout +++ /dev/null @@ -1,9 +0,0 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -manager-1, change_handler, TABLE_ELEMENT_NEW, a, 1, 12 -manager-1, change_handler, TABLE_ELEMENT_NEW, b, 2, 23 -manager-1, change_handler, TABLE_ELEMENT_NEW, c, 3, 42 -manager-1, change_handler, TABLE_ELEMENT_REMOVED, b, 2, 23 -manager-1, zeek_done, { -[c, 3] = 42, -[a, 1] = 12 -} diff --git a/testing/btest/Baseline/broker.store.brokerstore-backend-delete-composite-key/manager..stdout b/testing/btest/Baseline/broker.store.brokerstore-backend-delete-composite-key/manager..stdout new file mode 100644 index 0000000000..db3eb06e2c --- /dev/null +++ b/testing/btest/Baseline/broker.store.brokerstore-backend-delete-composite-key/manager..stdout @@ -0,0 +1,9 @@ +### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. +manager, change_handler, TABLE_ELEMENT_NEW, a, 1, 12 +manager, change_handler, TABLE_ELEMENT_NEW, b, 2, 23 +manager, change_handler, TABLE_ELEMENT_NEW, c, 3, 42 +manager, change_handler, TABLE_ELEMENT_REMOVED, b, 2, 23 +manager, zeek_done, { +[c, 3] = 42, +[a, 1] = 12 +} diff --git a/testing/btest/Baseline/broker.telemetry/manager.out b/testing/btest/Baseline/broker.telemetry/manager.out index ce348b2b02..a48dbf580b 100644 --- a/testing/btest/Baseline/broker.telemetry/manager.out +++ b/testing/btest/Baseline/broker.telemetry/manager.out @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -Telemetry::COUNTER, zeek, zeek_broker_peer_buffer_overflows_total, [endpoint, peer], [manager, worker] -Telemetry::GAUGE, zeek, zeek_broker_peer_buffer_messages, [endpoint, peer], [manager, worker] -Telemetry::GAUGE, zeek, zeek_broker_peer_buffer_recent_max_messages, [endpoint, peer], [manager, worker] +Telemetry::COUNTER, zeek, zeek_broker_peer_buffer_overflows_total, [endpoint, peer], [manager, worker-1] +Telemetry::GAUGE, zeek, zeek_broker_peer_buffer_messages, [endpoint, peer], [manager, worker-1] +Telemetry::GAUGE, zeek, zeek_broker_peer_buffer_recent_max_messages, [endpoint, peer], [manager, worker-1] diff --git a/testing/btest/Baseline/broker.telemetry/worker.out b/testing/btest/Baseline/broker.telemetry/worker-1.out similarity index 72% rename from testing/btest/Baseline/broker.telemetry/worker.out rename to testing/btest/Baseline/broker.telemetry/worker-1.out index b2486b0ace..a2e34b9a04 100644 --- a/testing/btest/Baseline/broker.telemetry/worker.out +++ b/testing/btest/Baseline/broker.telemetry/worker-1.out @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -Telemetry::COUNTER, zeek, zeek_broker_peer_buffer_overflows_total, [endpoint, peer], [worker, manager] -Telemetry::GAUGE, zeek, zeek_broker_peer_buffer_messages, [endpoint, peer], [worker, manager] -Telemetry::GAUGE, zeek, zeek_broker_peer_buffer_recent_max_messages, [endpoint, peer], [worker, manager] +Telemetry::COUNTER, zeek, zeek_broker_peer_buffer_overflows_total, [endpoint, peer], [worker-1, manager] +Telemetry::GAUGE, zeek, zeek_broker_peer_buffer_messages, [endpoint, peer], [worker-1, manager] +Telemetry::GAUGE, zeek, zeek_broker_peer_buffer_recent_max_messages, [endpoint, peer], [worker-1, manager] diff --git a/testing/btest/broker/store/brokerstore-backend-delete-composite-key.zeek b/testing/btest/broker/store/brokerstore-backend-delete-composite-key.zeek index 596f7d9154..b09e46e948 100644 --- a/testing/btest/broker/store/brokerstore-backend-delete-composite-key.zeek +++ b/testing/btest/broker/store/brokerstore-backend-delete-composite-key.zeek @@ -1,23 +1,18 @@ # @TEST-DOC: Test deletion of elements in a broker backed table with composite keys. Regression test for #3342. # -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 20 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout # @TEST-EXEC: btest-diff worker-1/.stdout @load policy/frameworks/cluster/experimental -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], -}; -# @TEST-END-FILE - function change_handler(t: table[string, count] of count, tpe: TableChange, k0: string, k1: count, v: count) { diff --git a/testing/btest/broker/store/brokerstore-backend-simple-incompatible.zeek b/testing/btest/broker/store/brokerstore-backend-simple-incompatible.zeek index fe5dae8e49..01f160b300 100644 --- a/testing/btest/broker/store/brokerstore-backend-simple-incompatible.zeek +++ b/testing/btest/broker/store/brokerstore-backend-simple-incompatible.zeek @@ -1,8 +1,10 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT +# +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . -# @TEST-EXEC: btest-bg-run manager-1 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b ../master.zeek >../master.out" +# @TEST-EXEC: btest-bg-run manager "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b ../master.zeek >../master.out" # @TEST-EXEC: btest-bg-run worker-1 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b ../clone.zeek >../clone.out" # @TEST-EXEC: btest-bg-run worker-2 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b ../clone.zeek >../clone2.out" # @TEST-EXEC: btest-bg-wait 30 @@ -10,14 +12,6 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-sort" btest-diff worker-1/err.log # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-sort" btest-diff worker-2/err.log -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - # @TEST-START-FILE master.zeek @load base/frameworks/cluster diff --git a/testing/btest/broker/store/brokerstore-backend-simple-reverse.zeek b/testing/btest/broker/store/brokerstore-backend-simple-reverse.zeek index 13e490eebc..f54b3c1864 100644 --- a/testing/btest/broker/store/brokerstore-backend-simple-reverse.zeek +++ b/testing/btest/broker/store/brokerstore-backend-simple-reverse.zeek @@ -1,8 +1,10 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT +# +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . -# @TEST-EXEC: btest-bg-run manager-1 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %DIR/sort-stuff.zeek ../common.zeek ../master.zeek >../master.out" +# @TEST-EXEC: btest-bg-run manager "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %DIR/sort-stuff.zeek ../common.zeek ../master.zeek >../master.out" # @TEST-EXEC: btest-bg-run worker-1 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %DIR/sort-stuff.zeek ../common.zeek ../clone.zeek >../clone.out" # @TEST-EXEC: btest-bg-run worker-2 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %DIR/sort-stuff.zeek ../common.zeek ../clone2.zeek >../clone2.out" # @TEST-EXEC: btest-bg-wait 40 @@ -12,14 +14,6 @@ # @TEST-EXEC: diff master.out clone.out # @TEST-EXEC: diff master.out clone2.out -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - # @TEST-START-FILE common.zeek @load base/frameworks/cluster diff --git a/testing/btest/broker/store/brokerstore-backend-simple.zeek b/testing/btest/broker/store/brokerstore-backend-simple.zeek index f2e5edbf4a..9870d0c6bb 100644 --- a/testing/btest/broker/store/brokerstore-backend-simple.zeek +++ b/testing/btest/broker/store/brokerstore-backend-simple.zeek @@ -1,8 +1,10 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT +# +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . -# @TEST-EXEC: btest-bg-run manager-1 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %DIR/sort-stuff.zeek ../common.zeek ../master.zeek >../master.out" +# @TEST-EXEC: btest-bg-run manager "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %DIR/sort-stuff.zeek ../common.zeek ../master.zeek >../master.out" # @TEST-EXEC: btest-bg-run worker-1 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %DIR/sort-stuff.zeek ../common.zeek ../clone.zeek >../clone.out" # @TEST-EXEC: btest-bg-run worker-2 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %DIR/sort-stuff.zeek ../common.zeek ../clone.zeek >../clone2.out" # @TEST-EXEC: btest-bg-wait 30 @@ -12,14 +14,6 @@ # @TEST-EXEC: diff master.out clone.out # @TEST-EXEC: diff master.out clone2.out -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - # @TEST-START-FILE common.zeek @load base/frameworks/cluster @load base/frameworks/broker diff --git a/testing/btest/broker/store/brokerstore-backend-sqlite.zeek b/testing/btest/broker/store/brokerstore-backend-sqlite.zeek index dc06438a55..39c9a9cc80 100644 --- a/testing/btest/broker/store/brokerstore-backend-sqlite.zeek +++ b/testing/btest/broker/store/brokerstore-backend-sqlite.zeek @@ -1,9 +1,11 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT +# +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . # @TEST-EXEC: zeek -b %DIR/sort-stuff.zeek common.zeek preseed-sqlite.zeek -# @TEST-EXEC: btest-bg-run manager-1 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %DIR/sort-stuff.zeek ../common.zeek ../master.zeek >../master.out" +# @TEST-EXEC: btest-bg-run manager "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %DIR/sort-stuff.zeek ../common.zeek ../master.zeek >../master.out" # @TEST-EXEC: btest-bg-run worker-1 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %DIR/sort-stuff.zeek ../common.zeek ../clone.zeek >../clone.out" # @TEST-EXEC: btest-bg-run worker-2 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %DIR/sort-stuff.zeek ../common.zeek ../clone.zeek >../clone2.out" # @TEST-EXEC: btest-bg-wait 40 @@ -13,14 +15,6 @@ # @TEST-EXEC: diff master.out clone.out # @TEST-EXEC: diff master.out clone2.out -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - # @TEST-START-FILE common.zeek type testrec: record { a: count; diff --git a/testing/btest/broker/telemetry.zeek b/testing/btest/broker/telemetry.zeek index e7874fefad..855b92509e 100644 --- a/testing/btest/broker/telemetry.zeek +++ b/testing/btest/broker/telemetry.zeek @@ -1,20 +1,16 @@ # @TEST-DOC: run a mini two-node cluster and check that Broker's peering telemetry is available. # -# @TEST-PORT: BROKER_PORT +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT # -# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b manager.zeek -# @TEST-EXEC: btest-bg-run worker ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker zeek -b worker.zeek +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b manager.zeek +# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b worker.zeek # @TEST-EXEC: btest-bg-wait 15 # # @TEST-EXEC: btest-diff manager/out -# @TEST-EXEC: btest-diff worker/out - -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT"))], - ["worker"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $manager="manager"], -}; -# @TEST-END-FILE +# @TEST-EXEC: btest-diff worker-1/out # @TEST-START-FILE common.zeek @load base/frameworks/cluster From e114b0e371f1fb7aee49537a34a414c00226a662 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Sun, 18 May 2025 15:21:10 +0200 Subject: [PATCH 04/12] btest/frameworks/config: Use generic cluster-layout.zeek --- .../{manager-1..stdout => manager..stdout} | 0 ...anager-1.config.log => manager.config.log} | 0 .../{manager-1..stdout => manager..stdout} | 0 ...anager-1.config.log => manager.config.log} | 0 .../{manager-1..stdout => manager..stdout} | 0 ...anager-1.config.log => manager.config.log} | 0 .../base/frameworks/config/basic_cluster.zeek | 26 +++++++--------- .../frameworks/config/cluster_resend.zeek | 30 ++++++++----------- .../config/read_config_cluster.zeek | 22 +++++--------- 9 files changed, 30 insertions(+), 48 deletions(-) rename testing/btest/Baseline/scripts.base.frameworks.config.basic_cluster/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.config.basic_cluster/{manager-1.config.log => manager.config.log} (100%) rename testing/btest/Baseline/scripts.base.frameworks.config.cluster_resend/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.config.cluster_resend/{manager-1.config.log => manager.config.log} (100%) rename testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/{manager-1.config.log => manager.config.log} (100%) diff --git a/testing/btest/Baseline/scripts.base.frameworks.config.basic_cluster/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.config.basic_cluster/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.config.basic_cluster/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.config.basic_cluster/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.config.basic_cluster/manager-1.config.log b/testing/btest/Baseline/scripts.base.frameworks.config.basic_cluster/manager.config.log similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.config.basic_cluster/manager-1.config.log rename to testing/btest/Baseline/scripts.base.frameworks.config.basic_cluster/manager.config.log diff --git a/testing/btest/Baseline/scripts.base.frameworks.config.cluster_resend/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.config.cluster_resend/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.config.cluster_resend/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.config.cluster_resend/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.config.cluster_resend/manager-1.config.log b/testing/btest/Baseline/scripts.base.frameworks.config.cluster_resend/manager.config.log similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.config.cluster_resend/manager-1.config.log rename to testing/btest/Baseline/scripts.base.frameworks.config.cluster_resend/manager.config.log diff --git a/testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/manager-1.config.log b/testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/manager.config.log similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/manager-1.config.log rename to testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/manager.config.log diff --git a/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek b/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek index 30f9198c8a..396083dfc1 100644 --- a/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek +++ b/testing/btest/scripts/base/frameworks/config/basic_cluster.zeek @@ -1,27 +1,21 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT +# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT +# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 45 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout # @TEST-EXEC: btest-diff worker-1/.stdout # @TEST-EXEC: btest-diff worker-2/.stdout -# @TEST-EXEC: btest-diff manager-1/config.log +# @TEST-EXEC: btest-diff manager/config.log @load base/frameworks/config @load policy/frameworks/cluster/experimental -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - redef Log::default_rotation_interval = 0secs; export { diff --git a/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek b/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek index 70bbe18024..0a790bdb23 100644 --- a/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek +++ b/testing/btest/scripts/base/frameworks/config/cluster_resend.zeek @@ -1,16 +1,18 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT -# @TEST-EXEC: $SCRIPTS/wait-for-file manager-1/ready 30 || (btest-bg-wait -k 1 && false) -# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT +# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT +# @TEST-EXEC: $SCRIPTS/wait-for-file manager/ready 30 || (btest-bg-wait -k 1 && false) +# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 60 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout # @TEST-EXEC: btest-diff worker-1/.stdout # @TEST-EXEC: btest-diff worker-2/.stdout -# @TEST-EXEC: btest-diff manager-1/config.log +# @TEST-EXEC: btest-diff manager/config.log # In this test we check if values get updated on a worker, even if they were set before the # worker is present. @@ -18,14 +20,6 @@ @load base/frameworks/config -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - redef Log::default_rotation_interval = 0secs; export { @@ -51,7 +45,7 @@ function option_changed(ID: string, new_value: any, location: string): any ++option_changed_count; print "option changed", ID, new_value, location; - if ( Cluster::node == "manager-1" && option_changed_count == 3 ) + if ( Cluster::node == "manager" && option_changed_count == 3 ) system("touch ready"); if ( Cluster::node == "worker-2" && option_changed_count == 3 ) diff --git a/testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek b/testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek index 21509c1cc8..4ed03968d3 100644 --- a/testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek +++ b/testing/btest/scripts/base/frameworks/config/read_config_cluster.zeek @@ -3,19 +3,21 @@ # lines (and sets) being displayed in a different order due to different # hash function seedings (though probably -D would control for that). # @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1" -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT +# +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: sleep 1 # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 30 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout # @TEST-EXEC: btest-diff worker-1/.stdout # @TEST-EXEC: btest-diff worker-2/.stdout -# @TEST-EXEC: btest-diff manager-1/config.log +# @TEST-EXEC: btest-diff manager/config.log @load base/frameworks/config @load base/frameworks/cluster @@ -23,14 +25,6 @@ @load base/protocols/conn -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - # @TEST-START-FILE configfile testbool F testcount 1 From 0a06a77c6931f39555b617c3861f97ea5dd5f6e0 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Sun, 18 May 2025 15:48:53 +0200 Subject: [PATCH 05/12] btest/frameworks/cluster: Use generic cluster-layout.zeek --- .../{manager-1..stdout => manager..stdout} | 0 .../{manager-1..stdout => manager..stdout} | 0 .../{manager-1..stdout => manager..stdout} | 0 .../logger-1..stdout | 2 +- .../{manager-1..stdout => manager..stdout} | 0 .../{manager-1..stdout => manager..stdout} | 0 .../{manager-1..stdout => manager..stdout} | 0 .../{manager-1..stdout => manager..stdout} | 0 .../{manager-1..stdout => manager..stdout} | 0 .../cluster/custom_pool_exclusivity.zeek | 32 +++++++---------- .../cluster/custom_pool_limits.zeek | 32 +++++++---------- .../base/frameworks/cluster/forwarding.zeek | 28 ++++++--------- .../frameworks/cluster/log_distribution.zeek | 30 ++++++---------- .../cluster/start-it-up-logger.zeek | 34 +++++++------------ .../base/frameworks/cluster/start-it-up.zeek | 30 ++++++---------- .../cluster/topic_distribution.zeek | 28 ++++++--------- .../cluster/topic_distribution_bifs.zeek | 30 ++++++---------- .../topic_distribution_make_event.zeek | 28 ++++++--------- 18 files changed, 101 insertions(+), 173 deletions(-) rename testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_exclusivity/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.cluster.forwarding/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.cluster.start-it-up-logger/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.cluster.start-it-up/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_make_event/{manager-1..stdout => manager..stdout} (100%) diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_exclusivity/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_exclusivity/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_exclusivity/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_exclusivity/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.forwarding/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.forwarding/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.cluster.forwarding/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.cluster.forwarding/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.start-it-up-logger/logger-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.start-it-up-logger/logger-1..stdout index 1e3ee5e637..39f6f5deba 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.cluster.start-it-up-logger/logger-1..stdout +++ b/testing/btest/Baseline/scripts.base.frameworks.cluster.start-it-up-logger/logger-1..stdout @@ -5,7 +5,7 @@ Connected to a peer Connected to a peer Connected to a peer Connected to a peer -got fully_connected event from, manager-1 +got fully_connected event from, manager got fully_connected event from, proxy-1 got fully_connected event from, proxy-2 got fully_connected event from, worker-1 diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.start-it-up-logger/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.start-it-up-logger/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.cluster.start-it-up-logger/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.cluster.start-it-up-logger/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.start-it-up/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.start-it-up/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.cluster.start-it-up/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.cluster.start-it-up/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_bifs/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_make_event/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_make_event/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_make_event/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution_make_event/manager..stdout diff --git a/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek b/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek index 4ea9b77d46..456f2ea7a2 100644 --- a/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek @@ -1,25 +1,17 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 -# @TEST-PORT: BROKER_PORT5 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_PROXY2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run proxy-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run proxy-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT +# @TEST-EXEC: btest-bg-run proxy-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek -b %INPUT +# @TEST-EXEC: btest-bg-run proxy-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 45 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout @load policy/frameworks/cluster/experimental -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - global my_pool_spec: Cluster::PoolSpec = Cluster::PoolSpec( $topic = "zeek/cluster/pool/my_pool", @@ -76,7 +68,7 @@ function print_stuff(heading: string) event Cluster::Experimental::cluster_started() { - if ( Cluster::node != "manager-1" ) + if ( Cluster::node != "manager" ) return; print_stuff("1st stuff"); @@ -86,7 +78,7 @@ event Cluster::Experimental::cluster_started() event Cluster::node_down(name: string, id: string) { - if ( Cluster::node != "manager-1" ) + if ( Cluster::node != "manager" ) return; if ( name == "proxy-1" ) @@ -105,6 +97,6 @@ event Cluster::node_down(name: string, id: string) event Cluster::node_down(name: string, id: string) { - if ( name == "manager-1" ) + if ( name == "manager" ) terminate(); } diff --git a/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek b/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek index 2234ad79b0..85428bb5c6 100644 --- a/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/custom_pool_limits.zeek @@ -1,25 +1,17 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 -# @TEST-PORT: BROKER_PORT5 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_PROXY2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run proxy-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run proxy-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT +# @TEST-EXEC: btest-bg-run proxy-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek -b %INPUT +# @TEST-EXEC: btest-bg-run proxy-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 45 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout @load policy/frameworks/cluster/experimental -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - global my_pool_spec: Cluster::PoolSpec = Cluster::PoolSpec( $topic = "zeek/cluster/pool/my_pool", @@ -76,7 +68,7 @@ function print_stuff(heading: string) event Cluster::Experimental::cluster_started() { - if ( Cluster::node != "manager-1" ) + if ( Cluster::node != "manager" ) return; print_stuff("1st stuff"); @@ -86,7 +78,7 @@ event Cluster::Experimental::cluster_started() event Cluster::node_down(name: string, id: string) { - if ( Cluster::node != "manager-1" ) + if ( Cluster::node != "manager" ) return; if ( name == "proxy-1" ) @@ -105,6 +97,6 @@ event Cluster::node_down(name: string, id: string) event Cluster::node_down(name: string, id: string) { - if ( name == "manager-1" ) + if ( name == "manager" ) terminate(); } diff --git a/testing/btest/scripts/base/frameworks/cluster/forwarding.zeek b/testing/btest/scripts/base/frameworks/cluster/forwarding.zeek index 31e27fb151..c30fc02ad2 100644 --- a/testing/btest/scripts/base/frameworks/cluster/forwarding.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/forwarding.zeek @@ -1,32 +1,26 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -B broker -b %INPUT -# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT +# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT +# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 45 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout # @TEST-EXEC: btest-diff worker-1/.stdout # @TEST-EXEC: btest-diff worker-2/.stdout @load policy/frameworks/cluster/experimental -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - redef Broker::forward_messages = T; event forwarded_event() { print "got forwarded event"; - if ( Cluster::node == "manager-1" ) + if ( Cluster::node == "manager" ) print "manager should NOT have raised the forwarded event"; terminate(); @@ -43,7 +37,7 @@ event Cluster::Experimental::cluster_started() event zeek_init() { - if ( Cluster::node == "manager-1" ) + if ( Cluster::node == "manager" ) Broker::forward("test_topic"); if ( Cluster::node == "worker-1" ) Broker::subscribe("test_topic"); diff --git a/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek b/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek index 5214d781a7..df8f982999 100644 --- a/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek @@ -1,33 +1,25 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_LOGGER1_PORT +# @TEST-PORT: BROKER_LOGGER10_PORT +# +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# Add an additional logger-10 node, the template only has logger-1 and logger-2 +# @TEST-EXEC: echo 'redef Cluster::nodes += { ["logger-10"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_LOGGER10_PORT")), $manager="manager"], };' >> cluster-layout.zeek # # Note: the logger names are chosen on purpose such that one is a prefix of the # other to help verify that the node-specific Cluster topics are able to # uniquely target a particular node. -# @TEST-EXEC: btest-bg-run logger-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=logger-1 zeek -b %INPUT +# @TEST-EXEC: btest-bg-run logger-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=logger-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run logger-10 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=logger-10 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT -# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT +# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 45 # @TEST-EXEC: btest-diff logger-1/test.log # @TEST-EXEC: btest-diff logger-10/test.log @load policy/frameworks/cluster/experimental -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::manager_is_logger = F; - -redef Cluster::nodes = { - ["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager"], - ["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager"], - ["logger-10"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager"] -}; - -# @TEST-END-FILE - redef Log::default_rotation_interval = 0sec; module Test; diff --git a/testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.zeek b/testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.zeek index b1c13f6d4a..60435fdccb 100644 --- a/testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/start-it-up-logger.zeek @@ -1,38 +1,28 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 -# @TEST-PORT: BROKER_PORT5 -# @TEST-PORT: BROKER_PORT6 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_LOGGER1_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_PROXY2_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT +# +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . # # @TEST-EXEC: btest-bg-run logger-1 CLUSTER_NODE=logger-1 ZEEKPATH=$ZEEKPATH:.. zeek -b %INPUT -# @TEST-EXEC: btest-bg-run manager-1 CLUSTER_NODE=manager-1 ZEEKPATH=$ZEEKPATH:.. zeek -b %INPUT +# @TEST-EXEC: btest-bg-run manager CLUSTER_NODE=manager ZEEKPATH=$ZEEKPATH:.. zeek -b %INPUT # @TEST-EXEC: btest-bg-run proxy-1 CLUSTER_NODE=proxy-1 ZEEKPATH=$ZEEKPATH:.. zeek -b %INPUT # @TEST-EXEC: btest-bg-run proxy-2 CLUSTER_NODE=proxy-2 ZEEKPATH=$ZEEKPATH:.. zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 CLUSTER_NODE=worker-1 ZEEKPATH=$ZEEKPATH:.. zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-2 CLUSTER_NODE=worker-2 ZEEKPATH=$ZEEKPATH:.. zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 40 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff logger-1/.stdout -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout +# @TEST-EXEC: btest-diff proxy-1/.stdout # @TEST-EXEC: btest-diff proxy-1/.stdout -# @TEST-EXEC: btest-diff proxy-2/.stdout # @TEST-EXEC: btest-diff worker-1/.stdout # @TEST-EXEC: btest-diff worker-2/.stdout @load base/frameworks/cluster -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::manager_is_logger = F; -redef Cluster::nodes = { - ["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2"))], - ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], - ["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1"], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT5")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT6")), $manager="manager-1"], -}; -# @TEST-END-FILE - global peer_count = 0; global fully_connected_nodes = 0; @@ -68,7 +58,7 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) return; } - local expected_nodes = Cluster::node == "manager-1" ? 5 : 4; + local expected_nodes = Cluster::node == "manager" ? 5 : 4; if ( peer_count == expected_nodes ) { Broker::publish(Cluster::logger_topic, fully_connected, Cluster::node); diff --git a/testing/btest/scripts/base/frameworks/cluster/start-it-up.zeek b/testing/btest/scripts/base/frameworks/cluster/start-it-up.zeek index c549a0cee7..0069c2a76f 100644 --- a/testing/btest/scripts/base/frameworks/cluster/start-it-up.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/start-it-up.zeek @@ -1,16 +1,18 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 -# @TEST-PORT: BROKER_PORT5 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_PROXY2_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run proxy-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run proxy-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 40 -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager/.stdout # @TEST-EXEC: btest-diff proxy-1/.stdout # @TEST-EXEC: btest-diff proxy-2/.stdout # @TEST-EXEC: btest-diff worker-1/.stdout @@ -18,16 +20,6 @@ @load base/frameworks/cluster -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT5")), $manager="manager-1"], -}; -# @TEST-END-FILE - global peer_count = 0; global fully_connected_nodes = 0; @@ -40,7 +32,7 @@ event fully_connected() print "Got fully_connected event"; fully_connected_nodes = fully_connected_nodes + 1; - if ( Cluster::node == "manager-1" ) + if ( Cluster::node == "manager" ) { if ( peer_count == 4 && fully_connected_nodes == 4 ) terminate(); @@ -52,7 +44,7 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) print "Connected to a peer"; peer_count = peer_count + 1; - if ( Cluster::node == "manager-1" ) + if ( Cluster::node == "manager" ) { if ( peer_count == 4 && fully_connected_nodes == 4 ) terminate(); diff --git a/testing/btest/scripts/base/frameworks/cluster/topic_distribution.zeek b/testing/btest/scripts/base/frameworks/cluster/topic_distribution.zeek index 635294522b..2f7218dda0 100644 --- a/testing/btest/scripts/base/frameworks/cluster/topic_distribution.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/topic_distribution.zeek @@ -1,25 +1,17 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 -# @TEST-PORT: BROKER_PORT5 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_PROXY2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run proxy-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run proxy-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 40 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout @load policy/frameworks/cluster/experimental -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - event go_away() { terminate(); @@ -46,7 +38,7 @@ function print_stuff(heading: string) event Cluster::Experimental::cluster_started() { - if ( Cluster::node != "manager-1" ) + if ( Cluster::node != "manager" ) return; print_stuff("1st stuff"); @@ -56,7 +48,7 @@ event Cluster::Experimental::cluster_started() event Cluster::node_down(name: string, id: string) { - if ( Cluster::node != "manager-1" ) + if ( Cluster::node != "manager" ) return; if ( name == "proxy-1" ) @@ -75,6 +67,6 @@ event Cluster::node_down(name: string, id: string) event Cluster::node_down(name: string, id: string) { - if ( name == "manager-1" ) + if ( name == "manager" ) terminate(); } diff --git a/testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.zeek b/testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.zeek index c46782b4d4..da7ae65ecd 100644 --- a/testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/topic_distribution_bifs.zeek @@ -1,27 +1,19 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 -# @TEST-PORT: BROKER_PORT5 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_PROXY2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run proxy-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run proxy-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 30 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout +# @TEST-EXEC: btest-diff proxy-1/.stdout # @TEST-EXEC: btest-diff proxy-1/.stdout -# @TEST-EXEC: btest-diff proxy-2/.stdout @load policy/frameworks/cluster/experimental -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - global q = 0; event go_away() @@ -58,7 +50,7 @@ function send_stuff(heading: string) event Cluster::Experimental::cluster_started() { - if ( Cluster::node != "manager-1" ) + if ( Cluster::node != "manager" ) return; send_stuff("1st stuff"); @@ -68,7 +60,7 @@ event Cluster::Experimental::cluster_started() event Cluster::node_down(name: string, id: string) { - if ( Cluster::node != "manager-1" ) + if ( Cluster::node != "manager" ) return; if ( name == "proxy-1" ) @@ -87,6 +79,6 @@ event Cluster::node_down(name: string, id: string) event Cluster::node_down(name: string, id: string) { - if ( name == "manager-1" ) + if ( name == "manager" ) terminate(); } diff --git a/testing/btest/scripts/base/frameworks/cluster/topic_distribution_make_event.zeek b/testing/btest/scripts/base/frameworks/cluster/topic_distribution_make_event.zeek index b56c5342d0..2c8fb3271b 100644 --- a/testing/btest/scripts/base/frameworks/cluster/topic_distribution_make_event.zeek +++ b/testing/btest/scripts/base/frameworks/cluster/topic_distribution_make_event.zeek @@ -1,29 +1,21 @@ # @TEST-DOC: Broker::make_event() together with Cluster::publish_hrw() and Cluster::publish_rr() -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 -# @TEST-PORT: BROKER_PORT5 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_PROXY2_PORT +# +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . # # @TEST-EXEC: zeek -b --parse-only %INPUT -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run proxy-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run proxy-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 30 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout # @TEST-EXEC: btest-diff proxy-1/.stdout # @TEST-EXEC: btest-diff proxy-2/.stdout @load policy/frameworks/cluster/experimental -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - global q = 0; event go_away() @@ -65,7 +57,7 @@ function send_stuff(heading: string) event Cluster::Experimental::cluster_started() { - if ( Cluster::node != "manager-1" ) + if ( Cluster::node != "manager" ) return; send_stuff("1st stuff"); @@ -75,7 +67,7 @@ event Cluster::Experimental::cluster_started() event Cluster::node_down(name: string, id: string) { - if ( Cluster::node != "manager-1" ) + if ( Cluster::node != "manager" ) return; if ( name == "proxy-1" ) @@ -94,6 +86,6 @@ event Cluster::node_down(name: string, id: string) event Cluster::node_down(name: string, id: string) { - if ( name == "manager-1" ) + if ( name == "manager" ) terminate(); } From 4dec63936e2ba245ce03de71b1d0015b05e88279 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Sun, 18 May 2025 16:19:10 +0200 Subject: [PATCH 06/12] btest/frameworks/sumstats: Use generic cluster-layout.zeek --- .../{manager-1..stdout => manager..stdout} | 0 .../{manager-1..stdout => manager..stdout} | 0 .../{manager-1..stdout => manager..stdout} | 0 .../{manager-1..stdout => manager..stdout} | 0 .../{manager-1..stdout => manager..stdout} | 0 .../{manager-1..stdout => manager..stdout} | 0 .../{manager-1..stdout => manager..stdout} | 0 .../frameworks/sumstats/basic-cluster.zeek | 20 ++++++----------- .../sumstats/cluster-intermediate-update.zeek | 22 +++++++------------ .../frameworks/sumstats/last-cluster.zeek | 19 ++++++---------- .../sumstats/manual-epoch-cluster.zeek | 20 ++++++----------- .../sumstats/on-demand-cluster.zeek | 22 +++++++------------ .../frameworks/sumstats/sample-cluster.zeek | 20 ++++++----------- .../frameworks/sumstats/topk-cluster.zeek | 19 ++++++---------- 14 files changed, 51 insertions(+), 91 deletions(-) rename testing/btest/Baseline/scripts.base.frameworks.sumstats.basic-cluster/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.sumstats.cluster-intermediate-update/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.sumstats.last-cluster/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.sumstats.manual-epoch-cluster/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.sumstats.on-demand-cluster/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.sumstats.topk-cluster/{manager-1..stdout => manager..stdout} (100%) diff --git a/testing/btest/Baseline/scripts.base.frameworks.sumstats.basic-cluster/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.sumstats.basic-cluster/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.sumstats.basic-cluster/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.sumstats.basic-cluster/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.sumstats.cluster-intermediate-update/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.sumstats.cluster-intermediate-update/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.sumstats.cluster-intermediate-update/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.sumstats.cluster-intermediate-update/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.sumstats.last-cluster/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.sumstats.last-cluster/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.sumstats.last-cluster/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.sumstats.last-cluster/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.sumstats.manual-epoch-cluster/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.sumstats.manual-epoch-cluster/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.sumstats.manual-epoch-cluster/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.sumstats.manual-epoch-cluster/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.sumstats.on-demand-cluster/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.sumstats.on-demand-cluster/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.sumstats.on-demand-cluster/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.sumstats.on-demand-cluster/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.sumstats.topk-cluster/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.sumstats.topk-cluster/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.sumstats.topk-cluster/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.sumstats.topk-cluster/manager..stdout diff --git a/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek index 9d96be4b43..890140ff27 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek @@ -1,25 +1,19 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 30 -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager/.stdout @load base/frameworks/sumstats @load policy/frameworks/cluster/experimental -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - redef Log::default_rotation_interval = 0secs; global n = 0; diff --git a/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek b/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek index d28420a6a2..2401eba1de 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek @@ -1,24 +1,18 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 45 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout @load base/frameworks/cluster @load base/frameworks/sumstats -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - redef Log::default_rotation_interval = 0secs; event zeek_init() &priority=5 @@ -62,7 +56,7 @@ event do_stats(i: count) event Cluster::node_up(name: string, id: string) { - if ( name == "manager-1" ) + if ( name == "manager" ) { if ( Cluster::node == "worker-1" ) { diff --git a/testing/btest/scripts/base/frameworks/sumstats/last-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/last-cluster.zeek index cabeb33865..90198726ed 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/last-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/last-cluster.zeek @@ -1,22 +1,17 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 25 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout @load base/frameworks/sumstats @load base/frameworks/cluster -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], -}; -# @TEST-END-FILE - global c = 0; event do_observe() @@ -57,7 +52,7 @@ event Cluster::node_up(name: string, id: string) { print "node up", name; - if ( Cluster::node == "worker-1" && name == "manager-1" ) + if ( Cluster::node == "worker-1" && name == "manager" ) schedule 0.1secs { do_observe() }; } diff --git a/testing/btest/scripts/base/frameworks/sumstats/manual-epoch-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/manual-epoch-cluster.zeek index 511271bbcb..adb273d85f 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/manual-epoch-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/manual-epoch-cluster.zeek @@ -1,25 +1,19 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 30 -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager/.stdout @load base/frameworks/sumstats @load policy/frameworks/cluster/experimental -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - redef Log::default_rotation_interval = 0secs; global n = 0; diff --git a/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.zeek index 4dc2c7511b..fad8828806 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.zeek @@ -1,26 +1,20 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 30 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout # @load policy/frameworks/cluster/experimental @load base/frameworks/sumstats -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - redef Log::default_rotation_interval = 0secs; global n = 0; @@ -47,7 +41,7 @@ event on_demand() if ( "test" in result ) print fmt(" Host: %s -> %.0f", host, result["test"]$sum); - if ( Cluster::node == "manager-1" ) + if ( Cluster::node == "manager" ) terminate(); } } diff --git a/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek index 75f136baf1..0902a9ddf2 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.zeek @@ -1,25 +1,19 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # This timeout needs to be large to accommodate ZAM compilation delays. # @TEST-EXEC: btest-bg-wait 45 -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager/.stdout @load base/frameworks/sumstats @load policy/frameworks/cluster/experimental -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - redef Log::default_rotation_interval = 0secs; global did_data = F; diff --git a/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek b/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek index 5d118c74ee..2c71779cfb 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.zeek @@ -1,21 +1,16 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 45 -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager/.stdout # -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE @load base/frameworks/sumstats @load policy/frameworks/cluster/experimental From 00a12a4cc5aebcb93991af18f5703360531dcc07 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Sun, 18 May 2025 16:31:46 +0200 Subject: [PATCH 07/12] btest/frameworks/intel: Use generic cluster-layout.zeek --- .../{manager-1..stdout => manager..stdout} | 6 ++-- ...{manager-1.intel.log => manager.intel.log} | 0 .../{manager-1..stdout => manager..stdout} | 6 ++-- ...{manager-1.intel.log => manager.intel.log} | 0 .../{manager-1..stdout => manager..stdout} | 0 ...{manager-1.intel.log => manager.intel.log} | 0 .../{manager-1..stdout => manager..stdout} | 0 ...{manager-1.intel.log => manager.intel.log} | 0 .../cluster-transparency-with-proxy.zeek | 31 +++++++----------- .../intel/cluster-transparency.zeek | 26 ++++++--------- .../intel/read-file-dist-cluster.zeek | 32 ++++++++----------- .../frameworks/intel/remove-item-cluster.zeek | 23 ++++++------- 12 files changed, 50 insertions(+), 74 deletions(-) rename testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/{manager-1..stdout => manager..stdout} (59%) rename testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/{manager-1.intel.log => manager.intel.log} (100%) rename testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/{manager-1..stdout => manager..stdout} (59%) rename testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/{manager-1.intel.log => manager.intel.log} (100%) rename testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/{manager-1.intel.log => manager.intel.log} (100%) rename testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/{manager-1.intel.log => manager.intel.log} (100%) diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager..stdout similarity index 59% rename from testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager..stdout index a7343538ef..37a086e8dc 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager-1..stdout +++ b/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager..stdout @@ -2,6 +2,6 @@ ### NOTE: This file has been sorted with diff-sort. insert_item: 123.123.123.123 inserted by worker-1 insert_item: 4.3.2.1 inserted by worker-2 -new_item triggered for 1.2.3.4 by manager on manager-1 -new_item triggered for 123.123.123.123 by worker-1 on manager-1 -new_item triggered for 4.3.2.1 by worker-2 on manager-1 +new_item triggered for 1.2.3.4 by manager on manager +new_item triggered for 123.123.123.123 by worker-1 on manager +new_item triggered for 4.3.2.1 by worker-2 on manager diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager-1.intel.log b/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager.intel.log similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager-1.intel.log rename to testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency-with-proxy/manager.intel.log diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager..stdout similarity index 59% rename from testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager..stdout index a7343538ef..37a086e8dc 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager-1..stdout +++ b/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager..stdout @@ -2,6 +2,6 @@ ### NOTE: This file has been sorted with diff-sort. insert_item: 123.123.123.123 inserted by worker-1 insert_item: 4.3.2.1 inserted by worker-2 -new_item triggered for 1.2.3.4 by manager on manager-1 -new_item triggered for 123.123.123.123 by worker-1 on manager-1 -new_item triggered for 4.3.2.1 by worker-2 on manager-1 +new_item triggered for 1.2.3.4 by manager on manager +new_item triggered for 123.123.123.123 by worker-1 on manager +new_item triggered for 4.3.2.1 by worker-2 on manager diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager-1.intel.log b/testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager.intel.log similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager-1.intel.log rename to testing/btest/Baseline/scripts.base.frameworks.intel.cluster-transparency/manager.intel.log diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/manager-1.intel.log b/testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/manager.intel.log similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/manager-1.intel.log rename to testing/btest/Baseline/scripts.base.frameworks.intel.read-file-dist-cluster/manager.intel.log diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/manager-1..stdout rename to testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/manager-1.intel.log b/testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/manager.intel.log similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/manager-1.intel.log rename to testing/btest/Baseline/scripts.base.frameworks.intel.remove-item-cluster/manager.intel.log diff --git a/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek b/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek index 6e5ba59935..6bc1b56ac8 100644 --- a/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek +++ b/testing/btest/scripts/base/frameworks/intel/cluster-transparency-with-proxy.zeek @@ -2,29 +2,22 @@ # manager and both workers insert intel items, and both workers do lookups that # we expect to hit. -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run proxy-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT +# @TEST-EXEC: btest-bg-run proxy-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek -b %INPUT +# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT +# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 30 -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-2/.stdout -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-timestamps-and-sort btest-diff manager-1/intel.log - -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], - ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1"], -}; -# @TEST-END-FILE +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-timestamps-and-sort btest-diff manager/intel.log @load policy/frameworks/cluster/experimental @load base/frameworks/intel diff --git a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek index de0e944d8a..4b790e4ab3 100644 --- a/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek +++ b/testing/btest/scripts/base/frameworks/intel/cluster-transparency.zeek @@ -1,26 +1,20 @@ # This test verifies intel data propagation via a cluster. The manager and both # workers insert intel items, and both workers do lookups that we expect to hit. -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT +# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT +# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 30 -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-2/.stdout -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-timestamps-and-sort btest-diff manager-1/intel.log - -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-timestamps-and-sort btest-diff manager/intel.log @load policy/frameworks/cluster/experimental @load base/frameworks/intel diff --git a/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek b/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek index dda19545fd..2632f7fa6a 100644 --- a/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek @@ -1,24 +1,18 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT +# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT +# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 40 -# @TEST-EXEC: btest-diff manager-1/.stdout -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-timestamps-and-sort btest-diff manager-1/intel.log +# @TEST-EXEC: btest-diff manager/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-timestamps-and-sort btest-diff manager/intel.log # @TEST-EXEC: btest-diff worker-1/.stdout # @TEST-EXEC: btest-diff worker-2/.stdout -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - # @TEST-START-FILE intel.dat #fields indicator indicator_type meta.source meta.desc meta.url 1.2.3.4 Intel::ADDR source1 this host is just plain baaad http://some-data-distributor.com/1234 @@ -43,7 +37,7 @@ redef enum Intel::Where += { event do_it() { - if ( Cluster::node == "manager-1" ) + if ( Cluster::node == "manager" ) { Broker::publish(Cluster::node_topic("worker-2"), do_it); return; @@ -53,7 +47,7 @@ event do_it() Intel::seen([$indicator="e@mail.com", $indicator_type=Intel::EMAIL, $where=Intel::IN_A_TEST]); if ( Cluster::node == "worker-1" ) - Broker::publish(Cluster::node_topic("manager-1"), do_it); + Broker::publish(Cluster::node_topic("manager"), do_it); } event start_it() @@ -63,7 +57,7 @@ event start_it() event Cluster::Experimental::cluster_started() { - if ( Cluster::node == "manager-1" ) + if ( Cluster::node == "manager" ) # Give more time for intel distribution. schedule 1sec { start_it() }; } diff --git a/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek b/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek index 6ec58eefe6..f5c9b8ed53 100644 --- a/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/intel/remove-item-cluster.zeek @@ -1,23 +1,18 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT +# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 30 -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff worker-1/.stdout -# @TEST-EXEC: btest-diff manager-1/intel.log +# @TEST-EXEC: btest-diff manager/intel.log @load base/frameworks/intel @load policy/frameworks/cluster/experimental -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], -}; -# @TEST-END-FILE - module Intel; redef Log::default_rotation_interval=0sec; @@ -43,7 +38,7 @@ event test_manager() event Cluster::Experimental::cluster_started() { - if ( Cluster::node != "manager-1" ) + if ( Cluster::node != "manager" ) return; # Insert the data once all workers are connected. From 2a3f2d00047bb14d236d4a4c8730cfe824e0d656 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Sun, 18 May 2025 16:47:13 +0200 Subject: [PATCH 08/12] btest/policy: Use generic cluster-layout.zeek Catch-all for cluster scripts in policy directory. --- .../{manager-1..stdout => manager..stdout} | 0 .../{manager-1..stdout => manager..stdout} | 0 ...{manager-1.intel.log => manager.intel.log} | 0 ...er-1.services.out => manager.services.out} | 2 +- ...eird_stats.log => manager.weird_stats.log} | 0 .../frameworks/cluster/cluster_started.zeek | 26 ++++++---------- .../cluster/cluster_started_logger.zeek | 31 +++++++------------ .../frameworks/intel/seen/smtp-cluster.zeek | 25 ++++++--------- .../frameworks/telemetry/prometheus.zeek | 23 +++++++------- .../policy/misc/weird-stats-cluster.zeek | 22 +++++-------- 10 files changed, 51 insertions(+), 78 deletions(-) rename testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started_logger/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.policy.frameworks.intel.seen.smtp-cluster/{manager-1.intel.log => manager.intel.log} (100%) rename testing/btest/Baseline/scripts.policy.frameworks.telemetry.prometheus/{manager-1.services.out => manager.services.out} (89%) rename testing/btest/Baseline/scripts.policy.misc.weird-stats-cluster/{manager-1.weird_stats.log => manager.weird_stats.log} (100%) diff --git a/testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started/manager-1..stdout b/testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started/manager-1..stdout rename to testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started/manager..stdout diff --git a/testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started_logger/manager-1..stdout b/testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started_logger/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started_logger/manager-1..stdout rename to testing/btest/Baseline/scripts.policy.frameworks.cluster.cluster_started_logger/manager..stdout diff --git a/testing/btest/Baseline/scripts.policy.frameworks.intel.seen.smtp-cluster/manager-1.intel.log b/testing/btest/Baseline/scripts.policy.frameworks.intel.seen.smtp-cluster/manager.intel.log similarity index 100% rename from testing/btest/Baseline/scripts.policy.frameworks.intel.seen.smtp-cluster/manager-1.intel.log rename to testing/btest/Baseline/scripts.policy.frameworks.intel.seen.smtp-cluster/manager.intel.log diff --git a/testing/btest/Baseline/scripts.policy.frameworks.telemetry.prometheus/manager-1.services.out b/testing/btest/Baseline/scripts.policy.frameworks.telemetry.prometheus/manager.services.out similarity index 89% rename from testing/btest/Baseline/scripts.policy.frameworks.telemetry.prometheus/manager-1.services.out rename to testing/btest/Baseline/scripts.policy.frameworks.telemetry.prometheus/manager.services.out index ab13f24568..eab828e89f 100644 --- a/testing/btest/Baseline/scripts.policy.frameworks.telemetry.prometheus/manager-1.services.out +++ b/testing/btest/Baseline/scripts.policy.frameworks.telemetry.prometheus/manager.services.out @@ -1,5 +1,5 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -endpoint="manager-1" +endpoint="manager" endpoint="logger-1" endpoint="proxy-1" endpoint="worker-1" diff --git a/testing/btest/Baseline/scripts.policy.misc.weird-stats-cluster/manager-1.weird_stats.log b/testing/btest/Baseline/scripts.policy.misc.weird-stats-cluster/manager.weird_stats.log similarity index 100% rename from testing/btest/Baseline/scripts.policy.misc.weird-stats-cluster/manager-1.weird_stats.log rename to testing/btest/Baseline/scripts.policy.misc.weird-stats-cluster/manager.weird_stats.log diff --git a/testing/btest/scripts/policy/frameworks/cluster/cluster_started.zeek b/testing/btest/scripts/policy/frameworks/cluster/cluster_started.zeek index f05a45f093..a2373c91f1 100644 --- a/testing/btest/scripts/policy/frameworks/cluster/cluster_started.zeek +++ b/testing/btest/scripts/policy/frameworks/cluster/cluster_started.zeek @@ -1,30 +1,22 @@ # @TEST-DOC: Run a simple cluster to verify cluster_started() and node_fully_connected() are generated. -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 -# @TEST-PORT: BROKER_PORT5 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_PROXY2_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run proxy-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run proxy-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 40 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout @load policy/frameworks/cluster/experimental -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT5")), $manager="manager-1"], -}; -# @TEST-END-FILE - redef Log::default_rotation_interval = 0secs; event Cluster::Experimental::node_fully_connected(name: string, id: string, resending: bool) diff --git a/testing/btest/scripts/policy/frameworks/cluster/cluster_started_logger.zeek b/testing/btest/scripts/policy/frameworks/cluster/cluster_started_logger.zeek index b20748c9cf..7ee8f774be 100644 --- a/testing/btest/scripts/policy/frameworks/cluster/cluster_started_logger.zeek +++ b/testing/btest/scripts/policy/frameworks/cluster/cluster_started_logger.zeek @@ -1,33 +1,24 @@ # @TEST-DOC: Run a cluster that includes a dedicated logger to verify cluster_started() and node_fully_connected() are generated. -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 -# @TEST-PORT: BROKER_PORT5 -# @TEST-PORT: BROKER_PORT6 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_LOGGER1_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_PROXY2_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run logger-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=logger-1 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT +# @TEST-EXEC: btest-bg-run logger-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=logger-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run proxy-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run proxy-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 40 -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout @load policy/frameworks/cluster/experimental -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2"))], - ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], - ["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1"], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT5")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT6")), $manager="manager-1"], -}; -# @TEST-END-FILE - redef Log::default_rotation_interval = 0secs; event Cluster::Experimental::node_fully_connected(name: string, id: string, resending: bool) diff --git a/testing/btest/scripts/policy/frameworks/intel/seen/smtp-cluster.zeek b/testing/btest/scripts/policy/frameworks/intel/seen/smtp-cluster.zeek index 5ce363af46..ba6883ee1c 100644 --- a/testing/btest/scripts/policy/frameworks/intel/seen/smtp-cluster.zeek +++ b/testing/btest/scripts/policy/frameworks/intel/seen/smtp-cluster.zeek @@ -1,24 +1,19 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 - -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT +# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 90 -# @TEST-EXEC: btest-diff manager-1/intel.log +# @TEST-EXEC: btest-diff manager/intel.log # @TEST-START-FILE intel.dat #fields indicator indicator_type meta.source meta.desc meta.url example@gmail.com Intel::EMAIL source1 test entry http://some-data-distributor.com/100000 # @TEST-END-FILE -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], -}; -# @TEST-END-FILE - @load base/frameworks/cluster @load base/frameworks/intel @load frameworks/intel/seen @@ -67,7 +62,7 @@ event proceed() event Cluster::node_up(name: string, id: string) { - if ( Cluster::node != "manager-1" ) + if ( Cluster::node != "manager" ) return; connected = T; @@ -83,7 +78,7 @@ event Cluster::node_down(name: string, id: string) event Input::end_of_data(name: string, source: string) { - if ( Cluster::node != "manager-1" ) + if ( Cluster::node != "manager" ) return; done_reading = T; diff --git a/testing/btest/scripts/policy/frameworks/telemetry/prometheus.zeek b/testing/btest/scripts/policy/frameworks/telemetry/prometheus.zeek index ae1072f138..8f15087403 100644 --- a/testing/btest/scripts/policy/frameworks/telemetry/prometheus.zeek +++ b/testing/btest/scripts/policy/frameworks/telemetry/prometheus.zeek @@ -4,10 +4,11 @@ # @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1" # @TEST-REQUIRES: which jq # -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_LOGGER1_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# # @TEST-PORT: METRICS_PORT1 # @TEST-PORT: METRICS_PORT2 # @TEST-PORT: METRICS_PORT3 @@ -15,19 +16,19 @@ # # @TEST-REQUIRES: which curl # @TEST-EXEC: zeek --parse-only %INPUT -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run logger-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=logger-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run proxy-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 30 -# @TEST-EXEC: btest-diff manager-1/services.out +# @TEST-EXEC: btest-diff manager/services.out # @TEST-START-FILE cluster-layout.zeek redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1")), $metrics_port=to_port(getenv("METRICS_PORT1"))], - ["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1", $metrics_port=to_port(getenv("METRICS_PORT2"))], - ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1", $metrics_port=to_port(getenv("METRICS_PORT3"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1", $metrics_port=to_port(getenv("METRICS_PORT4"))], + ["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_MANAGER_PORT")), $metrics_port=to_port(getenv("METRICS_PORT1"))], + ["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_LOGGER1_PORT")), $manager="manager", $metrics_port=to_port(getenv("METRICS_PORT2"))], + ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PROXY1_PORT")), $manager="manager", $metrics_port=to_port(getenv("METRICS_PORT3"))], + ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_WORKER1_PORT")), $manager="manager", $metrics_port=to_port(getenv("METRICS_PORT4"))], }; # @TEST-END-FILE @@ -60,7 +61,7 @@ done # So the cluster nodes don't terminate right away. #redef exit_only_after_terminate=T; -@if ( Cluster::node == "manager-1" ) +@if ( Cluster::node == "manager" ) @load base/utils/exec diff --git a/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek b/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek index b84675beb1..e65300add8 100644 --- a/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek +++ b/testing/btest/scripts/policy/misc/weird-stats-cluster.zeek @@ -1,21 +1,15 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 45 -# @TEST-EXEC: btest-diff manager-1/weird_stats.log - -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE +# @TEST-EXEC: btest-diff manager/weird_stats.log @load misc/weird-stats @load policy/frameworks/cluster/experimental @@ -42,7 +36,7 @@ event ready_again() event Cluster::Experimental::cluster_started() { - if ( Cluster::node == "manager-1" ) + if ( Cluster::node == "manager" ) return; local n = 0; From d7b5955e5e7447ba266ab8eba1966d87f2895462 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Sun, 18 May 2025 16:52:50 +0200 Subject: [PATCH 09/12] btest/frameworks/notice: Use generic cluster-layout.zeek --- ...anager-1.notice.log => manager.notice.log} | 0 ...anager-1.notice.log => manager.notice.log} | 0 .../base/frameworks/notice/cluster.zeek | 20 +++++--------- .../notice/suppression-cluster.zeek | 27 +++++++------------ 4 files changed, 17 insertions(+), 30 deletions(-) rename testing/btest/Baseline/scripts.base.frameworks.notice.cluster/{manager-1.notice.log => manager.notice.log} (100%) rename testing/btest/Baseline/scripts.base.frameworks.notice.suppression-cluster/{manager-1.notice.log => manager.notice.log} (100%) diff --git a/testing/btest/Baseline/scripts.base.frameworks.notice.cluster/manager-1.notice.log b/testing/btest/Baseline/scripts.base.frameworks.notice.cluster/manager.notice.log similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.notice.cluster/manager-1.notice.log rename to testing/btest/Baseline/scripts.base.frameworks.notice.cluster/manager.notice.log diff --git a/testing/btest/Baseline/scripts.base.frameworks.notice.suppression-cluster/manager-1.notice.log b/testing/btest/Baseline/scripts.base.frameworks.notice.suppression-cluster/manager.notice.log similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.notice.suppression-cluster/manager-1.notice.log rename to testing/btest/Baseline/scripts.base.frameworks.notice.suppression-cluster/manager.notice.log diff --git a/testing/btest/scripts/base/frameworks/notice/cluster.zeek b/testing/btest/scripts/base/frameworks/notice/cluster.zeek index ce0ff72580..c350bb6c47 100644 --- a/testing/btest/scripts/base/frameworks/notice/cluster.zeek +++ b/testing/btest/scripts/base/frameworks/notice/cluster.zeek @@ -1,24 +1,18 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_WORKER1_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run proxy-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 20 -# @TEST-EXEC: btest-diff manager-1/notice.log +# @TEST-EXEC: btest-diff manager/notice.log @load policy/frameworks/cluster/experimental @load base/frameworks/notice -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - redef Log::default_rotation_interval = 0secs; redef enum Notice::Type += { diff --git a/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek b/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek index 6416675d2a..22116f38ef 100644 --- a/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/notice/suppression-cluster.zeek @@ -1,27 +1,20 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run proxy-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 30 -# @TEST-EXEC: btest-diff manager-1/notice.log +# @TEST-EXEC: btest-diff manager/notice.log @load base/frameworks/notice @load policy/frameworks/cluster/experimental -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1"], -}; -# @TEST-END-FILE - redef Log::default_rotation_interval = 0secs; redef enum Notice::Type += { @@ -41,7 +34,7 @@ event do_notice() $msg="test notice!", $identifier="this identifier is static"]); Broker::flush_logs(); - Broker::publish(Cluster::node_topic("manager-1"), proceed); + Broker::publish(Cluster::node_topic("manager"), proceed); } event Notice::suppressed(n: Notice::Info) @@ -58,7 +51,7 @@ event Notice::begin_suppression(ts: time, suppress_for: interval, note: Notice:: print "begin suppression", suppress_for, note, identifier; if ( Cluster::node == "worker-1" ) - Broker::publish(Cluster::node_topic("manager-1"), proceed); + Broker::publish(Cluster::node_topic("manager"), proceed); } @if ( Cluster::local_node_type() == Cluster::MANAGER ) From 6c00c052497c225ee308e42a9ce5497654e40543 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Sun, 18 May 2025 16:57:18 +0200 Subject: [PATCH 10/12] btest/files/x509: Use generic cluster-layout.zeek --- .../{manager-1.x509.log => manager.x509.log} | 0 .../{manager-1.x509.log => manager.x509.log} | 0 .../base/files/x509/log-caching-cluster.test | 22 +++++++------------ .../x509/log-caching-disabled-cluster.test | 22 +++++++------------ 4 files changed, 16 insertions(+), 28 deletions(-) rename testing/btest/Baseline/scripts.base.files.x509.log-caching-cluster/{manager-1.x509.log => manager.x509.log} (100%) rename testing/btest/Baseline/scripts.base.files.x509.log-caching-disabled-cluster/{manager-1.x509.log => manager.x509.log} (100%) diff --git a/testing/btest/Baseline/scripts.base.files.x509.log-caching-cluster/manager-1.x509.log b/testing/btest/Baseline/scripts.base.files.x509.log-caching-cluster/manager.x509.log similarity index 100% rename from testing/btest/Baseline/scripts.base.files.x509.log-caching-cluster/manager-1.x509.log rename to testing/btest/Baseline/scripts.base.files.x509.log-caching-cluster/manager.x509.log diff --git a/testing/btest/Baseline/scripts.base.files.x509.log-caching-disabled-cluster/manager-1.x509.log b/testing/btest/Baseline/scripts.base.files.x509.log-caching-disabled-cluster/manager.x509.log similarity index 100% rename from testing/btest/Baseline/scripts.base.files.x509.log-caching-disabled-cluster/manager-1.x509.log rename to testing/btest/Baseline/scripts.base.files.x509.log-caching-disabled-cluster/manager.x509.log diff --git a/testing/btest/scripts/base/files/x509/log-caching-cluster.test b/testing/btest/scripts/base/files/x509/log-caching-cluster.test index 5416562886..0afb423519 100644 --- a/testing/btest/scripts/base/files/x509/log-caching-cluster.test +++ b/testing/btest/scripts/base/files/x509/log-caching-cluster.test @@ -1,25 +1,19 @@ # Test that certificate log deduplication works in clustered mode. # -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager-1 zeek -b %INPUT" +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager zeek -b %INPUT" # @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-1 zeek -b --pseudo-realtime -C -r $TRACES/tls/ecdhe.pcap %INPUT" -# @TEST-EXEC: $SCRIPTS/wait-for-file manager-1/lost 15 || (btest-bg-wait -k 1 && false) +# @TEST-EXEC: $SCRIPTS/wait-for-file manager/lost 15 || (btest-bg-wait -k 1 && false) # @TEST-EXEC: btest-bg-run worker-2 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-2 zeek -b --pseudo-realtime -C -r $TRACES/tls/ecdhe.pcap %INPUT" # @TEST-EXEC: btest-bg-wait 30 -# @TEST-EXEC: btest-diff manager-1/x509.log - -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE +# @TEST-EXEC: btest-diff manager/x509.log @load base/protocols/ssl @load base/frameworks/cluster diff --git a/testing/btest/scripts/base/files/x509/log-caching-disabled-cluster.test b/testing/btest/scripts/base/files/x509/log-caching-disabled-cluster.test index 051fe9dfce..89bb1baa23 100644 --- a/testing/btest/scripts/base/files/x509/log-caching-disabled-cluster.test +++ b/testing/btest/scripts/base/files/x509/log-caching-disabled-cluster.test @@ -1,25 +1,19 @@ # Test that certificate log deduplication can be disabled in clustered mode. # -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager-1 zeek -b %INPUT" +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager zeek -b %INPUT" # @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-1 zeek -b --pseudo-realtime -C -r $TRACES/tls/ecdhe.pcap %INPUT" -# @TEST-EXEC: $SCRIPTS/wait-for-file manager-1/lost 15 || (btest-bg-wait -k 1 && false) +# @TEST-EXEC: $SCRIPTS/wait-for-file manager/lost 15 || (btest-bg-wait -k 1 && false) # @TEST-EXEC: btest-bg-run worker-2 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-2 zeek -b --pseudo-realtime -C -r $TRACES/tls/ecdhe.pcap %INPUT" # @TEST-EXEC: btest-bg-wait 30 -# @TEST-EXEC: btest-diff manager-1/x509.log - -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE +# @TEST-EXEC: btest-diff manager/x509.log @load base/protocols/ssl @load base/frameworks/cluster From 9365f71965c0dfe06668ff4d649ccb80527c4fb1 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Sun, 18 May 2025 17:01:08 +0200 Subject: [PATCH 11/12] btest/frameworks/logging: Use generic cluster-layout.zeek --- .../manager-reporter.log | 2 +- .../{manager-1.http.log => manager.http.log} | 0 .../field-extension-cluster-error.zeek | 23 ++++++++----------- .../logging/field-extension-cluster.zeek | 19 ++++++--------- 4 files changed, 17 insertions(+), 27 deletions(-) rename testing/btest/Baseline/scripts.base.frameworks.logging.field-extension-cluster/{manager-1.http.log => manager.http.log} (100%) diff --git a/testing/btest/Baseline/scripts.base.frameworks.logging.field-extension-cluster-error/manager-reporter.log b/testing/btest/Baseline/scripts.base.frameworks.logging.field-extension-cluster-error/manager-reporter.log index 4bbb12e5f2..87cd619914 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.logging.field-extension-cluster-error/manager-reporter.log +++ b/testing/btest/Baseline/scripts.base.frameworks.logging.field-extension-cluster-error/manager-reporter.log @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ### NOTE: This file has been sorted with diff-sort. XXXXXXXXXX.XXXXXX Reporter::INFO qux <...>/field-extension-cluster-error.zeek, line XX -XXXXXXXXXX.XXXXXX bah manager-1 XXXXXXXXXX.XXXXXX Reporter::INFO qux <...>/field-extension-cluster-error.zeek, line XX +XXXXXXXXXX.XXXXXX bah manager XXXXXXXXXX.XXXXXX Reporter::INFO qux <...>/field-extension-cluster-error.zeek, line XX diff --git a/testing/btest/Baseline/scripts.base.frameworks.logging.field-extension-cluster/manager-1.http.log b/testing/btest/Baseline/scripts.base.frameworks.logging.field-extension-cluster/manager.http.log similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.logging.field-extension-cluster/manager-1.http.log rename to testing/btest/Baseline/scripts.base.frameworks.logging.field-extension-cluster/manager.http.log diff --git a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.zeek b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.zeek index 0462e2f762..560e988f91 100644 --- a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.zeek +++ b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.zeek @@ -1,20 +1,15 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT # -# @TEST-EXEC: btest-bg-run manager-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager-1 zeek -b %INPUT" -# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-1 zeek -b --pseudo-realtime -C -r $TRACES/wikipedia.trace %INPUT" +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager zeek -b %INPUT" +# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-1 zeek -b --pseudo-realtime -C -r $TRACES/wikipedia.trace %INPUT" # @TEST-EXEC: btest-bg-wait 30 -# @TEST-EXEC: grep qux manager-1/reporter.log | sed 's#line ..#line XX#g' > manager-reporter.log -# @TEST-EXEC: grep qux manager-1/reporter-2.log | sed 's#line ..*#line XX#g' >> manager-reporter.log +# @TEST-EXEC: grep qux manager/reporter.log | sed 's#line ..#line XX#g' > manager-reporter.log +# @TEST-EXEC: grep qux manager/reporter-2.log | sed 's#line ..*#line XX#g' >> manager-reporter.log # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-canonifier | $SCRIPTS/diff-remove-abspath | grep -v ^# | $SCRIPTS/diff-sort" btest-diff manager-reporter.log -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], -}; -# @TEST-END-FILE - @load base/frameworks/cluster @load base/frameworks/logging @load base/frameworks/reporter @@ -72,7 +67,7 @@ event zeek_init() suspend_processing(); } - if ( Cluster::node == "manager-1" ) + if ( Cluster::node == "manager" ) { Broker::subscribe("ready"); } diff --git a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.zeek b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.zeek index 9a25005099..557a5b83d1 100644 --- a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.zeek @@ -1,19 +1,14 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT # -# @TEST-EXEC: btest-bg-run manager-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager-1 zeek -b %INPUT" -# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-1 zeek -b --pseudo-realtime -C -r $TRACES/wikipedia.trace %INPUT" +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager zeek -b %INPUT" +# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-1 zeek -b --pseudo-realtime -C -r $TRACES/wikipedia.trace %INPUT" # @TEST-EXEC: btest-bg-wait 30 -# @TEST-EXEC: btest-diff manager-1/http.log +# @TEST-EXEC: btest-diff manager/http.log -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], -}; -# @TEST-END-FILE - @load base/protocols/conn @load base/protocols/http @load base/frameworks/cluster From 00eabb6cbb43955f386c1a6a672dbbfda3dedd48 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Sun, 18 May 2025 17:12:00 +0200 Subject: [PATCH 12/12] btest remaining: Use generic cluster-layout.zeek --- .../{manager-1..stdout => manager..stdout} | 0 ...er-1.openflow.log => manager.openflow.log} | 0 .../{manager-1..stdout => manager..stdout} | 0 .../{manager-1.dhcp.log => manager.dhcp.log} | 0 .../worker-1..stdout | 2 +- testing/btest/bifs/hll_cluster.zeek | 20 ++++++----------- .../coverage/test-all-policy-cluster.test | 22 +++++++------------ .../frameworks/netcontrol/basic-cluster.zeek | 22 +++++++------------ .../base/frameworks/openflow/log-cluster.zeek | 19 ++++++---------- .../frameworks/storage/redis-cluster.zeek | 22 +++++++------------ .../scripts/base/protocols/dhcp/cluster.zeek | 21 +++++++----------- 11 files changed, 47 insertions(+), 81 deletions(-) rename testing/btest/Baseline/bifs.hll_cluster/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.frameworks.openflow.log-cluster/{manager-1.openflow.log => manager.openflow.log} (100%) rename testing/btest/Baseline/scripts.base.protocols.dhcp.cluster/{manager-1..stdout => manager..stdout} (100%) rename testing/btest/Baseline/scripts.base.protocols.dhcp.cluster/{manager-1.dhcp.log => manager.dhcp.log} (100%) diff --git a/testing/btest/Baseline/bifs.hll_cluster/manager-1..stdout b/testing/btest/Baseline/bifs.hll_cluster/manager..stdout similarity index 100% rename from testing/btest/Baseline/bifs.hll_cluster/manager-1..stdout rename to testing/btest/Baseline/bifs.hll_cluster/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.frameworks.openflow.log-cluster/manager-1.openflow.log b/testing/btest/Baseline/scripts.base.frameworks.openflow.log-cluster/manager.openflow.log similarity index 100% rename from testing/btest/Baseline/scripts.base.frameworks.openflow.log-cluster/manager-1.openflow.log rename to testing/btest/Baseline/scripts.base.frameworks.openflow.log-cluster/manager.openflow.log diff --git a/testing/btest/Baseline/scripts.base.protocols.dhcp.cluster/manager-1..stdout b/testing/btest/Baseline/scripts.base.protocols.dhcp.cluster/manager..stdout similarity index 100% rename from testing/btest/Baseline/scripts.base.protocols.dhcp.cluster/manager-1..stdout rename to testing/btest/Baseline/scripts.base.protocols.dhcp.cluster/manager..stdout diff --git a/testing/btest/Baseline/scripts.base.protocols.dhcp.cluster/manager-1.dhcp.log b/testing/btest/Baseline/scripts.base.protocols.dhcp.cluster/manager.dhcp.log similarity index 100% rename from testing/btest/Baseline/scripts.base.protocols.dhcp.cluster/manager-1.dhcp.log rename to testing/btest/Baseline/scripts.base.protocols.dhcp.cluster/manager.dhcp.log diff --git a/testing/btest/Baseline/scripts.base.protocols.dhcp.cluster/worker-1..stdout b/testing/btest/Baseline/scripts.base.protocols.dhcp.cluster/worker-1..stdout index 0520896388..7647e420f5 100644 --- a/testing/btest/Baseline/scripts.base.protocols.dhcp.cluster/worker-1..stdout +++ b/testing/btest/Baseline/scripts.base.protocols.dhcp.cluster/worker-1..stdout @@ -1,4 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -node_up, manager-1 +node_up, manager dhcp_message, CHhAvVGS1DHFjwGM9 file_done diff --git a/testing/btest/bifs/hll_cluster.zeek b/testing/btest/bifs/hll_cluster.zeek index ce5bd70340..54685bb160 100644 --- a/testing/btest/bifs/hll_cluster.zeek +++ b/testing/btest/bifs/hll_cluster.zeek @@ -1,27 +1,21 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT +# +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . # # @TEST-EXEC: zeek -b %INPUT>out -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT runnumber=1 # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT runnumber=2 # @TEST-EXEC: btest-bg-wait 30 # -# @TEST-EXEC: btest-diff manager-1/.stdout +# @TEST-EXEC: btest-diff manager/.stdout # @TEST-EXEC: btest-diff worker-1/.stdout # @TEST-EXEC: btest-diff worker-2/.stdout @load base/frameworks/cluster -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - redef Log::default_rotation_interval = 0secs; global hll_data: event(data: opaque of cardinality); diff --git a/testing/btest/coverage/test-all-policy-cluster.test b/testing/btest/coverage/test-all-policy-cluster.test index 7bbe320789..3ef38781c7 100644 --- a/testing/btest/coverage/test-all-policy-cluster.test +++ b/testing/btest/coverage/test-all-policy-cluster.test @@ -1,9 +1,11 @@ # @TEST-DOC: Start each node type and ensure there are no unexpected warnings to be seen # -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 -# @TEST-PORT: BROKER_PORT4 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_LOGGER1_PORT +# @TEST-PORT: BROKER_PROXY1_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . # # @TEST-EXEC: CLUSTER_NODE=manager zeek %INPUT # @TEST-EXEC: CLUSTER_NODE=logger-1 zeek %INPUT @@ -20,16 +22,6 @@ # calls in some scripts. redef Cluster::backend = Cluster::CLUSTER_BACKEND_BROKER; -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2"))], - ["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4"))], -}; - -# @TEST-END-FILE - # Make this a single-node cluster-layout so no connection attempts happen # to other nodes. redef Cluster::nodes = { @@ -41,6 +33,8 @@ redef Log::default_rotation_interval = 0sec; event zeek_init() { + # Prevent connections to the manager defined in Cluster::nodes. + delete Cluster::nodes[Cluster::node]$manager; print Cluster::node, "zeek_init()"; terminate(); } diff --git a/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek b/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek index ba73634078..1435d860e5 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek @@ -1,11 +1,13 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT # -# @TEST-EXEC: btest-bg-run manager-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager-1 zeek -b %INPUT" -# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-1 zeek -b --pseudo-realtime -C -r $TRACES/tls/ecdhe.pcap %INPUT" +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager zeek -b %INPUT" +# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-1 zeek -b --pseudo-realtime -C -r $TRACES/tls/ecdhe.pcap %INPUT" -# @TEST-EXEC: $SCRIPTS/wait-for-file manager-1/lost 45 || (btest-bg-wait -k 1 && false) +# @TEST-EXEC: $SCRIPTS/wait-for-file manager/lost 45 || (btest-bg-wait -k 1 && false) # @TEST-EXEC: btest-bg-run worker-2 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-2 zeek -b --pseudo-realtime -C -r $TRACES/tls/ecdhe.pcap %INPUT" # This timeout needs to be large to accommodate ZAM compilation delays. @@ -13,14 +15,6 @@ # @TEST-EXEC: btest-diff worker-1/.stdout # @TEST-EXEC: btest-diff worker-2/.stdout -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - redef Log::default_rotation_interval = 0secs; redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/openflow/log-cluster.zeek b/testing/btest/scripts/base/frameworks/openflow/log-cluster.zeek index d82244cb9d..8ec83611b3 100644 --- a/testing/btest/scripts/base/frameworks/openflow/log-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/openflow/log-cluster.zeek @@ -1,17 +1,12 @@ -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT # -# @TEST-EXEC: btest-bg-run manager-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager-1 zeek %INPUT" -# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-1 zeek --pseudo-realtime -C -r $TRACES/smtp.trace %INPUT" +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . +# +# @TEST-EXEC: btest-bg-run manager "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager zeek %INPUT" +# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-1 zeek --pseudo-realtime -C -r $TRACES/smtp.trace %INPUT" # @TEST-EXEC: btest-bg-wait 45 -# @TEST-EXEC: btest-diff manager-1/openflow.log - -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], -}; -# @TEST-END-FILE +# @TEST-EXEC: btest-diff manager/openflow.log redef Log::default_rotation_interval = 0secs; #redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/frameworks/storage/redis-cluster.zeek b/testing/btest/scripts/base/frameworks/storage/redis-cluster.zeek index f3c3ba620f..b68b9f4f15 100644 --- a/testing/btest/scripts/base/frameworks/storage/redis-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/storage/redis-cluster.zeek @@ -2,14 +2,16 @@ # @TEST-REQUIRES: have-redis # @TEST-PORT: REDIS_PORT -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 -# @TEST-PORT: BROKER_PORT3 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# @TEST-PORT: BROKER_WORKER2_PORT +# +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . # @TEST-EXEC: btest-bg-run redis-server run-redis-server ${REDIS_PORT%/tcp} -# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT -# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT +# @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT +# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT +# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT # @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-diff worker-1/.stdout # @TEST-EXEC: btest-diff worker-2/.stdout @@ -20,14 +22,6 @@ @load policy/frameworks/storage/backend/redis @load policy/frameworks/cluster/experimental -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], - ["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"], -}; -# @TEST-END-FILE - global redis_data_written: event() &is_used; @if ( Cluster::local_node_type() == Cluster::WORKER ) diff --git a/testing/btest/scripts/base/protocols/dhcp/cluster.zeek b/testing/btest/scripts/base/protocols/dhcp/cluster.zeek index e2912ef6df..4f4b345808 100644 --- a/testing/btest/scripts/base/protocols/dhcp/cluster.zeek +++ b/testing/btest/scripts/base/protocols/dhcp/cluster.zeek @@ -1,23 +1,18 @@ # Test in cluster mode, the manager produces the cluster.log # -# @TEST-PORT: BROKER_PORT1 -# @TEST-PORT: BROKER_PORT2 +# @TEST-PORT: BROKER_MANAGER_PORT +# @TEST-PORT: BROKER_WORKER1_PORT +# +# @TEST-EXEC: cp $FILES/broker/cluster-layout.zeek . # # @TEST-EXEC: zeek -b --parse-only %INPUT -# @TEST-EXEC: btest-bg-run manager-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager-1 zeek -b %INPUT" -# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-1 zeek -b --pseudo-realtime -C -r $TRACES/dhcp/dhcp_ack_subscriber_id_and_agent_remote_id.trace %INPUT" +# @TEST-EXEC: btest-bg-run manager "cp ../cluster-layout.zeek . && CLUSTER_NODE=manager zeek -b %INPUT" +# @TEST-EXEC: btest-bg-run worker-1 "cp ../cluster-layout.zeek . && CLUSTER_NODE=worker-1 zeek -b --pseudo-realtime -C -r $TRACES/dhcp/dhcp_ack_subscriber_id_and_agent_remote_id.trace %INPUT" # @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-diff worker-1/.stdout -# @TEST-EXEC: btest-diff manager-1/.stdout -# @TEST-EXEC: btest-diff manager-1/dhcp.log - -# @TEST-START-FILE cluster-layout.zeek -redef Cluster::nodes = { - ["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))], - ["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"], -}; -# @TEST-END-FILE +# @TEST-EXEC: btest-diff manager/.stdout +# @TEST-EXEC: btest-diff manager/dhcp.log @load base/protocols/dhcp @load base/frameworks/broker