Restructuring the data-model and template

aristanetworks · Feb 8, 2024 · 4405683 · 4405683
1 parent 932feb5
commit 4405683
Show file tree

Hide file tree

Showing 13 changed files with 829 additions and 437 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
@@ -282,13 +282,18 @@ router isis EVPN_UNDERLAY
    set-overload-bit on-startup wait-for-bgp timeout 10
    advertise passive-only
    spf-interval 250 10
-   authentication mode md5 rx-disabled
+   authentication mode md5 level-1
+   authentication mode sha key-id 2 level-2
    graceful-restart
    graceful-restart t2 level-1 10
    graceful-restart t2 level-2 20
    graceful-restart restart-hold-time 10
-   authentication key-id 2 algorithm sha-512 rfc-5310 key 0 password level-1
-   authentication key 0 shapass
+   authentication key 0 password
+   authentication key-id 2 algorithm sha-512 key 0 password
+   authentication key 0 password level-1
+   authentication key-id 1 algorithm sha-1 rfc-5310 key 0 password level-1
+   authentication key 0 password level-2
+   authentication key-id 1 algorithm sha-1 rfc-5310 key 0 password level-2
    !
    address-family ipv4 unicast
       maximum-paths 4

diff --git a/...ons/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis.md b/...ons/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis.md
@@ -321,6 +321,7 @@ router isis EVPN_UNDERLAY
    mpls ldp sync default
    timers local-convergence-delay 15000 protected-prefixes
    advertise passive-only
+   authentication mode sha key-id 4
    !
    address-family ipv4 unicast
       maximum-paths 2

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
@@ -80,13 +80,18 @@ router isis EVPN_UNDERLAY
    set-overload-bit on-startup wait-for-bgp timeout 10
    advertise passive-only
    spf-interval 250 10
-   authentication mode md5 rx-disabled
+   authentication mode md5 level-1
+   authentication mode sha key-id 2 level-2
    graceful-restart
    graceful-restart t2 level-1 10
    graceful-restart t2 level-2 20
    graceful-restart restart-hold-time 10
-   authentication key-id 2 algorithm sha-512 rfc-5310 key 0 password level-1
-   authentication key 0 shapass
+   authentication key 0 password
+   authentication key-id 2 algorithm sha-512 key 0 password
+   authentication key 0 password level-1
+   authentication key-id 1 algorithm sha-1 rfc-5310 key 0 password level-1
+   authentication key 0 password level-2
+   authentication key-id 1 algorithm sha-1 rfc-5310 key 0 password level-2
    !
    address-family ipv4 unicast
       maximum-paths 4

diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis.cfg
@@ -114,6 +114,7 @@ router isis EVPN_UNDERLAY
    mpls ldp sync default
    timers local-convergence-delay 15000 protected-prefixes
    advertise passive-only
+   authentication mode sha key-id 4
    !
    address-family ipv4 unicast
       maximum-paths 2

diff --git a/...ollections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis-new.yml b/...ollections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis-new.yml
@@ -68,18 +68,48 @@ router_isis:
         enabled: true
         timeout: 10
   authentication:
-    key_id:
-      - id: 2
-        algorithm: sha-512
-        rfc_5310:
+    both:
+      key_type: 0
+      key: password
+      key_id:
+        - id: 2
+          algorithm: sha-512
           key_type: 0
           key: password
-          levels: level-1
-    key_type: 0
-    key: shapass
-    mode:
-      md5:
-        rx_disabled_levels: both
+          rfc_5310: false
+    level_1:
+      key_type: 0
+      key: password
+      mode: md5
+      rx_disabled: true
+      key_id:
+        - id: 1
+          algorithm: sha-1
+          key_type: 0
+          key: password
+          rfc_5310: true
+        - id: 2
+          algorithm: sha-1
+          key_type: 0
+          key: password
+          rfc_5310: true
+    level_2:
+      key_type: 0
+      key: password
+      mode: sha
+      sha:
+        key_id: 2
+      key_id:
+        - id: 1
+          algorithm: sha-1
+          key_type: 0
+          key: password
+          rfc_5310: true
+        - id: 2
+          algorithm: sha-1
+          key_type: 0
+          key: password
+          rfc_5310: true
 
 ### Ethernet Interfaces ###
 ethernet_interfaces:

diff --git a/...le_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis.yml b/...le_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis.yml
@@ -16,6 +16,18 @@ router_isis:
     maximum_paths: 2
   segment_routing_mpls:
     enabled: true
+  authentication:
+    both:
+      mode: sha
+      sha:
+        key_id: 4
+    level_1:
+      mode: md5
+      rx_disabled: true
+    level_2:
+      mode: sha
+      sha:
+        key_id: 2
 
 ### Ethernet Interfaces ###
 ethernet_interfaces:

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