Skip to content

Commit b6f08cc

Browse files
committed
testing next tests round
1 parent 6d9e486 commit b6f08cc

File tree

2 files changed

+42
-18
lines changed

2 files changed

+42
-18
lines changed

run_all_tests_nohup.sh

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ mkdir -p "$(dirname ${LOG})"
55
if [ -z "$NOHUP_STARTED" ]; then
66
export NOHUP_STARTED=1
77
nohup "$0" "$@" >"${LOG}" 2>&1 &
8-
tail -f "${LOG}"
8+
tail -f "${LOG}" &
9+
wait %1
10+
kill %2
911
fi
1012

1113
. .venv/bin/activate || (
@@ -14,47 +16,69 @@ fi
1416
)
1517

1618
PROBES=(
17-
"ipfixprobe-raw"
18-
"ipfixprobe-dpdk"
19-
"nprobe-pcap"
20-
"nprobe-pfring"
19+
# "ipfixprobe-raw"
20+
# "ipfixprobe-raw-4"
21+
# "ipfixprobe-pcap"
22+
# "ipfixprobe-pcap-4"
23+
# "ipfixprobe-dpdk-1"
24+
# "ipfixprobe-dpdk-2"
25+
"ipfixprobe-dpdk-4"
26+
# "ipfixprobe-dpdk-16"
27+
# "nprobe-pcap"
28+
# "nprobe-pcap-4"
29+
# "nprobe-pfring"
2130
"nprobe-zc"
22-
"cento-pcap"
23-
"cento-pfring"
31+
# "cento-pcap"
32+
# "cento-pcap-4"
33+
# "cento-pfring"
2434
"cento-zc"
25-
"yaf-pcap"
26-
"yaf-pfring"
35+
# "yaf-pcap"
36+
# "yaf-pcap-4"
37+
# "yaf-pfring"
38+
# "yaf-pfring-pcap"
39+
# "yaf-pfring-pcap-4"
2740
"yaf-zc"
2841
)
2942

30-
declare -A PROBES_PROTOCOLS
31-
PROBES_PROTOCOLS=(
43+
declare -A PROBE_PROTOCOLS
44+
PROBE_PROTOCOLS=(
3245
"ipfixprobe-raw" "tcp"
33-
"ipfixprobe-dpdk" "tcp"
46+
"ipfixprobe-raw-4" "tcp"
47+
"ipfixprobe-pcap" "tcp"
48+
"ipfixprobe-pcap-4" "tcp"
49+
"ipfixprobe-dpdk-1" "tcp"
50+
"ipfixprobe-dpdk-2" "tcp"
51+
"ipfixprobe-dpdk-4" "tcp"
52+
"ipfixprobe-dpdk-16" "tcp"
3453
"nprobe-pcap" "udp"
54+
"nprobe-pcap-4" "udp"
3555
"nprobe-pfring" "udp"
3656
"nprobe-zc" "udp"
3757
"cento-pcap" "tcp"
58+
"cento-pcap-4" "tcp"
3859
"cento-pfring" "tcp"
3960
"cento-zc" "tcp"
4061
"yaf-pcap" "tcp"
62+
"yaf-pcap-4" "tcp"
4163
"yaf-pfring" "tcp"
64+
"yaf-pfring-pcap" "tcp"
65+
"yaf-pfring-pcap-4" "tcp"
4266
"yaf-zc" "tcp"
4367
)
4468

4569
for probe in ${PROBES[@]}; do
4670
ARGS=(
4771
"--config-path=/home/student/2025-bsc-kuppler-flowmeter/flowtest-configs"
4872
"--replicator=kuppler-2-xdp-zc"
49-
"--collector=ipfixcol-1:protocol=${PROBES_PROTOCOLS[$probe]}"
73+
"--collector=ipfixcol-1:protocol=${PROBE_PROTOCOLS[$probe]}"
5074
"--probe=${probe}"
5175
"--disable-ansible"
5276
"--html=logs/report.html"
5377
"--self-contained-html"
5478
"--continue-on-collection-errors"
5579
"--capture=tee-sys"
5680
"-m"
57-
"simulation and hospitals and sim_threshold"
81+
"simulation and once_per_probe"
5882
)
5983

6084
echo "📋 Starting tests with nohup... output in ${LOG} for $probe"

testing/simulation/one_packet_flows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ sim_threshold:
5050
- key: DURATION
5151
diff: 1
5252
- id: one_packet_small_cache_size
53-
marks: []
53+
marks: [once_per_probe]
5454
mbps_accuracy: 100
5555
mbps_required: 500
5656
speed_max: 12500
@@ -72,7 +72,7 @@ sim_threshold:
7272
- key: DURATION
7373
diff: 1
7474
- id: one_packet_larger_cache_size
75-
marks: []
75+
marks: [once_per_probe]
7676
mbps_accuracy: 100
7777
mbps_required: 500
7878
speed_max: 12500
@@ -95,7 +95,7 @@ sim_threshold:
9595
diff: 1
9696

9797
- id: one_packet_short_timeout
98-
marks: []
98+
marks: [once_per_probe]
9999
mbps_accuracy: 100
100100
mbps_required: 1000
101101
speed_max: 12500
@@ -119,7 +119,7 @@ sim_threshold:
119119
diff: 1
120120

121121
- id: one_packet_one_min_timeout
122-
marks: []
122+
marks: [once_per_probe]
123123
mbps_accuracy: 100
124124
mbps_required: 1000
125125
speed_max: 12500

0 commit comments

Comments
 (0)