]> git.puffer.fish Git - matthieu/frr.git/commitdiff
projects / matthieu / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e83a526)
isisd: fix metric calculation of classic lfa backup prefixes
authorLouis Scalbert <louis.scalbert@6wind.com>
Thu, 14 Apr 2022 13:32:17 +0000 (15:32 +0200)
committerLouis Scalbert <louis.scalbert@6wind.com>
Tue, 24 May 2022 08:06:05 +0000 (10:06 +0200)
The isis-lfa-topo1 topotest shows backup routes with lower metrics than
the primary ones.

> rt1# show isis route
> Area 1:
> IS-IS L1 IPv6 routing table:
>
>  Prefix                Metric  Interface  Nexthop                    Label(s)
>  ------------------------------------------------------------------------------
>  2001:db8:1000::1/128  0       -          -                          -
>  2001:db8:1000::2/128  20      eth-rt2    fe80::d091:eeff:fe09:31cd  -
>  2001:db8:1000::3/128  20      eth-rt3    fe80::946b:d4ff:fe5b:414b  -
>  2001:db8:1000::4/128  20      eth-rt4    fe80::5ced:29ff:feed:59c4  -
> (...)
>
> rt1# show isis route backup
> Area 1:
> IS-IS L1 IPv6 routing table:
>
>  Prefix                Metric  Interface  Nexthop                    Label(s)
>  ------------------------------------------------------------------------------
>  2001:db8:1000::2/128  15      eth-rt3    fe80::946b:d4ff:fe5b:414b  -
>                                eth-rt5    fe80::847d:feff:fe74:bdde  -
>                                eth-rt6    fe80::ac8c:dff:feac:8a8d   -
>  2001:db8:1000::3/128  15      eth-rt2    fe80::d091:eeff:fe09:31cd  -
>                                eth-rt5    fe80::847d:feff:fe74:bdde  -
>  2001:db8:1000::4/128  45      eth-rt5    fe80::847d:feff:fe74:bdde  -
> (...)

Backup routes metrics are incorrect because they only take into account
the path metric but not the prefix metric.

Add the prefix metric to the path metric on backup routes.

After the patch with a prefix metric of 10:

> rt1# show isis route backup
> Area 1:
> IS-IS L1 IPv6 routing table:
>
> Area 1:
> IS-IS L1 IPv6 routing table:
>
>  Prefix                Metric  Interface  Nexthop                    Label(s)
>  ------------------------------------------------------------------------------
>  2001:db8:1000::2/128  25      eth-rt3    fe80::8c6f:8aff:fe10:ad0d  -
>                                eth-rt5    fe80::b08e:5cff:fe90:62dd  -
>                                eth-rt6    fe80::4810:47ff:fe81:2b9a  -
>  2001:db8:1000::3/128  25      eth-rt2    fe80::e855:12ff:fe31:5765  -
>                                eth-rt5    fe80::b08e:5cff:fe90:62dd  -
>  2001:db8:1000::4/128  55      eth-rt5    fe80::b08e:5cff:fe90:62dd  -

Fixes: e886416f81 ("isisd: add support for classic LFA (RFC 5286)")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
isisd/isis_lfa.c patch | blob | history
tests/isisd/test_isis_spf.refout patch | blob | history

diff --git a/isisd/isis_lfa.c b/isisd/isis_lfa.c
index 800cac8521e99c1094567a72139bc65939f15802..b348c876d3022c846028045ed01d5ff32ba27eaf 100644 (file)
--- a/isisd/isis_lfa.c
+++ b/isisd/isis_lfa.c
@@ -1836,7 +1836,7 @@ static bool clfa_loop_free_check(struct isis_spftree *spftree,
                                 struct isis_vertex *vertex_S_D,
                                 struct isis_spf_adj *sadj_primary,
                                 struct isis_spf_adj *sadj_N,
-                                uint32_t *lfa_metric)
+                                uint32_t *path_metric)
 {
        struct isis_spf_node *node_N;
        uint32_t dist_N_D;
@@ -1882,7 +1882,7 @@ static bool clfa_loop_free_check(struct isis_spftree *spftree,
                           dist_N_S, dist_S_D);
 
        if (dist_N_D < (dist_N_S + dist_S_D)) {
-               *lfa_metric = sadj_N->metric + dist_N_D;
+               *path_metric = sadj_N->metric + dist_N_D;
                return true;
        }
 
@@ -2082,7 +2082,7 @@ void isis_lfa_compute(struct isis_area *area, struct isis_circuit *circuit,
                      struct isis_spftree *spftree,
                      struct lfa_protected_resource *resource)
 {
-       struct isis_vertex *vertex;
+       struct isis_vertex *vertex, *parent_vertex;
        struct listnode *vnode, *snode;
        int level = spftree->level;
 
@@ -2099,7 +2099,7 @@ void isis_lfa_compute(struct isis_area *area, struct isis_circuit *circuit,
                struct isis_vertex_adj *vadj_primary;
                struct isis_spf_adj *sadj_primary;
                bool allow_ecmp;
-               uint32_t best_metric = UINT32_MAX;
+               uint32_t prefix_metric, best_metric = UINT32_MAX;
                char buf[VID2STR_BUFFER];
 
                if (!VTYPE_IP(vertex->type))
@@ -2133,6 +2133,9 @@ void isis_lfa_compute(struct isis_area *area, struct isis_circuit *circuit,
                vadj_primary = listnode_head(vertex->Adj_N);
                sadj_primary = vadj_primary->sadj;
 
+               parent_vertex = listnode_head(vertex->parents);
+               prefix_metric = vertex->d_N - parent_vertex->d_N;
+
                /*
                 * Loop over list of SPF adjacencies and compute a list of
                 * preliminary LFAs.
@@ -2140,7 +2143,7 @@ void isis_lfa_compute(struct isis_area *area, struct isis_circuit *circuit,
                lfa_list = list_new();
                lfa_list->del = isis_vertex_adj_free;
                for (ALL_LIST_ELEMENTS_RO(spftree->sadj_list, snode, sadj_N)) {
-                       uint32_t lfa_metric;
+                       uint32_t lfa_metric, path_metric;
                        struct isis_vertex_adj *lfa;
                        struct isis_prefix_sid *psid = NULL;
                        bool last_hop = false;
@@ -2190,7 +2193,7 @@ void isis_lfa_compute(struct isis_area *area, struct isis_circuit *circuit,
 
                        /* Check loop-free criterion. */
                        if (!clfa_loop_free_check(spftree, vertex, sadj_primary,
-                                                 sadj_N, &lfa_metric)) {
+                                                 sadj_N, &path_metric)) {
                                if (IS_DEBUG_LFA)
                                        zlog_debug(
                                                "ISIS-LFA: LFA condition not met for %s",
@@ -2198,6 +2201,7 @@ void isis_lfa_compute(struct isis_area *area, struct isis_circuit *circuit,
                                continue;
                        }
 
+                       lfa_metric = path_metric + prefix_metric;
                        if (lfa_metric < best_metric)
                                best_metric = lfa_metric;
 
@@ -2208,7 +2212,7 @@ void isis_lfa_compute(struct isis_area *area, struct isis_circuit *circuit,
 
                        if (vertex->N.ip.sr.present) {
                                psid = &vertex->N.ip.sr.sid;
-                               if (lfa_metric == sadj_N->metric)
+                               if (path_metric == sadj_N->metric)
                                        last_hop = true;
                        }
                        lfa = isis_vertex_adj_add(spftree, vertex, lfa_list,
diff --git a/tests/isisd/test_isis_spf.refout b/tests/isisd/test_isis_spf.refout
index bdd5b2e439a253a32ba27a993e7f49b41ed78f15..23d41b9e5dd02a1ef7f0060f033da63f2f63d654 100644 (file)
--- a/tests/isisd/test_isis_spf.refout
+++ b/tests/isisd/test_isis_spf.refout
@@ -823,7 +823,7 @@ IS-IS L1 IPv4 routing table:
 \r
  Prefix         Metric  Interface  Nexthop  Label(s)       \r
  ----------------------------------------------------------\r
- 10.0.255.2/32  40      -          rt2      implicit-null  \r
+ 10.0.255.2/32  50      -          rt2      implicit-null  \r
 \r
 IS-IS paths to level-1 routers that speak IPv6\r
 Vertex               Type         Metric Next-Hop             Interface Parent\r
@@ -859,7 +859,7 @@ IS-IS L1 IPv6 routing table:
 \r
  Prefix           Metric  Interface  Nexthop  Label(s)       \r
  ------------------------------------------------------------\r
- 2001:db8::2/128  40      -          rt2      implicit-null  \r
+ 2001:db8::2/128  50      -          rt2      implicit-null  \r
 \r
 test# test isis topology 2 root rt4 lfa system-id rt6\r
 IS-IS paths to level-1 routers that speak IP\r
@@ -896,7 +896,7 @@ IS-IS L1 IPv4 routing table:
 \r
  Prefix         Metric  Interface  Nexthop  Label(s)  \r
  -----------------------------------------------------\r
- 10.0.255.6/32  20      -          rt5      16060     \r
+ 10.0.255.6/32  30      -          rt5      16060     \r
 \r
 IS-IS paths to level-1 routers that speak IPv6\r
 Vertex               Type         Metric Next-Hop             Interface Parent\r
@@ -932,7 +932,7 @@ IS-IS L1 IPv6 routing table:
 \r
  Prefix           Metric  Interface  Nexthop  Label(s)  \r
  -------------------------------------------------------\r
- 2001:db8::6/128  20      -          rt5      16061     \r
+ 2001:db8::6/128  30      -          rt5      16061     \r
 \r
 test# test isis topology 3 root rt1 lfa system-id rt2\r
 IS-IS paths to level-1 routers that speak IP\r
@@ -967,10 +967,10 @@ IS-IS L1 IPv4 routing table:
 \r
  Prefix         Metric  Interface  Nexthop  Label(s)  \r
  -----------------------------------------------------\r
- 10.0.255.2/32  20      -          rt3      16020     \r
- 10.0.255.4/32  30      -          rt3      16040     \r
- 10.0.255.5/32  40      -          rt3      16050     \r
- 10.0.255.6/32  40      -          rt3      16060     \r
+ 10.0.255.2/32  30      -          rt3      16020     \r
+ 10.0.255.4/32  40      -          rt3      16040     \r
+ 10.0.255.5/32  50      -          rt3      16050     \r
+ 10.0.255.6/32  50      -          rt3      16060     \r
 \r
 IS-IS paths to level-1 routers that speak IPv6\r
 Vertex               Type         Metric Next-Hop             Interface Parent\r
@@ -1017,7 +1017,7 @@ IS-IS L1 IPv4 routing table:
 \r
  Prefix         Metric  Interface  Nexthop  Label(s)  \r
  -----------------------------------------------------\r
- 10.0.255.3/32  20      -          rt2      16030     \r
+ 10.0.255.3/32  30      -          rt2      16030     \r
 \r
 IS-IS paths to level-1 routers that speak IPv6\r
 Vertex               Type         Metric Next-Hop             Interface Parent\r
@@ -1085,17 +1085,17 @@ IS-IS L1 IPv4 routing table:
 \r
  Prefix          Metric  Interface  Nexthop  Label(s)       \r
  -----------------------------------------------------------\r
- 10.0.255.2/32   40      -          rt2      implicit-null  \r
- 10.0.255.3/32   50      -          rt2      16030          \r
- 10.0.255.4/32   60      -          rt2      16040          \r
- 10.0.255.5/32   50      -          rt2      16050          \r
- 10.0.255.6/32   60      -          rt2      16060          \r
- 10.0.255.7/32   70      -          rt2      16070          \r
- 10.0.255.8/32   60      -          rt2      16080          \r
- 10.0.255.9/32   70      -          rt2      16090          \r
- 10.0.255.10/32  80      -          rt2      16100          \r
- 10.0.255.11/32  70      -          rt2      16110          \r
- 10.0.255.12/32  80      -          rt2      16120          \r
+ 10.0.255.2/32   50      -          rt2      implicit-null  \r
+ 10.0.255.3/32   60      -          rt2      16030          \r
+ 10.0.255.4/32   70      -          rt2      16040          \r
+ 10.0.255.5/32   60      -          rt2      16050          \r
+ 10.0.255.6/32   70      -          rt2      16060          \r
+ 10.0.255.7/32   80      -          rt2      16070          \r
+ 10.0.255.8/32   70      -          rt2      16080          \r
+ 10.0.255.9/32   80      -          rt2      16090          \r
+ 10.0.255.10/32  90      -          rt2      16100          \r
+ 10.0.255.11/32  80      -          rt2      16110          \r
+ 10.0.255.12/32  90      -          rt2      16120          \r
 \r
 IS-IS paths to level-1 routers that speak IPv6\r
 Vertex               Type         Metric Next-Hop             Interface Parent\r
@@ -1173,10 +1173,10 @@ IS-IS L1 IPv4 routing table:
 \r
  Prefix          Metric  Interface  Nexthop  Label(s)  \r
  ------------------------------------------------------\r
- 10.0.255.8/32   40      -          rt10     16080     \r
- 10.0.255.9/32   50      -          rt10     16090     \r
- 10.0.255.11/32  30      -          rt10     16110     \r
- 10.0.255.12/32  40      -          rt10     16120     \r
+ 10.0.255.8/32   50      -          rt10     16080     \r
+ 10.0.255.9/32   60      -          rt10     16090     \r
+ 10.0.255.11/32  40      -          rt10     16110     \r
+ 10.0.255.12/32  50      -          rt10     16120     \r
 \r
 IS-IS paths to level-1 routers that speak IPv6\r
 Vertex               Type         Metric Next-Hop             Interface Parent\r
@@ -1252,7 +1252,7 @@ IS-IS L1 IPv4 routing table:
 \r
  Prefix          Metric  Interface  Nexthop  Label(s)  \r
  ------------------------------------------------------\r
- 10.0.255.10/32  30      -          rt7      16100     \r
+ 10.0.255.10/32  40      -          rt7      16100     \r
 \r
 IS-IS paths to level-1 routers that speak IPv6\r
 Vertex               Type         Metric Next-Hop             Interface Parent\r
@@ -1313,14 +1313,14 @@ IS-IS L1 IPv4 routing table:
 \r
  Prefix         Metric  Interface  Nexthop  Label(s)       \r
  ----------------------------------------------------------\r
- 10.0.255.1/32  120     -          rt4      16010          \r
- 10.0.255.2/32  110     -          rt4      16020          \r
- 10.0.255.4/32  100     -          rt4      implicit-null  \r
- 10.0.255.5/32  110     -          rt4      16050          \r
- 10.0.255.6/32  130     -          rt4      16060          \r
- 10.0.255.7/32  130     -          rt4      16070          \r
- 10.0.255.8/32  130     -          rt4      16080          \r
- 10.0.255.9/32  120     -          rt4      16090          \r
+ 10.0.255.1/32  130     -          rt4      16010          \r
+ 10.0.255.2/32  120     -          rt4      16020          \r
+ 10.0.255.4/32  110     -          rt4      implicit-null  \r
+ 10.0.255.5/32  120     -          rt4      16050          \r
+ 10.0.255.6/32  140     -          rt4      16060          \r
+ 10.0.255.7/32  140     -          rt4      16070          \r
+ 10.0.255.8/32  140     -          rt4      16080          \r
+ 10.0.255.9/32  130     -          rt4      16090          \r
 \r
 IS-IS paths to level-1 routers that speak IPv6\r
 Vertex               Type         Metric Next-Hop             Interface Parent\r
@@ -1366,14 +1366,14 @@ IS-IS L1 IPv6 routing table:
 \r
  Prefix           Metric  Interface  Nexthop  Label(s)       \r
  ------------------------------------------------------------\r
- 2001:db8::1/128  120     -          rt4      16011          \r
- 2001:db8::2/128  110     -          rt4      16021          \r
- 2001:db8::4/128  100     -          rt4      implicit-null  \r
- 2001:db8::5/128  110     -          rt4      16051          \r
- 2001:db8::6/128  130     -          rt4      16061          \r
- 2001:db8::7/128  130     -          rt4      16071          \r
- 2001:db8::8/128  130     -          rt4      16081          \r
- 2001:db8::9/128  120     -          rt4      16091          \r
+ 2001:db8::1/128  130     -          rt4      16011          \r
+ 2001:db8::2/128  120     -          rt4      16021          \r
+ 2001:db8::4/128  110     -          rt4      implicit-null  \r
+ 2001:db8::5/128  120     -          rt4      16051          \r
+ 2001:db8::6/128  140     -          rt4      16061          \r
+ 2001:db8::7/128  140     -          rt4      16071          \r
+ 2001:db8::8/128  140     -          rt4      16081          \r
+ 2001:db8::9/128  130     -          rt4      16091          \r
 \r
 test# test isis topology 10 root rt8 lfa system-id rt5\r
 IS-IS paths to level-1 routers that speak IP\r
@@ -1414,15 +1414,15 @@ IS-IS L1 IPv4 routing table:
 \r
  Prefix         Metric  Interface  Nexthop  Label(s)  \r
  -----------------------------------------------------\r
- 10.0.255.1/32  80      -          rt6      16010     \r
+ 10.0.255.1/32  90      -          rt6      16010     \r
                         -          rt7      16010     \r
- 10.0.255.2/32  90      -          rt6      16020     \r
+ 10.0.255.2/32  100     -          rt6      16020     \r
                         -          rt7      16020     \r
- 10.0.255.3/32  60      -          rt6      16030     \r
+ 10.0.255.3/32  70      -          rt6      16030     \r
                         -          rt7      16030     \r
- 10.0.255.4/32  60      -          rt6      16040     \r
+ 10.0.255.4/32  70      -          rt6      16040     \r
                         -          rt7      16040     \r
- 10.0.255.5/32  100     -          rt6      16050     \r
+ 10.0.255.5/32  110     -          rt6      16050     \r
                         -          rt7      16050     \r
 \r
 IS-IS paths to level-1 routers that speak IPv6\r
@@ -1463,15 +1463,15 @@ IS-IS L1 IPv6 routing table:
 \r
  Prefix           Metric  Interface  Nexthop  Label(s)  \r
  -------------------------------------------------------\r
- 2001:db8::1/128  80      -          rt6      16011     \r
+ 2001:db8::1/128  90      -          rt6      16011     \r
                           -          rt7      16011     \r
- 2001:db8::2/128  90      -          rt6      16021     \r
+ 2001:db8::2/128  100     -          rt6      16021     \r
                           -          rt7      16021     \r
- 2001:db8::3/128  60      -          rt6      16031     \r
+ 2001:db8::3/128  70      -          rt6      16031     \r
                           -          rt7      16031     \r
- 2001:db8::4/128  60      -          rt6      16041     \r
+ 2001:db8::4/128  70      -          rt6      16041     \r
                           -          rt7      16041     \r
- 2001:db8::5/128  100     -          rt6      16051     \r
+ 2001:db8::5/128  110     -          rt6      16051     \r
                           -          rt7      16051     \r
 \r
 test# test isis topology 11 root rt3 lfa system-id rt5\r
@@ -1511,8 +1511,8 @@ IS-IS L1 IPv4 routing table:
 \r
  Prefix         Metric  Interface  Nexthop  Label(s)  \r
  -----------------------------------------------------\r
- 10.0.255.5/32  30      -          rt2      16050     \r
- 10.0.255.6/32  30      -          rt2      16060     \r
+ 10.0.255.5/32  40      -          rt2      16050     \r
+ 10.0.255.6/32  40      -          rt2      16060     \r
 \r
 IS-IS paths to level-1 routers that speak IPv6\r
 Vertex               Type         Metric Next-Hop             Interface Parent\r
@@ -1550,8 +1550,8 @@ IS-IS L1 IPv6 routing table:
 \r
  Prefix           Metric  Interface  Nexthop  Label(s)  \r
  -------------------------------------------------------\r
- 2001:db8::5/128  30      -          rt2      16051     \r
- 2001:db8::6/128  30      -          rt2      16061     \r
+ 2001:db8::5/128  40      -          rt2      16051     \r
+ 2001:db8::6/128  40      -          rt2      16061     \r
 \r
 test# test isis topology 13 root rt4 lfa system-id rt3\r
 IS-IS paths to level-1 routers that speak IP\r
@@ -1593,10 +1593,10 @@ IS-IS L1 IPv4 routing table:
 \r
  Prefix         Metric  Interface  Nexthop  Label(s)       \r
  ----------------------------------------------------------\r
- 10.0.255.3/32  110     -          rt5      16030          \r
- 10.0.255.5/32  100     -          rt5      implicit-null  \r
- 10.0.255.6/32  120     -          rt5      16060          \r
- 10.0.255.7/32  110     -          rt5      16070          \r
+ 10.0.255.3/32  120     -          rt5      16030          \r
+ 10.0.255.5/32  110     -          rt5      implicit-null  \r
+ 10.0.255.6/32  130     -          rt5      16060          \r
+ 10.0.255.7/32  120     -          rt5      16070          \r
 \r
 IS-IS paths to level-1 routers that speak IPv6\r
 Vertex               Type         Metric Next-Hop             Interface Parent\r
@@ -1699,7 +1699,7 @@ IS-IS L1 IPv4 routing table:
 \r
  Prefix         Metric  Interface  Nexthop  Label(s)  \r
  -----------------------------------------------------\r
- 10.0.255.2/32  20      -          rt3      -         \r
+ 10.0.255.2/32  30      -          rt3      -         \r
 \r
 IS-IS paths to level-1 routers that speak IPv6\r
 Vertex               Type         Metric Next-Hop             Interface Parent\r
@@ -1731,7 +1731,7 @@ IS-IS L1 IPv6 routing table:
 \r
  Prefix           Metric  Interface  Nexthop  Label(s)  \r
  -------------------------------------------------------\r
- 2001:db8::2/128  20      -          rt3      -         \r
+ 2001:db8::2/128  30      -          rt3      -         \r
 \r
 test# test isis topology 14 root rt5 lfa system-id rt4\r
 IS-IS paths to level-1 routers that speak IP\r
@@ -1765,10 +1765,10 @@ IS-IS L1 IPv4 routing table:
 \r
  Prefix         Metric  Interface  Nexthop  Label(s)  \r
  -----------------------------------------------------\r
- 10.0.255.1/32  60      -          rt3      -         \r
- 10.0.255.2/32  60      -          rt3      -         \r
- 10.0.255.3/32  50      -          rt3      -         \r
- 10.0.255.4/32  60      -          rt3      -         \r
+ 10.0.255.1/32  70      -          rt3      -         \r
+ 10.0.255.2/32  70      -          rt3      -         \r
+ 10.0.255.3/32  60      -          rt3      -         \r
+ 10.0.255.4/32  70      -          rt3      -         \r
 \r
 IS-IS paths to level-1 routers that speak IPv6\r
 Vertex               Type         Metric Next-Hop             Interface Parent\r
@@ -1801,10 +1801,10 @@ IS-IS L1 IPv6 routing table:
 \r
  Prefix           Metric  Interface  Nexthop  Label(s)  \r
  -------------------------------------------------------\r
- 2001:db8::1/128  60      -          rt3      -         \r
- 2001:db8::2/128  60      -          rt3      -         \r
- 2001:db8::3/128  50      -          rt3      -         \r
- 2001:db8::4/128  60      -          rt3      -         \r
+ 2001:db8::1/128  70      -          rt3      -         \r
+ 2001:db8::2/128  70      -          rt3      -         \r
+ 2001:db8::3/128  60      -          rt3      -         \r
+ 2001:db8::4/128  70      -          rt3      -         \r
 \r
 test# \r
 test# test isis topology 1 root rt1 remote-lfa system-id rt2\r
@@ -2174,11 +2174,11 @@ IS-IS L1 IPv4 routing table:
 \r
  Prefix         Metric  Interface  Nexthop  Label(s)  \r
  -----------------------------------------------------\r
- 10.0.255.1/32  40      -          rt3      16010     \r
+ 10.0.255.1/32  50      -          rt3      16010     \r
                         -          rt6      16010     \r
- 10.0.255.2/32  30      -          rt3      16020     \r
+ 10.0.255.2/32  40      -          rt3      16020     \r
                         -          rt6      16020     \r
- 10.0.255.4/32  20      -          rt3      16040     \r
+ 10.0.255.4/32  30      -          rt3      16040     \r
                         -          rt6      16040     \r
 \r
 test# test isis topology 3 root rt5 remote-lfa system-id rt3 ipv4-only\r
@@ -2535,13 +2535,13 @@ IS-IS L1 IPv4 routing table:
 \r
  Prefix         Metric  Interface  Nexthop  Label(s)     \r
  --------------------------------------------------------\r
- 10.0.255.1/32  50      -          rt10     16010        \r
+ 10.0.255.1/32  60      -          rt10     16010        \r
  10.0.255.2/32  60      -          rt12     50900/16020  \r
  10.0.255.3/32  70      -          rt12     50900/16030  \r
- 10.0.255.4/32  40      -          rt10     16040        \r
+ 10.0.255.4/32  50      -          rt10     16040        \r
  10.0.255.5/32  50      -          rt12     50900/16050  \r
  10.0.255.6/32  60      -          rt12     50900/16060  \r
- 10.0.255.7/32  30      -          rt10     16070        \r
+ 10.0.255.7/32  40      -          rt10     16070        \r
  10.0.255.8/32  40      -          rt12     50900/16080  \r
 \r
 test# test isis topology 7 root rt6 remote-lfa system-id rt5 ipv4-only\r
@@ -2671,13 +2671,13 @@ IS-IS L1 IPv4 routing table:
 \r
  Prefix          Metric  Interface  Nexthop  Label(s)  \r
  ------------------------------------------------------\r
- 10.0.255.1/32   70      -          rt9      16010     \r
- 10.0.255.4/32   60      -          rt9      16040     \r
- 10.0.255.5/32   50      -          rt9      16050     \r
- 10.0.255.7/32   50      -          rt9      16070     \r
- 10.0.255.8/32   40      -          rt9      16080     \r
- 10.0.255.10/32  60      -          rt9      16100     \r
- 10.0.255.11/32  50      -          rt9      16110     \r
+ 10.0.255.1/32   80      -          rt9      16010     \r
+ 10.0.255.4/32   70      -          rt9      16040     \r
+ 10.0.255.5/32   60      -          rt9      16050     \r
+ 10.0.255.7/32   60      -          rt9      16070     \r
+ 10.0.255.8/32   50      -          rt9      16080     \r
+ 10.0.255.10/32  70      -          rt9      16100     \r
+ 10.0.255.11/32  60      -          rt9      16110     \r
 \r
 test# test isis topology 8 root rt2 remote-lfa system-id rt5 ipv4-only\r
 P-space (self):\r
@@ -2863,14 +2863,14 @@ IS-IS L1 IPv4 routing table:
 \r
  Prefix         Metric  Interface  Nexthop  Label(s)       \r
  ----------------------------------------------------------\r
- 10.0.255.1/32  50      -          rt1      implicit-null  \r
+ 10.0.255.1/32  60      -          rt1      implicit-null  \r
                         -          rt3      16010          \r
- 10.0.255.3/32  50      -          rt1      16030          \r
+ 10.0.255.3/32  60      -          rt1      16030          \r
                         -          rt3      implicit-null  \r
  10.0.255.4/32  80      -          rt3      50500/16040    \r
- 10.0.255.5/32  60      -          rt1      16050          \r
+ 10.0.255.5/32  70      -          rt1      16050          \r
                         -          rt3      16050          \r
- 10.0.255.6/32  70      -          rt3      16060          \r
+ 10.0.255.6/32  80      -          rt3      16060          \r
 \r
 P-space (self):\r
 \r
@@ -2941,14 +2941,14 @@ IS-IS L1 IPv6 routing table:
 \r
  Prefix           Metric  Interface  Nexthop  Label(s)       \r
  ------------------------------------------------------------\r
- 2001:db8::1/128  50      -          rt1      implicit-null  \r
+ 2001:db8::1/128  60      -          rt1      implicit-null  \r
                           -          rt3      16011          \r
- 2001:db8::3/128  50      -          rt1      16031          \r
+ 2001:db8::3/128  60      -          rt1      16031          \r
                           -          rt3      implicit-null  \r
  2001:db8::4/128  80      -          rt3      50500/16041    \r
- 2001:db8::5/128  60      -          rt1      16051          \r
+ 2001:db8::5/128  70      -          rt1      16051          \r
                           -          rt3      16051          \r
- 2001:db8::6/128  70      -          rt3      16061          \r
+ 2001:db8::6/128  80      -          rt3      16061          \r
 \r
 test# test isis topology 13 root rt1 remote-lfa system-id rt3 ipv4-only\r
 P-space (self):\r
Unnamed repository; edit this file 'description' to name the repository.