From 17fc6e557523935c0afa08090404143cfc97c799 Mon Sep 17 00:00:00 2001 From: Shivani-gslab Date: Tue, 13 Aug 2024 12:39:18 +0530 Subject: [PATCH] Refactor(eos_cli_config_gen): Removing default type: switched from ethernet and port-channel interfaces --- .../documentation/devices/address-locking.md | 6 -- .../devices/ethernet-interfaces.md | 86 ------------------- .../documentation/devices/flow-tracking.md | 8 -- .../devices/l2-protocol-forwarding.md | 4 - .../documentation/devices/lldp.md | 2 - .../devices/port-channel-interfaces.md | 55 ------------ .../documentation/devices/router-isis-new.md | 1 - .../documentation/devices/router-isis.md | 1 - .../intended/configs/address-locking.cfg | 3 - .../intended/configs/ethernet-interfaces.cfg | 43 ---------- .../intended/configs/flow-tracking.cfg | 4 - .../configs/l2-protocol-forwarding.cfg | 2 - .../intended/configs/lldp.cfg | 1 - .../configs/port-channel-interfaces.cfg | 22 ----- .../ignore-custom-keys-in-data-models.cfg | 1 - .../intended/configs/platform_settings.cfg | 1 - .../documentation/ethernet-interfaces.j2 | 12 +-- .../documentation/port-channel-interfaces.j2 | 4 +- .../j2templates/eos/ethernet-interfaces.j2 | 2 +- .../eos/port-channel-interfaces.j2 | 2 +- 20 files changed, 10 insertions(+), 250 deletions(-) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/address-locking.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/address-locking.md index 8045c382446..ef35e99cb21 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/address-locking.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/address-locking.md @@ -101,9 +101,6 @@ address locking | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | Channel-Group | | --------- | ----------- | ---- | ----- | ----------- | ----------- | ------------- | -| Ethernet1 | Address Locking Interface Testing 1 | access | - | - | - | - | -| Ethernet2 | Address Locking Interface Testing 2 | access | - | - | - | - | -| Ethernet3 | Address Locking Interface Testing 3 | access | - | - | - | - | *Inherited from Port-Channel Interface @@ -113,16 +110,13 @@ address locking ! interface Ethernet1 description Address Locking Interface Testing 1 - switchport address locking ipv4 ! interface Ethernet2 description Address Locking Interface Testing 2 - switchport address locking ipv4 ipv6 ! interface Ethernet3 description Address Locking Interface Testing 3 - switchport address locking ipv6 ``` 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 2318b1562c7..c1862e844b7 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 @@ -87,57 +87,14 @@ sFlow is disabled. | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | Channel-Group | | --------- | ----------- | ---- | ----- | ----------- | ----------- | ------------- | -| Ethernet2 | SRV-POD02_Eth1 | trunk | 110-111,210-211 | - | - | - | | Ethernet6 | SRV-POD02_Eth1 | trunk | 110-111,210-211 | - | - | - | | Ethernet7 | Molecule L2 | access | - | - | - | - | | Ethernet11 | interface_in_mode_access_accepting_tagged_LACP | access | 200 | - | - | - | | Ethernet12 | interface_with_dot1q_tunnel | dot1q-tunnel | 300 | - | - | - | | Ethernet13 | interface_in_mode_access_with_voice | trunk phone | - | 100 | - | - | -| Ethernet14 | SRV-POD02_Eth1 | trunk | 110-111,210-211 | - | - | - | -| Ethernet15 | PVLAN Promiscuous Access - only one secondary | access | 110 | - | - | - | -| Ethernet16 | PVLAN Promiscuous Trunk - vlan translation out | trunk | 110-112 | - | - | - | -| Ethernet17 | PVLAN Secondary Trunk | trunk | 110-112 | - | - | - | -| Ethernet19 | Switched port with no LLDP rx/tx | access | 110 | - | - | - | -| Ethernet21 | 200MBit/s shape | access | - | - | - | - | -| Ethernet22 | 10% shape | access | - | - | - | - | -| Ethernet23 | Error-correction encoding | access | - | - | - | - | -| Ethernet24 | Disable error-correction encoding | access | - | - | - | - | -| Ethernet25 | Molecule MAC | access | - | - | - | - | -| Ethernet27 | EVPN-Vxlan single-active redundancy | access | - | - | - | - | -| Ethernet28 | EVPN-MPLS multihoming | access | - | - | - | - | -| Ethernet29 | DOT1X Testing - auto phone true | access | - | - | - | - | -| Ethernet30 | DOT1X Testing - force-authorized phone false | access | - | - | - | - | -| Ethernet31 | DOT1X Testing - force-unauthorized - no phone | access | - | - | - | - | -| Ethernet32 | DOT1X Testing - auto reauthentication | access | - | - | - | - | -| Ethernet33 | DOT1X Testing - pae mode authenticator | access | - | - | - | - | -| Ethernet34 | DOT1X Testing - authentication_failure allow | access | - | - | - | - | -| Ethernet35 | DOT1X Testing - authentication_failure drop | access | - | - | - | - | -| Ethernet36 | DOT1X Testing - host-mode single-host | access | - | - | - | - | -| Ethernet37 | DOT1X Testing - host-mode multi-host | access | - | - | - | - | -| Ethernet38 | DOT1X Testing - host-mode multi-host authenticated | access | - | - | - | - | -| Ethernet39 | DOT1X Testing - mac_based_authentication host-mode common true | access | - | - | - | - | -| Ethernet40 | DOT1X Testing - mac_based_authentication always | access | - | - | - | - | -| Ethernet41 | DOT1X Testing - mac_based_authentication always and host-mode common | access | - | - | - | - | -| Ethernet42 | DOT1X Testing - mac_based_authentication | access | - | - | - | - | -| Ethernet43 | DOT1X Testing - timeout values | access | - | - | - | - | -| Ethernet44 | DOT1X Testing - reauthorization_request_limit | access | - | - | - | - | -| Ethernet45 | DOT1X Testing - all features | access | - | - | - | - | -| Ethernet46 | native-vlan-tag-precedence | trunk | - | tag | - | - | | Ethernet48 | Load Interval | access | - | - | - | - | -| Ethernet50 | SFlow Interface Testing - SFlow ingress enabled | access | - | - | - | - | -| Ethernet51 | SFlow Interface Testing - SFlow egress enabled | access | - | - | - | - | -| Ethernet52 | SFlow Interface Testing - SFlow ingress and egress unmodified enabled | access | - | - | - | - | -| Ethernet53 | SFlow Interface Testing - SFlow ingress and egress disabled | access | - | - | - | - | -| Ethernet54 | SFlow Interface Testing - SFlow ingress and egress unmodified disabled | access | - | - | - | - | -| Ethernet56 | Interface with poe commands and limit in class | access | - | - | - | - | -| Ethernet57 | Interface with poe commands and limit in watts | access | - | - | - | - | -| Ethernet58 | Interface with poe disabled and no other poe keys | access | - | - | - | - | -| Ethernet60 | IP NAT Testing | access | - | - | - | - | | Ethernet61 | interface_in_mode_access_with_voice | trunk phone | - | 100 | - | - | | Ethernet62 | interface_in_mode_access_with_voice | trunk phone | - | 100 | - | - | -| Ethernet67 | Custom_Transceiver_Frequency | access | - | - | - | - | -| Ethernet68 | Custom_Transceiver_Frequency | access | - | - | - | - | -| Ethernet69 | IP NAT service-profile | access | - | - | - | - | *Inherited from Port-Channel Interface @@ -392,7 +349,6 @@ interface Ethernet2 description SRV-POD02_Eth1 switchport trunk allowed vlan 110-111,210-211 switchport mode trunk - switchport tcp mss ceiling ipv4 70 ingress multicast ipv4 boundary ACL_MULTICAST multicast ipv6 boundary ACL_V6_MULTICAST out @@ -577,13 +533,11 @@ interface Ethernet14 logging event link-status switchport trunk allowed vlan 110-111,210-211 switchport mode trunk - switchport ! interface Ethernet15 description PVLAN Promiscuous Access - only one secondary switchport access vlan 110 switchport mode access - switchport switchport pvlan mapping 111 ! interface Ethernet16 @@ -591,13 +545,11 @@ interface Ethernet16 switchport vlan translation out 111-112 110 switchport trunk allowed vlan 110-112 switchport mode trunk - switchport ! interface Ethernet17 description PVLAN Secondary Trunk switchport trunk allowed vlan 110-112 switchport mode trunk - switchport switchport trunk private-vlan secondary ! interface Ethernet18 @@ -611,7 +563,6 @@ interface Ethernet19 description Switched port with no LLDP rx/tx switchport access vlan 110 switchport mode access - switchport no lldp transmit no lldp receive lldp tlv transmit ztp vlan 666 @@ -624,29 +575,24 @@ interface Ethernet20 ! interface Ethernet21 description 200MBit/s shape - switchport no qos trust shape rate 200000 kbps ! interface Ethernet22 description 10% shape - switchport shape rate 10 percent ! interface Ethernet23 description Error-correction encoding error-correction encoding fire-code error-correction encoding reed-solomon - switchport ! interface Ethernet24 description Disable error-correction encoding no error-correction encoding - switchport ! interface Ethernet25 description Molecule MAC - switchport mac access-group MAC_ACL_IN in mac access-group MAC_ACL_OUT out ! @@ -685,7 +631,6 @@ interface Ethernet26.500 ! interface Ethernet27 description EVPN-Vxlan single-active redundancy - switchport evpn ethernet-segment identifier 0000:0000:0000:0102:0304 redundancy single-active @@ -696,7 +641,6 @@ interface Ethernet27 ! interface Ethernet28 description EVPN-MPLS multihoming - switchport evpn ethernet-segment identifier 0000:0000:0000:0102:0305 mpls tunnel flood filter time 100 @@ -705,81 +649,66 @@ interface Ethernet28 ! interface Ethernet29 description DOT1X Testing - auto phone true - switchport dot1x port-control auto dot1x port-control force-authorized phone ! interface Ethernet30 description DOT1X Testing - force-authorized phone false - switchport dot1x port-control force-authorized no dot1x port-control force-authorized phone ! interface Ethernet31 description DOT1X Testing - force-unauthorized - no phone - switchport dot1x port-control force-unauthorized ! interface Ethernet32 description DOT1X Testing - auto reauthentication - switchport dot1x reauthentication dot1x port-control auto ! interface Ethernet33 description DOT1X Testing - pae mode authenticator - switchport dot1x pae authenticator ! interface Ethernet34 description DOT1X Testing - authentication_failure allow - switchport dot1x authentication failure action traffic allow vlan 800 ! interface Ethernet35 description DOT1X Testing - authentication_failure drop - switchport dot1x authentication failure action traffic drop ! interface Ethernet36 description DOT1X Testing - host-mode single-host - switchport dot1x host-mode single-host ! interface Ethernet37 description DOT1X Testing - host-mode multi-host - switchport dot1x host-mode multi-host ! interface Ethernet38 description DOT1X Testing - host-mode multi-host authenticated - switchport dot1x host-mode multi-host authenticated ! interface Ethernet39 description DOT1X Testing - mac_based_authentication host-mode common true - switchport dot1x mac based authentication host-mode common ! interface Ethernet40 description DOT1X Testing - mac_based_authentication always - switchport dot1x mac based authentication always ! interface Ethernet41 description DOT1X Testing - mac_based_authentication always and host-mode common - switchport dot1x mac based authentication host-mode common dot1x mac based authentication always ! interface Ethernet42 description DOT1X Testing - mac_based_authentication - switchport dot1x mac based authentication ! interface Ethernet43 description DOT1X Testing - timeout values - switchport dot1x timeout quiet-period 10 dot1x timeout reauth-timeout-ignore always dot1x timeout tx-period 6 @@ -788,13 +717,11 @@ interface Ethernet43 ! interface Ethernet44 description DOT1X Testing - reauthorization_request_limit - switchport dot1x reauthorization request limit 3 dot1x eapol disabled ! interface Ethernet45 description DOT1X Testing - all features - switchport dot1x pae authenticator dot1x authentication failure action traffic allow vlan 800 dot1x reauthentication @@ -815,7 +742,6 @@ interface Ethernet46 description native-vlan-tag-precedence switchport trunk native vlan tag switchport mode trunk - switchport ! interface Ethernet47 description IP Helper @@ -833,29 +759,24 @@ interface Ethernet48 ! interface Ethernet50 description SFlow Interface Testing - SFlow ingress enabled - switchport sflow enable ! interface Ethernet51 description SFlow Interface Testing - SFlow egress enabled - switchport sflow egress enable ! interface Ethernet52 description SFlow Interface Testing - SFlow ingress and egress unmodified enabled - switchport sflow enable sflow egress unmodified enable ! interface Ethernet53 description SFlow Interface Testing - SFlow ingress and egress disabled - switchport no sflow enable no sflow egress enable ! interface Ethernet54 description SFlow Interface Testing - SFlow ingress and egress unmodified disabled - switchport no sflow enable no sflow egress unmodified enable ! @@ -869,7 +790,6 @@ interface Ethernet55 ! interface Ethernet56 description Interface with poe commands and limit in class - switchport poe priority low poe reboot action power-off poe link down action power-off 10 @@ -879,7 +799,6 @@ interface Ethernet56 ! interface Ethernet57 description Interface with poe commands and limit in watts - switchport poe priority critical poe reboot action maintain poe link down action maintain @@ -889,12 +808,10 @@ interface Ethernet57 ! interface Ethernet58 description Interface with poe disabled and no other poe keys - switchport poe disabled ! interface Ethernet60 description IP NAT Testing - switchport ip nat source static 3.0.0.1 4.0.0.1 ip nat source static 3.0.0.2 22 4.0.0.2 ip nat source static 3.0.0.3 22 4.0.0.3 23 @@ -1003,19 +920,16 @@ interface Ethernet66 interface Ethernet67 description Custom_Transceiver_Frequency no shutdown - switchport transceiver frequency 190050.000 ! interface Ethernet68 description Custom_Transceiver_Frequency no shutdown - switchport transceiver media override 100gbase-ar4 transceiver frequency 190080.000 ghz ! interface Ethernet69 description IP NAT service-profile - switchport ip nat service-profile TEST-NAT-PROFILE ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/flow-tracking.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/flow-tracking.md index 3fb992a1d8f..ec86dfe2802 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/flow-tracking.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/flow-tracking.md @@ -168,9 +168,6 @@ interface Dps1 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | Channel-Group | | --------- | ----------- | ---- | ----- | ----------- | ----------- | ------------- | -| Ethernet40 | - | access | - | - | - | - | -| Ethernet41 | - | access | - | - | - | - | -| Ethernet42 | - | access | - | - | - | - | *Inherited from Port-Channel Interface @@ -179,17 +176,14 @@ interface Dps1 ```eos ! interface Ethernet40 - switchport flow tracker hardware T2 flow tracker sampled T2 ! interface Ethernet41 - switchport flow tracker hardware T3 flow tracker sampled T3 ! interface Ethernet42 - switchport flow tracker sampled T3 ``` @@ -201,14 +195,12 @@ interface Ethernet42 | Interface | Description | Type | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI | | --------- | ----------- | ---- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- | -| Port-Channel42 | - | switched | access | - | - | - | - | - | - | - | #### Port-Channel Interfaces Device Configuration ```eos ! interface Port-Channel42 - switchport flow tracker hardware T3 flow tracker sampled T3 ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/l2-protocol-forwarding.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/l2-protocol-forwarding.md index 0d3ee11f6d9..7e49fd2286b 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/l2-protocol-forwarding.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/l2-protocol-forwarding.md @@ -122,7 +122,6 @@ l2-protocol | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | Channel-Group | | --------- | ----------- | ---- | ----- | ----------- | ----------- | ------------- | -| Ethernet1 | L2PF test | access | - | - | - | - | *Inherited from Port-Channel Interface @@ -132,7 +131,6 @@ l2-protocol ! interface Ethernet1 description L2PF test - switchport l2-protocol forwarding profile TEST1 ``` @@ -144,7 +142,6 @@ interface Ethernet1 | Interface | Description | Type | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI | | --------- | ----------- | ---- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- | -| Port-Channel1 | L2PF test | switched | access | - | - | - | - | - | - | - | #### Port-Channel Interfaces Device Configuration @@ -152,6 +149,5 @@ interface Ethernet1 ! interface Port-Channel1 description L2PF test - switchport l2-protocol forwarding profile TEST2 ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/lldp.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/lldp.md index 62e47fa12b3..82c23990117 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/lldp.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/lldp.md @@ -88,7 +88,6 @@ lldp tlv transmit system-description | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | Channel-Group | | --------- | ----------- | ---- | ----- | ----------- | ----------- | ------------- | -| Ethernet2 | Switched port with no LLDP rx/tx | access | 110 | - | - | - | | Ethernet3 | No special LLDP settings | access | 110 | - | - | - | *Inherited from Port-Channel Interface @@ -107,7 +106,6 @@ interface Ethernet2 description Switched port with no LLDP rx/tx switchport access vlan 110 switchport mode access - switchport no lldp transmit ! interface Ethernet3 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md index 40d4b4778c0..49f40f728c4 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md @@ -73,18 +73,6 @@ sFlow is disabled. | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | Channel-Group | | --------- | ----------- | ---- | ----- | ----------- | ----------- | ------------- | -| Ethernet3 | MLAG_PEER_DC1-LEAF1B_Ethernet3 | *trunk | *2-4094 | *- | *['LEAF_PEER_L3', 'MLAG'] | 3 | -| Ethernet4 | MLAG_PEER_DC1-LEAF1B_Ethernet4 | *trunk | *2-4094 | *- | *['LEAF_PEER_L3', 'MLAG'] | 3 | -| Ethernet5 | DC1-AGG01_Ethernet1 | *trunk | *110,201 | *- | *- | 5 | -| Ethernet10/1 | LAG Member | *access | *110 | *- | *- | 101 | -| Ethernet10/2 | LAG Member | *trunk | *110-112 | *- | *- | 102 | -| Ethernet10/3 | LAG Member | *trunk | *110-112 | *- | *- | 103 | -| Ethernet10/4 | LAG Member LACP fallback | *trunk | *112 | *- | *- | 104 | -| Ethernet11/2 | LAG Member LACP fallback LLDP ZTP VLAN | *trunk | *112 | *- | *- | 112 | -| Ethernet15 | DC1-AGG03_Ethernet1 | *trunk | *110,201 | *- | *- | 15 | -| Ethernet16 | DC1-AGG04_Ethernet1 | *trunk | *110,201 | *- | *- | 16 | -| Ethernet18 | LAG Member | *access | *110 | *- | *- | 109 | -| Ethernet50 | SRV-POD03_Eth1 | *trunk | *110,201 | *- | *- | 5 | *Inherited from Port-Channel Interface @@ -177,7 +165,6 @@ interface Ethernet11/2 description LAG Member LACP fallback LLDP ZTP VLAN switchport trunk allowed vlan 112 switchport mode trunk - switchport channel-group 112 mode active lldp tlv transmit ztp vlan 112 spanning-tree portfast @@ -216,31 +203,10 @@ interface Ethernet50 | Interface | Description | Type | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI | | --------- | ----------- | ---- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- | -| Port-Channel3 | MLAG_PEER_DC1-LEAF1B_Po3 | switched | trunk | 2-4094 | - | ['LEAF_PEER_L3', 'MLAG'] | - | - | - | - | -| Port-Channel5 | DC1_L2LEAF1_Po1 | switched | trunk | 110,201 | - | - | - | - | 5 | - | -| Port-Channel10 | SRV01_bond0 | switched | trunk | 2-3000 | - | - | - | - | - | 0000:0000:0404:0404:0303 | | Port-Channel12 | interface_in_mode_access_with_voice | switched | trunk phone | - | 100 | - | - | - | - | - | -| Port-Channel13 | EVPN-Vxlan single-active redundancy | switched | access | - | - | - | - | - | - | 0000:0000:0000:0102:0304 | -| Port-Channel14 | EVPN-MPLS multihoming | switched | access | - | - | - | - | - | - | 0000:0000:0000:0102:0305 | -| Port-Channel15 | DC1_L2LEAF3_Po1 | switched | trunk | 110,201 | - | - | - | - | 15 | - | -| Port-Channel16 | DC1_L2LEAF4_Po1 | switched | trunk | 110,201 | - | - | - | - | 16 | - | | Port-Channel20 | Po_in_mode_access_accepting_tagged_LACP_frames | switched | access | 200 | - | - | - | - | - | - | -| Port-Channel50 | SRV-POD03_PortChanne1 | switched | trunk | 1-4000 | - | - | - | - | - | 0000:0000:0303:0202:0101 | -| Port-Channel51 | ipv6_prefix | switched | trunk | 1-500 | - | - | - | - | - | - | -| Port-Channel101 | PVLAN Promiscuous Access - only one secondary | switched | access | 110 | - | - | - | - | - | - | -| Port-Channel102 | PVLAN Promiscuous Trunk - vlan translation out | switched | trunk | 110-112 | - | - | - | - | - | - | -| Port-Channel103 | PVLAN Secondary Trunk | switched | trunk | 110-112 | - | - | - | - | - | - | -| Port-Channel104 | LACP fallback individual | switched | trunk | 112 | - | - | 300 | individual | - | - | -| Port-Channel105 | bpdu disabled | switched | access | - | - | - | - | - | - | - | -| Port-Channel106 | bpdu enabled | switched | access | - | - | - | - | - | - | - | -| Port-Channel107 | bpdu true | switched | access | - | - | - | - | - | - | - | -| Port-Channel108 | bpdu false | switched | access | - | - | - | - | - | - | - | -| Port-Channel109 | Molecule ACLs | switched | access | 110 | - | - | - | - | - | - | -| Port-Channel112 | LACP fallback individual | switched | trunk | 112 | - | - | 5 | individual | - | - | -| Port-Channel115 | native-vlan-tag-precedence | switched | trunk | - | tag | - | - | - | - | - | | Port-Channel121 | access_port_with_no_vlans | switched | access | - | - | - | - | - | - | - | | Port-Channel122 | trunk_port_with_no_vlans | switched | trunk | - | - | - | - | - | - | - | -| Port-Channel130 | IP NAT Testing | switched | access | - | - | - | - | - | - | - | | Port-Channel131 | dot1q-tunnel mode | switched | dot1q-tunnel | 115 | - | - | - | - | - | - | ##### Encapsulation Dot1q @@ -355,7 +321,6 @@ interface Ethernet50 ! interface Port-Channel3 description MLAG_PEER_DC1-LEAF1B_Po3 - switchport switchport trunk allowed vlan 2-4094 switchport mode trunk switchport trunk group LEAF_PEER_L3 @@ -366,7 +331,6 @@ interface Port-Channel3 interface Port-Channel5 description DC1_L2LEAF1_Po1 bgp session tracker ST2 - switchport switchport trunk allowed vlan 110,201 switchport mode trunk ip igmp host-proxy @@ -414,7 +378,6 @@ interface Port-Channel9 ! interface Port-Channel10 description SRV01_bond0 - switchport switchport trunk allowed vlan 2-3000 switchport mode trunk evpn ethernet-segment @@ -432,7 +395,6 @@ interface Port-Channel12 ! interface Port-Channel13 description EVPN-Vxlan single-active redundancy - switchport evpn ethernet-segment identifier 0000:0000:0000:0102:0304 redundancy single-active @@ -443,7 +405,6 @@ interface Port-Channel13 ! interface Port-Channel14 description EVPN-MPLS multihoming - switchport evpn ethernet-segment identifier 0000:0000:0000:0102:0305 mpls tunnel flood filter time 100 @@ -452,7 +413,6 @@ interface Port-Channel14 ! interface Port-Channel15 description DC1_L2LEAF3_Po1 - switchport switchport trunk allowed vlan 110,201 switchport mode trunk mlag 15 @@ -461,7 +421,6 @@ interface Port-Channel15 ! interface Port-Channel16 description DC1_L2LEAF4_Po1 - switchport switchport trunk allowed vlan 110,201 switchport mode trunk snmp trap link-change @@ -482,7 +441,6 @@ interface Port-Channel20 ! interface Port-Channel50 description SRV-POD03_PortChanne1 - switchport switchport trunk allowed vlan 1-4000 switchport mode trunk evpn ethernet-segment @@ -492,7 +450,6 @@ interface Port-Channel50 ! interface Port-Channel51 description ipv6_prefix - switchport switchport trunk allowed vlan 1-500 switchport mode trunk ipv6 nd prefix a1::/64 infinite infinite no-autoconfig @@ -530,28 +487,24 @@ interface Port-Channel100.102 ! interface Port-Channel101 description PVLAN Promiscuous Access - only one secondary - switchport switchport access vlan 110 switchport pvlan mapping 111 no qos trust ! interface Port-Channel102 description PVLAN Promiscuous Trunk - vlan translation out - switchport switchport trunk allowed vlan 110-112 switchport mode trunk switchport vlan translation out 111-112 110 ! interface Port-Channel103 description PVLAN Secondary Trunk - switchport switchport trunk allowed vlan 110-112 switchport mode trunk switchport trunk private-vlan secondary ! interface Port-Channel104 description LACP fallback individual - switchport switchport trunk allowed vlan 112 switchport mode trunk port-channel lacp fallback timeout 300 @@ -559,29 +512,24 @@ interface Port-Channel104 ! interface Port-Channel105 description bpdu disabled - switchport spanning-tree bpduguard disable spanning-tree bpdufilter disable ! interface Port-Channel106 description bpdu enabled - switchport spanning-tree bpduguard enable spanning-tree bpdufilter enable ! interface Port-Channel107 description bpdu true - switchport spanning-tree bpduguard enable spanning-tree bpdufilter enable ! interface Port-Channel108 description bpdu false - switchport ! interface Port-Channel109 description Molecule ACLs - switchport switchport access vlan 110 ip access-group IPV4_ACL_IN in ip access-group IPV4_ACL_OUT out @@ -643,7 +591,6 @@ interface Port-Channel111.1000 ! interface Port-Channel112 description LACP fallback individual - switchport switchport trunk allowed vlan 112 switchport mode trunk port-channel lacp fallback timeout 5 @@ -666,7 +613,6 @@ interface Port-Channel114 ! interface Port-Channel115 description native-vlan-tag-precedence - switchport switchport trunk native vlan tag switchport mode trunk ! @@ -705,7 +651,6 @@ interface Port-Channel122 ! interface Port-Channel130 description IP NAT Testing - switchport ip nat source static 3.0.0.1 4.0.0.1 ip nat source dynamic access-list ACL2 pool POOL2 ip nat destination static 1.0.0.1 2.0.0.1 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-new.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-new.md index 4f6715f5cc1..6768c4a09b6 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-new.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-new.md @@ -49,7 +49,6 @@ interface Management1 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | Channel-Group | | --------- | ----------- | ---- | ----- | ----------- | ----------- | ------------- | -| Ethernet3 | MLAG_PEER_EAPI-LEAF1B_Ethernet3 | *access | *- | *- | *- | 3 | *Inherited from Port-Channel Interface diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis.md index ab4280e50bc..f51311b1269 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis.md @@ -50,7 +50,6 @@ interface Management1 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | Channel-Group | | --------- | ----------- | ---- | ----- | ----------- | ----------- | ------------- | -| Ethernet3 | MLAG_PEER_EAPI-LEAF1B_Ethernet3 | *access | *- | *- | *- | 3 | *Inherited from Port-Channel Interface diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/address-locking.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/address-locking.cfg index a11d73c69a1..0e75fac38eb 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/address-locking.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/address-locking.cfg @@ -20,17 +20,14 @@ address locking ! interface Ethernet1 description Address Locking Interface Testing 1 - switchport address locking ipv4 ! interface Ethernet2 description Address Locking Interface Testing 2 - switchport address locking ipv4 ipv6 ! interface Ethernet3 description Address Locking Interface Testing 3 - switchport address locking ipv6 ! interface Management1 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 7be8c428e5a..622e6bf42ea 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 @@ -45,7 +45,6 @@ interface Ethernet2 description SRV-POD02_Eth1 switchport trunk allowed vlan 110-111,210-211 switchport mode trunk - switchport tcp mss ceiling ipv4 70 ingress multicast ipv4 boundary ACL_MULTICAST multicast ipv6 boundary ACL_V6_MULTICAST out @@ -230,13 +229,11 @@ interface Ethernet14 logging event link-status switchport trunk allowed vlan 110-111,210-211 switchport mode trunk - switchport ! interface Ethernet15 description PVLAN Promiscuous Access - only one secondary switchport access vlan 110 switchport mode access - switchport switchport pvlan mapping 111 ! interface Ethernet16 @@ -244,13 +241,11 @@ interface Ethernet16 switchport vlan translation out 111-112 110 switchport trunk allowed vlan 110-112 switchport mode trunk - switchport ! interface Ethernet17 description PVLAN Secondary Trunk switchport trunk allowed vlan 110-112 switchport mode trunk - switchport switchport trunk private-vlan secondary ! interface Ethernet18 @@ -264,7 +259,6 @@ interface Ethernet19 description Switched port with no LLDP rx/tx switchport access vlan 110 switchport mode access - switchport no lldp transmit no lldp receive lldp tlv transmit ztp vlan 666 @@ -277,29 +271,24 @@ interface Ethernet20 ! interface Ethernet21 description 200MBit/s shape - switchport no qos trust shape rate 200000 kbps ! interface Ethernet22 description 10% shape - switchport shape rate 10 percent ! interface Ethernet23 description Error-correction encoding error-correction encoding fire-code error-correction encoding reed-solomon - switchport ! interface Ethernet24 description Disable error-correction encoding no error-correction encoding - switchport ! interface Ethernet25 description Molecule MAC - switchport mac access-group MAC_ACL_IN in mac access-group MAC_ACL_OUT out ! @@ -338,7 +327,6 @@ interface Ethernet26.500 ! interface Ethernet27 description EVPN-Vxlan single-active redundancy - switchport evpn ethernet-segment identifier 0000:0000:0000:0102:0304 redundancy single-active @@ -349,7 +337,6 @@ interface Ethernet27 ! interface Ethernet28 description EVPN-MPLS multihoming - switchport evpn ethernet-segment identifier 0000:0000:0000:0102:0305 mpls tunnel flood filter time 100 @@ -358,81 +345,66 @@ interface Ethernet28 ! interface Ethernet29 description DOT1X Testing - auto phone true - switchport dot1x port-control auto dot1x port-control force-authorized phone ! interface Ethernet30 description DOT1X Testing - force-authorized phone false - switchport dot1x port-control force-authorized no dot1x port-control force-authorized phone ! interface Ethernet31 description DOT1X Testing - force-unauthorized - no phone - switchport dot1x port-control force-unauthorized ! interface Ethernet32 description DOT1X Testing - auto reauthentication - switchport dot1x reauthentication dot1x port-control auto ! interface Ethernet33 description DOT1X Testing - pae mode authenticator - switchport dot1x pae authenticator ! interface Ethernet34 description DOT1X Testing - authentication_failure allow - switchport dot1x authentication failure action traffic allow vlan 800 ! interface Ethernet35 description DOT1X Testing - authentication_failure drop - switchport dot1x authentication failure action traffic drop ! interface Ethernet36 description DOT1X Testing - host-mode single-host - switchport dot1x host-mode single-host ! interface Ethernet37 description DOT1X Testing - host-mode multi-host - switchport dot1x host-mode multi-host ! interface Ethernet38 description DOT1X Testing - host-mode multi-host authenticated - switchport dot1x host-mode multi-host authenticated ! interface Ethernet39 description DOT1X Testing - mac_based_authentication host-mode common true - switchport dot1x mac based authentication host-mode common ! interface Ethernet40 description DOT1X Testing - mac_based_authentication always - switchport dot1x mac based authentication always ! interface Ethernet41 description DOT1X Testing - mac_based_authentication always and host-mode common - switchport dot1x mac based authentication host-mode common dot1x mac based authentication always ! interface Ethernet42 description DOT1X Testing - mac_based_authentication - switchport dot1x mac based authentication ! interface Ethernet43 description DOT1X Testing - timeout values - switchport dot1x timeout quiet-period 10 dot1x timeout reauth-timeout-ignore always dot1x timeout tx-period 6 @@ -441,13 +413,11 @@ interface Ethernet43 ! interface Ethernet44 description DOT1X Testing - reauthorization_request_limit - switchport dot1x reauthorization request limit 3 dot1x eapol disabled ! interface Ethernet45 description DOT1X Testing - all features - switchport dot1x pae authenticator dot1x authentication failure action traffic allow vlan 800 dot1x reauthentication @@ -468,7 +438,6 @@ interface Ethernet46 description native-vlan-tag-precedence switchport trunk native vlan tag switchport mode trunk - switchport ! interface Ethernet47 description IP Helper @@ -486,29 +455,24 @@ interface Ethernet48 ! interface Ethernet50 description SFlow Interface Testing - SFlow ingress enabled - switchport sflow enable ! interface Ethernet51 description SFlow Interface Testing - SFlow egress enabled - switchport sflow egress enable ! interface Ethernet52 description SFlow Interface Testing - SFlow ingress and egress unmodified enabled - switchport sflow enable sflow egress unmodified enable ! interface Ethernet53 description SFlow Interface Testing - SFlow ingress and egress disabled - switchport no sflow enable no sflow egress enable ! interface Ethernet54 description SFlow Interface Testing - SFlow ingress and egress unmodified disabled - switchport no sflow enable no sflow egress unmodified enable ! @@ -522,7 +486,6 @@ interface Ethernet55 ! interface Ethernet56 description Interface with poe commands and limit in class - switchport poe priority low poe reboot action power-off poe link down action power-off 10 @@ -532,7 +495,6 @@ interface Ethernet56 ! interface Ethernet57 description Interface with poe commands and limit in watts - switchport poe priority critical poe reboot action maintain poe link down action maintain @@ -542,12 +504,10 @@ interface Ethernet57 ! interface Ethernet58 description Interface with poe disabled and no other poe keys - switchport poe disabled ! interface Ethernet60 description IP NAT Testing - switchport ip nat source static 3.0.0.1 4.0.0.1 ip nat source static 3.0.0.2 22 4.0.0.2 ip nat source static 3.0.0.3 22 4.0.0.3 23 @@ -656,19 +616,16 @@ interface Ethernet66 interface Ethernet67 description Custom_Transceiver_Frequency no shutdown - switchport transceiver frequency 190050.000 ! interface Ethernet68 description Custom_Transceiver_Frequency no shutdown - switchport transceiver media override 100gbase-ar4 transceiver frequency 190080.000 ghz ! interface Ethernet69 description IP NAT service-profile - switchport ip nat service-profile TEST-NAT-PROFILE ! interface Management1 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/flow-tracking.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/flow-tracking.cfg index 66577b6847f..8628576051c 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/flow-tracking.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/flow-tracking.cfg @@ -56,7 +56,6 @@ no enable password no aaa root ! interface Port-Channel42 - switchport flow tracker hardware T3 flow tracker sampled T3 ! @@ -64,17 +63,14 @@ interface Dps1 flow tracker hardware T3 ! interface Ethernet40 - switchport flow tracker hardware T2 flow tracker sampled T2 ! interface Ethernet41 - switchport flow tracker hardware T3 flow tracker sampled T3 ! interface Ethernet42 - switchport flow tracker sampled T3 ! interface Management1 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/l2-protocol-forwarding.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/l2-protocol-forwarding.cfg index 9dbba4d2e1d..b08a94ae7ac 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/l2-protocol-forwarding.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/l2-protocol-forwarding.cfg @@ -47,12 +47,10 @@ no aaa root ! interface Port-Channel1 description L2PF test - switchport l2-protocol forwarding profile TEST2 ! interface Ethernet1 description L2PF test - switchport l2-protocol forwarding profile TEST1 ! interface Management1 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/lldp.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/lldp.cfg index 7649bb1bcee..a4375d5465b 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/lldp.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/lldp.cfg @@ -25,7 +25,6 @@ interface Ethernet2 description Switched port with no LLDP rx/tx switchport access vlan 110 switchport mode access - switchport no lldp transmit ! interface Ethernet3 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/port-channel-interfaces.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/port-channel-interfaces.cfg index 2dcb815b60d..4a2c9478bdb 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/port-channel-interfaces.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/port-channel-interfaces.cfg @@ -9,7 +9,6 @@ no aaa root ! interface Port-Channel3 description MLAG_PEER_DC1-LEAF1B_Po3 - switchport switchport trunk allowed vlan 2-4094 switchport mode trunk switchport trunk group LEAF_PEER_L3 @@ -20,7 +19,6 @@ interface Port-Channel3 interface Port-Channel5 description DC1_L2LEAF1_Po1 bgp session tracker ST2 - switchport switchport trunk allowed vlan 110,201 switchport mode trunk ip igmp host-proxy @@ -68,7 +66,6 @@ interface Port-Channel9 ! interface Port-Channel10 description SRV01_bond0 - switchport switchport trunk allowed vlan 2-3000 switchport mode trunk evpn ethernet-segment @@ -86,7 +83,6 @@ interface Port-Channel12 ! interface Port-Channel13 description EVPN-Vxlan single-active redundancy - switchport evpn ethernet-segment identifier 0000:0000:0000:0102:0304 redundancy single-active @@ -97,7 +93,6 @@ interface Port-Channel13 ! interface Port-Channel14 description EVPN-MPLS multihoming - switchport evpn ethernet-segment identifier 0000:0000:0000:0102:0305 mpls tunnel flood filter time 100 @@ -106,7 +101,6 @@ interface Port-Channel14 ! interface Port-Channel15 description DC1_L2LEAF3_Po1 - switchport switchport trunk allowed vlan 110,201 switchport mode trunk mlag 15 @@ -115,7 +109,6 @@ interface Port-Channel15 ! interface Port-Channel16 description DC1_L2LEAF4_Po1 - switchport switchport trunk allowed vlan 110,201 switchport mode trunk snmp trap link-change @@ -136,7 +129,6 @@ interface Port-Channel20 ! interface Port-Channel50 description SRV-POD03_PortChanne1 - switchport switchport trunk allowed vlan 1-4000 switchport mode trunk evpn ethernet-segment @@ -146,7 +138,6 @@ interface Port-Channel50 ! interface Port-Channel51 description ipv6_prefix - switchport switchport trunk allowed vlan 1-500 switchport mode trunk ipv6 nd prefix a1::/64 infinite infinite no-autoconfig @@ -184,28 +175,24 @@ interface Port-Channel100.102 ! interface Port-Channel101 description PVLAN Promiscuous Access - only one secondary - switchport switchport access vlan 110 switchport pvlan mapping 111 no qos trust ! interface Port-Channel102 description PVLAN Promiscuous Trunk - vlan translation out - switchport switchport trunk allowed vlan 110-112 switchport mode trunk switchport vlan translation out 111-112 110 ! interface Port-Channel103 description PVLAN Secondary Trunk - switchport switchport trunk allowed vlan 110-112 switchport mode trunk switchport trunk private-vlan secondary ! interface Port-Channel104 description LACP fallback individual - switchport switchport trunk allowed vlan 112 switchport mode trunk port-channel lacp fallback timeout 300 @@ -213,29 +200,24 @@ interface Port-Channel104 ! interface Port-Channel105 description bpdu disabled - switchport spanning-tree bpduguard disable spanning-tree bpdufilter disable ! interface Port-Channel106 description bpdu enabled - switchport spanning-tree bpduguard enable spanning-tree bpdufilter enable ! interface Port-Channel107 description bpdu true - switchport spanning-tree bpduguard enable spanning-tree bpdufilter enable ! interface Port-Channel108 description bpdu false - switchport ! interface Port-Channel109 description Molecule ACLs - switchport switchport access vlan 110 ip access-group IPV4_ACL_IN in ip access-group IPV4_ACL_OUT out @@ -297,7 +279,6 @@ interface Port-Channel111.1000 ! interface Port-Channel112 description LACP fallback individual - switchport switchport trunk allowed vlan 112 switchport mode trunk port-channel lacp fallback timeout 5 @@ -320,7 +301,6 @@ interface Port-Channel114 ! interface Port-Channel115 description native-vlan-tag-precedence - switchport switchport trunk native vlan tag switchport mode trunk ! @@ -359,7 +339,6 @@ interface Port-Channel122 ! interface Port-Channel130 description IP NAT Testing - switchport ip nat source static 3.0.0.1 4.0.0.1 ip nat source dynamic access-list ACL2 pool POOL2 ip nat destination static 1.0.0.1 2.0.0.1 @@ -422,7 +401,6 @@ interface Ethernet11/2 description LAG Member LACP fallback LLDP ZTP VLAN switchport trunk allowed vlan 112 switchport mode trunk - switchport channel-group 112 mode active lldp tlv transmit ztp vlan 112 spanning-tree portfast diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ignore-custom-keys-in-data-models.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ignore-custom-keys-in-data-models.cfg index 81ce4687b85..8bc2c9f9690 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ignore-custom-keys-in-data-models.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/ignore-custom-keys-in-data-models.cfg @@ -14,7 +14,6 @@ no aaa root vrf instance MGMT ! interface Ethernet1 - switchport no ip routing vrf MGMT ! management api http-commands diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/platform_settings.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/platform_settings.cfg index 40f2c224220..037a1bec27e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/platform_settings.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/platform_settings.cfg @@ -15,7 +15,6 @@ vrf instance MGMT ! interface Ethernet12 description Interface Created from platform_settings.structured_config - switchport no ip routing vrf MGMT ! management api http-commands diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/ethernet-interfaces.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/ethernet-interfaces.j2 index 35b4fbdc66d..d7a43d4e661 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/ethernet-interfaces.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/ethernet-interfaces.j2 @@ -20,7 +20,7 @@ {% set port_channel_interface = port_channel_interfaces | arista.avd.default([]) | selectattr('name', 'arista.avd.defined', port_channel_interface_name) | first %} -{% if port_channel_interface.type | arista.avd.default('switched') == 'switched' %} +{% if port_channel_interface.type is arista.avd.defined('switched') %} {% set description = ethernet_interface.description | arista.avd.default("-") %} {% set mode = port_channel_interface.mode | arista.avd.default("access") %} {% set vlans = port_channel_interface.vlans | arista.avd.default('-') %} @@ -42,7 +42,7 @@ {% endif %} | {{ ethernet_interface.name }} | {{ description }} | *{{ mode }} | *{{ vlans }} | *{{ native_vlan }} | *{{ l2.trunk_groups }} | {{ channel_group }} | {% endif %} -{% elif ethernet_interface.type | arista.avd.default('switched') == 'switched' %} +{% elif ethernet_interface.type is arista.avd.defined('switched') %} {% set description = ethernet_interface.description | arista.avd.default("-") %} {% set mode = ethernet_interface.mode | arista.avd.default("access") %} {% set vlans = ethernet_interface.vlans | arista.avd.default('-') %} @@ -326,7 +326,7 @@ first %} {% if port_channel_interface.ip_address is arista.avd.defined %} {% set description = ethernet_interface.description | arista.avd.default("-") %} -{% set type = port_channel_interface.type | arista.avd.default("*switchport") %} +{% set type = port_channel_interface.type | arista.avd.default("-") %} {% set channel_group = ethernet_interface.channel_group.id | arista.avd.default("-") %} {% set ip_address = port_channel_interface.ip_address | arista.avd.default("-") %} {% set vrf = port_channel_interface.vrf | arista.avd.default("*default") %} @@ -339,7 +339,7 @@ {% else %} {% if ethernet_interface.ip_address is arista.avd.defined %} {% set description = ethernet_interface.description | arista.avd.default("-") %} -{% set type = ethernet_interface.type | arista.avd.default("switchport") %} +{% set type = ethernet_interface.type | arista.avd.default("-") %} {% set ip_address = ethernet_interface.ip_address | arista.avd.default("-") %} {% set vrf = ethernet_interface.vrf | arista.avd.default("default") %} {% set mtu = ethernet_interface.mtu | arista.avd.default("-") %} @@ -393,7 +393,7 @@ first %} {% if port_channel_interface.ipv6_address is arista.avd.defined or port_channel_interface.ipv6_enable is arista.avd.defined(true) %} {% set description = ethernet_interface.description | arista.avd.default("-") %} -{% set type = port_channel_interface.type | arista.avd.default("switchport") %} +{% set type = port_channel_interface.type | arista.avd.default("-") %} {% set channel_group = ethernet_interface.channel_group.id | arista.avd.default("-") %} {% set ipv6_address = port_channel_interface.ipv6_address | arista.avd.default("-") %} {% set vrf = port_channel_interface.vrf | arista.avd.default("default") %} @@ -408,7 +408,7 @@ {% else %} {% if ethernet_interface.ipv6_address is arista.avd.defined or ethernet_interface.ipv6_enable is arista.avd.defined(true) %} {% set description = ethernet_interface.description | arista.avd.default("-") %} -{% set type = ethernet_interface.type | arista.avd.default("switchport") %} +{% set type = ethernet_interface.type | arista.avd.default("-") %} {% set ipv6_address = ethernet_interface.ipv6_address | arista.avd.default("-") %} {% set vrf = ethernet_interface.vrf | arista.avd.default("default") %} {% set mtu = ethernet_interface.mtu | arista.avd.default("-") %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/port-channel-interfaces.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/port-channel-interfaces.j2 index 24408c7713a..8e57ec49074 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/port-channel-interfaces.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/port-channel-interfaces.j2 @@ -15,9 +15,9 @@ | Interface | Description | Type | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI | | --------- | ----------- | ---- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- | {% for port_channel_interface in port_channel_interfaces | arista.avd.natural_sort('name') %} -{% if port_channel_interface.type | arista.avd.default("switched") == 'switched' %} +{% if port_channel_interface.type is arista.avd.defined("switched") %} {% set description = port_channel_interface.description | arista.avd.default("-") %} -{% set type = port_channel_interface.type | arista.avd.default("switched") %} +{% set type = port_channel_interface.type %} {% set mode = port_channel_interface.mode | arista.avd.default("access") %} {% set vlans = port_channel_interface.vlans | arista.avd.default("-") %} {% if port_channel_interface.native_vlan_tag is arista.avd.defined(true) %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2 index 2d00a8072fd..da73daefdaf 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2 @@ -149,7 +149,7 @@ interface {{ ethernet_interface.name }} encapsulation vlan {{ encapsulation_cli }} {% endif %} -{% elif ethernet_interface.type | arista.avd.default('switched') == 'switched' %} +{% elif ethernet_interface.type is arista.avd.defined('switched') %} switchport {% endif %} {% if ethernet_interface.trunk_private_vlan_secondary is arista.avd.defined(true) %} diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/port-channel-interfaces.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/port-channel-interfaces.j2 index a41e82f9df0..0246fd624ff 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/port-channel-interfaces.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/port-channel-interfaces.j2 @@ -61,7 +61,7 @@ interface {{ port_channel_interface.name }} encapsulation vlan {{ encapsulation_cli }} {% endif %} -{% elif port_channel_interface.type | arista.avd.default("switched") == 'switched' %} +{% elif port_channel_interface.type is arista.avd.defined("switched") %} switchport {% endif %} {% if port_channel_interface.vlans is arista.avd.defined and port_channel_interface.mode is arista.avd.defined and port_channel_interface.mode in ["access", "dot1q-tunnel"] %}