Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix(eos_cli_config_gen): Fix radius attribute 32 format option. #3413

Merged
merged 3 commits into from
Dec 14, 2023
Merged

Fix(eos_cli_config_gen): Fix radius attribute 32 format option. #3413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
245758b
Bug(eos_cli_gen): Fix for PR3412 Radius attribute attribute_32_includ…
Chr1stophP Dec 8, 2023
f9d813c
Add test coverage
ClausHolbechArista Dec 14, 2023
c45b29b
Merge branch 'devel' into fix_pr3412
ClausHolbechArista Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions ...arista/avd/molecule/eos_cli_config_gen/documentation/devices/radius-server-2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# radius-server-2

## Table of Contents

- [Management](#management)
- [Management Interfaces](#management-interfaces)
- [Authentication](#authentication)
- [RADIUS Server](#radius-server)

## Management

### Management Interfaces

#### Management Interfaces Summary

##### IPv4

| Management Interface | description | Type | VRF | IP Address | Gateway |
| -------------------- | ----------- | ---- | --- | ---------- | ------- |
| Management1 | oob_management | oob | MGMT | 10.73.255.122/24 | 10.73.255.2 |

##### IPv6

| Management Interface | description | Type | VRF | IPv6 Address | IPv6 Gateway |
| -------------------- | ----------- | ---- | --- | ------------ | ------------ |
| Management1 | oob_management | oob | MGMT | - | - |

#### Management Interfaces Device Configuration

```eos
!
interface Management1
description oob_management
vrf MGMT
ip address 10.73.255.122/24
```

## Authentication

### RADIUS Server

- Attribute 32 is included in access requests using format 'myformat'

#### RADIUS Server Hosts

| VRF | RADIUS Servers | Timeout | Retransmit |
| --- | -------------- | ------- | ---------- |

#### RADIUS Server Device Configuration

```eos
!
radius-server attribute 32 include-in-access-req format myformat
```
17 changes: 17 additions & 0 deletions ...e_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/radius-server-2.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
!RANCID-CONTENT-TYPE: arista
!
transceiver qsfp default-mode 4x10G
!
hostname radius-server-2
!
radius-server attribute 32 include-in-access-req format myformat
!
no enable password
no aaa root
!
interface Management1
description oob_management
vrf MGMT
ip address 10.73.255.122/24
!
end
5 changes: 5 additions & 0 deletions ...ollections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/radius-server-2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
### Radius Server
radius_server:
attribute_32_include_in_access_req:
format: myformat
1 change: 1 addition & 0 deletions ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ queue_monitor_length
queue_monitor_length_notifying
queue_monitor_streaming
radius-server
radius-server-2
redundancy
roles
route-maps
Expand Down
2 changes: 1 addition & 1 deletion ..._collections/arista/avd/roles/eos_cli_config_gen/templates/documentation/radius-server.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{% if radius_server.attribute_32_include_in_access_req.hostname is arista.avd.defined(true) %}
{% set doc_line = doc_line ~ " using hostname" %}
{% elif radius_server.attribute_32_include_in_access_req.format is arista.avd.defined %}
{% set doc_line = doc_line ~ " using format '" ~ attribute_32_include_in_access_req.format ~ "'" %}
{% set doc_line = doc_line ~ " using format '" ~ radius_server.attribute_32_include_in_access_req.format ~ "'" %}
{% endif %}

{{ doc_line }}
Expand Down
2 changes: 1 addition & 1 deletion ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/radius-server.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{% if radius_server.attribute_32_include_in_access_req.hostname is arista.avd.defined (true) %}
{% set attribute_32_include_in_access_cli = attribute_32_include_in_access_cli ~ " hostname" %}
{% elif radius_server.attribute_32_include_in_access_req.format is arista.avd.defined %}
{% set attribute_32_include_in_access_cli = attribute_32_include_in_access_cli ~ " format " ~ radius_server.attribute_32_include_in_access.format %}
{% set attribute_32_include_in_access_cli = attribute_32_include_in_access_cli ~ " format " ~ radius_server.attribute_32_include_in_access_req.format %}
{% endif %}
{{ attribute_32_include_in_access_cli }}
{% endif %}
Expand Down