From 48ef371d7d55ad92302cc9a5325569e440d5043c Mon Sep 17 00:00:00 2001 From: Laxmikant Chintakindi Date: Tue, 10 Sep 2024 13:06:36 +0530 Subject: [PATCH] Rebase --- .../documentation/devices/ethernet-interfaces.md | 6 ------ .../intended/configs/ethernet-interfaces.cfg | 3 --- .../docs/tables/ethernet-interfaces.md | 10 +++++++--- .../schema/eos_cli_config_gen.schema.yml | 3 +++ 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md index cfde8e314fb..2733f9af254 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md @@ -141,9 +141,6 @@ sFlow is disabled. | Ethernet67 | Custom_Transceiver_Frequency | - | - | - | - | - | | Ethernet68 | Custom_Transceiver_Frequency | - | - | - | - | - | | Ethernet69 | IP NAT service-profile | - | - | - | - | - | -| Ethernet70 | dot1x_aaa_unresponsive | access | - | - | - | - | -| Ethernet71 | dot1x_aaa_unresponsive1 | access | - | - | - | - | -| Ethernet72 | dot1x_aaa_unresponsive2 | access | - | - | - | - | *Inherited from Port-Channel Interface @@ -1148,7 +1145,6 @@ interface Ethernet69 interface Ethernet70 description dot1x_aaa_unresponsive no shutdown - switchport 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 @@ -1157,7 +1153,6 @@ interface Ethernet70 interface Ethernet71 description dot1x_aaa_unresponsive1 no shutdown - switchport 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 @@ -1166,7 +1161,6 @@ interface Ethernet71 interface Ethernet72 description dot1x_aaa_unresponsive2 no shutdown - switchport dot1x aaa unresponsive action traffic allow vlan 10 access-list acl1 dot1x aaa unresponsive eap response success dot1x mac based access-list diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ethernet-interfaces.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ethernet-interfaces.cfg index 77fc75bade1..78f7da8e03c 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ethernet-interfaces.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ethernet-interfaces.cfg @@ -761,7 +761,6 @@ interface Ethernet69 interface Ethernet70 description dot1x_aaa_unresponsive no shutdown - switchport 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 @@ -770,7 +769,6 @@ interface Ethernet70 interface Ethernet71 description dot1x_aaa_unresponsive1 no shutdown - switchport 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 @@ -779,7 +777,6 @@ interface Ethernet71 interface Ethernet72 description dot1x_aaa_unresponsive2 no shutdown - switchport dot1x aaa unresponsive action traffic allow vlan 10 access-list acl1 dot1x aaa unresponsive eap response success dot1x mac based access-list diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md index 4c7b9493108..fa39d7bca6f 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md @@ -282,6 +282,7 @@ | [        enabled](## "ethernet_interfaces.[].dot1x.mac_based_authentication.enabled") | Boolean | | | | | | [        always](## "ethernet_interfaces.[].dot1x.mac_based_authentication.always") | Boolean | | | | | | [        host_mode_common](## "ethernet_interfaces.[].dot1x.mac_based_authentication.host_mode_common") | Boolean | | | | | + | [      mac_based_access_list](## "ethernet_interfaces.[].dot1x.mac_based_access_list") | Boolean | | | | Operate interface in per-mac access-list mode. | | [      timeout](## "ethernet_interfaces.[].dot1x.timeout") | Dictionary | | | | | | [        idle_host](## "ethernet_interfaces.[].dot1x.timeout.idle_host") | Integer | | | Min: 10
Max: 65535 | | | [        quiet_period](## "ethernet_interfaces.[].dot1x.timeout.quiet_period") | Integer | | | Min: 1
Max: 65535 | | @@ -1059,6 +1060,9 @@ enabled: always: host_mode_common: + + # Operate interface in per-mac access-list mode. + mac_based_access_list: timeout: idle_host: quiet_period: @@ -1087,6 +1091,9 @@ # Set action for supplicant when AAA times out. action: + # Name of standard access-list to apply when AAA times out. + traffic_allow_access_list: + # Use results from a previous AAA response. apply_cached_results: cached_results_timeout: @@ -1107,9 +1114,6 @@ traffic_allow: traffic_allow_vlan: - # Name of standard access-list to apply when AAA times out. - traffic_allow_access_list: - # Set action for supplicant when AAA times out. phone_action: diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml index 2029d00634f..0aaef55fcb1 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml @@ -3059,6 +3059,9 @@ keys: type: bool host_mode_common: type: bool + mac_based_access_list: + type: bool + description: Operate interface in per-mac access-list mode. timeout: type: dict keys: