From c141f60a3888a02ff84fcc4d7c7fd41de5297996 Mon Sep 17 00:00:00 2001 From: Laxmikant Chintakindi Date: Fri, 16 Aug 2024 14:32:56 +0530 Subject: [PATCH 1/9] Cut(eos_cli_config_gen): Remove primary_key mark in router_pim_sparse_mode.rp_addresses --- .../eos_cli_config_gen/docs/tables/router-pim-sparse-mode.md | 4 ++-- .../_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml | 1 - .../schema_fragments/router_pim_sparse_mode.schema.yml | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-pim-sparse-mode.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-pim-sparse-mode.md index 54c82d2c972..2b60e625539 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-pim-sparse-mode.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-pim-sparse-mode.md @@ -12,7 +12,7 @@ | [    bfd](## "router_pim_sparse_mode.ipv4.bfd") | Boolean | | | | Enable/Disable BFD. | | [    ssm_range](## "router_pim_sparse_mode.ipv4.ssm_range") | String | | | | IPv4 Prefix associated with SSM. | | [    rp_addresses](## "router_pim_sparse_mode.ipv4.rp_addresses") | List, items: Dictionary | | | | | - | [      - address](## "router_pim_sparse_mode.ipv4.rp_addresses.[].address") | String | Required, Unique | | | RP Address. | + | [      - address](## "router_pim_sparse_mode.ipv4.rp_addresses.[].address") | String | | | | RP Address. | | [        groups](## "router_pim_sparse_mode.ipv4.rp_addresses.[].groups") | List, items: String | | | | | | [          - <str>](## "router_pim_sparse_mode.ipv4.rp_addresses.[].groups.[]") | String | | | | | | [        access_lists](## "router_pim_sparse_mode.ipv4.rp_addresses.[].access_lists") | List, items: String | | | | | @@ -53,7 +53,7 @@ rp_addresses: # RP Address. - - address: + - address: groups: - access_lists: diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml index 3ff8e6853e7..f7321a6581c 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml @@ -15561,7 +15561,6 @@ keys: description: IPv4 Prefix associated with SSM. rp_addresses: type: list - primary_key: address items: type: dict keys: diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_pim_sparse_mode.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_pim_sparse_mode.schema.yml index 6f754b88010..7b61bfe1214 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_pim_sparse_mode.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_pim_sparse_mode.schema.yml @@ -20,11 +20,6 @@ keys: description: IPv4 Prefix associated with SSM. rp_addresses: type: list - # This primary_key is inserted to support conversion from wildcard dicts, - # but it also stops the user from defining the same RP address multiple times, - # which should be allowed. When wildcard dict support is finally removed, - # this primary_key should also be removed. TODO: AVD5.0 - primary_key: address items: type: dict keys: From 994ed5e74dc5fa5dc2601e1ac467249dee3d6eb3 Mon Sep 17 00:00:00 2001 From: Laxmikant Chintakindi Date: Fri, 16 Aug 2024 14:56:17 +0530 Subject: [PATCH 2/9] Update porting guide --- ansible_collections/arista/avd/docs/porting-guides/5.x.x.md | 4 ++++ 1 file changed, 4 insertions(+) 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 index 428cb7aef95..55c4498409b 100644 --- a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md +++ b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md @@ -345,6 +345,10 @@ In AVD 4.0.0, we had "switched" as the default value for `ethernet_interfaces[]. With AVD 5.0.0, the default value for `type` in `ethernet_interfaces` and `port_channel_interfaces` is no longer supported. The `type` key must now be explicitly defined in the input variables if it is needed in the configuration and documentation. +### Unmark `router_pim_sparse_mode.ipv4.rp_addresses.address` as a primary_key + +With AVD 5.0.0, the key `router_pim_sparse_mode.ipv4.rp_addresses.address` is `not` a `primary_key`. + ### Removal of deprecated data models The following data model keys have been removed from `eos_cli_config_gen` in v5.0.0. From 6ce4ad951ba87dc9e1394ed0fc681aed93b6f1ea Mon Sep 17 00:00:00 2001 From: Laxmikant Chintakindi Date: Fri, 16 Aug 2024 15:01:28 +0530 Subject: [PATCH 3/9] Fix porting guide. --- ansible_collections/arista/avd/docs/porting-guides/5.x.x.md | 4 ++-- 1 file changed, 2 insertions(+), 2 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 index 55c4498409b..feac056684f 100644 --- a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md +++ b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md @@ -345,9 +345,9 @@ In AVD 4.0.0, we had "switched" as the default value for `ethernet_interfaces[]. With AVD 5.0.0, the default value for `type` in `ethernet_interfaces` and `port_channel_interfaces` is no longer supported. The `type` key must now be explicitly defined in the input variables if it is needed in the configuration and documentation. -### Unmark `router_pim_sparse_mode.ipv4.rp_addresses.address` as a primary_key +### `router_pim_sparse_mode.ipv4.rp_addresses[].address` is unmarked as a `primary_key` -With AVD 5.0.0, the key `router_pim_sparse_mode.ipv4.rp_addresses.address` is `not` a `primary_key`. +With AVD 5.0.0, the key `router_pim_sparse_mode.ipv4.rp_addresses[].address` is `not` a `primary_key`. ### Removal of deprecated data models From 893f0d77fef245e66df1947b0076219067b2a661 Mon Sep 17 00:00:00 2001 From: Laxmikant Chintakindi Date: Fri, 16 Aug 2024 20:30:03 +0530 Subject: [PATCH 4/9] Fix porting guide and schema. --- ansible_collections/arista/avd/docs/porting-guides/5.x.x.md | 4 ---- .../eos_cli_config_gen/docs/tables/router-pim-sparse-mode.md | 4 ++-- .../_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml | 1 + .../schema/schema_fragments/router_pim_sparse_mode.schema.yml | 1 + 4 files changed, 4 insertions(+), 6 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 index feac056684f..428cb7aef95 100644 --- a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md +++ b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md @@ -345,10 +345,6 @@ In AVD 4.0.0, we had "switched" as the default value for `ethernet_interfaces[]. With AVD 5.0.0, the default value for `type` in `ethernet_interfaces` and `port_channel_interfaces` is no longer supported. The `type` key must now be explicitly defined in the input variables if it is needed in the configuration and documentation. -### `router_pim_sparse_mode.ipv4.rp_addresses[].address` is unmarked as a `primary_key` - -With AVD 5.0.0, the key `router_pim_sparse_mode.ipv4.rp_addresses[].address` is `not` a `primary_key`. - ### Removal of deprecated data models The following data model keys have been removed from `eos_cli_config_gen` in v5.0.0. diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-pim-sparse-mode.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-pim-sparse-mode.md index 2b60e625539..37224d0c93e 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-pim-sparse-mode.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-pim-sparse-mode.md @@ -12,7 +12,7 @@ | [    bfd](## "router_pim_sparse_mode.ipv4.bfd") | Boolean | | | | Enable/Disable BFD. | | [    ssm_range](## "router_pim_sparse_mode.ipv4.ssm_range") | String | | | | IPv4 Prefix associated with SSM. | | [    rp_addresses](## "router_pim_sparse_mode.ipv4.rp_addresses") | List, items: Dictionary | | | | | - | [      - address](## "router_pim_sparse_mode.ipv4.rp_addresses.[].address") | String | | | | RP Address. | + | [      - address](## "router_pim_sparse_mode.ipv4.rp_addresses.[].address") | String | Required | | | RP Address. | | [        groups](## "router_pim_sparse_mode.ipv4.rp_addresses.[].groups") | List, items: String | | | | | | [          - <str>](## "router_pim_sparse_mode.ipv4.rp_addresses.[].groups.[]") | String | | | | | | [        access_lists](## "router_pim_sparse_mode.ipv4.rp_addresses.[].access_lists") | List, items: String | | | | | @@ -53,7 +53,7 @@ rp_addresses: # RP Address. - - address: + - address: groups: - access_lists: diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml index f7321a6581c..60bda585113 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml @@ -15566,6 +15566,7 @@ keys: keys: address: type: str + required: true description: RP Address. groups: type: list diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_pim_sparse_mode.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_pim_sparse_mode.schema.yml index 7b61bfe1214..a91fef6b471 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_pim_sparse_mode.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_pim_sparse_mode.schema.yml @@ -25,6 +25,7 @@ keys: keys: address: type: str + required: true description: RP Address. groups: type: list From f599fd43bee650f6f908bd3743a41812c8010a09 Mon Sep 17 00:00:00 2001 From: Laxmikant Chintakindi Date: Mon, 19 Aug 2024 16:22:46 +0530 Subject: [PATCH 5/9] Update porting guide. --- ansible_collections/arista/avd/docs/porting-guides/5.x.x.md | 5 +++++ 1 file changed, 5 insertions(+) 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 index 428cb7aef95..b8c96c8c4f7 100644 --- a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md +++ b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md @@ -213,6 +213,11 @@ By default an MLAG ID will only be configured on Port-Channel downlinks dual-hom + mlag_on_orphan_port_channel_downlink: true ``` +### Duplicate value of `address` is allowed in `router_pim_sparse_mode.ipv4.rp_addresses`. + +In AVD 4.0.0, the value of `address` key was unique in `router_pim_sparse_mode.ipv4.rp_addresses`. +In AVD 5.0.0, duplicate value of `address` is allowed in `router_pim_sparse_mode.ipv4.rp_addresses`. + ## Changes to role `arista.avd.eos_cli_config_gen` TODO: Level 3 sections for each change with details on how to migrate From 0c896c6a53575e98c69ab74c37df64594ac4cf51 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 10:56:10 +0000 Subject: [PATCH 6/9] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- ansible_collections/arista/avd/docs/porting-guides/5.x.x.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index b8c96c8c4f7..970d9a230d0 100644 --- a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md +++ b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md @@ -213,7 +213,7 @@ By default an MLAG ID will only be configured on Port-Channel downlinks dual-hom + mlag_on_orphan_port_channel_downlink: true ``` -### Duplicate value of `address` is allowed in `router_pim_sparse_mode.ipv4.rp_addresses`. +### Duplicate value of `address` is allowed in `router_pim_sparse_mode.ipv4.rp_addresses` In AVD 4.0.0, the value of `address` key was unique in `router_pim_sparse_mode.ipv4.rp_addresses`. In AVD 5.0.0, duplicate value of `address` is allowed in `router_pim_sparse_mode.ipv4.rp_addresses`. From b818da5376312f56d590769ca3c2f24e50d56006 Mon Sep 17 00:00:00 2001 From: Laxmikant Chintakindi Date: Mon, 19 Aug 2024 17:17:55 +0530 Subject: [PATCH 7/9] Add test for duplicate address. --- .../documentation/devices/router-pim-sparse-mode.md | 4 ++++ .../intended/configs/router-pim-sparse-mode.cfg | 3 +++ .../inventory/host_vars/router-pim-sparse-mode.yml | 7 +++++++ 3 files changed, 14 insertions(+) diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-pim-sparse-mode.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-pim-sparse-mode.md index a5059553952..acee05cdfa9 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-pim-sparse-mode.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-pim-sparse-mode.md @@ -50,6 +50,7 @@ BFD enabled: True | Rendezvous Point Address | Group Address | Access Lists | Priority | Hashmask | Override | | ------------------------ | ------------- | ------------ | -------- | -------- | -------- | | 10.238.1.161 | 239.12.12.12/32, 239.12.12.13/32, 239.12.12.14/32, 239.12.12.16/32, 239.12.12.20/32, 239.12.12.21/32 | RP_ACL, RP_ACL2 | 20 | - | - | +| 10.238.1.161 | 239.12.12.12/32 | RP_ACL, RP_ACL2 | 20 | - | - | ##### IP Anycast Information @@ -87,6 +88,9 @@ router pim sparse-mode rp address 10.238.1.161 239.12.12.21/32 priority 20 rp address 10.238.1.161 access-list RP_ACL priority 20 rp address 10.238.1.161 access-list RP_ACL2 priority 20 + rp address 10.238.1.161 239.12.12.12/32 priority 20 + rp address 10.238.1.161 access-list RP_ACL priority 20 + rp address 10.238.1.161 access-list RP_ACL2 priority 20 anycast-rp 10.38.1.161 10.50.64.16 register-count 15 ssm range standard ! diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-pim-sparse-mode.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-pim-sparse-mode.cfg index 6beb5a8a256..79b42cad9d3 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-pim-sparse-mode.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-pim-sparse-mode.cfg @@ -15,6 +15,9 @@ router pim sparse-mode rp address 10.238.1.161 239.12.12.21/32 priority 20 rp address 10.238.1.161 access-list RP_ACL priority 20 rp address 10.238.1.161 access-list RP_ACL2 priority 20 + rp address 10.238.1.161 239.12.12.12/32 priority 20 + rp address 10.238.1.161 access-list RP_ACL priority 20 + rp address 10.238.1.161 access-list RP_ACL2 priority 20 anycast-rp 10.38.1.161 10.50.64.16 register-count 15 ssm range standard ! diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-pim-sparse-mode.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-pim-sparse-mode.yml index a03404dccc6..389baf279c8 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-pim-sparse-mode.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-pim-sparse-mode.yml @@ -16,6 +16,13 @@ router_pim_sparse_mode: - RP_ACL - RP_ACL2 priority: 20 + - address: 10.238.1.161 + groups: + - 239.12.12.12/32 + access_lists: + - RP_ACL + - RP_ACL2 + priority: 20 anycast_rps: - address: 10.38.1.161 other_anycast_rp_addresses: From 0fffaf4c8d5ee6e1f5ad83c0a9f3e89a722b27a2 Mon Sep 17 00:00:00 2001 From: Laxmikant Chintakindi Date: Tue, 20 Aug 2024 12:39:55 +0530 Subject: [PATCH 8/9] Allow duplicate primary keys. --- .../_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml | 3 ++- .../schema/schema_fragments/router_pim_sparse_mode.schema.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml index 60bda585113..0eff5cd834f 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml @@ -15561,12 +15561,13 @@ keys: description: IPv4 Prefix associated with SSM. rp_addresses: type: list + primary_key: address + allow_duplicate_primary_key: true items: type: dict keys: address: type: str - required: true description: RP Address. groups: type: list diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_pim_sparse_mode.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_pim_sparse_mode.schema.yml index a91fef6b471..c10d5bf0a87 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_pim_sparse_mode.schema.yml +++ b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_pim_sparse_mode.schema.yml @@ -20,12 +20,13 @@ keys: description: IPv4 Prefix associated with SSM. rp_addresses: type: list + primary_key: address + allow_duplicate_primary_key: true items: type: dict keys: address: type: str - required: true description: RP Address. groups: type: list From 8d4452e7fe7501a0177dd07f4dcd543bffd0a384 Mon Sep 17 00:00:00 2001 From: Laxmikant Chintakindi Date: Thu, 22 Aug 2024 16:04:38 +0530 Subject: [PATCH 9/9] Update test and porting guide. --- .../arista/avd/docs/porting-guides/5.x.x.md | 5 ----- .../documentation/devices/router-pim-sparse-mode.md | 7 +++---- .../intended/configs/router-pim-sparse-mode.cfg | 5 ++--- .../inventory/host_vars/router-pim-sparse-mode.yml | 6 ++---- 4 files changed, 7 insertions(+), 16 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 index 970d9a230d0..428cb7aef95 100644 --- a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md +++ b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md @@ -213,11 +213,6 @@ By default an MLAG ID will only be configured on Port-Channel downlinks dual-hom + mlag_on_orphan_port_channel_downlink: true ``` -### Duplicate value of `address` is allowed in `router_pim_sparse_mode.ipv4.rp_addresses` - -In AVD 4.0.0, the value of `address` key was unique in `router_pim_sparse_mode.ipv4.rp_addresses`. -In AVD 5.0.0, duplicate value of `address` is allowed in `router_pim_sparse_mode.ipv4.rp_addresses`. - ## Changes to role `arista.avd.eos_cli_config_gen` TODO: Level 3 sections for each change with details on how to migrate diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-pim-sparse-mode.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-pim-sparse-mode.md index acee05cdfa9..39c6a804fbb 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-pim-sparse-mode.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-pim-sparse-mode.md @@ -50,7 +50,7 @@ BFD enabled: True | Rendezvous Point Address | Group Address | Access Lists | Priority | Hashmask | Override | | ------------------------ | ------------- | ------------ | -------- | -------- | -------- | | 10.238.1.161 | 239.12.12.12/32, 239.12.12.13/32, 239.12.12.14/32, 239.12.12.16/32, 239.12.12.20/32, 239.12.12.21/32 | RP_ACL, RP_ACL2 | 20 | - | - | -| 10.238.1.161 | 239.12.12.12/32 | RP_ACL, RP_ACL2 | 20 | - | - | +| 10.238.1.161 | 239.12.12.17/32 | RP_ACL3 | - | - | - | ##### IP Anycast Information @@ -88,9 +88,8 @@ router pim sparse-mode rp address 10.238.1.161 239.12.12.21/32 priority 20 rp address 10.238.1.161 access-list RP_ACL priority 20 rp address 10.238.1.161 access-list RP_ACL2 priority 20 - rp address 10.238.1.161 239.12.12.12/32 priority 20 - rp address 10.238.1.161 access-list RP_ACL priority 20 - rp address 10.238.1.161 access-list RP_ACL2 priority 20 + rp address 10.238.1.161 239.12.12.17/32 + rp address 10.238.1.161 access-list RP_ACL3 anycast-rp 10.38.1.161 10.50.64.16 register-count 15 ssm range standard ! diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-pim-sparse-mode.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-pim-sparse-mode.cfg index 79b42cad9d3..f94faec1e56 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-pim-sparse-mode.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-pim-sparse-mode.cfg @@ -15,9 +15,8 @@ router pim sparse-mode rp address 10.238.1.161 239.12.12.21/32 priority 20 rp address 10.238.1.161 access-list RP_ACL priority 20 rp address 10.238.1.161 access-list RP_ACL2 priority 20 - rp address 10.238.1.161 239.12.12.12/32 priority 20 - rp address 10.238.1.161 access-list RP_ACL priority 20 - rp address 10.238.1.161 access-list RP_ACL2 priority 20 + rp address 10.238.1.161 239.12.12.17/32 + rp address 10.238.1.161 access-list RP_ACL3 anycast-rp 10.38.1.161 10.50.64.16 register-count 15 ssm range standard ! diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-pim-sparse-mode.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-pim-sparse-mode.yml index 389baf279c8..39d50c8dd17 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-pim-sparse-mode.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-pim-sparse-mode.yml @@ -18,11 +18,9 @@ router_pim_sparse_mode: priority: 20 - address: 10.238.1.161 groups: - - 239.12.12.12/32 + - 239.12.12.17/32 access_lists: - - RP_ACL - - RP_ACL2 - priority: 20 + - RP_ACL3 anycast_rps: - address: 10.38.1.161 other_anycast_rp_addresses: