Skip to content

Commit f7d28d2

Browse files
authored
Feat(eos_designs): Add support for timeout and retransmit to aaa_settings.radius (#6847)
1 parent 2926df7 commit f7d28d2

8 files changed

Lines changed: 35 additions & 2 deletions

File tree

ansible_collections/arista/avd/extensions/molecule/eos_designs_unit_tests/intended/configs/aaa-settings-1.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ hostname aaa-settings-1
1414
!
1515
vrf instance MGMT
1616
!
17-
radius-server host 11.10.10.11 key 7 071B245F5A
17+
radius-server host 11.10.10.11 timeout 10 retransmit 3 key 7 071B245F5A
1818
radius-server host 10.10.10.42 key 7 071B245F5A
1919
radius-server host 11.10.10.12 tls ssl-profile HOST_SSL_PROFILE port 2080
20-
radius-server host 11.10.10.1 vrf MGMT key 7 071B245F5A
20+
radius-server host 11.10.10.1 vrf MGMT timeout 20 key 7 071B245F5A
2121
radius-server host 11.10.10.2 vrf MGMT key 7 071B245F5A
2222
radius-server host 11.10.10.5 vrf MGMT tls ssl-profile HOST_SSL_PROFILE port 2080
2323
radius-server host 11.10.10.3 vrf MGMT key 7 0112140D481F07

ansible_collections/arista/avd/extensions/molecule/eos_designs_unit_tests/intended/structured_configs/aaa-settings-1.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@ metadata:
202202
radius_server:
203203
servers:
204204
- host: 11.10.10.11
205+
timeout: 10
206+
retransmit: 3
205207
key: 071B245F5A
206208
- host: 10.10.10.42
207209
key: 071B245F5A
@@ -214,6 +216,7 @@ radius_server:
214216
- name: MGMT
215217
servers:
216218
- host: 11.10.10.1
219+
timeout: 20
217220
key: 071B245F5A
218221
- host: 11.10.10.2
219222
key: 071B245F5A

ansible_collections/arista/avd/extensions/molecule/eos_designs_unit_tests/inventory/host_vars/aaa-settings-1.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ aaa_settings:
9898
servers:
9999
- host: 11.10.10.11
100100
vrf: default
101+
timeout: 10
102+
retransmit: 3
101103
key: 071B245F5A
102104
# key take precedence over cleartext_key
103105
cleartext_key: arista
@@ -107,6 +109,7 @@ aaa_settings:
107109
# Test with host as domain name and cleartext_key to AVD type-7 encrypt key
108110
- host: 11.10.10.1
109111
vrf: use_mgmt_interface_vrf
112+
timeout: 20
110113
key: 071B245F5A
111114
groups:
112115
- RADIUS1

ansible_collections/arista/avd/roles/eos_designs/docs/tables/aaa-settings.md

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

python-avd/pyavd/_eos_designs/schema/__init__.py

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

python-avd/pyavd/_eos_designs/schema/schema_fragments/aaa_settings.schema.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,12 @@ keys:
137137
- Any other string will be used directly as the VRF name.
138138
convert_types:
139139
- int
140+
timeout:
141+
type: int
142+
$ref: "eos_cli_config_gen#/keys/radius_server/keys/servers/items/keys/timeout"
143+
retransmit:
144+
type: int
145+
$ref: "eos_cli_config_gen#/keys/radius_server/keys/servers/items/keys/retransmit"
140146
key:
141147
type: str
142148
description: |-

python-avd/pyavd/_eos_designs/structured_config/base/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,9 @@ def _add_radius_server_config(self, server: EosDesigns.AaaSettings.Radius.Server
724724
else:
725725
server_kwargs["key"] = self._get_tacacs_or_radius_server_password(server)
726726

727+
server_kwargs["timeout"] = server.timeout
728+
server_kwargs["retransmit"] = server.retransmit
729+
727730
if server_vrf == "default":
728731
self.structured_config.radius_server.servers.append_new(**server_kwargs)
729732
else:

0 commit comments

Comments
 (0)