Feat(eos_designs): Add option for ip igmp snooping fast-leave (#4180)

Co-authored-by: Guillaume Mulocher <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
aristanetworks · Jul 12, 2024 · d8dcef0 · d8dcef0
1 parent b64b80c
commit d8dcef0
Show file tree

Hide file tree

Showing 21 changed files with 543 additions and 8 deletions.
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
@@ -2,6 +2,9 @@
 !
 vlan internal order ascending range 1006 1199
 !
+ip igmp snooping vlan 230 querier
+ip igmp snooping vlan 230 querier address 192.168.255.8
+!
 transceiver qsfp default-mode 4x10G
 !
 service routing protocols model multi-agent
@@ -80,6 +83,12 @@ 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
 !
@@ -414,6 +423,8 @@ 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
@@ -591,6 +602,17 @@ 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 igmp
+      redistribute learned
+   !
    vlan 256
       rd 192.168.255.8:10256
       route-target both 10256:10256

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L2LEAF1A.cfg b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L2LEAF1A.cfg
@@ -80,6 +80,12 @@ 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
 !
@@ -113,7 +119,7 @@ interface Port-Channel1
    description EVPN_MULTICAST_L3LEAF1_Po6
    no shutdown
    switchport
-   switchport trunk allowed vlan 1-9,110-111,130-131,140-141,150,210-211,230-231,240-241,250,256-257,260,310-311,330-331,550,4092
+   switchport trunk allowed vlan 1-9,110-111,130-131,140-141,150,210-211,230-231,240-241,250-252,256-257,260,310-311,330-331,550,4092
    switchport mode trunk
 !
 interface Ethernet1

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
@@ -5,6 +5,7 @@ vlan internal order ascending range 1006 1199
 ip igmp snooping vlan 1 querier
 ip igmp snooping vlan 1 querier address 1.1.1.1
 ip igmp snooping vlan 1 querier version 3
+ip igmp snooping vlan 1 fast-leave
 ip igmp snooping vlan 2 querier
 ip igmp snooping vlan 2 querier address 1.1.1.1
 ip igmp snooping vlan 2 querier version 3
@@ -19,14 +20,24 @@ ip igmp snooping vlan 9 querier address 2.2.2.2
 ip igmp snooping vlan 9 querier version 1
 ip igmp snooping vlan 110 querier
 ip igmp snooping vlan 110 querier address 192.168.255.3
+ip igmp snooping vlan 110 fast-leave
 ip igmp snooping vlan 111 querier
 ip igmp snooping vlan 111 querier address 192.168.255.3
+ip igmp snooping vlan 111 fast-leave
 ip igmp snooping vlan 210 querier
 ip igmp snooping vlan 210 querier address 192.168.255.3
+ip igmp snooping vlan 210 fast-leave
+ip igmp snooping vlan 230 querier
+ip igmp snooping vlan 230 querier address 192.168.255.3
+ip igmp snooping vlan 252 querier
+ip igmp snooping vlan 252 querier address 192.168.255.3
+ip igmp snooping vlan 252 fast-leave
 ip igmp snooping vlan 257 querier
 ip igmp snooping vlan 257 querier address 192.168.255.3
+ip igmp snooping vlan 257 fast-leave
 ip igmp snooping vlan 4092 querier
 ip igmp snooping vlan 4092 querier address 192.168.255.3
+ip igmp snooping vlan 4092 fast-leave
 !
 transceiver qsfp default-mode 4x10G
 !
@@ -108,6 +119,12 @@ 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
 !
@@ -262,7 +279,7 @@ interface Port-Channel6
    description EVPN-MULTICAST-L2LEAF1A_Po1
    no shutdown
    switchport
-   switchport trunk allowed vlan 1-9,110-111,130-131,140-141,150,210-211,230-231,240-241,250,256-257,260,310-311,330-331,550,4092
+   switchport trunk allowed vlan 1-9,110-111,130-131,140-141,150,210-211,230-231,240-241,250-252,256-257,260,310-311,330-331,550,4092
    switchport mode trunk
    mlag 6
 !
@@ -706,6 +723,8 @@ 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
@@ -739,6 +758,7 @@ interface Vxlan1
    vxlan vlan 110 multicast group 232.0.0.109
    vxlan vlan 111 multicast group 232.0.0.110
    vxlan vlan 210 multicast group 232.0.0.209
+   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
@@ -856,6 +876,12 @@ router bgp 65101
       redistribute learned
       vlan 7
    !
+   vlan-aware-bundle MULTICAST_DISABLED_251
+      rd 192.168.255.3:10251
+      route-target both 10251:10251
+      redistribute learned
+      vlan 251
+   !
    vlan-aware-bundle MULTICAST_DISABLED_256
       rd 192.168.255.3:10256
       route-target both 10256:10256
@@ -910,6 +936,13 @@ router bgp 65101
       redistribute learned
       vlan 210-211
    !
+   vlan-aware-bundle MULTICAST_ENABLED_252
+      rd 192.168.255.3:10252
+      route-target both 10252:10252
+      redistribute igmp
+      redistribute learned
+      vlan 252
+   !
    vlan-aware-bundle MULTICAST_ENABLED_257
       rd 192.168.255.3:10257
       route-target both 10257:10257

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
@@ -5,6 +5,7 @@ vlan internal order ascending range 1006 1199
 ip igmp snooping vlan 1 querier
 ip igmp snooping vlan 1 querier address 1.1.1.1
 ip igmp snooping vlan 1 querier version 3
+ip igmp snooping vlan 1 fast-leave
 ip igmp snooping vlan 2 querier
 ip igmp snooping vlan 2 querier address 1.1.1.1
 ip igmp snooping vlan 2 querier version 3
@@ -19,14 +20,24 @@ ip igmp snooping vlan 9 querier address 2.2.2.2
 ip igmp snooping vlan 9 querier version 1
 ip igmp snooping vlan 110 querier
 ip igmp snooping vlan 110 querier address 192.168.255.4
+ip igmp snooping vlan 110 fast-leave
 ip igmp snooping vlan 111 querier
 ip igmp snooping vlan 111 querier address 192.168.255.4
+ip igmp snooping vlan 111 fast-leave
 ip igmp snooping vlan 210 querier
 ip igmp snooping vlan 210 querier address 192.168.255.4
+ip igmp snooping vlan 210 fast-leave
+ip igmp snooping vlan 230 querier
+ip igmp snooping vlan 230 querier address 192.168.255.4
+ip igmp snooping vlan 252 querier
+ip igmp snooping vlan 252 querier address 192.168.255.4
+ip igmp snooping vlan 252 fast-leave
 ip igmp snooping vlan 257 querier
 ip igmp snooping vlan 257 querier address 192.168.255.4
+ip igmp snooping vlan 257 fast-leave
 ip igmp snooping vlan 4092 querier
 ip igmp snooping vlan 4092 querier address 192.168.255.4
+ip igmp snooping vlan 4092 fast-leave
 !
 transceiver qsfp default-mode 4x10G
 !
@@ -108,6 +119,12 @@ 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
 !
@@ -262,7 +279,7 @@ interface Port-Channel6
    description EVPN-MULTICAST-L2LEAF1A_Po1
    no shutdown
    switchport
-   switchport trunk allowed vlan 1-9,110-111,130-131,140-141,150,210-211,230-231,240-241,250,256-257,260,310-311,330-331,550,4092
+   switchport trunk allowed vlan 1-9,110-111,130-131,140-141,150,210-211,230-231,240-241,250-252,256-257,260,310-311,330-331,550,4092
    switchport mode trunk
    mlag 6
 !
@@ -706,6 +723,8 @@ 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
@@ -739,6 +758,7 @@ interface Vxlan1
    vxlan vlan 110 multicast group 232.0.0.109
    vxlan vlan 111 multicast group 232.0.0.110
    vxlan vlan 210 multicast group 232.0.0.209
+   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
@@ -856,6 +876,12 @@ router bgp 65101
       redistribute learned
       vlan 7
    !
+   vlan-aware-bundle MULTICAST_DISABLED_251
+      rd 192.168.255.4:10251
+      route-target both 10251:10251
+      redistribute learned
+      vlan 251
+   !
    vlan-aware-bundle MULTICAST_DISABLED_256
       rd 192.168.255.4:10256
       route-target both 10256:10256
@@ -910,6 +936,13 @@ router bgp 65101
       redistribute learned
       vlan 210-211
    !
+   vlan-aware-bundle MULTICAST_ENABLED_252
+      rd 192.168.255.4:10252
+      route-target both 10252:10252
+      redistribute igmp
+      redistribute learned
+      vlan 252
+   !
    vlan-aware-bundle MULTICAST_ENABLED_257
       rd 192.168.255.4:10257
       route-target both 10257:10257

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
@@ -5,6 +5,7 @@ vlan internal order ascending range 1006 1199
 ip igmp snooping vlan 1 querier
 ip igmp snooping vlan 1 querier address 1.1.1.1
 ip igmp snooping vlan 1 querier version 3
+ip igmp snooping vlan 1 fast-leave
 ip igmp snooping vlan 2 querier
 ip igmp snooping vlan 2 querier address 1.1.1.1
 ip igmp snooping vlan 2 querier version 3
@@ -19,14 +20,24 @@ ip igmp snooping vlan 9 querier address 2.2.2.2
 ip igmp snooping vlan 9 querier version 1
 ip igmp snooping vlan 110 querier
 ip igmp snooping vlan 110 querier address 192.168.255.5
+ip igmp snooping vlan 110 fast-leave
 ip igmp snooping vlan 111 querier
 ip igmp snooping vlan 111 querier address 192.168.255.5
+ip igmp snooping vlan 111 fast-leave
 ip igmp snooping vlan 210 querier
 ip igmp snooping vlan 210 querier address 192.168.255.5
+ip igmp snooping vlan 210 fast-leave
+ip igmp snooping vlan 230 querier
+ip igmp snooping vlan 230 querier address 192.168.255.5
+ip igmp snooping vlan 252 querier
+ip igmp snooping vlan 252 querier address 192.168.255.5
+ip igmp snooping vlan 252 fast-leave
 ip igmp snooping vlan 257 querier
 ip igmp snooping vlan 257 querier address 192.168.255.5
+ip igmp snooping vlan 257 fast-leave
 ip igmp snooping vlan 4092 querier
 ip igmp snooping vlan 4092 querier address 192.168.255.5
+ip igmp snooping vlan 4092 fast-leave
 !
 transceiver qsfp default-mode 4x10G
 !
@@ -108,6 +119,12 @@ 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
 !
@@ -459,6 +476,8 @@ 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
@@ -491,6 +510,7 @@ interface Vxlan1
    vxlan vlan 110 multicast group 232.0.0.109
    vxlan vlan 111 multicast group 232.0.0.110
    vxlan vlan 210 multicast group 232.0.0.209
+   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
@@ -653,6 +673,17 @@ router bgp 65103
       route-target both 10250:10250
       redistribute learned
    !
+   vlan 251
+      rd 192.168.255.5:10251
+      route-target both 10251:10251
+      redistribute learned
+   !
+   vlan 252
+      rd 192.168.255.5:10252
+      route-target both 10252:10252
+      redistribute igmp
+      redistribute learned
+   !
    vlan 256
       rd 192.168.255.5:10256
       route-target both 10256:10256