Fix(eos_designs): Add support to set IGMP fast_leave without setting evpn_l2_multicast.enabled: true (#6626)

Co-authored-by: Mahesh Kumar <[email protected]>
Co-authored-by: Carl Baillargeon <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: 4 people

ansible_collections/arista/avd/extensions/molecule/eos_designs_deprecated_vars/intended/configs/host1.cfg

@@ -4,12 +4,22 @@ no aaa root
 !
 vlan internal order ascending range 1006 1199
 !
+ip igmp snooping vlan 252 querier
+ip igmp snooping vlan 252 querier address 192.168.255.101
+ip igmp snooping vlan 252 fast-leave
+!
 transceiver qsfp default-mode 4x10G
 !
 service routing protocols model multi-agent
 !
 hostname host1
 !
+vlan 251
+   name MULTICAST_DISABLED_251
+!
+vlan 252
+   name MULTICAST_ENABLED_252
+!
 radius-server host 11.10.10.11 key 7 071B245F5A
 radius-server host 11.10.10.5 vrf MGMT1 tls ssl-profile HOST_SSL_PROFILE port 2080
 radius-server host 11.10.10.3 vrf MGMT key 7 0112140D481F07
@@ -25,13 +35,15 @@ interface Ethernet41
    mtu 9214
    no switchport
    ip address 192.168.42.200/31
+   pim ipv4 sparse-mode
 !
 interface Ethernet42
    description P2P_host1_Ethernet41
    no shutdown
    mtu 9214
    no switchport
    ip address 192.168.42.201/31
+   pim ipv4 sparse-mode
 !
 interface Loopback0
    description ROUTER_ID
@@ -52,13 +64,18 @@ interface Vxlan1
    description host1_VTEP
    vxlan source-interface Loopback1
    vxlan udp-port 4789
+   vxlan vlan 251 vni 10251
+   vxlan vlan 252 vni 10252
+   vxlan vlan 252 multicast group 232.0.0.251
 !
 ip routing
 !
 ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY
    seq 10 permit 192.168.255.0/24 eq 32
    seq 20 permit 192.168.254.0/24 eq 32
 !
+ip route 0.0.0.0/0 192.168.200.1
+!
 ip radius vrf default source-interface Vlan123
 ip radius vrf MGMT1 source-interface Vlan125
 ip radius vrf MGMT source-interface Vlan125
@@ -85,7 +102,23 @@ router bgp 101
    neighbor 192.168.42.201 description host1_Ethernet42
    redistribute connected route-map RM-CONN-2-BGP
    !
+   vlan 251
+      rd 192.168.255.101:10251
+      route-target both 10251:10251
+      redistribute learned
+   !
+   vlan 252
+      rd 192.168.255.101:10252
+      route-target both 10252:10252
+      redistribute igmp
+      redistribute learned
+   !
    address-family ipv4
       neighbor IPv4-UNDERLAY-PEERS activate
 !
+router multicast
+   ipv4
+      routing
+      software-forwarding sfe
+!
 end

ansible_collections/arista/avd/extensions/molecule/eos_designs_deprecated_vars/intended/structured_configs/host1.yml

@@ -19,6 +19,9 @@ ethernet_interfaces:
   shutdown: false
   mtu: 9214
   ip_address: 192.168.42.200/31
+  pim:
+    ipv4:
+      sparse_mode: true
   metadata:
     peer: host1
     peer_interface: Ethernet42
@@ -30,6 +33,9 @@ ethernet_interfaces:
   shutdown: false
   mtu: 9214
   ip_address: 192.168.42.201/31
+  pim:
+    ipv4:
+      sparse_mode: true
   metadata:
     peer: host1
     peer_interface: Ethernet41
@@ -39,6 +45,12 @@ ethernet_interfaces:
 hostname: host1
 ip_igmp_snooping:
   globally_enabled: true
+  vlans:
+  - id: 252
+    querier:
+      enabled: true
+      address: 192.168.255.101
+    fast_leave: true
 ip_radius_source_interfaces:
 - name: Vlan123
   vrf: default
@@ -63,6 +75,7 @@ management_interfaces:
   vrf: default
   ip_address: 192.168.0.103/24
   type: oob
+  gateway: 192.168.200.1
 metadata:
   is_deployed: true
   fabric_name: EOS_DESIGNS_DEPRECATED_VARS
@@ -134,17 +147,58 @@ router_bgp:
     connected:
       enabled: true
       route_map: RM-CONN-2-BGP
+  vlans:
+  - id: 251
+    metadata:
+      tenants:
+      - Tenant_F
+    rd: 192.168.255.101:10251
+    route_targets:
+      both:
+      - 10251:10251
+    redistribute_routes:
+    - learned
+  - id: 252
+    metadata:
+      tenants:
+      - Tenant_F
+    rd: 192.168.255.101:10252
+    route_targets:
+      both:
+      - 10252:10252
+    redistribute_routes:
+    - learned
+    - igmp
   address_family_ipv4:
     peer_groups:
     - name: IPv4-UNDERLAY-PEERS
       activate: true
+router_multicast:
+  ipv4:
+    routing: true
+    software_forwarding: sfe
 service_routing_protocols_model: multi-agent
+static_routes:
+- vrf: default
+  prefix: 0.0.0.0/0
+  next_hop: 192.168.200.1
 transceiver_qsfp_default_mode_4x10: true
 vlan_internal_order:
   allocation: ascending
   range:
     beginning: 1006
     ending: 1199
+vlans:
+- id: 251
+  name: MULTICAST_DISABLED_251
+  metadata:
+    tenants:
+    - Tenant_F
+- id: 252
+  name: MULTICAST_ENABLED_252
+  metadata:
+    tenants:
+    - Tenant_F
 vrfs:
 - name: default
   ip_routing: false
@@ -154,3 +208,9 @@ vxlan_interface:
     vxlan:
       source_interface: Loopback1
       udp_port: 4789
+      vlans:
+      - id: 251
+        vni: 10251
+      - id: 252
+        vni: 10252
+        multicast_group: 232.0.0.251

ansible_collections/arista/avd/extensions/molecule/eos_designs_deprecated_vars/inventory/host_vars/host1/evpn_l2_multicast_fast_leave.yml

@@ -0,0 +1,24 @@
+type: l3leaf
+
+mgmt_gateway: 192.168.200.1
+
+underlay_multicast_pim_sm: true
+evpn_multicast: true
+
+tenants:
+  # Test the deprecated key evpn_l2_multicast.fast_leave: true when evpn_l2_multicast.enabled: true/false
+  - name: Tenant_F
+    mac_vrf_vni_base: 10000
+    evpn_l2_multicast:
+      enabled: true
+      fast_leave: true
+      underlay_l2_multicast_group_ipv4_pool: 232.0.0.0/20
+    l2vlans:
+      - id: 251
+        name: "MULTICAST_DISABLED_251"
+        tags: ["test_l2"]
+        evpn_l2_multicast:
+          enabled: false
+      - id: 252
+        name: "MULTICAST_ENABLED_252"
+        tags: ["test_l2"]

ansible_collections/arista/avd/extensions/molecule/eos_designs_unit_tests/intended/configs/evpn-multicast-disabled.cfg

@@ -4,8 +4,19 @@ no aaa root
 !
 vlan internal order ascending range 1006 1199
 !
+ip igmp snooping vlan 1 fast-leave
+ip igmp snooping vlan 110 fast-leave
+ip igmp snooping vlan 111 fast-leave
+ip igmp snooping vlan 210 fast-leave
+no ip igmp snooping vlan 211 fast-leave
 ip igmp snooping vlan 230 querier
 ip igmp snooping vlan 230 querier address 192.168.255.8
+ip igmp snooping vlan 230 fast-leave
+ip igmp snooping vlan 256 fast-leave
+ip igmp snooping vlan 257 fast-leave
+ip igmp snooping vlan 310 fast-leave
+ip igmp snooping vlan 311 fast-leave
+ip igmp snooping vlan 4092 fast-leave
 !
 transceiver qsfp default-mode 4x10G
 !
@@ -91,12 +102,6 @@ vlan 241
 vlan 250
    name L3_MULTICAST_ENABLED_250
 !
-vlan 251
-   name MULTICAST_DISABLED_251
-!
-vlan 252
-   name MULTICAST_ENABLED_252
-!
 vlan 256
    name MULTICAST_DISABLED_256
 !
@@ -444,8 +449,6 @@ interface Vxlan1
    vxlan vlan 240 vni 10240
    vxlan vlan 241 vni 10241
    vxlan vlan 250 vni 10250
-   vxlan vlan 251 vni 10251
-   vxlan vlan 252 vni 10252
    vxlan vlan 256 vni 10256
    vxlan vlan 257 vni 10257
    vxlan vlan 260 vni 10260
@@ -678,16 +681,6 @@ router bgp 65106
       route-target both 10250:10250
       redistribute learned
    !
-   vlan 251
-      rd 192.168.255.8:10251
-      route-target both 10251:10251
-      redistribute learned
-   !
-   vlan 252
-      rd 192.168.255.8:10252
-      route-target both 10252:10252
-      redistribute learned
-   !
    vlan 256
       rd 192.168.255.8:10256
       route-target both 10256:10256

ansible_collections/arista/avd/extensions/molecule/eos_designs_unit_tests/intended/configs/evpn-multicast-l2leaf1a.cfg

@@ -4,6 +4,18 @@ no aaa root
 !
 vlan internal order ascending range 1006 1199
 !
+ip igmp snooping vlan 1 fast-leave
+ip igmp snooping vlan 110 fast-leave
+ip igmp snooping vlan 111 fast-leave
+ip igmp snooping vlan 210 fast-leave
+no ip igmp snooping vlan 211 fast-leave
+ip igmp snooping vlan 230 fast-leave
+ip igmp snooping vlan 256 fast-leave
+ip igmp snooping vlan 257 fast-leave
+ip igmp snooping vlan 310 fast-leave
+ip igmp snooping vlan 311 fast-leave
+ip igmp snooping vlan 4092 fast-leave
+!
 transceiver qsfp default-mode 4x10G
 !
 service routing protocols model multi-agent
@@ -88,12 +100,6 @@ vlan 241
 vlan 250
    name L3_MULTICAST_ENABLED_250
 !
-vlan 251
-   name MULTICAST_DISABLED_251
-!
-vlan 252
-   name MULTICAST_ENABLED_252
-!
 vlan 256
    name MULTICAST_DISABLED_256
 !
@@ -126,7 +132,7 @@ vrf instance MGMT
 interface Port-Channel1
    description L2_EVPN_MULTICAST_L3LEAF1_Port-Channel6
    no shutdown
-   switchport trunk allowed vlan 1-10,110-111,130-131,136-137,140-141,150,210-211,230-231,240-241,250-252,256-257,260,310-311,330-331,550,4092
+   switchport trunk allowed vlan 1-10,110-111,130-131,136-137,140-141,150,210-211,230-231,240-241,250,256-257,260,310-311,330-331,550,4092
    switchport mode trunk
    switchport
 !