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

Feat(eos_cli_config_gen): Adding support to disable make_before_break for PIM sparse-mode #4745

Merged
merged 15 commits into from
Nov 26, 2024
Merged

Feat(eos_cli_config_gen): Adding support to disable make_before_break for PIM sparse-mode #4745

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ade4321
adding support for make_before_break
davidhayes9 Nov 19, 2024
1b8e15e
fixing jinja in make-before-break doc
davidhayes9 Nov 21, 2024
79f537b
adding test coverage for make_before_break: true
davidhayes9 Nov 21, 2024
8f6d85e
removing colons from j2templates
davidhayes9 Nov 21, 2024
be03e85
Apply suggestions from code review
gmuloc Nov 22, 2024
724676e
Merge branch 'devel' into issue4743
gmuloc Nov 22, 2024
f8565f9
Revert "Apply suggestions from code review"
gmuloc Nov 22, 2024
024e33d
Refactor: Address PR comment
gmuloc Nov 22, 2024
85312a6
Refactor: Use namespace
gmuloc Nov 22, 2024
9a63590
Update python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation…
ClausHolbechArista Nov 22, 2024
71b0ecf
Merge branch 'devel' into issue4743
gmuloc Nov 22, 2024
8a86546
Update ansible_collections/arista/avd/molecule/eos_cli_config_gen/doc…
ClausHolbechArista Nov 22, 2024
97e9184
Update ansible_collections/arista/avd/molecule/eos_cli_config_gen/doc…
ClausHolbechArista Nov 22, 2024
0487d63
Merge branch 'devel' into issue4743
ClausHolbechArista Nov 25, 2024
96acdf6
Merge branch 'devel' into issue4743
gmuloc Nov 26, 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
4 changes: 4 additions & 0 deletions ...llections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/host1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5854,6 +5854,8 @@ router multicast

BFD enabled: True

Make-before-break: False

##### IP Rendezvous Information

| Rendezvous Point Address | Group Address | Access Lists | Priority | Hashmask | Override |
Expand Down Expand Up @@ -5890,6 +5892,7 @@ router pim sparse-mode
ipv4
ssm range standard
bfd
make-before-break disabled
rp address 10.238.1.161 239.12.12.12/32 priority 20
rp address 10.238.1.161 239.12.12.13/32 priority 20
rp address 10.238.1.161 239.12.12.14/32 priority 20
Expand All @@ -5905,6 +5908,7 @@ router pim sparse-mode
vrf MCAST_VRF1
ipv4
bfd
make-before-break disabled
rp address 10.238.2.161 239.12.22.12/32
rp address 10.238.2.161 239.12.22.13/32
rp address 10.238.2.161 239.12.22.14/32
Expand Down
2 changes: 2 additions & 0 deletions ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host1.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3777,6 +3777,7 @@ router pim sparse-mode
ipv4
ssm range standard
bfd
make-before-break disabled
rp address 10.238.1.161 239.12.12.12/32 priority 20
rp address 10.238.1.161 239.12.12.13/32 priority 20
rp address 10.238.1.161 239.12.12.14/32 priority 20
Expand All @@ -3792,6 +3793,7 @@ router pim sparse-mode
vrf MCAST_VRF1
ipv4
bfd
make-before-break disabled
rp address 10.238.2.161 239.12.22.12/32
rp address 10.238.2.161 239.12.22.13/32
rp address 10.238.2.161 239.12.22.14/32
Expand Down
2 changes: 2 additions & 0 deletions ...ista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/router-pim-sparse-mode.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
router_pim_sparse_mode:
ipv4:
bfd: true
make_before_break: false
rp_addresses:
- address: 10.238.1.161
groups:
Expand Down Expand Up @@ -32,6 +33,7 @@ router_pim_sparse_mode:
- name: MCAST_VRF1
ipv4:
bfd: true
make_before_break: false
ClausHolbechArista marked this conversation as resolved.
Show resolved Hide resolved
rp_addresses:
- address: 10.238.2.161
groups:
Expand Down
8 changes: 8 additions & 0 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.

4 changes: 4 additions & 0 deletions python-avd/pyavd/_eos_cli_config_gen/j2templates/documentation/router-pim-sparse-mode.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
{% if router_pim_sparse_mode.ipv4 is arista.avd.defined %}

BFD enabled: {{ router_pim_sparse_mode.ipv4.bfd | arista.avd.default(false) }}
{% if router_pim_sparse_mode.ipv4.make_before_break is arista.avd.defined %}

Make-before-break: {{ router_pim_sparse_mode.ipv4.make_before_break }}
{% endif %}
{% if router_pim_sparse_mode.ipv4.rp_addresses is arista.avd.defined %}

##### IP Rendezvous Information
Expand Down
14 changes: 14 additions & 0 deletions python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-pim-sparse-mode.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ router pim sparse-mode
{% if router_pim_sparse_mode.ipv4.bfd is arista.avd.defined(true) %}
bfd
{% endif %}
{% if router_pim_sparse_mode.ipv4.make_before_break is arista.avd.defined %}
{% if router_pim_sparse_mode.ipv4.make_before_break: %}
make-before-break
{% else %}
make-before-break disabled
{% endif %}
{% endif %}
Shivani-gslab marked this conversation as resolved.
Show resolved Hide resolved
{% for rp_address in router_pim_sparse_mode.ipv4.rp_addresses | arista.avd.natural_sort('address') %}
{% set rp_options_cli = "" %}
{% if rp_address.priority is arista.avd.defined %}
Expand Down Expand Up @@ -59,6 +66,13 @@ router pim sparse-mode
{% if vrf.ipv4.bfd is arista.avd.defined(true) %}
bfd
{% endif %}
{% if vrf.ipv4.make_before_break is arista.avd.defined %}
{% if vrf.ipv4.make_before_break: %}
make-before-break
{% else %}
make-before-break disabled
{% endif %}
{% endif %}
Shivani-gslab marked this conversation as resolved.
Show resolved Hide resolved
{% for rp_address in vrf.ipv4.rp_addresses | arista.avd.natural_sort('address') %}
{% set rp_options_cli = "" %}
{% if rp_address.priority is arista.avd.defined %}
Expand Down
6 changes: 6 additions & 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.

6 changes: 6 additions & 0 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 @@ -15,6 +15,9 @@ keys:
bfd:
type: bool
description: Enable/Disable BFD.
make_before_break:
type: bool
description: Enable/Disable Make-Before-Break.
ssm_range:
type: str
description: IPv4 Prefix associated with SSM.
Expand Down Expand Up @@ -85,6 +88,9 @@ keys:
bfd:
type: bool
description: Enable/Disable BFD.
make_before_break:
type: bool
description: Enable/Disable Make-Before-Break.
rp_addresses:
type: list
items:
Expand Down
Loading