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

Feat(eos_cli_config_gen): Add support for additional dot1x commands. #4191

Merged
merged 15 commits into from
Sep 12, 2024
Merged

Feat(eos_cli_config_gen): Add support for additional dot1x commands. #4191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
936ad09
Feat(eos_cli_config_gen): Add support for additional dot1x commands.
Jul 9, 2024
3c8d2df
Address multiple comments.
Jul 9, 2024
13bb6ff
Fix
Jul 18, 2024
55663ff
Adding missing tests from coverage report.
Jul 19, 2024
932830b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 26, 2024
cb3f5ac
Delete python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json
laxmikantchintakindi Aug 1, 2024
587e402
Delete python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen…
laxmikantchintakindi Aug 1, 2024
6144e97
Improve coverage.
Aug 5, 2024
e0686e9
Make template simpler.
Aug 9, 2024
3a32e57
Fix the template for traffic commands.
Aug 9, 2024
f8f341f
Change key name for av pair username format.
Aug 9, 2024
c372e89
Adding big keyword into a variable.
Aug 9, 2024
48ef371
Rebase
Sep 10, 2024
1d33d12
Merge branch 'devel' into additional_dot1x
ClausHolbechArista Sep 12, 2024
f15b4d7
Merge branch 'devel' into additional_dot1x
ClausHolbechArista Sep 12, 2024
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
26 changes: 26 additions & 0 deletions ...ta/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,6 +1141,29 @@ interface Ethernet69
description IP NAT service-profile
switchport
ip nat service-profile TEST-NAT-PROFILE
!
interface Ethernet70
description dot1x_aaa_unresponsive
no shutdown
dot1x aaa unresponsive phone action apply cached-results timeout 10 hours else traffic allow
dot1x aaa unresponsive action traffic allow vlan 10 access-list acl1
dot1x aaa unresponsive eap response success
dot1x mac based access-list
!
interface Ethernet71
description dot1x_aaa_unresponsive1
no shutdown
dot1x aaa unresponsive phone action apply cached-results timeout 10 hours
dot1x aaa unresponsive action traffic allow vlan 10 access-list acl1
dot1x aaa unresponsive eap response success
dot1x mac based access-list
!
interface Ethernet72
description dot1x_aaa_unresponsive2
no shutdown
dot1x aaa unresponsive action traffic allow vlan 10 access-list acl1
dot1x aaa unresponsive eap response success
dot1x mac based access-list
```

## BFD
Expand Down Expand Up @@ -1195,6 +1218,9 @@ interface Ethernet69
| Ethernet43 | - | - | - | - | - | - | - | - |
| Ethernet44 | - | - | - | - | - | - | - | - |
| Ethernet45 | authenticator | auto | - | True | allow vlan 800 | multi-host | True | True |
| Ethernet70 | - | - | - | - | - | - | - | - |
| Ethernet71 | - | - | - | - | - | - | - | - |
| Ethernet72 | - | - | - | - | - | - | - | - |

## Power Over Ethernet (PoE)

Expand Down
2 changes: 2 additions & 0 deletions ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/dot1x-2.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ dot1x protocol lldp bypass
dot1x protocol bpdu bypass
dot1x dynamic-authorization
dot1x
aaa unresponsive phone action apply cached-results
aaa unresponsive action traffic allow
radius av-pair service-type
radius av-pair framed-mtu 1500
1 change: 1 addition & 0 deletions ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/dot1x.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ dot1x
mac based authentication hold period 300 seconds
radius av-pair service-type
radius av-pair framed-mtu 1500
mac-based-auth radius av-pair user-name delimiter colon lowercase
supplicant disconnect cached-results timeout 79 seconds
captive-portal url http://portal-nacm08/captiveredirect/ ssl profile Profile1
captive-portal access-list ipv4 ACL
Expand Down
23 changes: 23 additions & 0 deletions ...llections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ethernet-interfaces.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,6 +758,29 @@ interface Ethernet69
switchport
ip nat service-profile TEST-NAT-PROFILE
!
interface Ethernet70
description dot1x_aaa_unresponsive
no shutdown
dot1x aaa unresponsive phone action apply cached-results timeout 10 hours else traffic allow
dot1x aaa unresponsive action traffic allow vlan 10 access-list acl1
dot1x aaa unresponsive eap response success
dot1x mac based access-list
!
interface Ethernet71
description dot1x_aaa_unresponsive1
no shutdown
dot1x aaa unresponsive phone action apply cached-results timeout 10 hours
dot1x aaa unresponsive action traffic allow vlan 10 access-list acl1
dot1x aaa unresponsive eap response success
dot1x mac based access-list
!
interface Ethernet72
description dot1x_aaa_unresponsive2
no shutdown
dot1x aaa unresponsive action traffic allow vlan 10 access-list acl1
dot1x aaa unresponsive eap response success
dot1x mac based access-list
!
interface Management1
description oob_management
vrf MGMT
Expand Down
6 changes: 6 additions & 0 deletions ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/dot1x-2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,9 @@ dot1x:
radius_av_pair:
service_type: true
framed_mtu: 1500
aaa:
unresponsive:
action:
traffic_allow: true
phone_action:
apply_cached_results: true
3 changes: 3 additions & 0 deletions ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/dot1x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ dot1x:
apply_alternate: true
recovery_action_reauthenticate: true
accounting_update_interval: 6
radius_av_pair_username_format:
delimiter: colon
mac_string_case: lowercase
captive_portal:
enabled: true
url: http://portal-nacm08/captiveredirect/
Expand Down
45 changes: 45 additions & 0 deletions ...ctions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,3 +1354,48 @@ ethernet_interfaces:
inner_vlan: 11
network:
protocol: client inner
- name: Ethernet70
Shivani-gslab marked this conversation as resolved.
Show resolved Hide resolved
description: dot1x_aaa_unresponsive
shutdown: false
dot1x:
aaa:
unresponsive:
eap_response: success
MaheshGSLAB marked this conversation as resolved.
Show resolved Hide resolved
action:
traffic_allow_vlan: 10
traffic_allow_access_list: acl1
phone_action:
apply_cached_results: true
cached_results_timeout:
time_duration: 10
time_duration_unit: hours
traffic_allow: true
apply_alternate: true
mac_based_access_list: true
- name: Ethernet71
description: dot1x_aaa_unresponsive1
shutdown: false
dot1x:
aaa:
unresponsive:
eap_response: success
action:
traffic_allow_vlan: 10
traffic_allow_access_list: acl1
phone_action:
apply_cached_results: true
cached_results_timeout:
time_duration: 10
time_duration_unit: hours
mac_based_access_list: true
- name: Ethernet72
description: dot1x_aaa_unresponsive2
shutdown: false
dot1x:
aaa:
unresponsive:
eap_response: success
action:
traffic_allow_vlan: 10
traffic_allow_access_list: acl1
mac_based_access_list: true
12 changes: 12 additions & 0 deletions ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/dot1x.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

78 changes: 78 additions & 0 deletions ...lections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/dot1x.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dot1x dynamic-authorization
{% endif %}
{% if dot1x.mac_based_authentication is arista.avd.defined or dot1x.radius_av_pair is arista.avd.defined or
dot1x.aaa.unresponsive is arista.avd.defined or dot1x.captive_portal is arista.avd.defined
or dot1x.supplicant is arista.avd.defined %}
or dot1x.supplicant is arista.avd.defined or dot1x.radius_av_pair_username_format is arista.avd.defined %}
dot1x
{% for profile in dot1x.supplicant.profiles | arista.avd.natural_sort("name") %}
supplicant profile {{ profile.name }}
Expand Down Expand Up @@ -99,6 +99,9 @@ dot1x
radius av-pair framed-mtu {{ dot1x.radius_av_pair.framed_mtu }}
{% endif %}
{% endif %}
{% if dot1x.radius_av_pair_username_format.delimiter is arista.avd.defined and dot1x.radius_av_pair_username_format.mac_string_case is arista.avd.defined %}
mac-based-auth radius av-pair user-name delimiter {{ dot1x.radius_av_pair_username_format.delimiter }} {{ dot1x.radius_av_pair_username_format.mac_string_case }}
{% endif %}
{% if dot1x.supplicant.disconnect_cached_results_timeout is arista.avd.defined %}
supplicant disconnect cached-results timeout {{ dot1x.supplicant.disconnect_cached_results_timeout }} seconds
{% endif %}
Expand Down
Loading
Loading