From 95ada21ed40a1291bc48101c2cfc65d68da49810 Mon Sep 17 00:00:00 2001 From: Vibhu-gslab Date: Fri, 26 Jul 2024 21:21:31 +0530 Subject: [PATCH] improving the coverage --- .../documentation/devices/router-isis-2.md | 1 - .../documentation/devices/router-isis-3.md | 2 -- .../documentation/devices/router-isis-new.md | 4 --- .../documentation/devices/router-isis.md | 26 +++++++++++++++++-- .../intended/configs/router-isis-2.cfg | 1 - .../intended/configs/router-isis-3.cfg | 2 -- .../intended/configs/router-isis-new.cfg | 2 -- .../intended/configs/router-isis.cfg | 8 +++++- .../inventory/host_vars/router-isis-2.yml | 1 - .../inventory/host_vars/router-isis-3.yml | 14 ---------- .../inventory/host_vars/router-isis-new.yml | 10 +++++-- .../inventory/host_vars/router-isis.yml | 18 ++++++++++++- .../eos_cli_config_gen/inventory/hosts.ini | 1 - 13 files changed, 56 insertions(+), 34 deletions(-) delete mode 100644 ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis-3.yml diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-2.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-2.md index d838523a310..7d2e94afa4a 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-2.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-2.md @@ -58,6 +58,5 @@ router isis EVPN_UNDERLAY set-overload-bit set-overload-bit on-startup 55 authentication mode sha key-id 4 rx-disabled - authentication key 0 password ! ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-3.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-3.md index 810cdf7c3b1..fa0c9446f89 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-3.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-3.md @@ -55,7 +55,5 @@ interface Management1 ```eos ! router isis EVPN_UNDERLAY - authentication mode sha key-id 4 rx-disabled level-1 - authentication key 0 password level-1 ! ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-new.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-new.md index cf38202f8bd..1fdaf58abd8 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-new.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis-new.md @@ -260,8 +260,6 @@ interface Vlan4094 | Settings | Value | | -------- | ----- | | IPv6 Address-family Enabled | True | -| Maximum-paths | 4 | -| BFD All-interfaces | True | | TI-LFA Mode | node-protection | | TI-LFA Level | level-1 | | TI-LFA SRLG Enabled | True | @@ -308,8 +306,6 @@ router isis EVPN_UNDERLAY fast-reroute ti-lfa srlg strict ! address-family ipv6 unicast - maximum-paths 4 - bfd all-interfaces fast-reroute ti-lfa mode node-protection level-1 fast-reroute ti-lfa srlg strict ! diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis.md index 91dcc1bfc71..f59b2187dba 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/router-isis.md @@ -321,7 +321,23 @@ interface Vlan4094 | Settings | Value | | -------- | ----- | | IPv4 Address-family Enabled | True | -| Maximum-paths | 2 | +| TI-LFA Mode | node-protection | +| TI-LFA Level | level-2 | +| TI-LFA SRLG Enabled | True | + +#### Tunnel Source + +| Source Protocol | RCF | +| --------------- | --- | +| BGP Labeled-Unicast | - | + +#### ISIS IPv6 Address Family Summary + +| Settings | Value | +| -------- | ----- | +| IPv6 Address-family Enabled | True | +| BFD All-interfaces | True | +| TI-LFA SRLG Enabled | True | #### Router ISIS Device Configuration @@ -342,7 +358,13 @@ router isis EVPN_UNDERLAY authentication key 0 password ! address-family ipv4 unicast - maximum-paths 2 + tunnel source-protocol bgp ipv4 labeled-unicast + fast-reroute ti-lfa mode node-protection level-2 + fast-reroute ti-lfa srlg + ! + address-family ipv6 unicast + bfd all-interfaces + fast-reroute ti-lfa srlg ! segment-routing mpls shutdown diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis-2.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis-2.cfg index 42d17731636..efd8c8cd42f 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis-2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis-2.cfg @@ -16,7 +16,6 @@ router isis EVPN_UNDERLAY set-overload-bit set-overload-bit on-startup 55 authentication mode sha key-id 4 rx-disabled - authentication key 0 password ! ! end diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis-3.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis-3.cfg index f8b038af2cd..493647ec917 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis-3.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis-3.cfg @@ -13,8 +13,6 @@ interface Management1 ip address 10.73.255.122/24 ! router isis EVPN_UNDERLAY - authentication mode sha key-id 4 rx-disabled level-1 - authentication key 0 password level-1 ! ! end diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis-new.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis-new.cfg index b60b152c85d..595b8860a16 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis-new.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/router-isis-new.cfg @@ -102,8 +102,6 @@ router isis EVPN_UNDERLAY fast-reroute ti-lfa srlg strict ! address-family ipv6 unicast - maximum-paths 4 - bfd all-interfaces fast-reroute ti-lfa mode node-protection level-1 fast-reroute ti-lfa srlg strict ! 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 index 463db5e7f8a..2c2e9317881 100644 --- 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 @@ -121,7 +121,13 @@ router isis EVPN_UNDERLAY authentication key 0 password ! address-family ipv4 unicast - maximum-paths 2 + tunnel source-protocol bgp ipv4 labeled-unicast + fast-reroute ti-lfa mode node-protection level-2 + fast-reroute ti-lfa srlg + ! + address-family ipv6 unicast + bfd all-interfaces + fast-reroute ti-lfa srlg ! segment-routing mpls shutdown diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis-2.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis-2.yml index 79add6034d1..d009055aef4 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis-2.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis-2.yml @@ -7,7 +7,6 @@ router_isis: authentication: both: key_type: 0 - key: password mode: sha sha: key_id: 4 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis-3.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis-3.yml deleted file mode 100644 index 470e6cf36b5..00000000000 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis-3.yml +++ /dev/null @@ -1,14 +0,0 @@ -router_isis: - instance: EVPN_UNDERLAY - # set_overload_bit: - # enabled: true - # on_startup: - # delay: 55 - authentication: - level_1: - key_type: 0 - key: password - mode: sha - sha: - key_id: 4 - rx_disabled: true diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis-new.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis-new.yml index a888b073257..8fbec56fbc4 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis-new.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis-new.yml @@ -52,8 +52,6 @@ router_isis: enabled: True rcf: lu_2_sr_pfx() address_family_ipv6: - maximum_paths: 4 - bfd_all_interfaces: true fast_reroute_ti_lfa: mode: node-protection level: level-1 @@ -104,6 +102,10 @@ router_isis: key_type: 0 key: password rfc_5310: true + - id: 3 + algorithm: sha-1 + key_type: 0 + key: password3 level_2: key_type: 0 key: password @@ -121,6 +123,10 @@ router_isis: key_type: 0 key: password rfc_5310: true + - id: 3 + algorithm: sha-1 + key_type: 0 + key: password2 ### Ethernet Interfaces ### ethernet_interfaces: diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis.yml index 1653bee1bc2..82832dde5f1 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-isis.yml @@ -8,6 +8,8 @@ router_isis: mpls_ldp_sync_default: false spf_interval: interval: 250 + graceful_restart: + enabled: false timers: local_convergence: protected_prefixes: true @@ -18,7 +20,21 @@ router_isis: - source_protocol: bgp route_map: RM-BGP address_family_ipv4: - maximum_paths: 2 + tunnel_source_labeled_unicast: + enabled: True + fast_reroute_ti_lfa: + mode: node-protection + level: level-2 + srlg: + enable: true + strict: false + address_family_ipv6: + bfd_all_interfaces: true + fast_reroute_ti_lfa: + level: level-2 + srlg: + enable: true + strict: false segment_routing_mpls: enabled: false prefix_segments: diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini index 8b365fc31e3..21d7c21744d 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/hosts.ini @@ -146,7 +146,6 @@ router-isis router-isis-new router-isis-1 router-isis-2 -router-isis-3 router-l2-vpn router-msdp router-multicast