Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor(eos_cli_config_gen): Allow duplicate value of address in router_pim_sparse_mode.rp_addresses #4366

Merged
merged 10 commits into from
Aug 23, 2024
Merged

Refactor(eos_cli_config_gen): Allow duplicate value of address in router_pim_sparse_mode.rp_addresses #4366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c141f60
Cut(eos_cli_config_gen): Remove primary_key mark in router_pim_sparse…
Aug 16, 2024
994ed5e
Update porting guide
Aug 16, 2024
6ce4ad9
Fix porting guide.
Aug 16, 2024
893f0d7
Fix porting guide and schema.
Aug 16, 2024
f599fd4
Update porting guide.
Aug 19, 2024
0c896c6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 19, 2024
b818da5
Add test for duplicate address.
Aug 19, 2024
0fffaf4
Allow duplicate primary keys.
Aug 20, 2024
8d4452e
Update test and porting guide.
Aug 22, 2024
4561f2a
Merge branch 'devel' into todo/router_pim_sparse_mode
ClausHolbechArista Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...avd/molecule/eos_cli_config_gen/documentation/devices/router-pim-sparse-mode.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.17/32 | RP_ACL3 | - | - | - |

##### IP Anycast Information

Expand Down Expand Up @@ -87,6 +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.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
!
Expand Down
2 changes: 2 additions & 0 deletions ...ctions/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-pim-sparse-mode.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +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.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
!
Expand Down
5 changes: 5 additions & 0 deletions ...ons/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-pim-sparse-mode.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ router_pim_sparse_mode:
- RP_ACL
- RP_ACL2
priority: 20
- address: 10.238.1.161
groups:
- 239.12.12.17/32
access_lists:
- RP_ACL3
anycast_rps:
- address: 10.38.1.161
other_anycast_rp_addresses:
Expand Down
4 changes: 2 additions & 2 deletions ...tions/arista/avd/roles/eos_cli_config_gen/docs/tables/router-pim-sparse-mode.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen.schema.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions ...n-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_pim_sparse_mode.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,8 @@ 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
ClausHolbechArista marked this conversation as resolved.
Show resolved Hide resolved
ClausHolbechArista marked this conversation as resolved.
Show resolved Hide resolved
allow_duplicate_primary_key: true
items:
type: dict
keys:
Expand Down
Loading