diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg index 0fb1e32d3c1..0427a28179e 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg @@ -761,6 +761,9 @@ ip address virtual source-nat vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES address 1 ip address virtual source-nat vrf TEN_E_L3_MULTICAST_TRANSIT address 10.255.52.3 ip address virtual source-nat vrf TEN_E_PEG_L3_MULTICAST_ENABLED address 10.255.51.3 ! +ip access-list standard RP_ACL_VRF_OVERRIDE + 10 permit 232.1.0.0/21 +! ip access-list standard RPS_ACL_VRF_Tenant_E_1 10 permit 232.0.120.0/21 20 permit 232.0.128.0/21 @@ -1167,6 +1170,7 @@ router pim sparse-mode vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE ipv4 rp address 10.20.20.20 232.0.0.0/21 + rp address 10.20.20.30 access-list RP_ACL_VRF_OVERRIDE rp address 10.40.40.40 ! vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg index d4423aad33a..1451a377635 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg @@ -761,6 +761,9 @@ ip address virtual source-nat vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES address 1 ip address virtual source-nat vrf TEN_E_L3_MULTICAST_TRANSIT address 10.255.52.4 ip address virtual source-nat vrf TEN_E_PEG_L3_MULTICAST_ENABLED address 10.255.51.4 ! +ip access-list standard RP_ACL_VRF_OVERRIDE + 10 permit 232.1.0.0/21 +! ip access-list standard RPS_ACL_VRF_Tenant_E_1 10 permit 232.0.120.0/21 20 permit 232.0.128.0/21 @@ -1167,6 +1170,7 @@ router pim sparse-mode vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE ipv4 rp address 10.20.20.20 232.0.0.0/21 + rp address 10.20.20.30 access-list RP_ACL_VRF_OVERRIDE rp address 10.40.40.40 ! vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml index ddffde5e38c..47807f57e39 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml @@ -1593,6 +1593,9 @@ router_pim_sparse_mode: groups: - 232.0.0.0/21 - address: 10.40.40.40 + - address: 10.20.20.30 + access_lists: + - RP_ACL_VRF_OVERRIDE - name: TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES ipv4: rp_addresses: @@ -1619,6 +1622,10 @@ router_pim_sparse_mode: access_lists: - RPS_ACL_VRF_Tenant_E_2 standard_access_lists: +- name: RP_ACL_VRF_OVERRIDE + sequence_numbers: + - sequence: 10 + action: permit 232.1.0.0/21 - name: RPS_ACL_VRF_Tenant_E_1 sequence_numbers: - sequence: 10 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml index e2f01b75e16..9d83684f93f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml @@ -1593,6 +1593,9 @@ router_pim_sparse_mode: groups: - 232.0.0.0/21 - address: 10.40.40.40 + - address: 10.20.20.30 + access_lists: + - RP_ACL_VRF_OVERRIDE - name: TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES ipv4: rp_addresses: @@ -1619,6 +1622,10 @@ router_pim_sparse_mode: access_lists: - RPS_ACL_VRF_Tenant_E_2 standard_access_lists: +- name: RP_ACL_VRF_OVERRIDE + sequence_numbers: + - sequence: 10 + action: permit 232.1.0.0/21 - name: RPS_ACL_VRF_Tenant_E_1 sequence_numbers: - sequence: 10 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/EVPN_MULTICAST_TESTS.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/EVPN_MULTICAST_TESTS.yml index 16a01e5515c..cee7d875c5f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/EVPN_MULTICAST_TESTS.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/EVPN_MULTICAST_TESTS.yml @@ -485,6 +485,12 @@ tenants: - 232.0.0.0/21 - rps: - 10.40.40.40 + - rps: + - 10.20.20.30 + nodes: [EVPN-MULTICAST-L3LEAF1A, EVPN-MULTICAST-L3LEAF1B] + groups: + - 232.1.0.0/21 + access_list_name: RP_ACL_VRF_OVERRIDE vrf_vni: 55 svis: - id: 550