Merge branch 'devel' into cv_deploy-molecule-update

aristanetworks · Sep 11, 2024 · 2994e4b · 2994e4b
2 parents 7d53320 + 580bb71
commit 2994e4b
Show file tree

Hide file tree

Showing 824 changed files with 2,720 additions and 2,355 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 ci:
-  autoupdate_commit_msg: "Bump: pre-commit autoupdate"
+  autoupdate_commit_msg: "CI: pre-commit autoupdate"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.6.0
@@ -75,7 +75,7 @@ repos:
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.6.3
+    rev: v0.6.4
     hooks:
       # Run the linter.
       - id: ruff

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
@@ -195,7 +195,7 @@ To retain the old configuration with no TCAM profile the default platform settin
 +      non_mlag: 1020
 ```
 
-#### Structured Configuration merged from SVI profiles is now deep merged instead of replaced
+### Structured Configuration merged from SVI profiles is now deep merged instead of replaced
 
 When merging `structured_config` from SVI profiles and parent profiles, AVD versions below 5.0.0 replaced the entire `structured_config` object with the most specific definition of `structured_config`.
 
@@ -242,7 +242,7 @@ no_autostate: false   # <-- Set on SVI, overriding the setting from svi_profile
 
 Depending on the complexity of the deployment, it may require changes to the SVI and profiles to retain the previous configuration output.
 
-#### MLAG L3 Peering VLAN 4093 is no longer created when `underlay_routing_protocol: 'none'`
+### MLAG L3 Peering VLAN 4093 is no longer created when `underlay_routing_protocol: 'none'`
 
 AVD versions below 5.0.0 created the MLAG L3 peering VLAN 4093, even when no L3 MLAG peering was created using an underlay routing protocol.
 This happened in cases where `underlay_routing_protocol` was set to `none`.
@@ -253,7 +253,7 @@ other VRFs; `<mlag_ibgp_peering_vrfs.base_vlan - default 3000> - 1 + <vrf_id>`.
 
 The peer VLAN config can be retained by setting `mlag_ibgp_peering_vlan: 4093` under the VRF, by using `custom_structured_configuration` or by setting `underlay_routing_protocol` to something else than `none`.
 
-#### BGP is now configured for Network services VRFs even if 'evpn' is not part of the address-families
+### BGP is now configured for Network services VRFs even if 'evpn' is not part of the address-families
 
 AVD versions below 5.0.0 did not generate BGP configuration for VRFs unless the node type included `evpn` or `mpls` under `default_address_families` *and* the
 VRF had the same `evpn` or `mpls` defined under `address_families` (default is `['evpn']`).
@@ -280,6 +280,23 @@ It is possible to forcefully add or remove BGP configuration per VRF by setting:
           enabled: <bool>  # <-- New optional setting to either always or never configure BGP for the VRF
 ```
 
+### Default interface descriptions are changed for more consistency
+
+With AVD version 5.0.0 the default interface descriptions are changed to give better consistency.
+
+The interface description for `Loopback0` changes to `ROUTER_ID` for all designs.
+Previously this description varied depending on the network design and chosen protocols.
+
+The `router_id_loopback_description` or the deprecated `overlay_loopback_description` settings still takes precedence,
+so no changes will be seen if either of these are set.
+
+The description can be reverted manually if needed:
+
+```diff
+ # Using the new 'router_id_loopback_description' which replaces the deprecated 'overlay_loopback_description'
++router_id_loopback_description: "EVPN_Overlay_Peering"
+```
+
 ### custom_structured_configuration_prefix no longer accepts a string
 
 Starting AVD 5.0.0, `custom_structured_configuration_prefix` only accepts a list of strings.

diff --git a/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE1.md b/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE1.md
@@ -428,20 +428,20 @@ interface Port-Channel551
 
 | Interface | Description | VRF | IP Address |
 | --------- | ----------- | --- | ---------- |
-| Loopback0 | Router_ID | default | 172.16.1.1/32 |
+| Loopback0 | ROUTER_ID | default | 172.16.1.1/32 |
 
 ##### IPv6
 
 | Interface | Description | VRF | IPv6 Address |
 | --------- | ----------- | --- | ------------ |
-| Loopback0 | Router_ID | default | - |
+| Loopback0 | ROUTER_ID | default | - |
 
 #### Loopback Interfaces Device Configuration
 
 ```eos
 !
 interface Loopback0
-   description Router_ID
+   description ROUTER_ID
    no shutdown
    ip address 172.16.1.1/32
    ip ospf area 0.0.0.0

diff --git a/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE2.md b/...e_collections/arista/avd/examples/campus-fabric/documentation/devices/SPINE2.md
@@ -428,20 +428,20 @@ interface Port-Channel551
 
 | Interface | Description | VRF | IP Address |
 | --------- | ----------- | --- | ---------- |
-| Loopback0 | Router_ID | default | 172.16.1.2/32 |
+| Loopback0 | ROUTER_ID | default | 172.16.1.2/32 |
 
 ##### IPv6
 
 | Interface | Description | VRF | IPv6 Address |
 | --------- | ----------- | --- | ------------ |
-| Loopback0 | Router_ID | default | - |
+| Loopback0 | ROUTER_ID | default | - |
 
 #### Loopback Interfaces Device Configuration
 
 ```eos
 !
 interface Loopback0
-   description Router_ID
+   description ROUTER_ID
    no shutdown
    ip address 172.16.1.2/32
    ip ospf area 0.0.0.0

diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE1.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE1.cfg
@@ -136,7 +136,7 @@ interface Ethernet56/1
    channel-group 551 mode active
 !
 interface Loopback0
-   description Router_ID
+   description ROUTER_ID
    no shutdown
    ip address 172.16.1.1/32
    ip ospf area 0.0.0.0

diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE2.cfg b/ansible_collections/arista/avd/examples/campus-fabric/intended/configs/SPINE2.cfg
@@ -136,7 +136,7 @@ interface Ethernet56/1
    channel-group 551 mode active
 !
 interface Loopback0
-   description Router_ID
+   description ROUTER_ID
    no shutdown
    ip address 172.16.1.2/32
    ip ospf area 0.0.0.0

diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE1.yml b/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE1.yml
@@ -315,7 +315,7 @@ mlag_configuration:
   reload_delay_non_mlag: '330'
 loopback_interfaces:
 - name: Loopback0
-  description: Router_ID
+  description: ROUTER_ID
   shutdown: false
   ip_address: 172.16.1.1/32
   ospf_area: 0.0.0.0

diff --git a/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE2.yml b/ansible_collections/arista/avd/examples/campus-fabric/intended/structured_configs/SPINE2.yml
@@ -315,7 +315,7 @@ mlag_configuration:
   reload_delay_non_mlag: '330'
 loopback_interfaces:
 - name: Loopback0
-  description: Router_ID
+  description: ROUTER_ID
   shutdown: false
   ip_address: 172.16.1.2/32
   ospf_area: 0.0.0.0

diff --git a/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1a.md b/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1a.md
@@ -358,7 +358,7 @@ interface Port-Channel8
 
 | Interface | Description | VRF | IP Address |
 | --------- | ----------- | --- | ---------- |
-| Loopback0 | EVPN_Overlay_Peering | default | 10.255.0.3/32 |
+| Loopback0 | ROUTER_ID | default | 10.255.0.3/32 |
 | Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.1.3/32 |
 | Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.3/32 |
 | Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.3/32 |
@@ -367,7 +367,7 @@ interface Port-Channel8
 
 | Interface | Description | VRF | IPv6 Address |
 | --------- | ----------- | --- | ------------ |
-| Loopback0 | EVPN_Overlay_Peering | default | - |
+| Loopback0 | ROUTER_ID | default | - |
 | Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
 | Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
 | Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -377,7 +377,7 @@ interface Port-Channel8
 ```eos
 !
 interface Loopback0
-   description EVPN_Overlay_Peering
+   description ROUTER_ID
    no shutdown
    ip address 10.255.0.3/32
 !

diff --git a/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1b.md b/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf1b.md
@@ -358,7 +358,7 @@ interface Port-Channel8
 
 | Interface | Description | VRF | IP Address |
 | --------- | ----------- | --- | ---------- |
-| Loopback0 | EVPN_Overlay_Peering | default | 10.255.0.4/32 |
+| Loopback0 | ROUTER_ID | default | 10.255.0.4/32 |
 | Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.1.3/32 |
 | Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.4/32 |
 | Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.4/32 |
@@ -367,7 +367,7 @@ interface Port-Channel8
 
 | Interface | Description | VRF | IPv6 Address |
 | --------- | ----------- | --- | ------------ |
-| Loopback0 | EVPN_Overlay_Peering | default | - |
+| Loopback0 | ROUTER_ID | default | - |
 | Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
 | Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
 | Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -377,7 +377,7 @@ interface Port-Channel8
 ```eos
 !
 interface Loopback0
-   description EVPN_Overlay_Peering
+   description ROUTER_ID
    no shutdown
    ip address 10.255.0.4/32
 !

diff --git a/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2a.md b/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2a.md
@@ -366,7 +366,7 @@ interface Port-Channel8
 
 | Interface | Description | VRF | IP Address |
 | --------- | ----------- | --- | ---------- |
-| Loopback0 | EVPN_Overlay_Peering | default | 10.255.0.5/32 |
+| Loopback0 | ROUTER_ID | default | 10.255.0.5/32 |
 | Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.1.5/32 |
 | Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.5/32 |
 | Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.5/32 |
@@ -375,7 +375,7 @@ interface Port-Channel8
 
 | Interface | Description | VRF | IPv6 Address |
 | --------- | ----------- | --- | ------------ |
-| Loopback0 | EVPN_Overlay_Peering | default | - |
+| Loopback0 | ROUTER_ID | default | - |
 | Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
 | Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
 | Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -385,7 +385,7 @@ interface Port-Channel8
 ```eos
 !
 interface Loopback0
-   description EVPN_Overlay_Peering
+   description ROUTER_ID
    no shutdown
    ip address 10.255.0.5/32
 !

diff --git a/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2b.md b/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-leaf2b.md
@@ -366,7 +366,7 @@ interface Port-Channel8
 
 | Interface | Description | VRF | IP Address |
 | --------- | ----------- | --- | ---------- |
-| Loopback0 | EVPN_Overlay_Peering | default | 10.255.0.6/32 |
+| Loopback0 | ROUTER_ID | default | 10.255.0.6/32 |
 | Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.1.5/32 |
 | Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.6/32 |
 | Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.6/32 |
@@ -375,7 +375,7 @@ interface Port-Channel8
 
 | Interface | Description | VRF | IPv6 Address |
 | --------- | ----------- | --- | ------------ |
-| Loopback0 | EVPN_Overlay_Peering | default | - |
+| Loopback0 | ROUTER_ID | default | - |
 | Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
 | Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
 | Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -385,7 +385,7 @@ interface Port-Channel8
 ```eos
 !
 interface Loopback0
-   description EVPN_Overlay_Peering
+   description ROUTER_ID
    no shutdown
    ip address 10.255.0.6/32
 !

diff --git a/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine1.md b/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine1.md
@@ -201,20 +201,20 @@ interface Ethernet4
 
 | Interface | Description | VRF | IP Address |
 | --------- | ----------- | --- | ---------- |
-| Loopback0 | EVPN_Overlay_Peering | default | 10.255.0.1/32 |
+| Loopback0 | ROUTER_ID | default | 10.255.0.1/32 |
 
 ##### IPv6
 
 | Interface | Description | VRF | IPv6 Address |
 | --------- | ----------- | --- | ------------ |
-| Loopback0 | EVPN_Overlay_Peering | default | - |
+| Loopback0 | ROUTER_ID | default | - |
 
 #### Loopback Interfaces Device Configuration
 
 ```eos
 !
 interface Loopback0
-   description EVPN_Overlay_Peering
+   description ROUTER_ID
    no shutdown
    ip address 10.255.0.1/32
 ```

diff --git a/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine2.md b/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc1-spine2.md
@@ -201,20 +201,20 @@ interface Ethernet4
 
 | Interface | Description | VRF | IP Address |
 | --------- | ----------- | --- | ---------- |
-| Loopback0 | EVPN_Overlay_Peering | default | 10.255.0.2/32 |
+| Loopback0 | ROUTER_ID | default | 10.255.0.2/32 |
 
 ##### IPv6
 
 | Interface | Description | VRF | IPv6 Address |
 | --------- | ----------- | --- | ------------ |
-| Loopback0 | EVPN_Overlay_Peering | default | - |
+| Loopback0 | ROUTER_ID | default | - |
 
 #### Loopback Interfaces Device Configuration
 
 ```eos
 !
 interface Loopback0
-   description EVPN_Overlay_Peering
+   description ROUTER_ID
    no shutdown
    ip address 10.255.0.2/32
 ```

diff --git a/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1a.md b/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1a.md
@@ -358,7 +358,7 @@ interface Port-Channel8
 
 | Interface | Description | VRF | IP Address |
 | --------- | ----------- | --- | ---------- |
-| Loopback0 | EVPN_Overlay_Peering | default | 10.255.128.13/32 |
+| Loopback0 | ROUTER_ID | default | 10.255.128.13/32 |
 | Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.129.13/32 |
 | Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.13/32 |
 | Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.13/32 |
@@ -367,7 +367,7 @@ interface Port-Channel8
 
 | Interface | Description | VRF | IPv6 Address |
 | --------- | ----------- | --- | ------------ |
-| Loopback0 | EVPN_Overlay_Peering | default | - |
+| Loopback0 | ROUTER_ID | default | - |
 | Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
 | Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
 | Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -377,7 +377,7 @@ interface Port-Channel8
 ```eos
 !
 interface Loopback0
-   description EVPN_Overlay_Peering
+   description ROUTER_ID
    no shutdown
    ip address 10.255.128.13/32
 !

diff --git a/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1b.md b/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf1b.md
@@ -358,7 +358,7 @@ interface Port-Channel8
 
 | Interface | Description | VRF | IP Address |
 | --------- | ----------- | --- | ---------- |
-| Loopback0 | EVPN_Overlay_Peering | default | 10.255.128.14/32 |
+| Loopback0 | ROUTER_ID | default | 10.255.128.14/32 |
 | Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.129.13/32 |
 | Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.14/32 |
 | Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.14/32 |
@@ -367,7 +367,7 @@ interface Port-Channel8
 
 | Interface | Description | VRF | IPv6 Address |
 | --------- | ----------- | --- | ------------ |
-| Loopback0 | EVPN_Overlay_Peering | default | - |
+| Loopback0 | ROUTER_ID | default | - |
 | Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
 | Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
 | Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -377,7 +377,7 @@ interface Port-Channel8
 ```eos
 !
 interface Loopback0
-   description EVPN_Overlay_Peering
+   description ROUTER_ID
    no shutdown
    ip address 10.255.128.14/32
 !

diff --git a/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2a.md b/...ollections/arista/avd/examples/dual-dc-l3ls/documentation/devices/dc2-leaf2a.md
@@ -366,7 +366,7 @@ interface Port-Channel8
 
 | Interface | Description | VRF | IP Address |
 | --------- | ----------- | --- | ---------- |
-| Loopback0 | EVPN_Overlay_Peering | default | 10.255.128.15/32 |
+| Loopback0 | ROUTER_ID | default | 10.255.128.15/32 |
 | Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 10.255.129.15/32 |
 | Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | 10.255.10.15/32 |
 | Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | 10.255.11.15/32 |
@@ -375,7 +375,7 @@ interface Port-Channel8
 
 | Interface | Description | VRF | IPv6 Address |
 | --------- | ----------- | --- | ------------ |
-| Loopback0 | EVPN_Overlay_Peering | default | - |
+| Loopback0 | ROUTER_ID | default | - |
 | Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - |
 | Loopback10 | VRF10_VTEP_DIAGNOSTICS | VRF10 | - |
 | Loopback11 | VRF11_VTEP_DIAGNOSTICS | VRF11 | - |
@@ -385,7 +385,7 @@ interface Port-Channel8
 ```eos
 !
 interface Loopback0
-   description EVPN_Overlay_Peering
+   description ROUTER_ID
    no shutdown
    ip address 10.255.128.15/32
 !