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): Add support for raw eos_cli under router_bgp #3673

Merged
merged 7 commits into from
Apr 5, 2024
Merged

Feat(eos_cli_config_gen): Add support for raw eos_cli under router_bgp #3673

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0d9a97c
Expand eos_cli support for BGP configuration #3570
laxmikantchintakindi Feb 28, 2024
4f8d441
Commiting after fixing linting errors
laxmikantchintakindi Feb 28, 2024
a279167
Added punctuation to the description
laxmikantchintakindi Feb 28, 2024
f13221f
Added hyphen after in description
laxmikantchintakindi Feb 28, 2024
ee0aed2
Fixed precommit failure
laxmikantchintakindi Feb 29, 2024
95a515b
Adding eos-cli under root of bgp
laxmikantchintakindi Feb 29, 2024
5cbdf93
Adding test value for eos_cli
laxmikantchintakindi Mar 4, 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
8 changes: 8 additions & 0 deletions ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;import_ethernet_segment_ip_mass_withdraw</samp>](## "router_bgp.address_family_evpn.route.import_ethernet_segment_ip_mass_withdraw") | Boolean | | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;export_ethernet_segment_ip_mass_withdraw</samp>](## "router_bgp.address_family_evpn.route.export_ethernet_segment_ip_mass_withdraw") | Boolean | | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;next_hop_unchanged</samp>](## "router_bgp.address_family_evpn.next_hop_unchanged") | Boolean | | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;eos_cli</samp>](## "router_bgp.address_family_evpn.eos_cli") | String | | | | Multiline EOS CLI rendered directly on the Router BGP, Address family EVPN in the final EOS configuration. |
| [<samp>&nbsp;&nbsp;address_family_rtc</samp>](## "router_bgp.address_family_rtc") | Dictionary | | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;peer_groups</samp>](## "router_bgp.address_family_rtc.peer_groups") | List, items: Dictionary | | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;name</samp>](## "router_bgp.address_family_rtc.peer_groups.[].name") | String | Required, Unique | | | Peer-group name |
Expand Down Expand Up @@ -731,6 +732,7 @@
| [<samp>&nbsp;&nbsp;session_trackers</samp>](## "router_bgp.session_trackers") | List, items: Dictionary | | | | |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;name</samp>](## "router_bgp.session_trackers.[].name") | String | Required, Unique | | | Name of session tracker |
| [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;recovery_delay</samp>](## "router_bgp.session_trackers.[].recovery_delay") | Integer | | | Min: 1<br>Max: 3600 | Recovery delay in seconds |
| [<samp>&nbsp;&nbsp;eos_cli</samp>](## "router_bgp.eos_cli") | String | | | | Multiline EOS CLI rendered directly on the Router BGP in the final EOS configuration. |

=== "YAML"

Expand Down Expand Up @@ -1244,6 +1246,9 @@
import_ethernet_segment_ip_mass_withdraw: <bool>
export_ethernet_segment_ip_mass_withdraw: <bool>
next_hop_unchanged: <bool>

# Multiline EOS CLI rendered directly on the Router BGP, Address family EVPN in the final EOS configuration.
eos_cli: <str>
address_family_rtc:
peer_groups:

Expand Down Expand Up @@ -1976,4 +1981,7 @@

# Recovery delay in seconds
recovery_delay: <int; 1-3600>

# Multiline EOS CLI rendered directly on the Router BGP in the final EOS configuration.
eos_cli: <str>
```
10 changes: 10 additions & 0 deletions ...ollections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions ...ble_collections/arista/avd/roles/eos_cli_config_gen/schemas/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.

8 changes: 8 additions & 0 deletions ...ctions/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/router_bgp.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,6 +1030,10 @@ keys:
type: bool
next_hop_unchanged:
type: bool
eos_cli:
gmuloc marked this conversation as resolved.
Show resolved Hide resolved
type: str
description: |-
Multiline EOS CLI rendered directly on the Router BGP, Address family EVPN in the final EOS configuration.
address_family_rtc:
type: dict
keys:
Expand Down Expand Up @@ -2677,3 +2681,7 @@ keys:
- str
min: 1
max: 3600
eos_cli:
type: str
description: |-
Multiline EOS CLI rendered directly on the Router BGP in the final EOS configuration.
4 changes: 4 additions & 0 deletions ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/router-bgp.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1741,4 +1741,8 @@ router bgp {{ router_bgp.as }}
recovery delay {{ session_tracker.recovery_delay }} seconds
{% endif %}
{% endfor %}
{% if router_bgp.eos_cli is arista.avd.defined %}
!
{{ router_bgp.eos_cli | indent(6, false) }}
{% endif %}
gmuloc marked this conversation as resolved.
Show resolved Hide resolved
{% endif %}
Loading