Skip to content

Commit

Permalink
Merge branch 'devel' into issue-4188
Browse files Browse the repository at this point in the history
  • Loading branch information
gmuloc committed Sep 30, 2024
2 parents 86ef983 + 0b5d9d7 commit 49cb8c3
Show file tree
Hide file tree
Showing 896 changed files with 12,771 additions and 8,988 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-management.yml
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ jobs:
# The version conflicts with our requirements,
# so we let the galaxy-importer version resolve remaining requirements.
run: |
pip install "galaxy-importer==0.4.22"
pip install "galaxy-importer==0.4.25"
- name: 'Build ansible package'
run: make collection-build
- name: 'Run galaxy-importer checks'
Expand Down
149 changes: 149 additions & 0 deletions ansible_collections/arista/avd/docs/porting-guides/5.x.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,128 @@ To retain the old descriptions, the value of the `description` key under `port_c
+default_network_ports_port_channel_description: "{adapter_description_or_endpoint}{endpoint_port_channel?<_}"
```

#### MLAG peer-link ethernet interfaces

The interface description for the MLAG peer-link ethernet interfaces changes to `MLAG_{mlag_peer}_{peer_interface}`.
Previously the description was `MLAG_PEER_{mlag_peer}_{interface}` so using the local interface instead of the peer's. Most often the MLAG interfaces are the same, so this is a minor issue.

The description can be reverted manually if needed:

```diff
+mlag_member_description: "MLAG_PEER_{mlag_peer}_{interface}"
```

#### MLAG peer-link port-channel interfaces

The interface description for the MLAG peer-link port-channel interfaces changes to `MLAG_{mlag_peer}_{peer_interface}`.
Previously the description was `MLAG_PEER_{mlag_peer}_Po{mlag_port_channel_id}` so using the local port-channel ID instead of the peer's. Most often the MLAG interfaces are the same, so this is a minor issue.

The description can be reverted manually if needed:

```diff
+mlag_port_channel_description: "MLAG_PEER_{mlag_peer}_Po{mlag_port_channel_id}"
```

#### MLAG peer VLAN interface

The interface description for the MLAG peer SVI changes to `MLAG`. Previously the description was `MLAG_PEER`.

The description can be reverted manually if needed:

```diff
+mlag_peer_svi_description: "MLAG_PEER"
```

The description setting supports a template. See the input variables documentation for available fields.

#### MLAG L3 peering VLAN interface

The interface description for the MLAG L3 peering SVI changes to `MLAG_L3`. Previously the description was `MLAG_PEER_L3_PEERING`.

The description can be reverted manually if needed:

```diff
+mlag_peer_l3_svi_description: "MLAG_PEER_L3_PEERING"
```

The description setting supports a template. See the input variables documentation for available fields.

#### MLAG L3 VRF peering VLAN interface

The interface description for the MLAG L3 VRF peering SVI changes to `MLAG_L3_VRF_{vrf}`. Previously the description was `MLAG_PEER_L3_iBGP: vrf {vrf}`.

The description can be reverted manually if needed:

```diff
+mlag_peer_l3_vrf_svi_description: "MLAG_PEER_L3_iBGP: vrf {vrf}"
```

The description setting supports a template. See the input variables documentation for available fields.

### Default VLAN names are changed for more consistency

#### MLAG peer VLAN

The name of the MLAG peer VLAN (VLAN 4094 by default) changes to `MLAG`. Previously the name was `MLAG_PEER`.

The name can be reverted manually if needed:

```diff
+mlag_peer_vlan_name: "MLAG_PEER"
```

The setting supports a template. See the input variables documentation for available fields.

#### MLAG L3 peering VLAN

The name of the MLAG L3 peering VLAN (VLAN 4093 by default) changes to `MLAG_L3`. Previously the name was `LEAF_PEER_L3`.

The name can be reverted manually if needed:

```diff
+mlag_peer_l3_vlan_name: "LEAF_PEER_L3"
```

The setting supports a template. See the input variables documentation for available fields.

#### MLAG L3 VRF peering VLAN

The name of the MLAG L3 VRF peering VLAN changes to `MLAG_L3_VRF_{vrf}`. Previously the name was `MLAG_iBGP_{vrf}`.

The name can be reverted manually if needed:

```diff
+mlag_peer_l3_vrf_vlan_name: "MLAG_iBGP_{vrf}"
```

The setting supports a template. See the input variables documentation for available fields.

### Default BGP peer descriptions are changed for more consistency

#### MLAG L3 peering

The description of the MLAG L3 BGP peers, including those in VRFs, changes to `{mlag_peer}_{peer_interface}`. Previously the description was `{mlag_peer}`.

The description can be reverted manually if needed:

```diff
+mlag_bgp_peer_description: "{mlag_peer}"
```

The setting supports a template. See the input variables documentation for available fields.

#### Overlay peerings

The description of the overlay BGP peers (EVPN, MPLS, WAN) changes to `{peer}{peer_interface?<_}`. Previously the description was `{peer}`.

The description can be reverted manually if needed:

```diff
+overlay_bgp_peer_description: "{peer}"
```

The setting supports a template. See the input variables documentation for available fields.

### Combine the VLAN trunk groups used for MLAG

With AVD version 5.0.0 a single `MLAG` trunk group is used for MLAG and MLAG L3 peerings, including the peerings in VRFs.
Expand Down Expand Up @@ -691,6 +813,25 @@ custom_platform_settings:
- AWE-7220R
```

#### Default encapsulation for WAN EVPN iBGP peerings changed to `path-selection`

With AVD version 5.0.0 the default encapsulation used for EVPN iBGP peering between WAN routers is `path-selection`. Previously it was `vxlan`.

!!! danger
The `path-selection` encapsulation is only supported on EOS above 4.33.0F.

It is critical that all WAN devices use the same encapsulation. For
existing deployments it is recommended to set the encapsulation back to
`vxlan` until a migration can be done across the entire WAN network.

Contact your Arista account team for guidance on migration.

To retain the vxlan encapsulation on WAN EVPN iBGP peerings use `wan_encapsulation`:

```diff
+ wan_encapsulation: vxlan
```

## Changes to role `arista.avd.eos_cli_config_gen`

TODO: Level 3 sections for each change with details on how to migrate
Expand Down Expand Up @@ -1090,6 +1231,14 @@ port_channel_interfaces:
+ encapsulation: unmatched
```

### Fix issues with flags, source/destination ports, and field set for TCP/UDP protocol under traffic-policies

The change has been incorporated into `traffic-policies.j2` eos template.

In AVD 4.0.0, configuring the `flags` for `UDP` protocol under traffic-policies was allowed and the configuration for `source/destination port` and `source/destination field-set` together was not generated for `TCP/UDP` protocol.

As of AVD 5.0.0, the configuration of `flags` in `UDP` protocol under traffic-policies is not generated and the configuration for `source/destination port` and `field set` can be generated together for `TCP/UDP` protocol. Also, the configuration order has been fixed as per the EOS running-config.

### Removal of deprecated data models

The following data model keys have been removed from `eos_cli_config_gen` in v5.0.0.
Expand Down
25 changes: 25 additions & 0 deletions ansible_collections/arista/avd/docs/release-notes/5.x.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -206,12 +206,37 @@ The updated version gives more flexibility to customizing interface descriptions

See the [Porting guide for AVD 5.x.x](../porting-guides/5.x.x.md#avdinterfacedescriptions-breaking-changes)

#### Reference to a non-existing profile now raise an error

With AVD version 5.0.0, if any referenced profile or parent profile is not defined, AVD will now raise an error. This helps catching typos in the input variables.

This applies to:

- `l3_interface_profiles`
- `port_profiles`
- `svi_profiles`

#### `wan_mode: autovpn` renamed `wan_mode: legacy-autovpn`

With AVD version 5.0.0 the valid values for `wan_mode` key are now `legacy-autovpn | cv-pathfinder`.

See the [porting guide](../porting-guides/5.x.x.md#wan-mode-autovpn-renamed-wan-mode-legacy-vpn) for details.

#### Default encapsulation for WAN EVPN iBGP peerings changed to `path-selection`

With AVD version 5.0.0 the default encapsulation used for EVPN iBGP peering between WAN routers is `path-selection`. Previously it was `vxlan`.

!!! danger
The `path-selection` encapsulation is only supported on EOS above 4.33.0F.

It is critical that all WAN devices use the same encapsulation. For
existing deployments it is recommended to set the encapsulation back to
`vxlan` until a migration can be done across the entire WAN network.

Contact your Arista account team for guidance on migration.

See the [porting guide](../porting-guides/5.x.x.md#default-encapsulation-for-wan-evpn-ibgp-peerings-changed-to-path-selection) for details.

### Other breaking or behavioral changes

Breaking changes may require modifications to the inventory or playbook. See the [Porting guide for AVD 5.x.x](../porting-guides/5.x.x.md)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ vlan internal order ascending range 1006 1199
| 110 | IDF1-Data | - |
| 120 | IDF1-Voice | - |
| 130 | IDF1-Guest | - |
| 4094 | MLAG_PEER | MLAG |
| 4094 | MLAG | MLAG |

### VLANs Device Configuration

Expand All @@ -267,7 +267,7 @@ vlan 130
name IDF1-Guest
!
vlan 4094
name MLAG_PEER
name MLAG
trunk group MLAG
```

Expand Down Expand Up @@ -330,8 +330,8 @@ vlan 4094
| Ethernet47 | IDF1 Standard Port | trunk phone | - | 110 | - | - |
| Ethernet48 | IDF1 Standard Port | trunk phone | - | 110 | - | - |
| Ethernet51 | SPINE1_Ethernet1 | *trunk | *10,110,120,130 | *- | *- | 51 |
| Ethernet53 | MLAG_PEER_LEAF1B_Ethernet53 | *trunk | *- | *- | *MLAG | 53 |
| Ethernet54 | MLAG_PEER_LEAF1B_Ethernet54 | *trunk | *- | *- | *MLAG | 53 |
| Ethernet53 | MLAG_LEAF1B_Ethernet53 | *trunk | *- | *- | *MLAG | 53 |
| Ethernet54 | MLAG_LEAF1B_Ethernet54 | *trunk | *- | *- | *MLAG | 53 |

*Inherited from Port-Channel Interface

Expand Down Expand Up @@ -1358,12 +1358,12 @@ interface Ethernet51
channel-group 51 mode active
!
interface Ethernet53
description MLAG_PEER_LEAF1B_Ethernet53
description MLAG_LEAF1B_Ethernet53
no shutdown
channel-group 53 mode active
!
interface Ethernet54
description MLAG_PEER_LEAF1B_Ethernet54
description MLAG_LEAF1B_Ethernet54
no shutdown
channel-group 53 mode active
```
Expand All @@ -1377,7 +1377,7 @@ interface Ethernet54
| Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI |
| --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- |
| Port-Channel51 | SPINES_Po1 | trunk | 10,110,120,130 | - | - | - | - | 51 | - |
| Port-Channel53 | MLAG_PEER_LEAF1B_Po53 | trunk | - | - | MLAG | - | - | - | - |
| Port-Channel53 | MLAG_LEAF1B_Port-Channel53 | trunk | - | - | MLAG | - | - | - | - |

#### Port-Channel Interfaces Device Configuration

Expand All @@ -1392,7 +1392,7 @@ interface Port-Channel51
mlag 51
!
interface Port-Channel53
description MLAG_PEER_LEAF1B_Po53
description MLAG_LEAF1B_Port-Channel53
no shutdown
switchport mode trunk
switchport trunk group MLAG
Expand All @@ -1406,7 +1406,7 @@ interface Port-Channel53
| Interface | Description | VRF | MTU | Shutdown |
| --------- | ----------- | --- | ---- | -------- |
| Vlan10 | Inband Management | default | 1500 | False |
| Vlan4094 | MLAG_PEER | default | 1500 | False |
| Vlan4094 | MLAG | default | 1500 | False |

##### IPv4

Expand All @@ -1426,7 +1426,7 @@ interface Vlan10
ip address 10.10.10.6/24
!
interface Vlan4094
description MLAG_PEER
description MLAG
no shutdown
mtu 1500
no autostate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ vlan internal order ascending range 1006 1199
| 110 | IDF1-Data | - |
| 120 | IDF1-Voice | - |
| 130 | IDF1-Guest | - |
| 4094 | MLAG_PEER | MLAG |
| 4094 | MLAG | MLAG |

### VLANs Device Configuration

Expand All @@ -267,7 +267,7 @@ vlan 130
name IDF1-Guest
!
vlan 4094
name MLAG_PEER
name MLAG
trunk group MLAG
```

Expand Down Expand Up @@ -330,8 +330,8 @@ vlan 4094
| Ethernet47 | IDF1 Standard Port | trunk phone | - | 110 | - | - |
| Ethernet48 | IDF1 Standard Port | trunk phone | - | 110 | - | - |
| Ethernet51 | SPINE2_Ethernet1 | *trunk | *10,110,120,130 | *- | *- | 51 |
| Ethernet53 | MLAG_PEER_LEAF1A_Ethernet53 | *trunk | *- | *- | *MLAG | 53 |
| Ethernet54 | MLAG_PEER_LEAF1A_Ethernet54 | *trunk | *- | *- | *MLAG | 53 |
| Ethernet53 | MLAG_LEAF1A_Ethernet53 | *trunk | *- | *- | *MLAG | 53 |
| Ethernet54 | MLAG_LEAF1A_Ethernet54 | *trunk | *- | *- | *MLAG | 53 |

*Inherited from Port-Channel Interface

Expand Down Expand Up @@ -1358,12 +1358,12 @@ interface Ethernet51
channel-group 51 mode active
!
interface Ethernet53
description MLAG_PEER_LEAF1A_Ethernet53
description MLAG_LEAF1A_Ethernet53
no shutdown
channel-group 53 mode active
!
interface Ethernet54
description MLAG_PEER_LEAF1A_Ethernet54
description MLAG_LEAF1A_Ethernet54
no shutdown
channel-group 53 mode active
```
Expand All @@ -1377,7 +1377,7 @@ interface Ethernet54
| Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI |
| --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- |
| Port-Channel51 | SPINES_Po1 | trunk | 10,110,120,130 | - | - | - | - | 51 | - |
| Port-Channel53 | MLAG_PEER_LEAF1A_Po53 | trunk | - | - | MLAG | - | - | - | - |
| Port-Channel53 | MLAG_LEAF1A_Port-Channel53 | trunk | - | - | MLAG | - | - | - | - |

#### Port-Channel Interfaces Device Configuration

Expand All @@ -1392,7 +1392,7 @@ interface Port-Channel51
mlag 51
!
interface Port-Channel53
description MLAG_PEER_LEAF1A_Po53
description MLAG_LEAF1A_Port-Channel53
no shutdown
switchport mode trunk
switchport trunk group MLAG
Expand All @@ -1406,7 +1406,7 @@ interface Port-Channel53
| Interface | Description | VRF | MTU | Shutdown |
| --------- | ----------- | --- | ---- | -------- |
| Vlan10 | Inband Management | default | 1500 | False |
| Vlan4094 | MLAG_PEER | default | 1500 | False |
| Vlan4094 | MLAG | default | 1500 | False |

##### IPv4

Expand All @@ -1426,7 +1426,7 @@ interface Vlan10
ip address 10.10.10.7/24
!
interface Vlan4094
description MLAG_PEER
description MLAG
no shutdown
mtu 1500
no autostate
Expand Down
Loading

0 comments on commit 49cb8c3

Please sign in to comment.