diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md
index 531409dd3dc..3b6b1bb42cb 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md
@@ -879,12 +879,7 @@ interface Dps1
| Ethernet5 | Molecule Routing | - | 220 | - | - | - |
| Ethernet6 | SRV-POD02_Eth1 | trunk | 110-111,210-211 | - | - | - |
| Ethernet7 | Molecule L2 | - | - | - | - | - |
-| 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 | interface_in_mode_access_accepting_tagged_LACP | access | 200 | - | - | - |
-| Ethernet11/2 | LAG Member LACP fallback LLDP ZTP VLAN | *trunk | *112 | *- | *- | 112 |
| 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 | - | - | - |
@@ -932,13 +927,18 @@ interface Dps1
| Ethernet67 | Custom_Transceiver_Frequency | - | - | - | - | - |
| Ethernet68 | Custom_Transceiver_Frequency | - | - | - | - | - |
| Ethernet69 | IP NAT service-profile | - | - | - | - | - |
-| Ethernet103 | MLAG_PEER_DC1-LEAF1B_Ethernet3 | *trunk | *2-4094 | *- | *LEAF_PEER_L3, MLAG | 3 |
-| Ethernet104 | MLAG_PEER_DC1-LEAF1B_Ethernet4 | *trunk | *2-4094 | *- | *LEAF_PEER_L3, MLAG | 3 |
-| Ethernet105 | DC1-AGG01_Ethernet1 | *trunk | *110,201 | *- | *- | 5 |
-| Ethernet115 | DC1-AGG03_Ethernet1 | *trunk | *110,201 | *- | *- | 15 |
-| Ethernet116 | DC1-AGG04_Ethernet1 | *trunk | *110,201 | *10 | *- | 16 |
-| Ethernet118 | LAG Member | *access | *110 | *- | *- | 109 |
-| Ethernet150 | SRV-POD03_Eth1 | *trunk | *110,201 | *- | *- | 5 |
+| Ethernet73 | DC1-AGG01_Ethernet1 | *trunk | *110,201 | *- | *- | 5 |
+| Ethernet74 | MLAG_PEER_DC1-LEAF1B_Ethernet3 | *trunk | *2-4094 | *- | *LEAF_PEER_L3, MLAG | 3 |
+| Ethernet75 | MLAG_PEER_DC1-LEAF1B_Ethernet4 | *trunk | *2-4094 | *- | *LEAF_PEER_L3, MLAG | 3 |
+| Ethernet76 | SRV-POD03_Eth1 | *trunk | *110,201 | *- | *- | 5 |
+| Ethernet78 | DC1-AGG03_Ethernet1 | *trunk | *110,201 | *- | *- | 15 |
+| Ethernet79 | DC1-AGG04_Ethernet1 | *trunk | *110,201 | *10 | *- | 16 |
+| Ethernet80/1 | LAG Member | *access | *110 | *- | *- | 101 |
+| Ethernet80/2 | LAG Member | *trunk | *110-112 | *- | *- | 102 |
+| Ethernet80/3 | LAG Member | *trunk | *110-112 | *- | *- | 103 |
+| Ethernet80/4 | LAG Member LACP fallback | *trunk | *112 | *- | *- | 104 |
+| Ethernet81 | LAG Member | *access | *110 | *- | *- | 109 |
+| Ethernet81/2 | LAG Member LACP fallback LLDP ZTP VLAN | *trunk | *112 | *- | *- | 112 |
*Inherited from Port-Channel Interface
@@ -1013,7 +1013,7 @@ interface Dps1
| Ethernet7 | - | 100gbase-ar4 |
| Ethernet67 | 190050.000 | - |
| Ethernet68 | 190080.000 ghz | 100gbase-ar4 |
-| Ethernet105 | - | 100gbase-ar4 |
+| Ethernet73 | - | 100gbase-ar4 |
##### Link Tracking Groups
@@ -1060,7 +1060,7 @@ interface Dps1
| Ethernet64 | DHCP server interface | - | 192.168.42.42/24 | default | - | - | - | - |
| Ethernet65 | Multiple VRIDs | - | 192.0.2.2/25 | default | - | False | - | - |
| Ethernet66 | Multiple VRIDs and tracking | - | 192.0.2.2/25 | default | - | False | - | - |
-| Ethernet117 | LAG Member | 17 | *192.0.2.3/31 | **default | **- | **- | **- | **- |
+| Ethernet80 | LAG Member | 17 | *192.0.2.3/31 | **default | **- | **- | **- | **- |
*Inherited from Port-Channel Interface
@@ -1147,7 +1147,7 @@ interface Dps1
| Interface | Channel Group | ISIS Instance | ISIS BFD | ISIS Metric | Mode | ISIS Circuit Type | Hello Padding | Authentication Mode |
| --------- | ------------- | ------------- | -------- | ----------- | ---- | ----------------- | ------------- | ------------------- |
| Ethernet5 | - | ISIS_TEST | True | 99 | point-to-point | level-2 | False | md5 |
-| Ethernet10/10 | 110 | *ISIS_TEST | True | *99 | *point-to-point | *level-2 | *True | *text |
+| Ethernet81/10 | 110 | *ISIS_TEST | True | *99 | *point-to-point | *level-2 | *True | *text |
*Inherited from Port-Channel Interface
@@ -1176,9 +1176,9 @@ interface Dps1
| Interface | Enabled |
| --------- | ------- |
-| Ethernet11/1 | fire-code
reed-solomon |
| Ethernet23 | fire-code
reed-solomon |
| Ethernet24 | Disabled |
+| Ethernet81/1 | fire-code
reed-solomon |
#### Priority Flow Control
@@ -1432,30 +1432,6 @@ interface Ethernet10
no mpls ldp interface
no mpls ip
!
-interface Ethernet10/1
- description LAG Member
- channel-group 101 mode active
-!
-interface Ethernet10/2
- description LAG Member
- channel-group 102 mode active
-!
-interface Ethernet10/3
- description LAG Member
- channel-group 103 mode active
-!
-interface Ethernet10/4
- description LAG Member LACP fallback
- switchport trunk allowed vlan 100
- switchport mode trunk
- switchport
- channel-group 104 mode active
- spanning-tree portfast
-!
-interface Ethernet10/10
- description isis_port_channel_member
- channel-group 110 mode active
-!
interface Ethernet11
description interface_in_mode_access_accepting_tagged_LACP
switchport access vlan 200
@@ -1463,21 +1439,6 @@ interface Ethernet11
switchport
l2-protocol encapsulation dot1q vlan 200
!
-interface Ethernet11/1
- description LAG Member with error_correction
- error-correction encoding fire-code
- error-correction encoding reed-solomon
- channel-group 111 mode active
-!
-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
-!
interface Ethernet12
description interface_with_dot1q_tunnel
switchport access vlan 300
@@ -2026,47 +1987,86 @@ interface Ethernet72
dot1x aaa unresponsive eap response success
dot1x mac based access-list
!
-interface Ethernet103
+interface Ethernet73
+ description DC1-AGG01_Ethernet1
+ channel-group 5 mode active
+ transceiver media override 100gbase-ar4
+!
+interface Ethernet74
description MLAG_PEER_DC1-LEAF1B_Ethernet3
channel-group 3 mode active
!
-interface Ethernet104
+interface Ethernet75
description MLAG_PEER_DC1-LEAF1B_Ethernet4
channel-group 3 mode active
!
-interface Ethernet105
- description DC1-AGG01_Ethernet1
+interface Ethernet76
+ description SRV-POD03_Eth1
channel-group 5 mode active
- transceiver media override 100gbase-ar4
+ no lldp transmit
+ no lldp receive
!
-interface Ethernet108
+interface Ethernet77
description MLAG_PEER_DC1-LEAF1B_Ethernet8
channel-group 8 mode active
!
-interface Ethernet115
+interface Ethernet78
description DC1-AGG03_Ethernet1
channel-group 15 mode active
lacp timer fast
lacp timer multiplier 30
!
-interface Ethernet116
+interface Ethernet79
description DC1-AGG04_Ethernet1
channel-group 16 mode active
lacp timer normal
!
-interface Ethernet117
+interface Ethernet80
description LAG Member
channel-group 17 mode active
!
-interface Ethernet118
+interface Ethernet80/1
+ description LAG Member
+ channel-group 101 mode active
+!
+interface Ethernet80/2
+ description LAG Member
+ channel-group 102 mode active
+!
+interface Ethernet80/3
+ description LAG Member
+ channel-group 103 mode active
+!
+interface Ethernet80/4
+ description LAG Member LACP fallback
+ switchport trunk allowed vlan 100
+ switchport mode trunk
+ switchport
+ channel-group 104 mode active
+ spanning-tree portfast
+!
+interface Ethernet81
description LAG Member
channel-group 109 mode active
!
-interface Ethernet150
- description SRV-POD03_Eth1
- channel-group 5 mode active
- no lldp transmit
- no lldp receive
+interface Ethernet81/1
+ description LAG Member with error_correction
+ error-correction encoding fire-code
+ error-correction encoding reed-solomon
+ channel-group 111 mode active
+!
+interface Ethernet81/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
+!
+interface Ethernet81/10
+ description isis_port_channel_member
+ channel-group 110 mode active
```
### Port-Channel Interfaces
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg
index 6e34c4149ee..42d3e8c8f78 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg
@@ -1067,30 +1067,6 @@ interface Ethernet10
no mpls ldp interface
no mpls ip
!
-interface Ethernet10/1
- description LAG Member
- channel-group 101 mode active
-!
-interface Ethernet10/2
- description LAG Member
- channel-group 102 mode active
-!
-interface Ethernet10/3
- description LAG Member
- channel-group 103 mode active
-!
-interface Ethernet10/4
- description LAG Member LACP fallback
- switchport trunk allowed vlan 100
- switchport mode trunk
- switchport
- channel-group 104 mode active
- spanning-tree portfast
-!
-interface Ethernet10/10
- description isis_port_channel_member
- channel-group 110 mode active
-!
interface Ethernet11
description interface_in_mode_access_accepting_tagged_LACP
switchport access vlan 200
@@ -1098,21 +1074,6 @@ interface Ethernet11
switchport
l2-protocol encapsulation dot1q vlan 200
!
-interface Ethernet11/1
- description LAG Member with error_correction
- error-correction encoding fire-code
- error-correction encoding reed-solomon
- channel-group 111 mode active
-!
-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
-!
interface Ethernet12
description interface_with_dot1q_tunnel
switchport access vlan 300
@@ -1661,47 +1622,86 @@ interface Ethernet72
dot1x aaa unresponsive eap response success
dot1x mac based access-list
!
-interface Ethernet103
+interface Ethernet73
+ description DC1-AGG01_Ethernet1
+ channel-group 5 mode active
+ transceiver media override 100gbase-ar4
+!
+interface Ethernet74
description MLAG_PEER_DC1-LEAF1B_Ethernet3
channel-group 3 mode active
!
-interface Ethernet104
+interface Ethernet75
description MLAG_PEER_DC1-LEAF1B_Ethernet4
channel-group 3 mode active
!
-interface Ethernet105
- description DC1-AGG01_Ethernet1
+interface Ethernet76
+ description SRV-POD03_Eth1
channel-group 5 mode active
- transceiver media override 100gbase-ar4
+ no lldp transmit
+ no lldp receive
!
-interface Ethernet108
+interface Ethernet77
description MLAG_PEER_DC1-LEAF1B_Ethernet8
channel-group 8 mode active
!
-interface Ethernet115
+interface Ethernet78
description DC1-AGG03_Ethernet1
channel-group 15 mode active
lacp timer fast
lacp timer multiplier 30
!
-interface Ethernet116
+interface Ethernet79
description DC1-AGG04_Ethernet1
channel-group 16 mode active
lacp timer normal
!
-interface Ethernet117
+interface Ethernet80
description LAG Member
channel-group 17 mode active
!
-interface Ethernet118
+interface Ethernet80/1
+ description LAG Member
+ channel-group 101 mode active
+!
+interface Ethernet80/2
+ description LAG Member
+ channel-group 102 mode active
+!
+interface Ethernet80/3
+ description LAG Member
+ channel-group 103 mode active
+!
+interface Ethernet80/4
+ description LAG Member LACP fallback
+ switchport trunk allowed vlan 100
+ switchport mode trunk
+ switchport
+ channel-group 104 mode active
+ spanning-tree portfast
+!
+interface Ethernet81
description LAG Member
channel-group 109 mode active
!
-interface Ethernet150
- description SRV-POD03_Eth1
- channel-group 5 mode active
- no lldp transmit
- no lldp receive
+interface Ethernet81/1
+ description LAG Member with error_correction
+ error-correction encoding fire-code
+ error-correction encoding reed-solomon
+ channel-group 111 mode active
+!
+interface Ethernet81/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
+!
+interface Ethernet81/10
+ description isis_port_channel_member
+ channel-group 110 mode active
!
interface Management1
description OOB_MANAGEMENT
diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/ethernet-interfaces.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/ethernet-interfaces.yml
index cba415793ff..9a82deec663 100644
--- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/ethernet-interfaces.yml
+++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/ethernet-interfaces.yml
@@ -1411,7 +1411,7 @@ ethernet_interfaces:
traffic_allow_access_list: acl1
mac_based_access_list: true
- - name: Ethernet105
+ - name: Ethernet73
peer: DC1-AGG01
peer_interface: Ethernet1
peer_type: l2leaf
@@ -1423,7 +1423,7 @@ ethernet_interfaces:
media:
override: 100gbase-ar4
- - name: Ethernet103
+ - name: Ethernet74
peer: DC1-LEAF1B
peer_interface: Ethernet3
peer_type: mlag_peer
@@ -1432,7 +1432,7 @@ ethernet_interfaces:
id: 3
mode: active
- - name: Ethernet104
+ - name: Ethernet75
peer: DC1-LEAF1B
peer_interface: Ethernet4
peer_type: mlag_peer
@@ -1441,7 +1441,7 @@ ethernet_interfaces:
id: 3
mode: active
- - name: Ethernet150
+ - name: Ethernet76
peer: SRV-POD03
peer_interface: Eth1
peer_type: server
@@ -1453,7 +1453,7 @@ ethernet_interfaces:
receive: false
transmit: false
- - name: Ethernet108
+ - name: Ethernet77
peer: DC1-LEAF1B
peer_interface: Ethernet4
description: MLAG_PEER_DC1-LEAF1B_Ethernet8
@@ -1461,7 +1461,7 @@ ethernet_interfaces:
id: 8
mode: active
- - name: Ethernet115
+ - name: Ethernet78
peer: DC1-AGG03
peer_interface: Ethernet1
peer_type: l2leaf
@@ -1473,7 +1473,7 @@ ethernet_interfaces:
mode: fast
multiplier: 30
- - name: Ethernet116
+ - name: Ethernet79
peer: DC1-AGG04
peer_interface: Ethernet1
peer_type: l2leaf
@@ -1484,31 +1484,31 @@ ethernet_interfaces:
lacp_timer:
mode: normal
- - name: Ethernet117
+ - name: Ethernet80
description: LAG Member
channel_group:
id: 17
mode: active
- - name: Ethernet10/1
+ - name: Ethernet80/1
description: LAG Member
channel_group:
id: 101
mode: active
- - name: Ethernet10/2
+ - name: Ethernet80/2
description: LAG Member
channel_group:
id: 102
mode: active
- - name: Ethernet10/3
+ - name: Ethernet80/3
description: LAG Member
channel_group:
id: 103
mode: active
- - name: Ethernet10/4
+ - name: Ethernet80/4
description: LAG Member LACP fallback
channel_group:
id: 104
@@ -1520,19 +1520,19 @@ ethernet_interfaces:
allowed_vlan: 100
spanning_tree_portfast: edge
- - name: Ethernet118
+ - name: Ethernet81
description: LAG Member
channel_group:
id: 109
mode: active
- - name: Ethernet10/10
+ - name: Ethernet81/10
description: isis_port_channel_member
channel_group:
id: 110
mode: active
- - name: Ethernet11/1
+ - name: Ethernet81/1
description: LAG Member with error_correction
error_correction_encoding:
fire_code: true
@@ -1541,7 +1541,7 @@ ethernet_interfaces:
id: 111
mode: active
- - name: Ethernet11/2
+ - name: Ethernet81/2
description: LAG Member LACP fallback LLDP ZTP VLAN
channel_group:
id: 112