Jinja template and variable updates to use variable names that make it easier to know where they are used during Jinja template rendering.

Author: marc-casavant

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

@@ -40,11 +40,11 @@ modules {
 	{% include "environments/configs/freeradius/common/mods-available/stats" %}
 
 	# radius module instance configuration
-	{% for i in range(1, (num_of_dst_servers + 1)) %}
-	radius radius-module-dst-server{{ i }} {
-		$template radius-module-dst-server-tmpl
+	{% for i in range(1, (load_gen_num_of_dest_servers + 1)) %}
+	radius radius-module-dest-server{{ i }} {
+		$template radius-module-dest-server-tmpl
 		udp {
-			ipaddr = homeserver{{ i }}
+			ipaddr = {{ load_gen_dest_server_name }}{{ i }}
 		}
 	}
 	{% endfor %}
@@ -183,8 +183,8 @@ server load-generator {
 	authenticate load-generator-proxy {
 		# Use redundant-load-balance to distribute requests to multiple home servers
 		redundant-load-balance {
-			{% for i in range(1, (num_of_dst_servers + 1)) %}
-			radius-module-dst-server{{ i }}
+			{% for i in range(1, (load_gen_num_of_dest_servers + 1)) %}
+			radius-module-dest-server{{ i }}
 			{% endfor %}
 		}
 	}

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

@@ -2,7 +2,7 @@
 #
 # radius module template for load-generator
 #
-radius-module-dst-server-tmpl {
+radius-module-dest-server-tmpl {
 	mode = client
 	transport = udp
 	type = Access-Request

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

@@ -17,7 +17,7 @@ x-common-config: &id001
   - NET_ADMIN
   - SYS_PTRACE
 services:
-{% for i in range(1, (num_of_dst_servers + 1)) %}
+{% for i in range(1, (compose_num_of_home_servers + 1)) %}
   homeserver{{ i }}:
     image: freeradius-build:latest
     volumes:
@@ -48,7 +48,7 @@ services:
       - "1813:1813/udp"
       - "1820:1820/udp"
     depends_on:
-{% for i in range(1, (num_of_dst_servers + 1)) %}
+{% for i in range(1, (compose_num_of_home_servers + 1)) %}
       - homeserver{{ i }}
 {% endfor %}
     volumes:

src/tests/multi-server/environments/jinja-vars/env-5hs-autoaccept.vars.yml

@@ -1,3 +1,7 @@
-num_of_dst_servers: 5
-dst_server_name: homeserver
+# Docker compose Jinja template vars
+compose_num_of_home_servers: 5
+# Load generator Jinja template vars
+load_gen_num_of_dest_servers: 5
+load_gen_dest_server_name: homeserver
+# General Jinja template vars
 listener_type: file