Fxing comments

aristanetworks · Nov 13, 2024 · 167b11e · 167b11e
1 parent c12d4e2
commit 167b11e
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 17 deletions.
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/...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/...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/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
@@ -30,10 +30,11 @@ router bgp {{ router_bgp.as }}
    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 " ~ router_bgp.timers.keepalive_time ~ " " ~ router_bgp.timers.hold_time %}
-{%         elif router_bgp.timers.min_hold_time is arista.avd.defined or router_bgp.timers.send_failure_hold_time is arista.avd.defined %}
-{%             set timers_bgp_cli = "timers bgp" %}
+{%             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 %}

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
diff --git a/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml b/python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/router_bgp.schema.yml
@@ -31,23 +31,27 @@ keys:
         type: dict
         keys:
           keepalive_time:
-            description: Time between BGP keepalive messages in seconds.
+            description: |-
+              Time between BGP keepalive messages in seconds.
+              `keepalive_time` should be lesser than `hold_time`.
             type: int
             convert_types:
               - str
             min: 0
             max: 3600
           hold_time:
             description: |-
-              Hold time in seconds. Must be defined along with keepalive_time.
+              Hold time in seconds. Must be defined along with `keepalive_time`.
               The valid values are 3-7200 or 0 if both values are 0.
             type: int
             convert_types:
               - str
             min: 0
             max: 7200
           min_hold_time:
-            description: Neighbor's minimum hold time constraint in seconds.
+            description: |-
+              Neighbor's minimum hold time constraint in seconds.
+              `min_hold_time` should be less than `hold_time`.
             type: int
             convert_types:
               - str
@@ -59,7 +63,7 @@ keys:
             convert_types:
               - str
             min: 60
-            max: 65335
+            max: 65535
       distance:
         type: dict
         keys: