Merge branch 'devel' into fix/eos_designs/schema-default-values

aristanetworks · Nov 7, 2024 · 71771fe · 71771fe
2 parents bee386b + 221cac0
commit 71771fe
Show file tree

Hide file tree

Showing 80 changed files with 1,161 additions and 755 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,6 @@ __pycache__/
 /python-avd/build/
 /python-avd/dist/
 /python-avd/vendor/
-/python-avd/tests/pyavd/artifacts/
 /python-avd/pyavd.egg-info/
 /python-avd/.tox/
 /python-avd/.coverage

diff --git a/ansible_collections/arista/avd/molecule/README.md b/ansible_collections/arista/avd/molecule/README.md
@@ -76,7 +76,7 @@ When you update a template in `eos_cli_config_gen`, you should report a test cas
 
 1. Create or update a file related to updated section under `inventory/host_vars`
 
-2. If the section is new, update the inventory file ([hosts.ini](eos_cli_config_gen/inventory/hosts.ini)) to add a new host. The host SHALL be the name of your section and also the `<filename>.yml` in your `host_vars`
+2. If the section is new, update the inventory file ([hosts.yml](eos_cli_config_gen/inventory/hosts.yml)) to add a new host. The host SHALL be the name of your section and also the `<filename>.yml` in your `host_vars`
 
 3. Run molecule scenario to generate artifacts:
 

diff --git a/...ta/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md b/...ta/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md
@@ -1041,6 +1041,7 @@ interface Ethernet63
 interface Ethernet64
    description DHCP server interface
    no switchport
+   mac timestamp replace-fcs
    ip address 192.168.42.42/24
    dhcp server ipv4
    dhcp server ipv6
@@ -1049,6 +1050,7 @@ interface Ethernet65
    description Multiple VRIDs
    no shutdown
    no switchport
+   mac timestamp header
    ip address 192.0.2.2/25
    ipv6 enable
    ipv6 address 2001:db8::2/64
@@ -1085,6 +1087,7 @@ interface Ethernet67
    description Custom_Transceiver_Frequency
    no shutdown
    switchport
+   mac timestamp before-fcs
    transceiver frequency 190050.000
 !
 interface Ethernet67.1

diff --git a/...sta/avd/molecule/eos_cli_config_gen/documentation/devices/host4_inline_jinja.md b/...sta/avd/molecule/eos_cli_config_gen/documentation/devices/host4_inline_jinja.md
@@ -0,0 +1,53 @@
+# host4_inline_jinja
+
+## Table of Contents
+
+- [Management](#management)
+  - [Management Interfaces](#management-interfaces)
+- [Authentication](#authentication)
+  - [TACACS Servers](#tacacs-servers)
+
+## Management
+
+### Management Interfaces
+
+#### Management Interfaces Summary
+
+##### IPv4
+
+| Management Interface | Description | Type | VRF | IP Address | Gateway |
+| -------------------- | ----------- | ---- | --- | ---------- | ------- |
+| Management1 | OOB_MANAGEMENT | oob | MGMT | 10.73.255.122/24 | 10.73.255.2 |
+
+##### IPv6
+
+| Management Interface | Description | Type | VRF | IPv6 Address | IPv6 Gateway |
+| -------------------- | ----------- | ---- | --- | ------------ | ------------ |
+| Management1 | OOB_MANAGEMENT | oob | MGMT | - | - |
+
+#### Management Interfaces Device Configuration
+
+```eos
+!
+interface Management1
+   description OOB_MANAGEMENT
+   vrf MGMT
+   ip address 10.73.255.122/24
+```
+
+## Authentication
+
+### TACACS Servers
+
+#### TACACS Servers
+
+| VRF | TACACS Servers | Single-Connection | Timeout |
+| --- | -------------- | ----------------- | ------- |
+| default | 10.10.10.158 | False | - |
+
+#### TACACS Servers Device Configuration
+
+```eos
+!
+tacacs-server host 10.10.10.158 key 7 <removed>
+```
diff --git a/...s/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-2.md b/...s/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-2.md
@@ -45,6 +45,12 @@ interface Management1
 | -------- | ----- |
 | Instance | EVPN_UNDERLAY |
 
+#### ISIS Route Timers
+
+| Settings | Value |
+| -------- | ----- |
+| LSP Generation Maximum Interval | 30 seconds |
+
 #### ISIS Interfaces Summary
 
 | Interface | ISIS Instance | ISIS Metric | Interface Mode |
@@ -57,6 +63,7 @@ interface Management1
 router isis EVPN_UNDERLAY
    set-overload-bit
    set-overload-bit on-startup 55
+   timers lsp generation 30
    authentication mode sha key-id 4 rx-disabled
    !
 ```
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
@@ -194,7 +194,6 @@ interface Vlan4094
 | Instance | EVPN_UNDERLAY |
 | Log Adjacency Changes | False |
 | MPLS LDP Sync Default | True |
-| Local Convergence Delay (ms) | 10000 |
 | Advertise Passive-only | True |
 | SR MPLS Enabled | True |
 | SPF Interval | 250 seconds |
@@ -205,6 +204,14 @@ interface Vlan4094
 | Graceful-restart t2 Level-2 | 20 |
 | Graceful-restart Restart-hold-time | 10 |
 
+#### ISIS Route Timers
+
+| Settings | Value |
+| -------- | ----- |
+| Local Convergence Delay | 10000 milliseconds |
+| LSP Generation Maximum Interval | 30 seconds |
+| LSP Generation Initial Wait-time | 40 milliseconds |
+
 #### ISIS Route Redistribution
 
 | Route Type | Route-Map | Include Leaked |
@@ -282,6 +289,7 @@ router isis EVPN_UNDERLAY
    set-overload-bit
    advertise passive-only
    spf-interval 250 seconds 10 milliseconds 20 milliseconds
+   timers lsp generation 30 40
    authentication mode shared-secret profile test1 algorithm md5 level-1
    authentication mode sha key-id 2 level-2
    graceful-restart

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
@@ -281,11 +281,24 @@ interface Vlan4094
 | Type | level-2 |
 | Router-ID | 192.168.255.3 |
 | Log Adjacency Changes | True |
-| Local Convergence Delay (ms) | 15000 |
 | Advertise Passive-only | True |
 | SR MPLS Enabled | False |
 | SPF Interval | 250 seconds |
 
+#### ISIS Route Timers
+
+| Settings | Value |
+| -------- | ----- |
+| Local Convergence Delay | 15000 milliseconds |
+| CSN Packet Transmission Interval | 10 seconds |
+| CSN Packet P2P Links Disabled | True |
+| LSP Generation Maximum Interval | 30 seconds |
+| LSP Generation Initial Wait-time | 40 milliseconds |
+| LSP Generation Wait-time | 50 milliseconds |
+| LSP Out-delay | 20 milliseconds |
+| LSP Refresh Interval | 56 seconds |
+| LSP Minimum Remaining Lifetime | 78 seconds |
+
 #### ISIS Route Redistribution
 
 | Route Type | Route-Map | Include Leaked |
@@ -352,6 +365,12 @@ router isis EVPN_UNDERLAY
    set-overload-bit on-startup wait-for-bgp
    advertise passive-only
    spf-interval 250
+   timers csnp generation interval 10 seconds
+   timers csnp generation p2p disabled
+   timers lsp out-delay 20
+   timers lsp refresh 56
+   timers lsp generation 30 40 50
+   timers lsp min-remaining-lifetime 78
    authentication mode sha key-id 5 rx-disabled level-1
    authentication mode shared-secret profile test2 algorithm md5 rx-disabled level-2
    authentication key 0 password

diff --git a/...llections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ethernet-interfaces.cfg b/...llections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ethernet-interfaces.cfg
@@ -656,6 +656,7 @@ interface Ethernet63
 interface Ethernet64
    description DHCP server interface
    no switchport
+   mac timestamp replace-fcs
    ip address 192.168.42.42/24
    dhcp server ipv4
    dhcp server ipv6
@@ -664,6 +665,7 @@ interface Ethernet65
    description Multiple VRIDs
    no shutdown
    no switchport
+   mac timestamp header
    ip address 192.0.2.2/25
    ipv6 enable
    ipv6 address 2001:db8::2/64
@@ -700,6 +702,7 @@ interface Ethernet67
    description Custom_Transceiver_Frequency
    no shutdown
    switchport
+   mac timestamp before-fcs
    transceiver frequency 190050.000
 !
 interface Ethernet67.1

diff --git a/...ollections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host4_inline_jinja.cfg b/...ollections/arista/avd/molecule/eos_cli_config_gen/intended/configs/host4_inline_jinja.cfg
@@ -0,0 +1,7 @@
+!
+tacacs-server host 10.10.10.158 key 7 071B245F5A
+!
+interface Management1
+   description OOB_MANAGEMENT
+   vrf MGMT
+   ip address 10.73.255.122/24
diff --git a/...ble_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis-2.cfg b/...ble_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis-2.cfg
@@ -7,5 +7,6 @@ interface Management1
 router isis EVPN_UNDERLAY
    set-overload-bit
    set-overload-bit on-startup 55
+   timers lsp generation 30
    authentication mode sha key-id 4 rx-disabled
    !
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
@@ -71,6 +71,7 @@ router isis EVPN_UNDERLAY
    set-overload-bit
    advertise passive-only
    spf-interval 250 seconds 10 milliseconds 20 milliseconds
+   timers lsp generation 30 40
    authentication mode shared-secret profile test1 algorithm md5 level-1
    authentication mode sha key-id 2 level-2
    graceful-restart

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
@@ -108,6 +108,12 @@ router isis EVPN_UNDERLAY
    set-overload-bit on-startup wait-for-bgp
    advertise passive-only
    spf-interval 250
+   timers csnp generation interval 10 seconds
+   timers csnp generation p2p disabled
+   timers lsp out-delay 20
+   timers lsp refresh 56
+   timers lsp generation 30 40 50
+   timers lsp min-remaining-lifetime 78
    authentication mode sha key-id 5 rx-disabled level-1
    authentication mode shared-secret profile test2 algorithm md5 rx-disabled level-2
    authentication key 0 password

diff --git a/...ctions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml b/...ctions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml
@@ -1146,6 +1146,7 @@ ethernet_interfaces:
     ip_address: 192.168.42.42/24
     dhcp_server_ipv4: true
     dhcp_server_ipv6: true
+    mac_timestamp: replace-fcs
 
   - name: Ethernet69
     switchport:
@@ -1163,6 +1164,7 @@ ethernet_interfaces:
     ipv6_enable: true
     ipv6_address: 2001:db8::2/64
     ipv6_address_link_local: fe80::2/64
+    mac_timestamp: header
     vrrp_ids:
       - id: 1
         priority_level: 105
@@ -1236,6 +1238,7 @@ ethernet_interfaces:
     shutdown: false
     transceiver:
       frequency: 190050
+    mac_timestamp: before-fcs
 
   - name: Ethernet67.1
     description: Test_encapsulation_dot1q

diff --git a/...tions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/tacacs-servers.yml b/...tions/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/host1/tacacs-servers.yml
@@ -14,8 +14,7 @@ tacacs_servers:
       single_connection: false
     - host: 10.10.10.158
       vrf: default
-      # Testing of play_vars in eos_cli_config_gen
-      key: "{{ tacacs_key_set_as_play_var }}"
+      key: 071B245F5A
       key_type: 7
     - host: 10.10.10.159
       vrf: default

diff --git a/...avd/molecule/eos_cli_config_gen/inventory/host_vars/host4_inline_jinja/tacacs-servers.yml b/...avd/molecule/eos_cli_config_gen/inventory/host_vars/host4_inline_jinja/tacacs-servers.yml
@@ -0,0 +1,9 @@
+---
+## Tacacs+ Servers
+tacacs_servers:
+  hosts:
+    - host: 10.10.10.158
+      vrf: default
+      # Testing of play_vars in eos_cli_config_gen
+      key: "{{ tacacs_key_set_as_play_var }}"
+      key_type: 7
diff --git a/..._collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis-2.yml b/..._collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis-2.yml
@@ -4,6 +4,10 @@ router_isis:
     enabled: true
     on_startup:
       delay: 55
+  timers:
+    lsp:
+      generation:
+        interval: 30
   authentication:
     both:
       key_type: 0

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
@@ -17,6 +17,10 @@ router_isis:
   timers:
     local_convergence:
       protected_prefixes: true
+    lsp:
+      generation:
+        interval: 30
+        initial_wait_time: 40
   advertise:
     passive_only: true
   redistribute_routes:

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
@@ -14,6 +14,18 @@ router_isis:
     local_convergence:
       protected_prefixes: true
       delay: 15000
+    csnp:
+      generation:
+        interval: 10
+        p2p_disabled: true
+    lsp:
+      out_delay: 20
+      refresh_interval: 56
+      generation:
+        interval: 30
+        initial_wait_time: 40
+        wait_time: 50
+      min_remaining_lifetime: 78
   advertise:
     passive_only: true
   redistribute_routes: