Skip to content

Commit 1f265df

Browse files
committed
New jinja vars file to use while rendering jinja .j2 template files.
1 parent 551f11d commit 1f265df

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

src/tests/multi-server/environments/configs/freeradius/load-generator/radiusd.conf.j2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ modules {
3030
{% include "environments/configs/freeradius/common/mods-available/linelog" %}
3131

3232
# Test-framework specific linelog module configuration based on OS environment
33-
{% if test.listener_type == "unix" %}
33+
{% if listener_type == "unix" %}
3434
{% include "environments/configs/freeradius/common/mods-available/linelog_socket" %}
35-
{% elif test.listener_type == "file" %}
35+
{% elif listener_type == "file" %}
3636
{% include "environments/configs/freeradius/common/mods-available/linelog_file" %}
3737
{% endif %}
3838

3939
# Common stats module configuration
4040
{% include "environments/configs/freeradius/common/mods-available/stats" %}
4141

4242
# radius module instance configuration
43-
{% for i in range(1, 6) %}
43+
{% for i in range(1, (num_of_dst_servers + 1)) %}
4444
radius radius-module-dst-server{{ i }} {
4545
$template radius-module-dst-server-tmpl
4646
udp {
@@ -183,7 +183,7 @@ server load-generator {
183183
authenticate load-generator-proxy {
184184
# Use redundant-load-balance to distribute requests to multiple home servers
185185
redundant-load-balance {
186-
{% for i in range(1, 6) %}
186+
{% for i in range(1, (num_of_dst_servers + 1)) %}
187187
radius-module-dst-server{{ i }}
188188
{% endfor %}
189189
}

src/tests/multi-server/environments/docker-compose/env-5hs-autoaccept.yml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ x-common-config: &id001
1717
- NET_ADMIN
1818
- SYS_PTRACE
1919
services:
20-
{% for i in range(1,6) %}
20+
{% for i in range(1, (num_of_dst_servers + 1)) %}
2121
homeserver{{ i }}:
2222
image: fr-build-ubuntu22:latest
2323
volumes:
@@ -48,7 +48,7 @@ services:
4848
- "1813:1813/udp"
4949
- "1820:1820/udp"
5050
depends_on:
51-
{% for i in range(1,6) %}
51+
{% for i in range(1, (num_of_dst_servers + 1)) %}
5252
- homeserver{{ i }}
5353
{% endfor %}
5454
volumes:
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
num_of_dst_servers: 5
2+
dst_server_name: homeserver
3+
listener_type: file

0 commit comments

Comments
 (0)