Fixing the output and suggestions

aristanetworks · Jan 24, 2024 · 65ad0dc · 65ad0dc
1 parent 5f8e087
commit 65ad0dc
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 18 deletions.
diff --git a/...arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-new.md b/...arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-new.md
@@ -276,7 +276,7 @@ router isis EVPN_UNDERLAY
    graceful-restart
    graceful-restart restart-hold-time 10
    graceful-restart t2 level-1 10
-   graceful-restart t2 level-1 20
+   graceful-restart t2 level-2 20
    !
    address-family ipv4 unicast
       maximum-paths 4

diff --git a/...e_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis-new.cfg b/...e_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis-new.cfg
@@ -82,7 +82,7 @@ router isis EVPN_UNDERLAY
    graceful-restart
    graceful-restart restart-hold-time 10
    graceful-restart t2 level-1 10
-   graceful-restart t2 level-1 20
+   graceful-restart t2 level-2 20
    !
    address-family ipv4 unicast
       maximum-paths 4

diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-isis.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/router-isis.md
@@ -66,8 +66,8 @@
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;restart_hold_time</samp>](## "router_isis.graceful_restart.restart_hold_time") | Integer |  |  | Min: 5<br>Max: 300 | Number of seconds |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;t2</samp>](## "router_isis.graceful_restart.t2") | Dictionary |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;wait_time</samp>](## "router_isis.graceful_restart.t2.wait_time") | Integer |  |  | Min: 5<br>Max: 300 | LSP database sync wait time in seconds |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;level_1_wait_time</samp>](## "router_isis.graceful_restart.t2.level_1_wait_time") | Integer |  |  | Min: 5<br>Max: 300 | Number of seconds |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;level_2_wait_time</samp>](## "router_isis.graceful_restart.t2.level_2_wait_time") | Integer |  |  | Min: 5<br>Max: 300 | Number of seconds |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;level_1_wait_time</samp>](## "router_isis.graceful_restart.t2.level_1_wait_time") | Integer |  |  | Min: 5<br>Max: 300 | Level-1 LSP database sync wait time in seconds. |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;level_2_wait_time</samp>](## "router_isis.graceful_restart.t2.level_2_wait_time") | Integer |  |  | Min: 5<br>Max: 300 | Level-2 LSP database sync wait time in seconds. |
 
 === "YAML"
 
@@ -175,9 +175,9 @@
           # LSP database sync wait time in seconds
           wait_time: <int; 5-300>
 
-          # Number of seconds
+          # Level-1 LSP database sync wait time in seconds.
           level_1_wait_time: <int; 5-300>
 
-          # Number of seconds
+          # Level-2 LSP database sync wait time in seconds.
           level_2_wait_time: <int; 5-300>
     ```
diff --git a/...ollections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json b/...ollections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json
diff --git a/...ble_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml b/...ble_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml
diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/router-isis.j2 b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/router-isis.j2
@@ -77,16 +77,11 @@ router isis {{ router_isis.instance }}
 {%         if router_isis.graceful_restart.restart_hold_time is arista.avd.defined %}
    graceful-restart restart-hold-time {{ router_isis.graceful_restart.restart_hold_time }}
 {%         endif %}
-{%         if router_isis.graceful_restart.t2.wait_time is arista.avd.defined %}
-   graceful-restart t2 level-1 {{ router_isis.graceful_restart.t2.wait_time }}
-   graceful-restart t2 level-2 {{ router_isis.graceful_restart.t2.wait_time }}
-{%         else %}
-{%             if router_isis.graceful_restart.t2.level_1_wait_time is arista.avd.defined %}
+{%         if router_isis.graceful_restart.t2.level_1_wait_time is arista.avd.defined %}
    graceful-restart t2 level-1 {{ router_isis.graceful_restart.t2.level_1_wait_time }}
-{%             endif %}
-{%             if router_isis.graceful_restart.t2.level_2_wait_time is arista.avd.defined %}
+{%         endif %}
+{%         if router_isis.graceful_restart.t2.level_2_wait_time is arista.avd.defined %}
    graceful-restart t2 level-2 {{ router_isis.graceful_restart.t2.level_2_wait_time }}
-{%             endif %}
 {%         endif %}
 {%     endif %}
    !