Merge branch 'devel' into wan-example

aristanetworks · Sep 18, 2024 · 66ada63 · 66ada63
2 parents 96ada23 + 8cd95b8
commit 66ada63
Show file tree

Hide file tree

Showing 49 changed files with 302 additions and 348 deletions.
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
@@ -108,6 +108,27 @@ tenants:
 +             always_redistribute_igmp: true
 ```
 
+### `vrf_id` is used instead of `vrf_vni` to calculate the IP address of EVPN underlay multicast group for a VRF
+
+AVD versions below 5.0.0 uses `vrf_vni` in the algorithm to set the offset in order to get the IP address of EVPN underlay multicast group.
+
+In AVD version 5.0.0, `vrf_id` is used instead of `vrf_vni` to calculate the offset for IP address of EVPN underlay multicast group for a VRF when `evpn_l3_multicast` is enabled. The configurations will only change in case `vrf_id` and `vrf_vni` are set to different values or `evpn_l3_multicast.evpn_underlay_l3_multicast_group` is set under `vrfs`.
+
+To retain the previous configuration, set group ip directly under the `vrfs` using `evpn_l3_multicast.evpn_underlay_l3_multicast_group`
+
+```diff
+tenants:
+  - name: Tenant_C
+    evpn_l3_multicast:
+      enabled: true
+    vrfs:
+      - name: TEN_C_L3_MULTICAST_ENABLED_130_131
+        evpn_l3_multicast:
+          enabled: true
++         evpn_underlay_l3_multicast_group: 232.0.64.2
+        <...>
+```
+
 ### Base class for custom IP addressing `AvdIpAddressing` was moved
 
 The `AvdIpAddressing` class was moved from the Ansible collection to `pyavd.api.ip_addressing`. Import statements must be updated.

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
@@ -182,6 +182,12 @@ Starting AVD 5.0.0, by default `redistribute igmp` will only get configured when
 
 See the [Porting guide for AVD 5.x.x](../porting-guides/5.x.x.md#removed-redistribute-igmp-from-bgp-vlan-config-belong-to-a-vrf-with-evpn-multicast)
 
+#### vrf_id will be used instead of vrf_vni to get the ip address of evpn underlay multicast group
+
+Starting AVD 5.0.0, `vrf_id` is used instead of `vrf_vni` in the algorithm to set the offset for IP address of EVPN underlay multicast group when `evpn_l3_multicast` is enabled.
+
+See the [Porting guide for AVD 5.x.x](../porting-guides/5.x.x.md#vrf_id-is-used-instead-of-vrf_vni-to-calculate-the-ip-address-of-evpn-underlay-multicast-group-for-a-vrf)
+
 #### AvdInterfaceDescriptions breaking changes
 
 The class `AvdInterfaceDescriptions` was moved to `pyavd` and heavily modified.

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-DISABLED.cfg b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-DISABLED.cfg
@@ -778,9 +778,9 @@ router bgp 65106
       redistribute connected
    !
    vrf TEN_C_L3_MULTICAST_ENABLED_130_131
-      rd 192.168.255.8:31
-      route-target import evpn 31:31
-      route-target export evpn 31:31
+      rd 192.168.255.8:66
+      route-target import evpn 66:66
+      route-target export evpn 66:66
       router-id 192.168.255.8
       redistribute connected
    !

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg
@@ -192,10 +192,6 @@ vlan 3022
    name MLAG_iBGP_MULTICAST_DISABLED_5_6
    trunk group LEAF_PEER_L3
 !
-vlan 3030
-   name MLAG_iBGP_TEN_C_L3_MULTICAST_ENABLED_130_131
-   trunk group LEAF_PEER_L3
-!
 vlan 3031
    name MLAG_iBGP_TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231
    trunk group LEAF_PEER_L3
@@ -228,6 +224,10 @@ vlan 3059
    name MLAG_iBGP_TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES
    trunk group LEAF_PEER_L3
 !
+vlan 3065
+   name MLAG_iBGP_TEN_C_L3_MULTICAST_ENABLED_130_131
+   trunk group LEAF_PEER_L3
+!
 vlan 4092
    name MULTICAST_ENABLED_4092
 !
@@ -655,13 +655,6 @@ interface Vlan3022
    vrf MULTICAST_DISABLED_5_6
    ip address 10.255.251.0/31
 !
-interface Vlan3030
-   description MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_ENABLED_130_131
-   no shutdown
-   mtu 9214
-   vrf TEN_C_L3_MULTICAST_ENABLED_130_131
-   ip address 10.255.251.0/31
-!
 interface Vlan3031
    description MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231
    no shutdown
@@ -718,6 +711,13 @@ interface Vlan3059
    vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES
    ip address 10.255.251.0/31
 !
+interface Vlan3065
+   description MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_ENABLED_130_131
+   no shutdown
+   mtu 9214
+   vrf TEN_C_L3_MULTICAST_ENABLED_130_131
+   ip address 10.255.251.0/31
+!
 interface Vlan4093
    description MLAG_PEER_L3_PEERING
    no shutdown
@@ -802,9 +802,9 @@ interface Vxlan1
    vxlan vlan 252 multicast group 232.0.0.251
    vxlan vlan 257 multicast group 232.0.1.0
    vxlan vlan 4092 multicast group 232.0.15.251
-   vxlan vrf TEN_C_L3_MULTICAST_ENABLED_130_131 multicast group 232.0.32.31
+   vxlan vrf TEN_C_L3_MULTICAST_ENABLED_130_131 multicast group 232.0.32.66
    vxlan vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 multicast group 232.0.32.32
-   vxlan vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 multicast group 232.0.64.40
+   vxlan vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 multicast group 232.0.64.2
    vxlan vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE multicast group 232.0.96.54
    vxlan vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES multicast group 232.0.96.59
    vxlan vrf TEN_E_L3_MULTICAST_TRANSIT multicast group 232.0.96.51
@@ -1005,8 +1005,8 @@ router bgp 65101
       vlan 330-331
    !
    vlan-aware-bundle TEN_C_L3_MULTICAST_ENABLED_130_131
-      rd 192.168.255.3:31
-      route-target both 31:31
+      rd 192.168.255.3:66
+      route-target both 66:66
       redistribute igmp
       redistribute learned
       vlan 130-131,136-137
@@ -1132,10 +1132,10 @@ router bgp 65101
       redistribute connected
    !
    vrf TEN_C_L3_MULTICAST_ENABLED_130_131
-      rd 192.168.255.3:31
+      rd 192.168.255.3:66
       evpn multicast
-      route-target import evpn 31:31
-      route-target export evpn 31:31
+      route-target import evpn 66:66
+      route-target export evpn 66:66
       router-id 192.168.255.3
       update wait-install
       neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg
@@ -192,10 +192,6 @@ vlan 3022
    name MLAG_iBGP_MULTICAST_DISABLED_5_6
    trunk group LEAF_PEER_L3
 !
-vlan 3030
-   name MLAG_iBGP_TEN_C_L3_MULTICAST_ENABLED_130_131
-   trunk group LEAF_PEER_L3
-!
 vlan 3031
    name MLAG_iBGP_TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231
    trunk group LEAF_PEER_L3
@@ -228,6 +224,10 @@ vlan 3059
    name MLAG_iBGP_TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES
    trunk group LEAF_PEER_L3
 !
+vlan 3065
+   name MLAG_iBGP_TEN_C_L3_MULTICAST_ENABLED_130_131
+   trunk group LEAF_PEER_L3
+!
 vlan 4092
    name MULTICAST_ENABLED_4092
 !
@@ -655,13 +655,6 @@ interface Vlan3022
    vrf MULTICAST_DISABLED_5_6
    ip address 10.255.251.1/31
 !
-interface Vlan3030
-   description MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_ENABLED_130_131
-   no shutdown
-   mtu 9214
-   vrf TEN_C_L3_MULTICAST_ENABLED_130_131
-   ip address 10.255.251.1/31
-!
 interface Vlan3031
    description MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231
    no shutdown
@@ -718,6 +711,13 @@ interface Vlan3059
    vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES
    ip address 10.255.251.1/31
 !
+interface Vlan3065
+   description MLAG_PEER_L3_iBGP: vrf TEN_C_L3_MULTICAST_ENABLED_130_131
+   no shutdown
+   mtu 9214
+   vrf TEN_C_L3_MULTICAST_ENABLED_130_131
+   ip address 10.255.251.1/31
+!
 interface Vlan4093
    description MLAG_PEER_L3_PEERING
    no shutdown
@@ -802,9 +802,9 @@ interface Vxlan1
    vxlan vlan 252 multicast group 232.0.0.251
    vxlan vlan 257 multicast group 232.0.1.0
    vxlan vlan 4092 multicast group 232.0.15.251
-   vxlan vrf TEN_C_L3_MULTICAST_ENABLED_130_131 multicast group 232.0.32.31
+   vxlan vrf TEN_C_L3_MULTICAST_ENABLED_130_131 multicast group 232.0.32.66
    vxlan vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 multicast group 232.0.32.32
-   vxlan vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 multicast group 232.0.64.40
+   vxlan vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 multicast group 232.0.64.2
    vxlan vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE multicast group 232.0.96.54
    vxlan vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES multicast group 232.0.96.59
    vxlan vrf TEN_E_L3_MULTICAST_TRANSIT multicast group 232.0.96.51
@@ -1005,8 +1005,8 @@ router bgp 65101
       vlan 330-331
    !
    vlan-aware-bundle TEN_C_L3_MULTICAST_ENABLED_130_131
-      rd 192.168.255.4:31
-      route-target both 31:31
+      rd 192.168.255.4:66
+      route-target both 66:66
       redistribute igmp
       redistribute learned
       vlan 130-131,136-137
@@ -1132,10 +1132,10 @@ router bgp 65101
       redistribute connected
    !
    vrf TEN_C_L3_MULTICAST_ENABLED_130_131
-      rd 192.168.255.4:31
+      rd 192.168.255.4:66
       evpn multicast
-      route-target import evpn 31:31
-      route-target export evpn 31:31
+      route-target import evpn 66:66
+      route-target export evpn 66:66
       router-id 192.168.255.4
       update wait-install
       neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF2A.cfg b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF2A.cfg
@@ -547,9 +547,9 @@ interface Vxlan1
    vxlan vlan 252 multicast group 232.0.0.251
    vxlan vlan 257 multicast group 232.0.1.0
    vxlan vlan 4092 multicast group 232.0.15.251
-   vxlan vrf TEN_C_L3_MULTICAST_ENABLED_130_131 multicast group 232.0.32.31
+   vxlan vrf TEN_C_L3_MULTICAST_ENABLED_130_131 multicast group 232.0.32.66
    vxlan vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 multicast group 232.0.32.32
-   vxlan vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 multicast group 232.0.64.40
+   vxlan vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 multicast group 232.0.64.2
    vxlan vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE multicast group 232.0.96.54
    vxlan vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES multicast group 232.0.96.59
    vxlan vrf TEN_E_L3_MULTICAST_TRANSIT multicast group 232.0.96.51
@@ -871,10 +871,10 @@ router bgp 65103
       redistribute connected
    !
    vrf TEN_C_L3_MULTICAST_ENABLED_130_131
-      rd 192.168.255.5:31
+      rd 192.168.255.5:66
       evpn multicast
-      route-target import evpn 31:31
-      route-target export evpn 31:31
+      route-target import evpn 66:66
+      route-target export evpn 66:66
       router-id 192.168.255.5
       redistribute connected
    !

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF3A.cfg b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF3A.cfg
@@ -575,9 +575,9 @@ interface Vxlan1
    vxlan vlan 252 multicast group 232.0.0.251
    vxlan vlan 257 multicast group 232.0.1.0
    vxlan vlan 4092 multicast group 232.0.15.251
-   vxlan vrf TEN_C_L3_MULTICAST_ENABLED_130_131 multicast group 232.0.32.31
+   vxlan vrf TEN_C_L3_MULTICAST_ENABLED_130_131 multicast group 232.0.32.66
    vxlan vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 multicast group 232.0.32.32
-   vxlan vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 multicast group 232.0.64.40
+   vxlan vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 multicast group 232.0.64.2
    vxlan vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE multicast group 232.0.96.54
    vxlan vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES multicast group 232.0.96.59
    vxlan vrf TEN_E_L3_MULTICAST_TRANSIT multicast group 232.0.96.51
@@ -899,10 +899,10 @@ router bgp 65104
       redistribute connected
    !
    vrf TEN_C_L3_MULTICAST_ENABLED_130_131
-      rd 192.168.255.6:31
+      rd 192.168.255.6:66
       evpn multicast
-      route-target import evpn 31:31
-      route-target export evpn 31:31
+      route-target import evpn 66:66
+      route-target export evpn 66:66
       router-id 192.168.255.6
       redistribute connected
    !

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF3B.cfg b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF3B.cfg
@@ -575,9 +575,9 @@ interface Vxlan1
    vxlan vlan 252 multicast group 232.0.0.251
    vxlan vlan 257 multicast group 232.0.1.0
    vxlan vlan 4092 multicast group 232.0.15.251
-   vxlan vrf TEN_C_L3_MULTICAST_ENABLED_130_131 multicast group 232.0.32.31
+   vxlan vrf TEN_C_L3_MULTICAST_ENABLED_130_131 multicast group 232.0.32.66
    vxlan vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 multicast group 232.0.32.32
-   vxlan vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 multicast group 232.0.64.40
+   vxlan vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 multicast group 232.0.64.2
    vxlan vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE multicast group 232.0.96.54
    vxlan vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES multicast group 232.0.96.59
    vxlan vrf TEN_E_L3_MULTICAST_TRANSIT multicast group 232.0.96.51
@@ -899,10 +899,10 @@ router bgp 65105
       redistribute connected
    !
    vrf TEN_C_L3_MULTICAST_ENABLED_130_131
-      rd 192.168.255.7:31
+      rd 192.168.255.7:66
       evpn multicast
-      route-target import evpn 31:31
-      route-target export evpn 31:31
+      route-target import evpn 66:66
+      route-target export evpn 66:66
       router-id 192.168.255.7
       redistribute connected
    !

diff --git a/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2B.cfg b/...ions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge2B.cfg
@@ -119,7 +119,7 @@ router path-selection
    tcp mss ceiling ipv4 ingress
    !
    path-group CUSTOM_LAN_HA id 65535
-      ipsec profile DP-PROFILE
+      ipsec profile ONE-PROFILE-TO-CONTROL-THEM-ALL
       flow assignment lan
       !
       local interface Ethernet52
@@ -200,35 +200,20 @@ ip security
    ike policy CP-IKE-POLICY
       local-id 192.168.142.3
    !
-   ike policy DP-IKE-POLICY
-      local-id 192.168.142.3
-   !
    sa policy CP-SA-POLICY
       esp encryption aes256gcm128
       pfs dh-group 14
    !
-   sa policy DP-SA-POLICY
-      esp encryption aes256gcm128
-      pfs dh-group 14
-   !
-   profile CP-PROFILE
+   profile ONE-PROFILE-TO-CONTROL-THEM-ALL
       ike-policy CP-IKE-POLICY
       sa-policy CP-SA-POLICY
       connection start
       shared-key 7 ABCDEF1234567890
       dpd 10 50 clear
       mode transport
    !
-   profile DP-PROFILE
-      ike-policy DP-IKE-POLICY
-      sa-policy DP-SA-POLICY
-      connection start
-      shared-key 7 ABCDEF1234567890666
-      dpd 10 50 clear
-      mode transport
-   !
    key controller
-      profile DP-PROFILE
+      profile ONE-PROFILE-TO-CONTROL-THEM-ALL
 !
 interface Dps1
    description DPS Interface

diff --git a/...d/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-DISABLED.yml b/...d/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-DISABLED.yml
@@ -147,16 +147,16 @@ router_bgp:
     redistribute_routes:
     - source_protocol: connected
   - name: TEN_C_L3_MULTICAST_ENABLED_130_131
-    rd: 192.168.255.8:31
+    rd: 192.168.255.8:66
     route_targets:
       import:
       - address_family: evpn
         route_targets:
-        - '31:31'
+        - 66:66
       export:
       - address_family: evpn
         route_targets:
-        - '31:31'
+        - 66:66
     router_id: 192.168.255.8
     redistribute_routes:
     - source_protocol: connected