Feat(eos_cli_config_gen): Add support for LSP and CSNP timers under r…

…outer_isis (aristanetworks#4619)
bjmeuer · Nov 7, 2024 · 8502431 · 8502431
1 parent f21aa4a
commit 8502431
Show file tree

Hide file tree

Showing 35 changed files with 397 additions and 48 deletions.
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/...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/..._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:

diff --git a/...ons/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1A.md b/...ons/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1A.md
@@ -690,9 +690,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP VLAN Aware Bundles
 

diff --git a/...ons/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1B.md b/...ons/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1B.md
@@ -690,9 +690,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP VLAN Aware Bundles
 

diff --git a/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF1A.md b/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF1A.md
@@ -566,9 +566,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP VLAN Aware Bundles
 

diff --git a/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2A.md b/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2A.md
@@ -920,9 +920,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP VLAN Aware Bundles
 

diff --git a/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2B.md b/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2B.md
@@ -920,9 +920,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP VLAN Aware Bundles
 

diff --git a/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE1.md b/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE1.md
@@ -420,9 +420,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP Device Configuration
 

diff --git a/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE2.md b/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE2.md
@@ -420,9 +420,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP Device Configuration
 

diff --git a/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE3.md b/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE3.md
@@ -420,9 +420,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP Device Configuration
 

diff --git a/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE4.md b/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE4.md
@@ -420,9 +420,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP Device Configuration
 

diff --git a/...ns/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md b/...ns/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md
@@ -1040,9 +1040,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP VLAN Aware Bundles
 

diff --git a/...ns/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3B.md b/...ns/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3B.md
@@ -1013,9 +1013,9 @@ ASN Notation: asplain
 
 ##### EVPN Peer Groups
 
-| Peer Group | Activate | Encapsulation |
-| ---------- | -------- | ------------- |
-| EVPN-OVERLAY-PEERS | True | default |
+| Peer Group | Activate | Route-map In | Route-map Out | Encapsulation |
+| ---------- | -------- | ------------ | ------------- | ------------- |
+| EVPN-OVERLAY-PEERS | True |  - | - | default |
 
 #### Router BGP VLAN Aware Bundles
 

diff --git a/...a/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER1.md b/...a/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER1.md
@@ -560,10 +560,15 @@ router ospf 19 vrf TENANT_B_INTRA
 | Router-ID | 100.70.0.5 |
 | Log Adjacency Changes | True |
 | MPLS LDP Sync Default | True |
-| Local Convergence Delay (ms) | 15000 |
 | Advertise Passive-only | True |
 | SR MPLS Enabled | True |
 
+#### ISIS Route Timers
+
+| Settings | Value |
+| -------- | ----- |
+| Local Convergence Delay | 15000 milliseconds |
+
 #### ISIS Interfaces Summary
 
 | Interface | ISIS Instance | ISIS Metric | Interface Mode |

diff --git a/...a/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER2.md b/...a/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LER2.md
@@ -525,10 +525,15 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5
 | Router-ID | 100.70.0.6 |
 | Log Adjacency Changes | True |
 | MPLS LDP Sync Default | True |
-| Local Convergence Delay (ms) | 15000 |
 | Advertise Passive-only | True |
 | SR MPLS Enabled | True |
 
+#### ISIS Route Timers
+
+| Settings | Value |
+| -------- | ----- |
+| Local Convergence Delay | 15000 milliseconds |
+
 #### ISIS Interfaces Summary
 
 | Interface | ISIS Instance | ISIS Metric | Interface Mode |

diff --git a/...a/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LSR1.md b/...a/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LSR1.md
@@ -333,10 +333,15 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5
 | Router-ID | 100.70.0.1 |
 | Log Adjacency Changes | True |
 | MPLS LDP Sync Default | True |
-| Local Convergence Delay (ms) | 15000 |
 | Advertise Passive-only | True |
 | SR MPLS Enabled | True |
 
+#### ISIS Route Timers
+
+| Settings | Value |
+| -------- | ----- |
+| Local Convergence Delay | 15000 milliseconds |
+
 #### ISIS Interfaces Summary
 
 | Interface | ISIS Instance | ISIS Metric | Interface Mode |

diff --git a/...a/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LSR2.md b/...a/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-LSR2.md
@@ -309,10 +309,15 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5
 | Router-ID | 100.70.0.2 |
 | Log Adjacency Changes | True |
 | MPLS LDP Sync Default | True |
-| Local Convergence Delay (ms) | 15000 |
 | Advertise Passive-only | True |
 | SR MPLS Enabled | True |
 
+#### ISIS Route Timers
+
+| Settings | Value |
+| -------- | ----- |
+| Local Convergence Delay | 15000 milliseconds |
+
 #### ISIS Interfaces Summary
 
 | Interface | ISIS Instance | ISIS Metric | Interface Mode |

diff --git a/...ta/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-RR1.md b/...ta/avd/molecule/eos_designs-mpls-isis-sr-ldp/documentation/devices/SITE1-RR1.md
@@ -288,10 +288,15 @@ ip route vrf MGMT 0.0.0.0/0 192.168.200.5
 | Router-ID | 100.70.0.8 |
 | Log Adjacency Changes | True |
 | MPLS LDP Sync Default | True |
-| Local Convergence Delay (ms) | 15000 |
 | Advertise Passive-only | True |
 | SR MPLS Enabled | True |
 
+#### ISIS Route Timers
+
+| Settings | Value |
+| -------- | ----- |
+| Local Convergence Delay | 15000 milliseconds |
+
 #### ISIS Interfaces Summary
 
 | Interface | ISIS Instance | ISIS Metric | Interface Mode |