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

Feat(eos_cli_config_gen): Add support for BGP default timers and send-community commands #4607

Open
wants to merge 13 commits into
base: devel
Choose a base branch
from
+191 −0
Open

Feat(eos_cli_config_gen): Add support for BGP default timers and send-community commands #4607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0222e6c
Feat(eos_cli_config_gen): Add support for BGP default timers and send…
Shivani-gslab Oct 17, 2024
83ba4d5
Apply suggestion
Shivani-gslab Oct 18, 2024
6c42a44
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 18, 2024
a2a4c9c
Add tests
Shivani-gslab Oct 18, 2024
4b0434e
fix test input
Shivani-gslab Oct 18, 2024
079501d
Changing data-model
Shivani-gslab Nov 8, 2024
952b29a
Add valid-values
Shivani-gslab Nov 11, 2024
43994e2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 11, 2024
e7c790c
Modified the data-model for timers
Shivani-gslab Nov 11, 2024
ee79ccf
hold-forever
Shivani-gslab Nov 11, 2024
6673b13
modified code
Shivani-gslab Nov 11, 2024
bb5fcfa
Removing hold-forever
Shivani-gslab Nov 12, 2024
ccf8103
Fixing comments
Shivani-gslab Nov 13, 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
2 changes: 2 additions & 0 deletions ...arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-base.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ router bgp 65101
update wait-install
no bgp default ipv4-unicast
no bgp default ipv4-unicast transport ipv6
timers bgp 10 15
distance bgp 20 200 200
graceful-restart restart-time 555
graceful-restart stalepath-time 666
Expand All @@ -161,6 +162,7 @@ router bgp 65101
bgp listen range 12.10.10.0/24 peer-id include router-id peer-group my-peer-group3 remote-as 65444
bgp listen range 13.10.10.0/24 peer-group my-peer-group4 peer-filter my-peer-filter
bgp bestpath d-path
neighbor default send-community standard
neighbor TEST peer group
neighbor TEST ttl maximum-hops 42
neighbor test-link-bandwidth1 peer group
Expand Down
2 changes: 2 additions & 0 deletions ...a/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-mpls.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,13 @@ ASN Notation: asplain
!
router bgp 65101
router-id 192.168.255.3
timers bgp min-hold-time 5 send-failure hold-time 65
no bgp default ipv4-unicast
distance bgp 20 200 200
graceful-restart restart-time 300
graceful-restart
maximum-paths 2 ecmp 2
neighbor default send-community standard extended large
neighbor EVPN-OVERLAY-PEERS peer group
neighbor EVPN-OVERLAY-PEERS remote-as 65001
neighbor EVPN-OVERLAY-PEERS update-source Loopback0
Expand Down
2 changes: 2 additions & 0 deletions .../eos_cli_config_gen/documentation/devices/router-bgp-evpn-vpn-import-pruning.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,13 @@ ASN Notation: asplain
!
router bgp 65101
router-id 192.168.255.3
timers bgp 0 0
no bgp default ipv4-unicast
distance bgp 20 200 200
graceful-restart restart-time 300
graceful-restart
maximum-paths 2 ecmp 2
neighbor default send-community
neighbor EVPN-OVERLAY-PEERS peer group
neighbor EVPN-OVERLAY-PEERS remote-as 65001
neighbor EVPN-OVERLAY-PEERS update-source Loopback0
Expand Down
1 change: 1 addition & 0 deletions ...arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ router bgp 65101
router-id 192.168.255.3
bgp default ipv4-unicast
bgp default ipv4-unicast transport ipv6
timers bgp min-hold-time 5
distance bgp 20 200 200
graceful-restart restart-time 300
graceful-restart
Expand Down
1 change: 1 addition & 0 deletions ...ule/eos_cli_config_gen/documentation/devices/router-bgp-ipv4-labeled-unicast.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ ASN Notation: asplain
```eos
!
router bgp 65101
timers bgp 4 6 min-hold-time 5 send-failure hold-time 67
!
address-family ipv4 labeled-unicast
update wait-for-convergence
Expand Down
1 change: 1 addition & 0 deletions .../avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-link-state.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ ASN Notation: asdot
router bgp 65101.0001
bgp asn notation asdot
router-id 192.168.255.3
timers bgp send-failure hold-time 65
neighbor PG-1 peer group
neighbor PG-1 remote-as 65001.0002
neighbor PG-2 peer group
Expand Down
2 changes: 2 additions & 0 deletions ...e_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-base.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ router bgp 65101
update wait-install
no bgp default ipv4-unicast
no bgp default ipv4-unicast transport ipv6
timers bgp 10 15
distance bgp 20 200 200
graceful-restart restart-time 555
graceful-restart stalepath-time 666
Expand All @@ -21,6 +22,7 @@ router bgp 65101
bgp listen range 12.10.10.0/24 peer-id include router-id peer-group my-peer-group3 remote-as 65444
bgp listen range 13.10.10.0/24 peer-group my-peer-group4 peer-filter my-peer-filter
bgp bestpath d-path
neighbor default send-community standard
MaheshGSLAB marked this conversation as resolved.
Show resolved Hide resolved
neighbor TEST peer group
neighbor TEST ttl maximum-hops 42
neighbor test-link-bandwidth1 peer group
Expand Down
2 changes: 2 additions & 0 deletions ...lections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn-mpls.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ interface Management1
!
router bgp 65101
router-id 192.168.255.3
timers bgp min-hold-time 5 send-failure hold-time 65
no bgp default ipv4-unicast
Comment on lines 8 to 10
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I my test the timers comes after the no bgp default ipv4-unicast

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

+router bgp 65101
+   router-id 192.168.255.3
+   no bgp default ipv4-unicast
+   timers bgp min-hold-time 5 send-failure hold-time 65
+   distance bgp 20 200 200
+   graceful-restart restart-time 300
+   graceful-restart
+   maximum-paths 2 ecmp 2
+   neighbor default send-community standard extended large
+   neighbor EVPN-OVERLAY-PEERS peer group
+   neighbor EVPN-OVERLAY-PEERS remote-as 65001
+   neighbor EVPN-OVERLAY-PEERS update-source Loopback0

Copy link
Contributor Author

@Shivani-gslab Shivani-gslab Nov 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the ordering is same in the template, this mismatch in the ordering of this file is because these commands are defined under bgp_defaults key, which is below timers in the template.

We can see the correct ordering in router-bgp-base.cfg

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/aristanetworks/avd/blob/devel/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn-mpls.yml#L4

distance bgp 20 200 200
graceful-restart restart-time 300
graceful-restart
maximum-paths 2 ecmp 2
neighbor default send-community standard extended large
neighbor EVPN-OVERLAY-PEERS peer group
neighbor EVPN-OVERLAY-PEERS remote-as 65001
neighbor EVPN-OVERLAY-PEERS update-source Loopback0
Expand Down
2 changes: 2 additions & 0 deletions ...a/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn-vpn-import-pruning.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ interface Management1
!
router bgp 65101
router-id 192.168.255.3
timers bgp 0 0
no bgp default ipv4-unicast
distance bgp 20 200 200
graceful-restart restart-time 300
graceful-restart
maximum-paths 2 ecmp 2
neighbor default send-community
neighbor EVPN-OVERLAY-PEERS peer group
neighbor EVPN-OVERLAY-PEERS remote-as 65001
neighbor EVPN-OVERLAY-PEERS update-source Loopback0
Expand Down
1 change: 1 addition & 0 deletions ...e_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ router bgp 65101
router-id 192.168.255.3
bgp default ipv4-unicast
bgp default ipv4-unicast transport ipv6
timers bgp min-hold-time 5
distance bgp 20 200 200
graceful-restart restart-time 300
graceful-restart
Expand Down
1 change: 1 addition & 0 deletions ...ista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-ipv4-labeled-unicast.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ interface Management1
ip address 10.73.255.122/24
!
router bgp 65101
timers bgp 4 6 min-hold-time 5 send-failure hold-time 67
!
address-family ipv4 labeled-unicast
update wait-for-convergence
Expand Down
1 change: 1 addition & 0 deletions ...ections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-link-state.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ interface Management1
router bgp 65101.0001
bgp asn notation asdot
router-id 192.168.255.3
timers bgp send-failure hold-time 65
neighbor PG-1 peer group
neighbor PG-1 remote-as 65001.0002
neighbor PG-2 peer group
Expand Down
5 changes: 5 additions & 0 deletions ...ollections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ router_bgp:
updates:
wait_for_convergence: true
wait_install: true
timers:
keepalive_time: 10
hold_time: 15
distance:
external_routes: 20
internal_routes: 200
Expand Down Expand Up @@ -47,6 +50,8 @@ router_bgp:
peer_group: my-peer-group4
peer_filter: my-peer-filter
remote_as: 65444
neighbor_default:
send_community: standard
peer_groups:
- name: test-link-bandwidth1
link_bandwidth:
Expand Down
6 changes: 6 additions & 0 deletions ...tions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn-mpls.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
router_bgp:
as: 65101
router_id: 192.168.255.3
# test for send_community
neighbor_default:
send_community: standard extended large
timers:
min_hold_time: 5
send_failure_hold_time: 65
bgp_defaults:
- no bgp default ipv4-unicast
- distance bgp 20 200 200
Expand Down
6 changes: 6 additions & 0 deletions ...vd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn-vpn-import-pruning.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
router_bgp:
as: 65101
router_id: 192.168.255.3
# test for send_community
neighbor_default:
send_community: all
timers:
keepalive_time: 0
hold_time: 0
bgp_defaults:
- no bgp default ipv4-unicast
- distance bgp 20 200 200
Expand Down
2 changes: 2 additions & 0 deletions ...ollections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
router_bgp:
as: 65101
router_id: 192.168.255.3
timers:
min_hold_time: 5
bgp_defaults:
- distance bgp 20 200 200
- graceful-restart restart-time 300
Expand Down
5 changes: 5 additions & 0 deletions ...a/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-ipv4-labeled-unicast.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
router_bgp:
as: 65101
timers:
keepalive_time: 4
hold_time: 6
min_hold_time: 5
send_failure_hold_time: 67
address_family_ipv4_labeled_unicast:
update_wait_for_convergence: true
aigp_session:
Expand Down
2 changes: 2 additions & 0 deletions ...ions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-link-state.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ router_bgp:
as: "65101.0001"
as_notation: asdot
router_id: 192.168.255.3
timers:
send_failure_hold_time: 65
peer_groups:
- name: PG-1
remote_as: "65001.0002"
Expand Down
25 changes: 25 additions & 0 deletions ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md
View file
Open in desktop

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

20 changes: 20 additions & 0 deletions python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,21 @@ router bgp {{ router_bgp.as }}
{% elif router_bgp.bgp.default.ipv4_unicast_transport_ipv6 is arista.avd.defined(false) %}
no bgp default ipv4-unicast transport ipv6
{% endif %}
{% if router_bgp.timers is arista.avd.defined %}
{% set timers_bgp_cli = "timers bgp" %}
{% if router_bgp.timers.keepalive_time is arista.avd.defined and router_bgp.timers.hold_time is arista.avd.defined %}
{% set timers_bgp_cli = timers_bgp_cli ~ " " ~ router_bgp.timers.keepalive_time ~ " " ~ router_bgp.timers.hold_time %}
{% endif %}
{% if router_bgp.timers.min_hold_time is arista.avd.defined or router_bgp.timers.send_failure_hold_time is arista.avd.defined %}
{% if router_bgp.timers.min_hold_time is arista.avd.defined %}
{% set timers_bgp_cli = timers_bgp_cli ~ " min-hold-time " ~ router_bgp.timers.min_hold_time %}
{% endif %}
{% if router_bgp.timers.send_failure_hold_time is arista.avd.defined %}
{% set timers_bgp_cli = timers_bgp_cli ~ " send-failure hold-time " ~ router_bgp.timers.send_failure_hold_time %}
{% endif %}
{% endif %}
{{ timers_bgp_cli }}
{% endif %}
{% if router_bgp.distance.external_routes is arista.avd.defined %}
{% set distance_cli = "distance bgp " ~ router_bgp.distance.external_routes %}
{% if router_bgp.distance.internal_routes is arista.avd.defined and router_bgp.distance.local_routes is arista.avd.defined %}
Expand Down Expand Up @@ -112,6 +127,11 @@ router bgp {{ router_bgp.as }}
{% if router_bgp.bgp.bestpath.d_path is arista.avd.defined(true) %}
bgp bestpath d-path
{% endif %}
{% if router_bgp.neighbor_default.send_community is arista.avd.defined('all') %}
neighbor default send-community
{% elif router_bgp.neighbor_default.send_community is arista.avd.defined %}
neighbor default send-community {{ router_bgp.neighbor_default.send_community }}
{% endif %}
{% for peer_group in router_bgp.peer_groups | arista.avd.natural_sort('name') %}
neighbor {{ peer_group.name }} peer group
{% if peer_group.remote_as is arista.avd.defined %}
Expand Down
51 changes: 51 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.

Loading
Loading