Feat(eos_cli_config_gen): Add support for BGP default timers and send…

…-community commands (#4607)
aristanetworks · Nov 15, 2024 · 40626f7 · 40626f7
1 parent b53e79a
commit 40626f7
Show file tree

Hide file tree

Showing 22 changed files with 191 additions and 0 deletions.
diff --git a/...arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-base.md b/...arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-base.md
@@ -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
@@ -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

diff --git a/...a/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-mpls.md b/...a/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn-mpls.md
@@ -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

diff --git a/.../eos_cli_config_gen/documentation/devices/router-bgp-evpn-vpn-import-pruning.md b/.../eos_cli_config_gen/documentation/devices/router-bgp-evpn-vpn-import-pruning.md
@@ -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

diff --git a/...arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn.md b/...arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-evpn.md
@@ -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

diff --git a/...ule/eos_cli_config_gen/documentation/devices/router-bgp-ipv4-labeled-unicast.md b/...ule/eos_cli_config_gen/documentation/devices/router-bgp-ipv4-labeled-unicast.md
@@ -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

diff --git a/.../avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-link-state.md b/.../avd/molecule/eos_cli_config_gen/documentation/devices/router-bgp-link-state.md
@@ -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

diff --git a/...e_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-base.cfg b/...e_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-base.cfg
@@ -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
@@ -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
    neighbor TEST peer group
    neighbor TEST ttl maximum-hops 42
    neighbor test-link-bandwidth1 peer group

diff --git a/...lections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn-mpls.cfg b/...lections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn-mpls.cfg
@@ -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
    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

diff --git a/...a/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn-vpn-import-pruning.cfg b/...a/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn-vpn-import-pruning.cfg
@@ -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

diff --git a/...e_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn.cfg b/...e_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-evpn.cfg
@@ -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

diff --git a/...ista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-ipv4-labeled-unicast.cfg b/...ista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-ipv4-labeled-unicast.cfg
@@ -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

diff --git a/...ections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-link-state.cfg b/...ections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-bgp-link-state.cfg
@@ -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

diff --git a/...ollections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-base.yml b/...ollections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-base.yml
@@ -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
@@ -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:

diff --git a/...tions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn-mpls.yml b/...tions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn-mpls.yml
@@ -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

diff --git a/...vd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn-vpn-import-pruning.yml b/...vd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn-vpn-import-pruning.yml
@@ -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

diff --git a/...ollections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn.yml b/...ollections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-evpn.yml
@@ -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

diff --git a/...a/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-ipv4-labeled-unicast.yml b/...a/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-ipv4-labeled-unicast.yml
@@ -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:

diff --git a/...ions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-link-state.yml b/...ions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-link-state.yml
@@ -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"

diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-bgp.md
diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/router-bgp.j2
@@ -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 %}
@@ -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 %}

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