isisd: add isis flex-algo lsp advertisement

[mirror_frr.git] / isisd / isis_lsp.c

diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index 08fa845e8e558f46eee6ebccce0d44febb17dd04..c07083a06da0b5db7f9abac28b543106634b6e2a 100644 (file)
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -46,6 +46,7 @@
 #include "isisd/fabricd.h"
 #include "isisd/isis_tx_queue.h"
 #include "isisd/isis_nb.h"
+#include "isisd/isis_flex_algo.h"
 
 DEFINE_MTYPE_STATIC(ISISD, ISIS_LSP, "ISIS LSP");
 
@@ -898,9 +899,15 @@ static void lsp_build_internal_reach_ipv4(struct isis_lsp *lsp,
                          area->area_tag, ipv4);
 
                if (area->srdb.enabled)
-                       for (int i = 0; i < SR_ALGORITHM_COUNT; i++)
+                       for (int i = 0; i < SR_ALGORITHM_COUNT; i++) {
+#ifndef FABRICD
+                               if (flex_algo_id_valid(i) &&
+                                   !isis_flex_algo_elected_supported(i, area))
+                                       continue;
+#endif /* ifndef FABRICD */
                                pcfgs[i] =
                                        isis_sr_cfg_prefix_find(area, ipv4, i);
+                       }
 
                isis_tlvs_add_extended_ip_reach(lsp->tlvs, ipv4, metric, false,
                                                pcfgs);
@@ -918,8 +925,14 @@ static void lsp_build_internal_reach_ipv6(struct isis_lsp *lsp,
                  area->area_tag, ipv6);
 
        if (area->srdb.enabled)
-               for (int i = 0; i < SR_ALGORITHM_COUNT; i++)
+               for (int i = 0; i < SR_ALGORITHM_COUNT; i++) {
+#ifndef FABRICD
+                       if (flex_algo_id_valid(i) &&
+                           !isis_flex_algo_elected_supported(i, area))
+                               continue;
+#endif /* ifndef FABRICD */
                        pcfgs[i] = isis_sr_cfg_prefix_find(area, ipv6, i);
+               }
 
        isis_tlvs_add_ipv6_reach(lsp->tlvs, isis_area_ipv6_topology(area), ipv6,
                                 metric, false, pcfgs);
@@ -955,9 +968,16 @@ static void lsp_build_ext_reach_ipv4(struct isis_lsp *lsp,
                                NULL};
 
                        if (area->srdb.enabled)
-                               for (int i = 0; i < SR_ALGORITHM_COUNT; i++)
+                               for (int i = 0; i < SR_ALGORITHM_COUNT; i++) {
+#ifndef FABRICD
+                                       if (flex_algo_id_valid(i) &&
+                                           !isis_flex_algo_elected_supported(
+                                                   i, area))
+                                               continue;
+#endif /* ifndef FABRICD */
                                        pcfgs[i] = isis_sr_cfg_prefix_find(
                                                area, ipv4, i);
+                               }
 
                        isis_tlvs_add_extended_ip_reach(lsp->tlvs, ipv4, metric,
                                                        true, pcfgs);
@@ -992,9 +1012,16 @@ static void lsp_build_ext_reach_ipv6(struct isis_lsp *lsp,
                                NULL};
 
                        if (area->srdb.enabled)
-                               for (int i = 0; i < SR_ALGORITHM_COUNT; i++)
+                               for (int i = 0; i < SR_ALGORITHM_COUNT; i++) {
+#ifndef FABRICD
+                                       if (flex_algo_id_valid(i) &&
+                                           !isis_flex_algo_elected_supported(
+                                                   i, area))
+                                               continue;
+#endif /* ifndef FABRICD */
                                        pcfgs[i] = isis_sr_cfg_prefix_find(
                                                area, p, i);
+                               }
 
                        isis_tlvs_add_ipv6_reach(lsp->tlvs,
                                                 isis_area_ipv6_topology(area),
@@ -1115,13 +1142,30 @@ static void lsp_build(struct isis_lsp *lsp, struct isis_area *area)
 
        /* Add Router Capability TLV. */
        if (area->isis->router_id != 0) {
-               struct isis_router_cap cap = {};
+               struct isis_router_cap *rcap;
+#ifndef FABRICD
+               struct isis_router_cap_fad *rcap_fad;
+               struct listnode *node;
+               struct flex_algo *fa;
+#endif /* ifndef FABRICD */
 
-               /* init SR algo list content to the default value */
-               for (int i = 0; i < SR_ALGORITHM_COUNT; i++)
-                       cap.algo[i] = SR_ALGORITHM_UNSET;
+               rcap = isis_tlvs_init_router_capability(lsp->tlvs);
 
-               cap.router_id.s_addr = area->isis->router_id;
+               rcap->router_id.s_addr = area->isis->router_id;
+
+#ifndef FABRICD
+               /* Set flex-algo definitions */
+               for (ALL_LIST_ELEMENTS_RO(area->flex_algos->flex_algos, node,
+                                         fa)) {
+                       if (!fa->advertise_definition)
+                               continue;
+                       lsp_debug("ISIS (%s):   Flex-Algo Definition %u",
+                                 area->area_tag, fa->algorithm);
+                       isis_tlvs_set_router_capability_fad(lsp->tlvs, fa,
+                                                           fa->algorithm,
+                                                           area->isis->sysid);
+               }
+#endif /* ifndef FABRICD */
 
                /* Add SR Sub-TLVs if SR is enabled. */
                if (area->srdb.enabled) {
@@ -1131,26 +1175,38 @@ static void lsp_build(struct isis_lsp *lsp, struct isis_area *area)
                        /* SRGB first */
                        range_size = srdb->config.srgb_upper_bound
                                     - srdb->config.srgb_lower_bound + 1;
-                       cap.srgb.flags = ISIS_SUBTLV_SRGB_FLAG_I
-                                        | ISIS_SUBTLV_SRGB_FLAG_V;
-                       cap.srgb.range_size = range_size;
-                       cap.srgb.lower_bound = srdb->config.srgb_lower_bound;
+                       rcap->srgb.flags = ISIS_SUBTLV_SRGB_FLAG_I |
+                                          ISIS_SUBTLV_SRGB_FLAG_V;
+                       rcap->srgb.range_size = range_size;
+                       rcap->srgb.lower_bound = srdb->config.srgb_lower_bound;
                        /* Then Algorithm */
-                       cap.algo[0] = SR_ALGORITHM_SPF;
-                       cap.algo[1] = SR_ALGORITHM_UNSET;
+                       rcap->algo[0] = SR_ALGORITHM_SPF;
+                       rcap->algo[1] = SR_ALGORITHM_UNSET;
+#ifndef FABRICD
+                       for (ALL_LIST_ELEMENTS_RO(area->flex_algos->flex_algos,
+                                                 node, fa)) {
+                               if (fa->advertise_definition)
+                                       rcap_fad = rcap->fads[fa->algorithm];
+                               else
+                                       rcap_fad = NULL;
+
+                               if (!isis_flex_algo_elected_supported_local_fad(
+                                           fa->algorithm, area, &rcap_fad))
+                                       continue;
+                               lsp_debug("ISIS (%s):   SR Algorithm %u",
+                                         area->area_tag, fa->algorithm);
+                               rcap->algo[fa->algorithm] = fa->algorithm;
+                       }
+#endif /* ifndef FABRICD */
                        /* SRLB */
-                       cap.srlb.flags = 0;
+                       rcap->srlb.flags = 0;
                        range_size = srdb->config.srlb_upper_bound
                                     - srdb->config.srlb_lower_bound + 1;
-                       cap.srlb.range_size = range_size;
-                       cap.srlb.lower_bound = srdb->config.srlb_lower_bound;
+                       rcap->srlb.range_size = range_size;
+                       rcap->srlb.lower_bound = srdb->config.srlb_lower_bound;
                        /* And finally MSD */
-                       cap.msd = srdb->config.msd;
+                       rcap->msd = srdb->config.msd;
                }
-
-               isis_tlvs_set_router_capability(lsp->tlvs, &cap);
-               lsp_debug("ISIS (%s): Adding Router Capabilities information",
-                         area->area_tag);
        }
 
        /* IPv4 address and TE router ID TLVs.