Merge branch 'devel' into todo-bgp

aristanetworks · Oct 1, 2024 · b7e8916 · b7e8916
2 parents 119f30b + e287ff1
commit b7e8916
Show file tree

Hide file tree

Showing 1,069 changed files with 15,294 additions and 9,479 deletions.
diff --git a/.github/workflows/pull-request-management.yml b/.github/workflows/pull-request-management.yml
@@ -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'

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -75,7 +75,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.6.7
+    rev: v0.6.8
     hooks:
       # Run the linter.
       - id: ruff
@@ -85,7 +85,7 @@ repos:
       - id: ruff-format
 
   - repo: https://github.com/pycqa/pylint
-    rev: "v3.3.0"
+    rev: "v3.3.1"
     hooks:
       - id: pylint # Use pylintrc file in repository
         name: Check for Linting errors on Python files outside the Ansible collection.
@@ -213,7 +213,7 @@ repos:
         additional_dependencies: ['Jinja2>=3.0.0', 'cryptography>=38.0.4', 'deepmerge>=1.1.0']
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.41.0
+    rev: v0.42.0
     hooks:
       - id: markdownlint
         name: Check for Linting errors on Markdown files with settings defined in `.github/.markdownlint.yaml`.

diff --git a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md
@@ -391,6 +391,69 @@ 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.
+
+#### Underlay L2 ethernet interfaces
+
+The interface description for the L2 uplink/downlink interfaces changes to `L2_<peer>_<peer_interface>`. Previously the description was `<peer | upper>_<peer_interface>`.
+
+The interfaces using this are the member interfaces of port-channel uplinks.
+
+The descriptions can be reverted manually if needed:
+
+```diff
++underlay_l2_ethernet_description: "{peer!u}_{peer_interface}"
+```
+
+The description field support templates. See the input variables documentation for available fields.
+
+#### Underlay L2 port-channel interfaces
+
+The interface description for the L2 uplink/downlink port-channels changes to `L2_<peer_node_group_or_peer>_<peer_interface>`. Previously the default description was `<peer_node_group_or_uppercase_peer>_Po<peer_port_channel_id>`.
+The field `peer_node_group_or_peer` will contain the peer's node group name for MLAG pairs or EVPN A/A nodes or the peer's hostname for a single switch.
+
+The port-channels using this are port-channel uplinks.
+
+The descriptions can be reverted manually if needed:
+
+```diff
++underlay_l2_port_channel_description: "{peer_node_group_or_uppercase_peer}_Po{peer_port_channel_id}"
+```
+
+The description field 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`.
@@ -832,6 +895,42 @@ To retain the vxlan encapsulation on WAN EVPN iBGP peerings use `wan_encapsulati
 + wan_encapsulation: vxlan
 ```
 
+### PREVIEW WAN HA Direct Link now uses Port-Channel by default
+
+For WAN direct HA, AVD will now configure a port-channel by default. This feature was introduced in EOS 4.33.0F.
+
+To retain the previous configuration use custom_platform_settings use `use_port_channel_for_direct_ha: false` under `wan_ha`.
+
+```diff
+  wan_router:
+    node_groups:
+      - group: Site42
+        cv_pathfinder_region: AVD_Land_West
+        cv_pathfinder_site: Site42
+        wan_ha:
+          enabled: true
++         use_port_channel_for_direct_ha: false
+          ha_interfaces: [Ethernet52]
+          ha_ipv4_pool: 10.10.10.0/24
+```
+
+### Prevent redistributing the MLAG peer link subnets into BGP for all VRFs by default
+
+With AVD version 5.0.0 the subnet of VRF L3 peering VLANs between MLAG peers are no longer redistributed into BGP by default. Previously all connected routes were redistributed to BGP.
+
+To retain the previous behavior, set `redistribute_mlag_ibgp_peering_vrfs` to `true` per tenant or VRF:
+
+```diff
+tenants:
+  - name: Tenant_A
++   redistribute_mlag_ibgp_peering_vrfs: true
+    <...>
+    vrfs:
+      - name: Tenant_A_OP
++       redistribute_mlag_ibgp_peering_vrfs: true
+        <...>
+```
+
 ## Changes to role `arista.avd.eos_cli_config_gen`
 
 TODO: Level 3 sections for each change with details on how to migrate

diff --git a/ansible_collections/arista/avd/docs/release-notes/5.x.x.md b/ansible_collections/arista/avd/docs/release-notes/5.x.x.md
@@ -237,6 +237,21 @@ With AVD version 5.0.0 the default encapsulation used for EVPN iBGP peering betw
 
 See the [porting guide](../porting-guides/5.x.x.md#default-encapsulation-for-wan-evpn-ibgp-peerings-changed-to-path-selection) for details.
 
+#### PREVIEW WAN HA Direct Link now uses Port-Channel by default
+
+TODO: Keep PREVIEW changes at the end as we warn users that PREVIEW mean changes
+
+For WAN direct HA, AVD will now configure a port-channel by default.
+This feature was introduced recently in EOS and may not be supported on your version.
+
+See the [porting guide](../porting-guides/5.x.x.md#preview-wan-ha-direct-link-now-uses-port-channel-by-default) for details.
+
+### Prevent redistributing the MLAG peer link subnets into BGP for all VRFs by default
+
+Starting AVD 5.0.0, default value of `redistribute_mlag_ibgp_peering_vrfs` changed to `false`.
+
+See the [porting guide](../porting-guides/5.x.x.md#prevent-redistributing-the-mlag-peer-link-subnets-into-bgp-for-all-vrfs-by-default)
+
 ### 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)

diff --git a/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1A.md b/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1A.md
@@ -329,7 +329,7 @@ vlan 4094
 | Ethernet46 | IDF1 Standard Port | trunk phone | - | 110 | - | - |
 | Ethernet47 | IDF1 Standard Port | trunk phone | - | 110 | - | - |
 | Ethernet48 | IDF1 Standard Port | trunk phone | - | 110 | - | - |
-| Ethernet51 | SPINE1_Ethernet1 | *trunk | *10,110,120,130 | *- | *- | 51 |
+| Ethernet51 | L2_SPINE1_Ethernet1 | *trunk | *10,110,120,130 | *- | *- | 51 |
 | Ethernet53 | MLAG_LEAF1B_Ethernet53 | *trunk | *- | *- | *MLAG | 53 |
 | Ethernet54 | MLAG_LEAF1B_Ethernet54 | *trunk | *- | *- | *MLAG | 53 |
 
@@ -1353,7 +1353,7 @@ interface Ethernet48
    spanning-tree bpduguard enable
 !
 interface Ethernet51
-   description SPINE1_Ethernet1
+   description L2_SPINE1_Ethernet1
    no shutdown
    channel-group 51 mode active
 !
@@ -1376,15 +1376,15 @@ 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-Channel51 | L2_SPINES_Port-Channel1 | trunk | 10,110,120,130 | - | - | - | - | 51 | - |
 | Port-Channel53 | MLAG_LEAF1B_Port-Channel53 | trunk | - | - | MLAG | - | - | - | - |
 
 #### Port-Channel Interfaces Device Configuration
 
 ```eos
 !
 interface Port-Channel51
-   description SPINES_Po1
+   description L2_SPINES_Port-Channel1
    no shutdown
    switchport trunk allowed vlan 10,110,120,130
    switchport mode trunk

diff --git a/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1B.md b/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF1B.md
@@ -329,7 +329,7 @@ vlan 4094
 | Ethernet46 | IDF1 Standard Port | trunk phone | - | 110 | - | - |
 | Ethernet47 | IDF1 Standard Port | trunk phone | - | 110 | - | - |
 | Ethernet48 | IDF1 Standard Port | trunk phone | - | 110 | - | - |
-| Ethernet51 | SPINE2_Ethernet1 | *trunk | *10,110,120,130 | *- | *- | 51 |
+| Ethernet51 | L2_SPINE2_Ethernet1 | *trunk | *10,110,120,130 | *- | *- | 51 |
 | Ethernet53 | MLAG_LEAF1A_Ethernet53 | *trunk | *- | *- | *MLAG | 53 |
 | Ethernet54 | MLAG_LEAF1A_Ethernet54 | *trunk | *- | *- | *MLAG | 53 |
 
@@ -1353,7 +1353,7 @@ interface Ethernet48
    spanning-tree bpduguard enable
 !
 interface Ethernet51
-   description SPINE2_Ethernet1
+   description L2_SPINE2_Ethernet1
    no shutdown
    channel-group 51 mode active
 !
@@ -1376,15 +1376,15 @@ 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-Channel51 | L2_SPINES_Port-Channel1 | trunk | 10,110,120,130 | - | - | - | - | 51 | - |
 | Port-Channel53 | MLAG_LEAF1A_Port-Channel53 | trunk | - | - | MLAG | - | - | - | - |
 
 #### Port-Channel Interfaces Device Configuration
 
 ```eos
 !
 interface Port-Channel51
-   description SPINES_Po1
+   description L2_SPINES_Port-Channel1
    no shutdown
    switchport trunk allowed vlan 10,110,120,130
    switchport mode trunk

diff --git a/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF2A.md b/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF2A.md
@@ -247,8 +247,8 @@ vlan 230
 
 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | Channel-Group |
 | --------- | ----------- | ---- | ----- | ----------- | ----------- | ------------- |
-| Ethernet1/1 | SPINE1_Ethernet49/1 | *trunk | *10,210,220,230 | *- | *- | 11 |
-| Ethernet1/3 | SPINE2_Ethernet49/1 | *trunk | *10,210,220,230 | *- | *- | 11 |
+| Ethernet1/1 | L2_SPINE1_Ethernet49/1 | *trunk | *10,210,220,230 | *- | *- | 11 |
+| Ethernet1/3 | L2_SPINE2_Ethernet49/1 | *trunk | *10,210,220,230 | *- | *- | 11 |
 | Ethernet3/1 | IDF2 Standard Port | trunk phone | - | 210 | - | - |
 | Ethernet3/2 | IDF2 Standard Port | trunk phone | - | 210 | - | - |
 | Ethernet3/3 | IDF2 Standard Port | trunk phone | - | 210 | - | - |
@@ -742,12 +742,12 @@ vlan 230
 ```eos
 !
 interface Ethernet1/1
-   description SPINE1_Ethernet49/1
+   description L2_SPINE1_Ethernet49/1
    no shutdown
    channel-group 11 mode active
 !
 interface Ethernet1/3
-   description SPINE2_Ethernet49/1
+   description L2_SPINE2_Ethernet49/1
    no shutdown
    channel-group 11 mode active
 !
@@ -6760,14 +6760,14 @@ interface Ethernet7/48
 
 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI |
 | --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- |
-| Port-Channel11 | SPINES_Po491 | trunk | 10,210,220,230 | - | - | - | - | - | - |
+| Port-Channel11 | L2_SPINES_Port-Channel491 | trunk | 10,210,220,230 | - | - | - | - | - | - |
 
 #### Port-Channel Interfaces Device Configuration
 
 ```eos
 !
 interface Port-Channel11
-   description SPINES_Po491
+   description L2_SPINES_Port-Channel491
    no shutdown
    switchport trunk allowed vlan 10,210,220,230
    switchport mode trunk

diff --git a/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3A.md b/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/LEAF3A.md
@@ -377,11 +377,11 @@ vlan 4094
 | Ethernet94 | IDF3 Standard Port | trunk phone | - | 310 | - | - |
 | Ethernet95 | IDF3 Standard Port | trunk phone | - | 310 | - | - |
 | Ethernet96 | IDF3 Standard Port | trunk phone | - | 310 | - | - |
-| Ethernet97/1 | SPINE1_Ethernet50/1 | *trunk | *10,310,320,330 | *- | *- | 971 |
-| Ethernet97/2 | SPINE2_Ethernet50/1 | *trunk | *10,310,320,330 | *- | *- | 971 |
-| Ethernet97/3 | LEAF3C_Ethernet97/1 | *trunk | *10,310,320,330 | *- | *- | 973 |
-| Ethernet97/4 | LEAF3D_Ethernet97/1 | *trunk | *10,310,320,330 | *- | *- | 974 |
-| Ethernet98/1 | LEAF3E_Ethernet97/1 | *trunk | *10,310,320,330 | *- | *- | 981 |
+| Ethernet97/1 | L2_SPINE1_Ethernet50/1 | *trunk | *10,310,320,330 | *- | *- | 971 |
+| Ethernet97/2 | L2_SPINE2_Ethernet50/1 | *trunk | *10,310,320,330 | *- | *- | 971 |
+| Ethernet97/3 | L2_LEAF3C_Ethernet97/1 | *trunk | *10,310,320,330 | *- | *- | 973 |
+| Ethernet97/4 | L2_LEAF3D_Ethernet97/1 | *trunk | *10,310,320,330 | *- | *- | 974 |
+| Ethernet98/1 | L2_LEAF3E_Ethernet97/1 | *trunk | *10,310,320,330 | *- | *- | 981 |
 | Ethernet98/3 | MLAG_LEAF3B_Ethernet98/3 | *trunk | *- | *- | *MLAG | 983 |
 | Ethernet98/4 | MLAG_LEAF3B_Ethernet98/4 | *trunk | *- | *- | *MLAG | 983 |
 
@@ -2413,27 +2413,27 @@ interface Ethernet96
    spanning-tree bpduguard enable
 !
 interface Ethernet97/1
-   description SPINE1_Ethernet50/1
+   description L2_SPINE1_Ethernet50/1
    no shutdown
    channel-group 971 mode active
 !
 interface Ethernet97/2
-   description SPINE2_Ethernet50/1
+   description L2_SPINE2_Ethernet50/1
    no shutdown
    channel-group 971 mode active
 !
 interface Ethernet97/3
-   description LEAF3C_Ethernet97/1
+   description L2_LEAF3C_Ethernet97/1
    no shutdown
    channel-group 973 mode active
 !
 interface Ethernet97/4
-   description LEAF3D_Ethernet97/1
+   description L2_LEAF3D_Ethernet97/1
    no shutdown
    channel-group 974 mode active
 !
 interface Ethernet98/1
-   description LEAF3E_Ethernet97/1
+   description L2_LEAF3E_Ethernet97/1
    no shutdown
    channel-group 981 mode active
 !
@@ -2456,42 +2456,42 @@ interface Ethernet98/4
 
 | Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI |
 | --------- | ----------- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- |
-| Port-Channel971 | SPINES_Po501 | trunk | 10,310,320,330 | - | - | - | - | 971 | - |
-| Port-Channel973 | LEAF3C_Po971 | trunk | 10,310,320,330 | - | - | - | - | 973 | - |
-| Port-Channel974 | LEAF3D_Po971 | trunk | 10,310,320,330 | - | - | - | - | 974 | - |
-| Port-Channel981 | LEAF3E_Po971 | trunk | 10,310,320,330 | - | - | - | - | 981 | - |
+| Port-Channel971 | L2_SPINES_Port-Channel501 | trunk | 10,310,320,330 | - | - | - | - | 971 | - |
+| Port-Channel973 | L2_LEAF3C_Port-Channel971 | trunk | 10,310,320,330 | - | - | - | - | 973 | - |
+| Port-Channel974 | L2_LEAF3D_Port-Channel971 | trunk | 10,310,320,330 | - | - | - | - | 974 | - |
+| Port-Channel981 | L2_LEAF3E_Port-Channel971 | trunk | 10,310,320,330 | - | - | - | - | 981 | - |
 | Port-Channel983 | MLAG_LEAF3B_Port-Channel983 | trunk | - | - | MLAG | - | - | - | - |
 
 #### Port-Channel Interfaces Device Configuration
 
 ```eos
 !
 interface Port-Channel971
-   description SPINES_Po501
+   description L2_SPINES_Port-Channel501
    no shutdown
    switchport trunk allowed vlan 10,310,320,330
    switchport mode trunk
    switchport
    mlag 971
 !
 interface Port-Channel973
-   description LEAF3C_Po971
+   description L2_LEAF3C_Port-Channel971
    no shutdown
    switchport trunk allowed vlan 10,310,320,330
    switchport mode trunk
    switchport
    mlag 973
 !
 interface Port-Channel974
-   description LEAF3D_Po971
+   description L2_LEAF3D_Port-Channel971
    no shutdown
    switchport trunk allowed vlan 10,310,320,330
    switchport mode trunk
    switchport
    mlag 974
 !
 interface Port-Channel981
-   description LEAF3E_Po971
+   description L2_LEAF3E_Port-Channel971
    no shutdown
    switchport trunk allowed vlan 10,310,320,330
    switchport mode trunk