Adding bfd all-interfaces to router_isis.address_family ipv4 and ipv6

aristanetworks · Jan 24, 2024 · 3630d55 · 3630d55
1 parent eba6c14
commit 3630d55
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 0 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
@@ -281,11 +281,13 @@ router isis EVPN_UNDERLAY
    address-family ipv4 unicast
       maximum-paths 4
       tunnel source-protocol bgp ipv4 labeled-unicast rcf lu_2_sr_pfx()
+      bfd all-interfaces
       fast-reroute ti-lfa mode link-protection level-2
       fast-reroute ti-lfa srlg strict
    !
    address-family ipv6 unicast
       maximum-paths 4
+      bfd all-interfaces
       fast-reroute ti-lfa mode node-protection
       fast-reroute ti-lfa srlg
    !

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
@@ -87,11 +87,13 @@ router isis EVPN_UNDERLAY
    address-family ipv4 unicast
       maximum-paths 4
       tunnel source-protocol bgp ipv4 labeled-unicast rcf lu_2_sr_pfx()
+      bfd all-interfaces
       fast-reroute ti-lfa mode link-protection level-2
       fast-reroute ti-lfa srlg strict
    !
    address-family ipv6 unicast
       maximum-paths 4
+      bfd all-interfaces
       fast-reroute ti-lfa mode node-protection
       fast-reroute ti-lfa srlg
    !

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
@@ -38,6 +38,7 @@ router_isis:
       route_map: RM-OSPF-NSSA_EXT-TO-ISIS
   address_family_ipv4:
     maximum_paths: 4
+    bfd_all_interfaces: true
     fast_reroute_ti_lfa:
       mode: link-protection
       level: level-2
@@ -49,6 +50,7 @@ router_isis:
       rcf: lu_2_sr_pfx()
   address_family_ipv6:
     maximum_paths: 4
+    bfd_all_interfaces: true
     fast_reroute_ti_lfa:
       mode: node-protection
       srlg:

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
@@ -32,6 +32,7 @@
     | [<samp>&nbsp;&nbsp;address_family_ipv4</samp>](## "router_isis.address_family_ipv4") | Dictionary |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;enabled</samp>](## "router_isis.address_family_ipv4.enabled") | Boolean |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;maximum_paths</samp>](## "router_isis.address_family_ipv4.maximum_paths") | Integer |  |  | Min: 1<br>Max: 128 |  |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;bfd_all_interfaces</samp>](## "router_isis.address_family_ipv4.bfd_all_interfaces") | Boolean |  |  |  | Enable BFD on all interfaces |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;fast_reroute_ti_lfa</samp>](## "router_isis.address_family_ipv4.fast_reroute_ti_lfa") | Dictionary |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;mode</samp>](## "router_isis.address_family_ipv4.fast_reroute_ti_lfa.mode") | String |  |  | Valid Values:<br>- <code>link-protection</code><br>- <code>node-protection</code> |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;level</samp>](## "router_isis.address_family_ipv4.fast_reroute_ti_lfa.level") | String |  |  | Valid Values:<br>- <code>level-1</code><br>- <code>level-2</code> |  |
@@ -44,6 +45,7 @@
     | [<samp>&nbsp;&nbsp;address_family_ipv6</samp>](## "router_isis.address_family_ipv6") | Dictionary |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;enabled</samp>](## "router_isis.address_family_ipv6.enabled") | Boolean |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;maximum_paths</samp>](## "router_isis.address_family_ipv6.maximum_paths") | Integer |  |  | Min: 1<br>Max: 128 |  |
+    | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;bfd_all_interfaces</samp>](## "router_isis.address_family_ipv6.bfd_all_interfaces") | Boolean |  |  |  | Enable BFD on all interfaces |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;fast_reroute_ti_lfa</samp>](## "router_isis.address_family_ipv6.fast_reroute_ti_lfa") | Dictionary |  |  |  |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;mode</samp>](## "router_isis.address_family_ipv6.fast_reroute_ti_lfa.mode") | String |  |  | Valid Values:<br>- <code>link-protection</code><br>- <code>node-protection</code> |  |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;level</samp>](## "router_isis.address_family_ipv6.fast_reroute_ti_lfa.level") | String |  |  | Valid Values:<br>- <code>level-1</code><br>- <code>level-2</code> | Optional, default is to protect all levels |
@@ -118,6 +120,9 @@
       address_family_ipv4:
         enabled: <bool>
         maximum_paths: <int; 1-128>
+
+        # Enable BFD on all interfaces
+        bfd_all_interfaces: <bool>
         fast_reroute_ti_lfa:
           mode: <str; "link-protection" | "node-protection">
           level: <str; "level-1" | "level-2">
@@ -134,6 +139,9 @@
       address_family_ipv6:
         enabled: <bool>
         maximum_paths: <int; 1-128>
+
+        # Enable BFD on all interfaces
+        bfd_all_interfaces: <bool>
         fast_reroute_ti_lfa:
           mode: <str; "link-protection" | "node-protection">
 

diff --git a/...ollections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json b/...ollections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json
diff --git a/...ble_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml b/...ble_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml
diff --git a/...tions/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/router_isis.schema.yml b/...tions/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/router_isis.schema.yml
@@ -112,6 +112,9 @@ keys:
               - "str"
             min: 1
             max: 128
+          bfd_all_interfaces:
+            type: bool
+            description: Enable BFD on all interfaces
           fast_reroute_ti_lfa:
             type: dict
             keys:
@@ -152,6 +155,9 @@ keys:
               - "str"
             min: 1
             max: 128
+          bfd_all_interfaces:
+            type: bool
+            description: Enable BFD on all interfaces
           fast_reroute_ti_lfa:
             type: dict
             keys:

diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/router-isis.j2 b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/router-isis.j2
@@ -113,6 +113,9 @@ router isis {{ router_isis.instance }}
 {%             endif %}
       {{ lu_cli }}
 {%         endif %}
+{%         if router_isis.address_family_ipv4.bfd_all_interfaces is arista.avd.defined(true) %}
+      bfd all-interfaces
+{%         endif %}
 {%         if router_isis.address_family_ipv4.fast_reroute_ti_lfa.mode is arista.avd.defined %}
 {%             set ti_lfa_cli = "fast-reroute ti-lfa mode " ~ router_isis.address_family_ipv4.fast_reroute_ti_lfa.mode %}
 {%             if router_isis.address_family_ipv4.fast_reroute_ti_lfa.level is arista.avd.defined %}
@@ -134,6 +137,9 @@ router isis {{ router_isis.instance }}
 {%         if router_isis.address_family_ipv6.maximum_paths is arista.avd.defined %}
       maximum-paths {{ router_isis.address_family_ipv6.maximum_paths }}
 {%         endif %}
+{%         if router_isis.address_family_ipv4.bfd_all_interfaces is arista.avd.defined(true) %}
+      bfd all-interfaces
+{%         endif %}
 {%         if router_isis.address_family_ipv6.fast_reroute_ti_lfa.mode is arista.avd.defined %}
 {%             set ti_lfa_cli = "fast-reroute ti-lfa mode " ~ router_isis.address_family_ipv6.fast_reroute_ti_lfa.mode %}
 {%             if router_isis.address_family_ipv6.fast_reroute_ti_lfa.level is arista.avd.defined %}