Fixing coverage warnings

aristanetworks · Aug 6, 2024 · 551b28f · 551b28f
1 parent bf2e0de
commit 551b28f
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 35 deletions.
diff --git a/...ta/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md b/...ta/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/...llections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ethernet-interfaces.cfg b/...llections/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/...ctions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml b/...ctions/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,31 +1054,31 @@ 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
     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
diff --git a/...lections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md b/...lections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md
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
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
@@ -888,6 +888,7 @@ keys:
                   keys:
                     enabled:
                       type: bool
+                      required: true
                     timeout:
                       type: int
                       min: 0