From 551b28fc4eccda9f1e993e23b1f641f6bbea4064 Mon Sep 17 00:00:00 2001 From: Shivani-gslab Date: Tue, 6 Aug 2024 19:35:03 +0530 Subject: [PATCH] Fixing coverage warnings --- .../devices/ethernet-interfaces.md | 31 +++++++++----- .../intended/configs/ethernet-interfaces.cfg | 21 ++++++---- .../host_vars/ethernet-interfaces.yml | 42 ++++++++++++------- .../docs/tables/ethernet-interfaces.md | 4 +- .../schema/eos_cli_config_gen.schema.yml | 1 + .../ethernet_interfaces.schema.yml | 1 + 6 files changed, 65 insertions(+), 35 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 f4d4262b5cc..30dd5eb5e29 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 @@ -138,9 +138,11 @@ sFlow is disabled. | Ethernet67 | Custom_Transceiver_Frequency | access | - | - | - | - | | Ethernet68 | Custom_Transceiver_Frequency | access | - | - | - | - | | Ethernet69 | IP NAT service-profile | access | - | - | - | - | -| Ethernet70 | dot1x_aaa_unresponsive | access | - | - | - | - | +| Ethernet70 | dot1x_aaa_unresponsive and dot1x_eapol_authentication_failure_fallback_mba | access | - | - | - | - | | Ethernet71 | dot1x_aaa_unresponsive1 | access | - | - | - | - | | Ethernet72 | dot1x_aaa_unresponsive2 | access | - | - | - | - | +| Ethernet111 | DOT1X Testing - host-mode multi-host without multi-host authenticated | access | - | - | - | - | +| Ethernet112 | DOT1X Testing - host-mode multi-host undefined | access | - | - | - | - | *Inherited from Port-Channel Interface @@ -799,15 +801,12 @@ interface Ethernet45 description DOT1X Testing - all features switchport dot1x pae authenticator - dot1x authentication failure action traffic allow vlan 800 dot1x reauthentication dot1x port-control auto dot1x host-mode multi-host authenticated dot1x mac based authentication dot1x timeout quiet-period 10 dot1x timeout reauth-timeout-ignore always - dot1x timeout tx-period 10 - dot1x timeout reauth-period server dot1x timeout idle-host 10 seconds dot1x reauthorization request limit 2 dot1x unauthorized access vlan membership egress @@ -1022,30 +1021,38 @@ interface Ethernet69 ip nat service-profile TEST-NAT-PROFILE ! interface Ethernet70 - description dot1x_aaa_unresponsive + description dot1x_aaa_unresponsive and dot1x_eapol_authentication_failure_fallback_mba 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 dot1x mac based access-list + dot1x eapol authentication failure fallback mba ! 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 + dot1x aaa unresponsive action apply cached-results dot1x mac based access-list ! interface Ethernet72 description dot1x_aaa_unresponsive2 no shutdown switchport - dot1x aaa unresponsive action traffic allow vlan 10 access-list acl1 + dot1x aaa unresponsive phone action apply cached-results timeout 10 hours dot1x aaa unresponsive eap response success dot1x mac based access-list +! +interface Ethernet111 + description DOT1X Testing - host-mode multi-host without multi-host authenticated + switchport + dot1x host-mode multi-host +! +interface Ethernet112 + description DOT1X Testing - host-mode multi-host undefined + switchport ``` ## BFD @@ -1099,10 +1106,12 @@ interface Ethernet72 | Ethernet42 | - | - | - | - | - | - | True | - | | Ethernet43 | - | - | - | - | - | - | - | - | | Ethernet44 | - | - | - | - | - | - | - | - | -| Ethernet45 | authenticator | auto | - | True | allow vlan 800 | multi-host | True | True | -| Ethernet70 | - | - | - | - | - | - | - | - | +| Ethernet45 | authenticator | auto | - | True | - | multi-host | True | True | +| Ethernet70 | - | - | - | - | - | - | - | True | | Ethernet71 | - | - | - | - | - | - | - | - | | Ethernet72 | - | - | - | - | - | - | - | - | +| Ethernet111 | - | - | - | - | - | multi-host | - | - | +| Ethernet112 | - | - | - | - | - | - | - | - | ## Power Over Ethernet (PoE) 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 8d0e2642f76..3a72d8ad9e7 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 @@ -449,15 +449,12 @@ interface Ethernet45 description DOT1X Testing - all features switchport dot1x pae authenticator - dot1x authentication failure action traffic allow vlan 800 dot1x reauthentication dot1x port-control auto dot1x host-mode multi-host authenticated dot1x mac based authentication dot1x timeout quiet-period 10 dot1x timeout reauth-timeout-ignore always - dot1x timeout tx-period 10 - dot1x timeout reauth-period server dot1x timeout idle-host 10 seconds dot1x reauthorization request limit 2 dot1x unauthorized access vlan membership egress @@ -672,31 +669,39 @@ interface Ethernet69 ip nat service-profile TEST-NAT-PROFILE ! interface Ethernet70 - description dot1x_aaa_unresponsive + description dot1x_aaa_unresponsive and dot1x_eapol_authentication_failure_fallback_mba 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 dot1x mac based access-list + dot1x eapol authentication failure fallback mba ! 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 + dot1x aaa unresponsive action apply cached-results dot1x mac based access-list ! interface Ethernet72 description dot1x_aaa_unresponsive2 no shutdown switchport - dot1x aaa unresponsive action traffic allow vlan 10 access-list acl1 + dot1x aaa unresponsive phone action apply cached-results timeout 10 hours dot1x aaa unresponsive eap response success dot1x mac based access-list ! +interface Ethernet111 + description DOT1X Testing - host-mode multi-host without multi-host authenticated + switchport + dot1x host-mode multi-host +! +interface Ethernet112 + description DOT1X Testing - host-mode multi-host undefined + switchport +! interface Management1 description oob_management vrf MGMT diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml index 9913c8a5d1e..72aab7bec96 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml @@ -560,6 +560,19 @@ ethernet_interfaces: host_mode: mode: multi-host + - name: Ethernet111 + description: DOT1X Testing - host-mode multi-host without multi-host authenticated + dot1x: + host_mode: + mode: multi-host + multi_host_authenticated: false + + - name: Ethernet112 + description: DOT1X Testing - host-mode multi-host undefined + dot1x: + host_mode: + multi_host_authenticated: true + - name: Ethernet38 description: DOT1X Testing - host-mode multi-host authenticated dot1x: @@ -620,7 +633,6 @@ ethernet_interfaces: pae: mode: authenticator authentication_failure: - action: allow allow_vlan: 800 host_mode: mode: multi-host @@ -630,9 +642,7 @@ ethernet_interfaces: timeout: idle_host: 10 quiet_period: 10 - reauth_period: server reauth_timeout_ignore: true - tx_period: 10 eapol: disabled: false authentication_failure_fallback_mba: @@ -936,6 +946,7 @@ ethernet_interfaces: description: IP NAT service-profile ip_nat: service_profile: TEST-NAT-PROFILE + # VRRP - name: Ethernet65 description: Multiple VRIDs @@ -1009,12 +1020,14 @@ ethernet_interfaces: ipv4: address: 100.64.0.1 version: 3 + # Transceiver Frequency - name: Ethernet67 description: Custom_Transceiver_Frequency shutdown: false transceiver: frequency: 190050 + - name: Ethernet68 description: Custom_Transceiver_Frequency shutdown: false @@ -1023,8 +1036,9 @@ ethernet_interfaces: frequency_unit: ghz media: override: 100gbase-ar4 + - name: Ethernet70 - description: dot1x_aaa_unresponsive + description: dot1x_aaa_unresponsive and dot1x_eapol_authentication_failure_fallback_mba shutdown: false dot1x: aaa: @@ -1040,23 +1054,21 @@ ethernet_interfaces: time_duration_unit: hours traffic_allow: true apply_alternate: true + eapol: + authentication_failure_fallback_mba: + enabled: 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 @@ -1064,7 +1076,9 @@ ethernet_interfaces: 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 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 caf61e58817..02e69da52ea 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 @@ -283,7 +283,7 @@ | [      eapol](## "ethernet_interfaces.[].dot1x.eapol") | Dictionary | | | | | | [        disabled](## "ethernet_interfaces.[].dot1x.eapol.disabled") | Boolean | | | | | | [        authentication_failure_fallback_mba](## "ethernet_interfaces.[].dot1x.eapol.authentication_failure_fallback_mba") | Dictionary | | | | | - | [          enabled](## "ethernet_interfaces.[].dot1x.eapol.authentication_failure_fallback_mba.enabled") | Boolean | | | | | + | [          enabled](## "ethernet_interfaces.[].dot1x.eapol.authentication_failure_fallback_mba.enabled") | Boolean | Required | | | | | [          timeout](## "ethernet_interfaces.[].dot1x.eapol.authentication_failure_fallback_mba.timeout") | Integer | | | Min: 0
Max: 65535 | | | [      aaa](## "ethernet_interfaces.[].dot1x.aaa") | Dictionary | | | | | | [        unresponsive](## "ethernet_interfaces.[].dot1x.aaa.unresponsive") | Dictionary | | | | Configure AAA timeout options. | @@ -931,7 +931,7 @@ eapol: disabled: authentication_failure_fallback_mba: - enabled: + enabled: timeout: aaa: 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 330d7e7878a..f6a3d47d5dc 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 @@ -2972,6 +2972,7 @@ keys: keys: enabled: type: bool + required: true timeout: type: int min: 0 diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml index 56dde682575..e78ad86fa92 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml @@ -888,6 +888,7 @@ keys: keys: enabled: type: bool + required: true timeout: type: int min: 0