Removing hold-forever

aristanetworks · Nov 13, 2024 · bb5fcfa · bb5fcfa
1 parent 6673b13
commit bb5fcfa
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 20 deletions.
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
@@ -6,7 +6,7 @@ router_bgp:
     send_community: all
   timers:
     keepalive_time: 0
-    hold_forever: true
+    hold_time: 0
   bgp_defaults:
     - no bgp default ipv4-unicast
     - distance bgp 20 200 200

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,9 +30,7 @@ router bgp {{ router_bgp.as }}
    no bgp default ipv4-unicast transport ipv6
 {%     endif %}
 {%     if router_bgp.timers is arista.avd.defined %}
-{%         if router_bgp.timers.hold_forever is arista.avd.defined(true) %}
-{%             set timers_bgp_cli = "timers bgp 0 0" %}
-{%         elif router_bgp.timers.keepalive_time is arista.avd.defined and router_bgp.timers.hold_time is arista.avd.defined %}
+{%         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" %}

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
@@ -38,15 +38,14 @@ keys:
             min: 0
             max: 3600
           hold_time:
-            description: Hold time in seconds. Must be defined along with keepalive_time.
+            description: |-
+              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: 3
+            min: 0
             max: 7200
-          hold_forever:
-            type: bool
-            description: Don't send keep-alives.
           min_hold_time:
             description: Neighbor's minimum hold time constraint in seconds.
             type: int