Fixing the schema and code.

aristanetworks · Jul 4, 2024 · 2bc92e3 · 2bc92e3
1 parent bfa0c99
commit 2bc92e3
Show file tree

Hide file tree

Showing 13 changed files with 75 additions and 648 deletions.
diff --git a/..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_isis.cfg b/..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/l3_edge_isis.cfg
@@ -53,6 +53,8 @@ interface ethernet3
    isis metric 50
    isis hello padding
    isis network point-to-point
+   isis authentication mode text
+   isis authentication key 7 $1c$sTNAlR6rKSw=
 !
 interface ethernet4
    description P2P_LINK_TO_peer4_ethernet4
@@ -66,6 +68,8 @@ interface ethernet4
    isis metric 50
    isis hello padding
    isis network point-to-point
+   isis authentication mode text
+   isis authentication key 7 $1c$sTNAlR6rKSw=
 !
 interface Loopback0
    description EVPN_Overlay_Peering
@@ -82,8 +86,6 @@ router isis EVPN_UNDERLAY
    is-type level-2
    router-id ipv4 1.2.3.1
    log-adjacency-changes
-   authentication mode md5
-   authentication key 0 password
    !
    address-family ipv4 unicast
       maximum-paths 4

diff --git a/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_isis.yml b/...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/l3_edge_isis.yml
@@ -32,12 +32,6 @@ router_isis:
   address_family_ipv4:
     enabled: true
     maximum_paths: 4
-  authentication:
-    both:
-      key_type: '0'
-      key: password
-      mode: md5
-      rx_disabled: true
 ethernet_interfaces:
 - name: ethernet1
   peer: peer1
@@ -86,6 +80,8 @@ ethernet_interfaces:
   isis_network_point_to_point: true
   isis_hello_padding: true
   isis_circuit_type: level-2
+  isis_authentication_mode: text
+  isis_authentication_key: $1c$sTNAlR6rKSw=
 - name: ethernet4
   peer: peer4
   peer_interface: ethernet4
@@ -101,3 +97,5 @@ ethernet_interfaces:
   isis_network_point_to_point: true
   isis_hello_padding: true
   isis_circuit_type: level-2
+  isis_authentication_mode: text
+  isis_authentication_key: $1c$sTNAlR6rKSw=
diff --git a/...llections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/l3_edge_isis.yml b/...llections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/l3_edge_isis.yml
@@ -1,11 +1,7 @@
 underlay_routing_protocol: isis
 underlay_isis_bfd: true
-underlay_isis_authentication:
-  both:
-    key_type: 0
-    key: password
-    mode: md5
-    rx_disabled: true
+underlay_isis_authentication_mode: text
+underlay_isis_authentication_key: $1c$sTNAlR6rKSw=
 isis_area_id: "49.0001"
 
 type: spine

diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/isis-settings.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/isis-settings.md
@@ -18,55 +18,8 @@
     | [<samp>&nbsp;&nbsp;enabled</samp>](## "isis_ti_lfa.enabled") | Boolean |  | `False` |  |  |
     | [<samp>&nbsp;&nbsp;protection</samp>](## "isis_ti_lfa.protection") | String |  |  | Valid Values:<br>- <code>link</code><br>- <code>node</code> |  |
     | [<samp>&nbsp;&nbsp;local_convergence_delay</samp>](## "isis_ti_lfa.local_convergence_delay") | Integer |  | `10000` |  | Local convergence delay in milliseconds. |
-    | [<samp>underlay_isis_authentication</samp>](## "underlay_isis_authentication") | Dictionary |  |  |  | Only `md5` and `text` authentication modes are supported for `eos_designs`. |
-    | [<samp>&nbsp;&nbsp;both</samp>](## "underlay_isis_authentication.both") | Dictionary |  |  |  | Authentication settings for level-1 and level-2. 'both' takes precedence over 'level_1' and 'level_2' settings. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;key_type</samp>](## "underlay_isis_authentication.both.key_type") | String |  |  | Valid Values:<br>- <code>0</code><br>- <code>7</code><br>- <code>8a</code> | Configure authentication key type. Default key_id is 0. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;key</samp>](## "underlay_isis_authentication.both.key") | String |  |  |  | Password string. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;key_ids</samp>](## "underlay_isis_authentication.both.key_ids") | List, items: Dictionary |  |  |  |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;id</samp>](## "underlay_isis_authentication.both.key_ids.[].id") | Integer | Required, Unique |  | Min: 1<br>Max: 65535 | Configure authentication key-id. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;algorithm</samp>](## "underlay_isis_authentication.both.key_ids.[].algorithm") | String | Required |  | Valid Values:<br>- <code>sha-1</code><br>- <code>sha-224</code><br>- <code>sha-256</code><br>- <code>sha-384</code><br>- <code>sha-512</code> |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;key_type</samp>](## "underlay_isis_authentication.both.key_ids.[].key_type") | String | Required |  | Valid Values:<br>- <code>0</code><br>- <code>7</code><br>- <code>8a</code> | Configure authentication key type. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;key</samp>](## "underlay_isis_authentication.both.key_ids.[].key") | String | Required |  |  | Password string. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rfc_5310</samp>](## "underlay_isis_authentication.both.key_ids.[].rfc_5310") | Boolean |  |  |  | SHA digest computation according to rfc5310. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;mode</samp>](## "underlay_isis_authentication.both.mode") | String |  |  | Valid Values:<br>- <code>md5</code><br>- <code>sha</code><br>- <code>text</code><br>- <code>shared_secret</code> | Authentication mode. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;sha</samp>](## "underlay_isis_authentication.both.sha") | Dictionary |  |  |  | Required settings for authentication mode 'sha'. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;key_id</samp>](## "underlay_isis_authentication.both.sha.key_id") | Integer | Required |  | Min: 1<br>Max: 65535 |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;shared_secret</samp>](## "underlay_isis_authentication.both.shared_secret") | Dictionary |  |  |  | Required settings for authentication mode 'shared_secret'. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;profile</samp>](## "underlay_isis_authentication.both.shared_secret.profile") | String | Required |  |  |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;algorithm</samp>](## "underlay_isis_authentication.both.shared_secret.algorithm") | String | Required |  | Valid Values:<br>- <code>md5</code><br>- <code>sha-1</code><br>- <code>sha-224</code><br>- <code>sha-256</code><br>- <code>sha-384</code><br>- <code>sha-512</code> |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;rx_disabled</samp>](## "underlay_isis_authentication.both.rx_disabled") | Boolean |  |  |  |  |
-    | [<samp>&nbsp;&nbsp;level_1</samp>](## "underlay_isis_authentication.level_1") | Dictionary |  |  |  | Authentication settings for level-1. 'both' takes precedence over 'level_1' and 'level_2' settings. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;key_type</samp>](## "underlay_isis_authentication.level_1.key_type") | String |  |  | Valid Values:<br>- <code>0</code><br>- <code>7</code><br>- <code>8a</code> | Configure authentication key type. Default key_id is 0. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;key</samp>](## "underlay_isis_authentication.level_1.key") | String |  |  |  | Password string. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;key_ids</samp>](## "underlay_isis_authentication.level_1.key_ids") | List, items: Dictionary |  |  |  |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;id</samp>](## "underlay_isis_authentication.level_1.key_ids.[].id") | Integer | Required, Unique |  | Min: 1<br>Max: 65535 | Configure authentication key-id. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;algorithm</samp>](## "underlay_isis_authentication.level_1.key_ids.[].algorithm") | String | Required |  | Valid Values:<br>- <code>sha-1</code><br>- <code>sha-224</code><br>- <code>sha-256</code><br>- <code>sha-384</code><br>- <code>sha-512</code> |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;key_type</samp>](## "underlay_isis_authentication.level_1.key_ids.[].key_type") | String | Required |  | Valid Values:<br>- <code>0</code><br>- <code>7</code><br>- <code>8a</code> | Configure authentication key type. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;key</samp>](## "underlay_isis_authentication.level_1.key_ids.[].key") | String | Required |  |  | Password string. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rfc_5310</samp>](## "underlay_isis_authentication.level_1.key_ids.[].rfc_5310") | Boolean |  |  |  | SHA digest computation according to rfc5310. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;mode</samp>](## "underlay_isis_authentication.level_1.mode") | String |  |  | Valid Values:<br>- <code>md5</code><br>- <code>sha</code><br>- <code>text</code><br>- <code>shared_secret</code> | Authentication mode. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;sha</samp>](## "underlay_isis_authentication.level_1.sha") | Dictionary |  |  |  | Required settings for authentication mode 'sha'. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;key_id</samp>](## "underlay_isis_authentication.level_1.sha.key_id") | Integer | Required |  | Min: 1<br>Max: 65535 |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;shared_secret</samp>](## "underlay_isis_authentication.level_1.shared_secret") | Dictionary |  |  |  | Required settings for authentication mode 'shared_secret'. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;profile</samp>](## "underlay_isis_authentication.level_1.shared_secret.profile") | String | Required |  |  |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;algorithm</samp>](## "underlay_isis_authentication.level_1.shared_secret.algorithm") | String | Required |  | Valid Values:<br>- <code>md5</code><br>- <code>sha-1</code><br>- <code>sha-224</code><br>- <code>sha-256</code><br>- <code>sha-384</code><br>- <code>sha-512</code> |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;rx_disabled</samp>](## "underlay_isis_authentication.level_1.rx_disabled") | Boolean |  |  |  |  |
-    | [<samp>&nbsp;&nbsp;level_2</samp>](## "underlay_isis_authentication.level_2") | Dictionary |  |  |  | Authentication settings for level-2. 'both' takes precedence over 'level_1' and 'level_2' settings. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;key_type</samp>](## "underlay_isis_authentication.level_2.key_type") | String |  |  | Valid Values:<br>- <code>0</code><br>- <code>7</code><br>- <code>8a</code> | Configure authentication key type. Default key_id is 0. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;key</samp>](## "underlay_isis_authentication.level_2.key") | String |  |  |  | Password string. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;key_ids</samp>](## "underlay_isis_authentication.level_2.key_ids") | List, items: Dictionary |  |  |  |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;id</samp>](## "underlay_isis_authentication.level_2.key_ids.[].id") | Integer | Required, Unique |  | Min: 1<br>Max: 65535 | Configure authentication key-id. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;algorithm</samp>](## "underlay_isis_authentication.level_2.key_ids.[].algorithm") | String | Required |  | Valid Values:<br>- <code>sha-1</code><br>- <code>sha-224</code><br>- <code>sha-256</code><br>- <code>sha-384</code><br>- <code>sha-512</code> |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;key_type</samp>](## "underlay_isis_authentication.level_2.key_ids.[].key_type") | String | Required |  | Valid Values:<br>- <code>0</code><br>- <code>7</code><br>- <code>8a</code> | Configure authentication key type. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;key</samp>](## "underlay_isis_authentication.level_2.key_ids.[].key") | String | Required |  |  | Password string. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rfc_5310</samp>](## "underlay_isis_authentication.level_2.key_ids.[].rfc_5310") | Boolean |  |  |  | SHA digest computation according to rfc5310. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;mode</samp>](## "underlay_isis_authentication.level_2.mode") | String |  |  | Valid Values:<br>- <code>md5</code><br>- <code>sha</code><br>- <code>text</code><br>- <code>shared_secret</code> | Authentication mode. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;sha</samp>](## "underlay_isis_authentication.level_2.sha") | Dictionary |  |  |  | Required settings for authentication mode 'sha'. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;key_id</samp>](## "underlay_isis_authentication.level_2.sha.key_id") | Integer | Required |  | Min: 1<br>Max: 65535 |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;shared_secret</samp>](## "underlay_isis_authentication.level_2.shared_secret") | Dictionary |  |  |  | Required settings for authentication mode 'shared_secret'. |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;profile</samp>](## "underlay_isis_authentication.level_2.shared_secret.profile") | String | Required |  |  |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;algorithm</samp>](## "underlay_isis_authentication.level_2.shared_secret.algorithm") | String | Required |  | Valid Values:<br>- <code>md5</code><br>- <code>sha-1</code><br>- <code>sha-224</code><br>- <code>sha-256</code><br>- <code>sha-384</code><br>- <code>sha-512</code> |  |
-    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;rx_disabled</samp>](## "underlay_isis_authentication.level_2.rx_disabled") | Boolean |  |  |  |  |
+    | [<samp>underlay_isis_authentication_key</samp>](## "underlay_isis_authentication_key") | String |  |  |  | Type-7 encrypted password. |
+    | [<samp>underlay_isis_authentication_mode</samp>](## "underlay_isis_authentication_mode") | String |  |  | Valid Values:<br>- <code>md5</code><br>- <code>text</code> | Underlay ISIS authentication mode. |
     | [<samp>underlay_isis_bfd</samp>](## "underlay_isis_bfd") | Boolean |  | `False` |  | Enable BFD for ISIS on all underlay links. |
     | [<samp>underlay_isis_instance_name</samp>](## "underlay_isis_instance_name") | String |  |  |  | Default -> "EVPN_UNDERLAY" for l3ls, "CORE" for mpls. |
 
@@ -98,116 +51,11 @@
       # Local convergence delay in milliseconds.
       local_convergence_delay: <int; default=10000>
 
-    # Only `md5` and `text` authentication modes are supported for `eos_designs`.
-    underlay_isis_authentication:
+    # Type-7 encrypted password.
+    underlay_isis_authentication_key: <str>
 
-      # Authentication settings for level-1 and level-2. 'both' takes precedence over 'level_1' and 'level_2' settings.
-      both:
-
-        # Configure authentication key type. Default key_id is 0.
-        key_type: <str; "0" | "7" | "8a">
-
-        # Password string.
-        key: <str>
-        key_ids:
-
-            # Configure authentication key-id.
-          - id: <int; 1-65535; required; unique>
-            algorithm: <str; "sha-1" | "sha-224" | "sha-256" | "sha-384" | "sha-512"; required>
-
-            # Configure authentication key type.
-            key_type: <str; "0" | "7" | "8a"; required>
-
-            # Password string.
-            key: <str; required>
-
-            # SHA digest computation according to rfc5310.
-            rfc_5310: <bool>
-
-        # Authentication mode.
-        mode: <str; "md5" | "sha" | "text" | "shared_secret">
-
-        # Required settings for authentication mode 'sha'.
-        sha:
-          key_id: <int; 1-65535; required>
-
-        # Required settings for authentication mode 'shared_secret'.
-        shared_secret:
-          profile: <str; required>
-          algorithm: <str; "md5" | "sha-1" | "sha-224" | "sha-256" | "sha-384" | "sha-512"; required>
-        rx_disabled: <bool>
-
-      # Authentication settings for level-1. 'both' takes precedence over 'level_1' and 'level_2' settings.
-      level_1:
-
-        # Configure authentication key type. Default key_id is 0.
-        key_type: <str; "0" | "7" | "8a">
-
-        # Password string.
-        key: <str>
-        key_ids:
-
-            # Configure authentication key-id.
-          - id: <int; 1-65535; required; unique>
-            algorithm: <str; "sha-1" | "sha-224" | "sha-256" | "sha-384" | "sha-512"; required>
-
-            # Configure authentication key type.
-            key_type: <str; "0" | "7" | "8a"; required>
-
-            # Password string.
-            key: <str; required>
-
-            # SHA digest computation according to rfc5310.
-            rfc_5310: <bool>
-
-        # Authentication mode.
-        mode: <str; "md5" | "sha" | "text" | "shared_secret">
-
-        # Required settings for authentication mode 'sha'.
-        sha:
-          key_id: <int; 1-65535; required>
-
-        # Required settings for authentication mode 'shared_secret'.
-        shared_secret:
-          profile: <str; required>
-          algorithm: <str; "md5" | "sha-1" | "sha-224" | "sha-256" | "sha-384" | "sha-512"; required>
-        rx_disabled: <bool>
-
-      # Authentication settings for level-2. 'both' takes precedence over 'level_1' and 'level_2' settings.
-      level_2:
-
-        # Configure authentication key type. Default key_id is 0.
-        key_type: <str; "0" | "7" | "8a">
-
-        # Password string.
-        key: <str>
-        key_ids:
-
-            # Configure authentication key-id.
-          - id: <int; 1-65535; required; unique>
-            algorithm: <str; "sha-1" | "sha-224" | "sha-256" | "sha-384" | "sha-512"; required>
-
-            # Configure authentication key type.
-            key_type: <str; "0" | "7" | "8a"; required>
-
-            # Password string.
-            key: <str; required>
-
-            # SHA digest computation according to rfc5310.
-            rfc_5310: <bool>
-
-        # Authentication mode.
-        mode: <str; "md5" | "sha" | "text" | "shared_secret">
-
-        # Required settings for authentication mode 'sha'.
-        sha:
-          key_id: <int; 1-65535; required>
-
-        # Required settings for authentication mode 'shared_secret'.
-        shared_secret:
-          profile: <str; required>
-          algorithm: <str; "md5" | "sha-1" | "sha-224" | "sha-256" | "sha-384" | "sha-512"; required>
-        rx_disabled: <bool>
+    # Underlay ISIS authentication mode.
+    underlay_isis_authentication_mode: <str; "md5" | "text">
 
     # Enable BFD for ISIS on all underlay links.
     underlay_isis_bfd: <bool; default=False>