Refactor(eos_cli_config_gen): Addressed missed comments for patch-pan…

…el (aristanetworks#4078)
ClausHolbechArista · Jun 7, 2024 · 6e1686f · 6e1686f
1 parent d0c043b
commit 6e1686f
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 23 deletions.
diff --git a/...ons/arista/avd/molecule/eos_cli_config_gen/documentation/devices/patch-panel.md b/...ons/arista/avd/molecule/eos_cli_config_gen/documentation/devices/patch-panel.md
@@ -40,9 +40,7 @@ interface Management1
 
 ### Patch Panel Summary
 
-Patch Panel Connector Interface Recovery Review Delay Min: 10
-
-Patch Panel Connector Interface Recovery Review Delay Max: 900
+Patch Panel Connector Interface Recovery Review Delay Min: 10s - Max: 900s
 
 Patch Panel Connector Interface Path BGP VPWS Remote Failure Errdisable is enabled.
 

diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/patch-panel.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/patch-panel.md
@@ -14,8 +14,8 @@
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;bgp_vpws_remote_failure_errdisable</samp>](## "patch_panel.connector.interface.patch.bgp_vpws_remote_failure_errdisable") | Boolean |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;recovery</samp>](## "patch_panel.connector.interface.recovery") | Dictionary |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;review_delay</samp>](## "patch_panel.connector.interface.recovery.review_delay") | Dictionary |  |  |  |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;min</samp>](## "patch_panel.connector.interface.recovery.review_delay.min") | Integer | Required |  | Min: 10 | Minimum delay (10-600). |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;max</samp>](## "patch_panel.connector.interface.recovery.review_delay.max") | Integer | Required |  | Min: 15 | Maximum delay (15-900). |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;min</samp>](## "patch_panel.connector.interface.recovery.review_delay.min") | Integer | Required |  | Min: 10<br>Max: 600 | Minimum delay. |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;max</samp>](## "patch_panel.connector.interface.recovery.review_delay.max") | Integer | Required |  | Min: 15<br>Max: 900 | Maximum delay. |
     | [<samp>&nbsp;&nbsp;patches</samp>](## "patch_panel.patches") | List, items: Dictionary |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;name</samp>](## "patch_panel.patches.[].name") | String | Required, Unique |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;enabled</samp>](## "patch_panel.patches.[].enabled") | Boolean |  |  |  |  |
@@ -35,11 +35,11 @@
           recovery:
             review_delay:
 
-              # Minimum delay (10-600).
-              min: <int; >=10; required>
+              # Minimum delay.
+              min: <int; 10-600; required>
 
-              # Maximum delay (15-900).
-              max: <int; >=15; required>
+              # Maximum delay.
+              max: <int; 15-900; required>
       patches:
         - name: <str; required; unique>
           enabled: <bool>

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/...tions/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/patch_panel.schema.yml b/...tions/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/patch_panel.schema.yml
@@ -30,16 +30,18 @@ keys:
                         type: int
                         required: true
                         min: 10
+                        max: 600
                         convert_types:
                           - str
-                        description: Minimum delay (10-600).
+                        description: Minimum delay.
                       max:
                         type: int
                         required: true
                         min: 15
+                        max: 900
                         convert_types:
                           - str
-                        description: Maximum delay (15-900).
+                        description: Maximum delay.
       patches:
         type: list
         primary_key: name

diff --git a/...le_collections/arista/avd/roles/eos_cli_config_gen/templates/documentation/patch-panel.j2 b/...le_collections/arista/avd/roles/eos_cli_config_gen/templates/documentation/patch-panel.j2
@@ -9,13 +9,9 @@
 ## Patch Panel
 
 ### Patch Panel Summary
-{%     if patch_panel.connector.interface.recovery.review_delay.min is arista.avd.defined %}
+{%     if patch_panel.connector.interface.recovery.review_delay.min is arista.avd.defined and patch_panel.connector.interface.recovery.review_delay.max is arista.avd.defined %}
 
-Patch Panel Connector Interface Recovery Review Delay Min: {{ patch_panel.connector.interface.recovery.review_delay.min }}
-{%     endif %}
-{%     if patch_panel.connector.interface.recovery.review_delay.max is arista.avd.defined %}
-
-Patch Panel Connector Interface Recovery Review Delay Max: {{ patch_panel.connector.interface.recovery.review_delay.max }}
+Patch Panel Connector Interface Recovery Review Delay Min: {{ patch_panel.connector.interface.recovery.review_delay.min }}s - Max: {{ patch_panel.connector.interface.recovery.review_delay.max }}s
 {%     endif %}
 {%     if patch_panel.connector.interface.patch.bgp_vpws_remote_failure_errdisable is arista.avd.defined(true) %}
 

diff --git a/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.jsonschema.json b/ansible_collections/arista/avd/roles/eos_designs/schemas/eos_designs.jsonschema.json