Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor(eos_designs)!: Change L3 P2P descriptions for uplinks and p2p_links #4520

Merged
merged 6 commits into from
Sep 30, 2024
Merged

Refactor(eos_designs)!: Change L3 P2P descriptions for uplinks and p2p_links #4520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b534e2c
Refactor(eos_designs)!: Change L3 P2P descriptions for uplinks and p2…
ClausHolbechArista Sep 26, 2024
ba4c691
fix negative test
ClausHolbechArista Sep 27, 2024
b92564a
Merge branch 'devel' into refactor/eos_designs/l3-p2p-descriptions
carlbuchmann Sep 27, 2024
03b87cf
fix negative test
ClausHolbechArista Sep 30, 2024
5bcc9e8
Merge branch 'devel' into refactor/eos_designs/l3-p2p-descriptions
carlbuchmann Sep 30, 2024
b31ddfb
fix typo
carlbuchmann Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
34 changes: 34 additions & 0 deletions ansible_collections/arista/avd/docs/porting-guides/5.x.x.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,40 @@ The description can be reverted manually if needed:
+vtep_loopback_description: "VTEP_VXLAN_Tunnel_Source"
```

#### Underlay point-to-point L3 ethernet interfaces

The interface description for the L3 point-to-point interfaces changes to `P2P_<peer>_<peer_interface>_VRF_<vrf>`. Previously the description was `P2P_LINK_TO_<peer | upper>_<peer_interface>_vrf_<vrf>`. The VRF suffix is only added when using `uplink_type: p2p-vrfs`.

The interfaces using this are routed uplinks and `p2p_links` defined under `l3_edge` or `core_interfaces`.

Setting the description directly on `p2p_links` defined under `l3_edge` or `core_interfaces` still takes precedence.

The default descriptions can be reverted manually if needed:

```diff
+default_underlay_p2p_ethernet_description: "P2P_LINK_TO_{peer!u}_{peer_interface}{vrf?<_vrf_}"
```

The description fields support templates. See the input variables documentation for available fields.

#### Underlay point-to-point L3 port-channel interfaces

The interface description for the L3 point-to-point port-channels changes to `P2P_<peer>_<peer_interface>`. Previously the default description was `P2P_LINK_TO_<peer>_<peer_interface>`.

The port-channels using this are `p2p_links` defined under `l3_edge` or `core_interfaces`.

Setting the description directly on `p2p_links` defined under `l3_edge` or `core_interfaces` still takes precedence.

In AVD 5.0.0 it is also possible to control the port-channel description separately by setting the `description` key under `port_channel`. It will replace the full port-channel interface description.

The default descriptions can be reverted manually if needed:

```diff
+default_underlay_p2p_port_channel_description: "P2P_LINK_TO_{peer}_{peer_interface}"
```

The description fields support templates. See the input variables documentation for available fields.

#### Out-of-band management interface

The default interface description for the management interface changes to `OOB_MANAGEMENT`.
Expand Down
4 changes: 2 additions & 2 deletions ...e_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ vlan 4094

| Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out |
| --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- |
| Ethernet52/1 | P2P_LINK_TO_WAN_Ethernet1/1 | - | 10.0.0.3/31 | default | 1500 | False | - | - |
| Ethernet52/1 | P2P_WAN_Ethernet1/1 | - | 10.0.0.3/31 | default | 1500 | False | - | - |

#### Ethernet Interfaces Device Configuration

Expand All @@ -351,7 +351,7 @@ interface Ethernet51/1
channel-group 501 mode active
!
interface Ethernet52/1
description P2P_LINK_TO_WAN_Ethernet1/1
description P2P_WAN_Ethernet1/1
no shutdown
mtu 1500
no switchport
Expand Down
4 changes: 2 additions & 2 deletions ...e_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ vlan 4094

| Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out |
| --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- |
| Ethernet52/1 | P2P_LINK_TO_WAN_Ethernet1/1 | - | 10.0.0.5/31 | default | 1500 | False | - | - |
| Ethernet52/1 | P2P_WAN_Ethernet1/1 | - | 10.0.0.5/31 | default | 1500 | False | - | - |

#### Ethernet Interfaces Device Configuration

Expand All @@ -351,7 +351,7 @@ interface Ethernet51/1
channel-group 501 mode active
!
interface Ethernet52/1
description P2P_LINK_TO_WAN_Ethernet1/1
description P2P_WAN_Ethernet1/1
no shutdown
mtu 1500
no switchport
Expand Down
2 changes: 1 addition & 1 deletion ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE1.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ interface Ethernet51/1
channel-group 501 mode active
!
interface Ethernet52/1
description P2P_LINK_TO_WAN_Ethernet1/1
description P2P_WAN_Ethernet1/1
no shutdown
mtu 1500
no switchport
Expand Down
2 changes: 1 addition & 1 deletion ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE2.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ interface Ethernet51/1
channel-group 501 mode active
!
interface Ethernet52/1
description P2P_LINK_TO_WAN_Ethernet1/1
description P2P_WAN_Ethernet1/1
no shutdown
mtu 1500
no switchport
Expand Down
2 changes: 1 addition & 1 deletion ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,14 +300,14 @@ ethernet_interfaces:
peer: WAN
peer_interface: Ethernet1/1
peer_type: other
description: P2P_LINK_TO_WAN_Ethernet1/1
switchport:
enabled: false
shutdown: false
mtu: 1500
ip_address: 10.0.0.3/31
ospf_network_point_to_point: true
ospf_area: 0.0.0.0
description: P2P_WAN_Ethernet1/1
mlag_configuration:
domain_id: SPINES
local_interface: Vlan4094
Expand Down
2 changes: 1 addition & 1 deletion ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,14 +300,14 @@ ethernet_interfaces:
peer: WAN
peer_interface: Ethernet1/1
peer_type: other
description: P2P_LINK_TO_WAN_Ethernet1/1
switchport:
enabled: false
shutdown: false
mtu: 1500
ip_address: 10.0.0.5/31
ospf_network_point_to_point: true
ospf_area: 0.0.0.0
description: P2P_WAN_Ethernet1/1
mlag_configuration:
domain_id: SPINES
local_interface: Vlan4094
Expand Down
8 changes: 4 additions & 4 deletions ...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1a.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,22 +265,22 @@ vlan 4094

| Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out |
| --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- |
| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet1 | - | 10.255.255.1/31 | default | 1500 | False | - | - |
| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet1 | - | 10.255.255.3/31 | default | 1500 | False | - | - |
| Ethernet1 | P2P_dc1-spine1_Ethernet1 | - | 10.255.255.1/31 | default | 1500 | False | - | - |
| Ethernet2 | P2P_dc1-spine2_Ethernet1 | - | 10.255.255.3/31 | default | 1500 | False | - | - |

#### Ethernet Interfaces Device Configuration

```eos
!
interface Ethernet1
description P2P_LINK_TO_DC1-SPINE1_Ethernet1
description P2P_dc1-spine1_Ethernet1
no shutdown
mtu 1500
no switchport
ip address 10.255.255.1/31
!
interface Ethernet2
description P2P_LINK_TO_DC1-SPINE2_Ethernet1
description P2P_dc1-spine2_Ethernet1
no shutdown
mtu 1500
no switchport
Expand Down
8 changes: 4 additions & 4 deletions ...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1b.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,22 +265,22 @@ vlan 4094

| Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out |
| --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- |
| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet2 | - | 10.255.255.5/31 | default | 1500 | False | - | - |
| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet2 | - | 10.255.255.7/31 | default | 1500 | False | - | - |
| Ethernet1 | P2P_dc1-spine1_Ethernet2 | - | 10.255.255.5/31 | default | 1500 | False | - | - |
| Ethernet2 | P2P_dc1-spine2_Ethernet2 | - | 10.255.255.7/31 | default | 1500 | False | - | - |

#### Ethernet Interfaces Device Configuration

```eos
!
interface Ethernet1
description P2P_LINK_TO_DC1-SPINE1_Ethernet2
description P2P_dc1-spine1_Ethernet2
no shutdown
mtu 1500
no switchport
ip address 10.255.255.5/31
!
interface Ethernet2
description P2P_LINK_TO_DC1-SPINE2_Ethernet2
description P2P_dc1-spine2_Ethernet2
no shutdown
mtu 1500
no switchport
Expand Down
12 changes: 6 additions & 6 deletions ...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2a.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,23 +265,23 @@ vlan 4094

| Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out |
| --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- |
| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet3 | - | 10.255.255.9/31 | default | 1500 | False | - | - |
| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet3 | - | 10.255.255.11/31 | default | 1500 | False | - | - |
| Ethernet6 | P2P_LINK_TO_dc2-leaf2a_Ethernet6 | - | 172.16.100.0/31 | default | 1500 | False | - | - |
| Ethernet1 | P2P_dc1-spine1_Ethernet3 | - | 10.255.255.9/31 | default | 1500 | False | - | - |
| Ethernet2 | P2P_dc1-spine2_Ethernet3 | - | 10.255.255.11/31 | default | 1500 | False | - | - |
| Ethernet6 | P2P_dc2-leaf2a_Ethernet6 | - | 172.16.100.0/31 | default | 1500 | False | - | - |

#### Ethernet Interfaces Device Configuration

```eos
!
interface Ethernet1
description P2P_LINK_TO_DC1-SPINE1_Ethernet3
description P2P_dc1-spine1_Ethernet3
no shutdown
mtu 1500
no switchport
ip address 10.255.255.9/31
!
interface Ethernet2
description P2P_LINK_TO_DC1-SPINE2_Ethernet3
description P2P_dc1-spine2_Ethernet3
no shutdown
mtu 1500
no switchport
Expand All @@ -303,7 +303,7 @@ interface Ethernet5
channel-group 5 mode active
!
interface Ethernet6
description P2P_LINK_TO_dc2-leaf2a_Ethernet6
description P2P_dc2-leaf2a_Ethernet6
no shutdown
mtu 1500
no switchport
Expand Down
12 changes: 6 additions & 6 deletions ...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2b.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,23 +265,23 @@ vlan 4094

| Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out |
| --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- |
| Ethernet1 | P2P_LINK_TO_DC1-SPINE1_Ethernet4 | - | 10.255.255.13/31 | default | 1500 | False | - | - |
| Ethernet2 | P2P_LINK_TO_DC1-SPINE2_Ethernet4 | - | 10.255.255.15/31 | default | 1500 | False | - | - |
| Ethernet6 | P2P_LINK_TO_dc2-leaf2b_Ethernet6 | - | 172.16.100.2/31 | default | 1500 | False | - | - |
| Ethernet1 | P2P_dc1-spine1_Ethernet4 | - | 10.255.255.13/31 | default | 1500 | False | - | - |
| Ethernet2 | P2P_dc1-spine2_Ethernet4 | - | 10.255.255.15/31 | default | 1500 | False | - | - |
| Ethernet6 | P2P_dc2-leaf2b_Ethernet6 | - | 172.16.100.2/31 | default | 1500 | False | - | - |

#### Ethernet Interfaces Device Configuration

```eos
!
interface Ethernet1
description P2P_LINK_TO_DC1-SPINE1_Ethernet4
description P2P_dc1-spine1_Ethernet4
no shutdown
mtu 1500
no switchport
ip address 10.255.255.13/31
!
interface Ethernet2
description P2P_LINK_TO_DC1-SPINE2_Ethernet4
description P2P_dc1-spine2_Ethernet4
no shutdown
mtu 1500
no switchport
Expand All @@ -303,7 +303,7 @@ interface Ethernet5
channel-group 5 mode active
!
interface Ethernet6
description P2P_LINK_TO_dc2-leaf2b_Ethernet6
description P2P_dc2-leaf2b_Ethernet6
no shutdown
mtu 1500
no switchport
Expand Down
16 changes: 8 additions & 8 deletions ...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,38 +155,38 @@ vlan internal order ascending range 1006 1199

| Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out |
| --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- |
| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet1 | - | 10.255.255.0/31 | default | 1500 | False | - | - |
| Ethernet2 | P2P_LINK_TO_DC1-LEAF1B_Ethernet1 | - | 10.255.255.4/31 | default | 1500 | False | - | - |
| Ethernet3 | P2P_LINK_TO_DC1-LEAF2A_Ethernet1 | - | 10.255.255.8/31 | default | 1500 | False | - | - |
| Ethernet4 | P2P_LINK_TO_DC1-LEAF2B_Ethernet1 | - | 10.255.255.12/31 | default | 1500 | False | - | - |
| Ethernet1 | P2P_dc1-leaf1a_Ethernet1 | - | 10.255.255.0/31 | default | 1500 | False | - | - |
| Ethernet2 | P2P_dc1-leaf1b_Ethernet1 | - | 10.255.255.4/31 | default | 1500 | False | - | - |
| Ethernet3 | P2P_dc1-leaf2a_Ethernet1 | - | 10.255.255.8/31 | default | 1500 | False | - | - |
| Ethernet4 | P2P_dc1-leaf2b_Ethernet1 | - | 10.255.255.12/31 | default | 1500 | False | - | - |

#### Ethernet Interfaces Device Configuration

```eos
!
interface Ethernet1
description P2P_LINK_TO_DC1-LEAF1A_Ethernet1
description P2P_dc1-leaf1a_Ethernet1
no shutdown
mtu 1500
no switchport
ip address 10.255.255.0/31
!
interface Ethernet2
description P2P_LINK_TO_DC1-LEAF1B_Ethernet1
description P2P_dc1-leaf1b_Ethernet1
no shutdown
mtu 1500
no switchport
ip address 10.255.255.4/31
!
interface Ethernet3
description P2P_LINK_TO_DC1-LEAF2A_Ethernet1
description P2P_dc1-leaf2a_Ethernet1
no shutdown
mtu 1500
no switchport
ip address 10.255.255.8/31
!
interface Ethernet4
description P2P_LINK_TO_DC1-LEAF2B_Ethernet1
description P2P_dc1-leaf2b_Ethernet1
no shutdown
mtu 1500
no switchport
Expand Down
16 changes: 8 additions & 8 deletions ...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,38 +155,38 @@ vlan internal order ascending range 1006 1199

| Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out |
| --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- |
| Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet2 | - | 10.255.255.2/31 | default | 1500 | False | - | - |
| Ethernet2 | P2P_LINK_TO_DC1-LEAF1B_Ethernet2 | - | 10.255.255.6/31 | default | 1500 | False | - | - |
| Ethernet3 | P2P_LINK_TO_DC1-LEAF2A_Ethernet2 | - | 10.255.255.10/31 | default | 1500 | False | - | - |
| Ethernet4 | P2P_LINK_TO_DC1-LEAF2B_Ethernet2 | - | 10.255.255.14/31 | default | 1500 | False | - | - |
| Ethernet1 | P2P_dc1-leaf1a_Ethernet2 | - | 10.255.255.2/31 | default | 1500 | False | - | - |
| Ethernet2 | P2P_dc1-leaf1b_Ethernet2 | - | 10.255.255.6/31 | default | 1500 | False | - | - |
| Ethernet3 | P2P_dc1-leaf2a_Ethernet2 | - | 10.255.255.10/31 | default | 1500 | False | - | - |
| Ethernet4 | P2P_dc1-leaf2b_Ethernet2 | - | 10.255.255.14/31 | default | 1500 | False | - | - |

#### Ethernet Interfaces Device Configuration

```eos
!
interface Ethernet1
description P2P_LINK_TO_DC1-LEAF1A_Ethernet2
description P2P_dc1-leaf1a_Ethernet2
no shutdown
mtu 1500
no switchport
ip address 10.255.255.2/31
!
interface Ethernet2
description P2P_LINK_TO_DC1-LEAF1B_Ethernet2
description P2P_dc1-leaf1b_Ethernet2
no shutdown
mtu 1500
no switchport
ip address 10.255.255.6/31
!
interface Ethernet3
description P2P_LINK_TO_DC1-LEAF2A_Ethernet2
description P2P_dc1-leaf2a_Ethernet2
no shutdown
mtu 1500
no switchport
ip address 10.255.255.10/31
!
interface Ethernet4
description P2P_LINK_TO_DC1-LEAF2B_Ethernet2
description P2P_dc1-leaf2b_Ethernet2
no shutdown
mtu 1500
no switchport
Expand Down
8 changes: 4 additions & 4 deletions ...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1a.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,22 +265,22 @@ vlan 4094

| Interface | Description | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out |
| --------- | ----------- | ------------- | ---------- | ----| ---- | -------- | ------ | ------- |
| Ethernet1 | P2P_LINK_TO_DC2-SPINE1_Ethernet1 | - | 10.255.255.105/31 | default | 1500 | False | - | - |
| Ethernet2 | P2P_LINK_TO_DC2-SPINE2_Ethernet1 | - | 10.255.255.107/31 | default | 1500 | False | - | - |
| Ethernet1 | P2P_dc2-spine1_Ethernet1 | - | 10.255.255.105/31 | default | 1500 | False | - | - |
| Ethernet2 | P2P_dc2-spine2_Ethernet1 | - | 10.255.255.107/31 | default | 1500 | False | - | - |

#### Ethernet Interfaces Device Configuration

```eos
!
interface Ethernet1
description P2P_LINK_TO_DC2-SPINE1_Ethernet1
description P2P_dc2-spine1_Ethernet1
no shutdown
mtu 1500
no switchport
ip address 10.255.255.105/31
!
interface Ethernet2
description P2P_LINK_TO_DC2-SPINE2_Ethernet1
description P2P_dc2-spine2_Ethernet1
no shutdown
mtu 1500
no switchport
Expand Down
Loading
Loading