Skip to content

Commit b8a6d64

Browse files
committed
WIP: updated prof-accept test and config files to be inline with improvements made in the prof-pap-auth test
1 parent 8a3744f commit b8a6d64

5 files changed

Lines changed: 9 additions & 45 deletions

File tree

src/tests/multi-server/configs/freeradius/profiling-server/radiusd.conf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ server profiling-server {
3737
filename = ${confdir}/load-generator-packets/packet.conf
3838

3939
# Saving proto_load statistics disabled by default, can be enabled for debugging purposes.
40-
csv = ${confdir}/stats/load-generator-client-stats.csv
40+
csv = ${confdir}/stats/load-generator-stats.csv
4141

4242
max_attributes = 64
4343

src/tests/multi-server/configs/freeradius/profiling-server/stats/load-generator-client-stats.csv renamed to src/tests/multi-server/configs/freeradius/profiling-server/stats/load-generator-stats.csv

File renamed without changes.

src/tests/multi-server/configs/freeradius/profiling-server/template.d/load-generator-templates

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#
2+
# virtual server templates placeholder
3+
#

src/tests/multi-server/environments/profiling.yml.j2

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ services:
1616
image: freeradius-prof:latest
1717
volumes:
1818
# profiling-server server config
19-
- ${DATA_PATH}/freeradius/profiling-server/radiusd.conf:/etc/raddb/radiusd.conf
20-
- ${DATA_PATH}/prof-results/:/etc/prof-results/
19+
- ${DATA_PATH}/freeradius/profiling-server/radiusd.conf:/etc/freeradius/radiusd.conf
2120
# proto_load packet configuration and statistics output
22-
- ${DATA_PATH}/freeradius/profiling-server/load-generator-packets/:/etc/raddb/load-generator-packets/
23-
- ${DATA_PATH}/freeradius/profiling-server/stats/load-generator-client-stats.csv:/etc/freeradius/stats/load-generator-client-stats.csv
21+
- ${DATA_PATH}/freeradius/profiling-server/load-generator-packets/:/etc/freeradius/load-generator-packets/
22+
- ${DATA_PATH}/freeradius/profiling-server/stats/load-generator-stats.csv:/etc/freeradius/stats/load-generator-stats.csv
23+
# Profiling results directory
24+
- ${DATA_PATH}/prof-results/:/etc/prof-results/
2425
# Listener directory
2526
- ${LISTENER_DIR}/:/var/run/multi-server/
2627
entrypoint:
@@ -32,27 +33,4 @@ services:
3233
#
3334
# Start the server after configuring environment variables from test case's template.yml.j2 file.
3435
sleep infinity
35-
36-
## TO BE USED FOR DEBUGGING PURPOSES ONLY, NOT TO BE EXECUTED BY DEFAULT
37-
##
38-
## proto_load configuration via environment variables
39-
##
40-
#{%- for key, value in loadgen.items() %}
41-
#export TEST_LOADGEN_{{ key | upper }}="{{ value }}"
42-
#{%- endfor %}
43-
#TEST_LOADGEN_NUM_MESSAGES=0
44-
#for ((pps=$TEST_LOADGEN_START_PPS; pps<=$TEST_LOADGEN_MAX_PPS; pps+=$TEST_LOADGEN_STEP)); do
45-
# TEST_LOADGEN_NUM_MESSAGES=$((TEST_LOADGEN_NUM_MESSAGES + TEST_LOADGEN_DURATION * pps))
46-
#done
47-
#export TEST_LOADGEN_NUM_MESSAGES
48-
##
49-
## Starting profiling-server server which will generate traffic based on env configuration
50-
## from above.
51-
##
52-
#printf "Starting profiling-server with the following configuration:\n"
53-
#{%- for key, value in loadgen.items() %}
54-
#printf " {{ key | upper }}:%s\n" "$TEST_LOADGEN_{{ key | upper }}"
55-
#{%- endfor %}
56-
#printf " NUM_MESSAGES: %s\n" "$TEST_LOADGEN_NUM_MESSAGES"
57-
#exec freeradius -f -l stdout
5836
<<: *id001

0 commit comments

Comments
 (0)