Merge pull request #7591 from opensourcerouting/isisd-bug-fixes

isisd: assorted bug fixes
This commit is contained in:
Donald Sharp 2020-11-24 20:59:50 -05:00 committed by GitHub
commit 5a6947e530
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
127 changed files with 1462 additions and 796 deletions

View File

@ -170,15 +170,19 @@ DEFPY_YANG(ip_router_isis, ip_router_isis_cmd,
return CMD_SUCCESS;
}
ifp = nb_running_get_entry(NULL, VTY_CURR_XPATH, false);
if (!vrf_name && ifp->vrf_id == VRF_DEFAULT)
vrf_name = VRF_DEFAULT_NAME;
if (ifp->vrf_id != VRF_DEFAULT) {
vrf = vrf_lookup_by_id(ifp->vrf_id);
if (vrf && !vrf_name)
vrf_name = vrf->name;
if (!vrf_name) {
if (ifp) {
if (ifp->vrf_id == VRF_DEFAULT)
vrf_name = VRF_DEFAULT_NAME;
else {
vrf = vrf_lookup_by_id(ifp->vrf_id);
if (vrf && !vrf_name)
vrf_name = vrf->name;
}
} else
vrf_name = VRF_DEFAULT_NAME;
}
area = isis_area_lookup_by_vrf(tag, vrf_name);
if (!area) {
isis_global_instance_create(vrf_name);
@ -235,7 +239,7 @@ DEFPY_YANG(ip_router_isis, ip_router_isis_cmd,
}
/* check if the interface is a loopback and if so set it as passive */
if (if_is_loopback(ifp))
if (ifp && if_is_loopback(ifp))
nb_cli_enqueue_change(vty, "./frr-isisd:isis/passive",
NB_OP_MODIFY, "true");
@ -263,14 +267,19 @@ DEFPY_YANG(ip6_router_isis, ip6_router_isis_cmd,
return CMD_SUCCESS;
ifp = nb_running_get_entry(NULL, VTY_CURR_XPATH, false);
if (!vrf_name && ifp->vrf_id == VRF_DEFAULT)
vrf_name = VRF_DEFAULT_NAME;
if (ifp->vrf_id != VRF_DEFAULT) {
vrf = vrf_lookup_by_id(ifp->vrf_id);
if (vrf && !vrf_name)
vrf_name = vrf->name;
if (!vrf_name) {
if (ifp) {
if (ifp->vrf_id == VRF_DEFAULT)
vrf_name = VRF_DEFAULT_NAME;
else {
vrf = vrf_lookup_by_id(ifp->vrf_id);
if (vrf && !vrf_name)
vrf_name = vrf->name;
}
} else
vrf_name = VRF_DEFAULT_NAME;
}
area = isis_area_lookup_by_vrf(tag, vrf_name);
if (!area) {
isis_global_instance_create(vrf_name);
@ -326,7 +335,7 @@ DEFPY_YANG(ip6_router_isis, ip6_router_isis_cmd,
}
/* check if the interface is a loopback and if so set it as passive */
if (if_is_loopback(ifp))
if (ifp && if_is_loopback(ifp))
nb_cli_enqueue_change(vty, "./frr-isisd:isis/passive",
NB_OP_MODIFY, "true");

View File

@ -1811,7 +1811,8 @@ static void isis_print_paths(struct vty *vty, struct isis_vertex_queue *queue,
"Vertex Type Metric Next-Hop Interface Parent\n");
for (ALL_QUEUE_ELEMENTS_RO(queue, node, vertex)) {
if (memcmp(vertex->N.id, root_sysid, ISIS_SYS_ID_LEN) == 0) {
if (VTYPE_IS(vertex->type)
&& memcmp(vertex->N.id, root_sysid, ISIS_SYS_ID_LEN) == 0) {
vty_out(vty, "%-20s %-12s %-6s",
print_sys_hostname(root_sysid), "", "");
vty_out(vty, "%-30s\n", "");

View File

@ -207,35 +207,30 @@ static int isis_zebra_add_nexthops(struct isis *isis, struct list *nexthops,
api_nh->ifindex = nexthop->ifindex;
/* Add MPLS label(s). */
switch (type) {
case ISIS_NEXTHOP_MAIN:
if (nexthop->sr.present) {
api_nh->label_num = 1;
api_nh->labels[0] = nexthop->sr.label;
} else if (mpls_lsp)
if (nexthop->label_stack) {
api_nh->label_num = nexthop->label_stack->num_labels;
memcpy(api_nh->labels, nexthop->label_stack->label,
sizeof(mpls_label_t) * api_nh->label_num);
} else if (nexthop->sr.present) {
api_nh->label_num = 1;
api_nh->labels[0] = nexthop->sr.label;
} else if (mpls_lsp) {
switch (type) {
case ISIS_NEXTHOP_MAIN:
/*
* Do not use non-SR enabled nexthops to prevent
* broken LSPs from being formed.
*/
continue;
break;
case ISIS_NEXTHOP_BACKUP:
if (nexthop->label_stack) {
api_nh->label_num =
nexthop->label_stack->num_labels;
memcpy(api_nh->labels,
nexthop->label_stack->label,
sizeof(mpls_label_t)
* api_nh->label_num);
} else if (mpls_lsp) {
case ISIS_NEXTHOP_BACKUP:
/*
* This is necessary because zebra requires
* the nexthops of MPLS LSPs to be labeled.
*/
api_nh->label_num = 1;
api_nh->labels[0] = MPLS_LABEL_IMPLICIT_NULL;
break;
}
break;
}
/* Backup nexthop handling. */
@ -263,9 +258,15 @@ void isis_zebra_route_add_route(struct isis *isis, struct prefix *prefix,
struct zapi_route api;
int count = 0;
if (zclient->sock < 0 || list_isempty(route_info->nexthops))
if (zclient->sock < 0)
return;
/* Uninstall the route if it doesn't have any valid nexthop. */
if (list_isempty(route_info->nexthops)) {
isis_zebra_route_del_route(isis, prefix, src_p, route_info);
return;
}
memset(&api, 0, sizeof(api));
api.vrf_id = isis->vrf_id;
api.type = PROTO_TYPE;

View File

@ -134,27 +134,6 @@
]
}
],
"10.0.2.0\/24":[
{
"prefix":"10.0.2.0\/24",
"protocol":"isis",
"distance":115,
"metric":20,
"nexthops":[
{
"ip":"10.0.2.4",
"afi":"ipv4",
"interfaceName":"eth-rt4-1"
},
{
"ip":"10.0.3.4",
"afi":"ipv4",
"interfaceName":"eth-rt4-2",
"active":true
}
]
}
],
"10.0.3.0\/24":[
{
"prefix":"10.0.3.0\/24",

View File

@ -278,21 +278,6 @@
]
}
],
"10.0.7.0\/24":[
{
"prefix":"10.0.7.0\/24",
"protocol":"isis",
"distance":115,
"metric":20,
"nexthops":[
{
"ip":"10.0.7.6",
"afi":"ipv4",
"interfaceName":"eth-rt6"
}
]
}
],
"10.0.8.0\/24":[
{
"prefix":"10.0.8.0\/24",

View File

@ -274,21 +274,6 @@
]
}
],
"10.0.6.0\/24":[
{
"prefix":"10.0.6.0\/24",
"protocol":"isis",
"distance":115,
"metric":20,
"nexthops":[
{
"ip":"10.0.6.4",
"afi":"ipv4",
"interfaceName":"eth-rt4"
}
]
}
],
"10.0.7.0\/24":[
{
"prefix":"10.0.7.0\/24",

View File

@ -281,21 +281,6 @@
]
}
],
"10.0.6.0\/24":[
{
"prefix":"10.0.6.0\/24",
"protocol":"isis",
"distance":115,
"metric":20,
"nexthops":[
{
"ip":"10.0.6.4",
"afi":"ipv4",
"interfaceName":"eth-rt4"
}
]
}
],
"10.0.7.0\/24":[
{
"prefix":"10.0.7.0\/24",

View File

@ -254,21 +254,6 @@
]
}
],
"10.0.6.0\/24":[
{
"prefix":"10.0.6.0\/24",
"protocol":"isis",
"distance":115,
"metric":20,
"nexthops":[
{
"ip":"10.0.6.4",
"afi":"ipv4",
"interfaceName":"eth-rt4"
}
]
}
],
"10.0.7.0\/24":[
{
"prefix":"10.0.7.0\/24",

View File

@ -281,21 +281,6 @@
]
}
],
"10.0.6.0\/24":[
{
"prefix":"10.0.6.0\/24",
"protocol":"isis",
"distance":115,
"metric":20,
"nexthops":[
{
"ip":"10.0.6.4",
"afi":"ipv4",
"interfaceName":"eth-rt4"
}
]
}
],
"10.0.7.0\/24":[
{
"prefix":"10.0.7.0\/24",

View File

@ -275,21 +275,6 @@
]
}
],
"10.0.6.0\/24":[
{
"prefix":"10.0.6.0\/24",
"protocol":"isis",
"distance":115,
"metric":20,
"nexthops":[
{
"ip":"10.0.6.4",
"afi":"ipv4",
"interfaceName":"eth-rt4"
}
]
}
],
"10.0.7.0\/24":[
{
"prefix":"10.0.7.0\/24",

View File

@ -281,21 +281,6 @@
]
}
],
"10.0.6.0\/24":[
{
"prefix":"10.0.6.0\/24",
"protocol":"isis",
"distance":115,
"metric":20,
"nexthops":[
{
"ip":"10.0.6.4",
"afi":"ipv4",
"interfaceName":"eth-rt4"
}
]
}
],
"10.0.7.0\/24":[
{
"prefix":"10.0.7.0\/24",

View File

@ -275,21 +275,6 @@
]
}
],
"10.0.6.0\/24":[
{
"prefix":"10.0.6.0\/24",
"protocol":"isis",
"distance":115,
"metric":20,
"nexthops":[
{
"ip":"10.0.6.4",
"afi":"ipv4",
"interfaceName":"eth-rt4"
}
]
}
],
"10.0.7.0\/24":[
{
"prefix":"10.0.7.0\/24",

View File

@ -281,21 +281,6 @@
]
}
],
"10.0.6.0\/24":[
{
"prefix":"10.0.6.0\/24",
"protocol":"isis",
"distance":115,
"metric":20,
"nexthops":[
{
"ip":"10.0.6.4",
"afi":"ipv4",
"interfaceName":"eth-rt4"
}
]
}
],
"10.0.7.0\/24":[
{
"prefix":"10.0.7.0\/24",

View File

@ -281,21 +281,6 @@
]
}
],
"10.0.6.0\/24":[
{
"prefix":"10.0.6.0\/24",
"protocol":"isis",
"distance":115,
"metric":20,
"nexthops":[
{
"ip":"10.0.6.4",
"afi":"ipv4",
"interfaceName":"eth-rt4"
}
]
}
],
"10.0.7.0\/24":[
{
"prefix":"10.0.7.0\/24",

View File

@ -103,13 +103,13 @@
"type":"SR (IS-IS)",
"outLabel":16060,
"installed":true,
"nexthop":"10.0.1.2"
"nexthop":"10.0.1.3"
},
{
"type":"SR (IS-IS)",
"outLabel":16060,
"installed":true,
"nexthop":"10.0.1.3"
"nexthop":"10.0.1.2"
}
]
},

View File

@ -1,5 +1,5 @@
--- rt1/step3/show_ip_route.ref 2020-09-25 17:48:05.062911204 -0300
+++ rt1/step4/show_ip_route.ref 2020-09-25 17:49:01.563647190 -0300
--- a/rt1/step3/show_ip_route.ref
+++ b/rt1/step4/show_ip_route.ref
@@ -60,10 +60,7 @@
"ip":"10.0.1.2",
"afi":"ipv4",

View File

@ -1,5 +1,5 @@
--- rt1/step3/show_ipv6_route.ref 2020-09-25 17:48:06.358928078 -0300
+++ rt1/step4/show_ipv6_route.ref 2020-09-25 17:49:02.791663194 -0300
--- a/rt1/step3/show_ipv6_route.ref
+++ b/rt1/step4/show_ipv6_route.ref
@@ -57,10 +57,7 @@
"fib":true,
"afi":"ipv6",

View File

@ -1,5 +1,5 @@
--- rt1/step3/show_mpls_table.ref 2020-09-25 17:48:03.782894539 -0300
+++ rt1/step4/show_mpls_table.ref 2020-09-25 17:49:00.343631290 -0300
--- a/rt1/step3/show_mpls_table.ref
+++ b/rt1/step4/show_mpls_table.ref
@@ -47,30 +47,6 @@
}
]

View File

@ -1,5 +1,5 @@
--- rt1/step4/show_ip_route.ref 2020-09-25 17:49:01.563647190 -0300
+++ rt1/step5/show_ip_route.ref 2020-09-25 17:50:12.144567593 -0300
--- a/rt1/step4/show_ip_route.ref
+++ b/rt1/step5/show_ip_route.ref
@@ -60,7 +60,10 @@
"ip":"10.0.1.2",
"afi":"ipv4",

View File

@ -1,5 +1,5 @@
--- rt1/step4/show_ipv6_route.ref 2020-09-25 17:49:02.791663194 -0300
+++ rt1/step5/show_ipv6_route.ref 2020-09-25 17:50:13.428584346 -0300
--- a/rt1/step4/show_ipv6_route.ref
+++ b/rt1/step5/show_ipv6_route.ref
@@ -57,7 +57,10 @@
"fib":true,
"afi":"ipv6",

View File

@ -1,5 +1,5 @@
--- rt1/step4/show_mpls_table.ref 2020-09-25 17:49:00.343631290 -0300
+++ rt1/step5/show_mpls_table.ref 2020-09-25 17:50:10.868550944 -0300
--- a/rt1/step4/show_mpls_table.ref
+++ b/rt1/step5/show_mpls_table.ref
@@ -47,6 +47,30 @@
}
]

View File

@ -1,5 +1,5 @@
--- rt1/step6/show_ip_route.ref 2020-09-25 17:51:15.105389461 -0300
+++ rt1/step7/show_ip_route.ref 2020-09-25 17:52:02.014002243 -0300
--- a/rt1/step6/show_ip_route.ref
+++ b/rt1/step7/show_ip_route.ref
@@ -83,10 +83,7 @@
"ip":"10.0.1.3",
"afi":"ipv4",

View File

@ -1,5 +1,5 @@
--- rt1/step6/show_ipv6_route.ref 2020-09-25 17:51:16.345405655 -0300
+++ rt1/step7/show_ipv6_route.ref 2020-09-25 17:52:03.230018133 -0300
--- a/rt1/step6/show_ipv6_route.ref
+++ b/rt1/step7/show_ipv6_route.ref
@@ -79,10 +79,7 @@
"fib":true,
"afi":"ipv6",

View File

@ -1,5 +1,5 @@
--- rt1/step6/show_mpls_table.ref 2020-09-25 17:51:13.861373215 -0300
+++ rt1/step7/show_mpls_table.ref 2020-09-25 17:52:00.769985988 -0300
--- a/rt1/step6/show_mpls_table.ref
+++ b/rt1/step7/show_mpls_table.ref
@@ -71,30 +71,6 @@
}
]

View File

@ -1,5 +1,5 @@
--- rt1/step7/show_ip_route.ref 2020-09-25 17:52:02.014002243 -0300
+++ rt1/step8/show_ip_route.ref 2020-09-25 17:53:20.003021800 -0300
--- a/rt1/step7/show_ip_route.ref
+++ b/rt1/step8/show_ip_route.ref
@@ -83,7 +83,10 @@
"ip":"10.0.1.3",
"afi":"ipv4",

View File

@ -1,5 +1,5 @@
--- rt1/step7/show_ipv6_route.ref 2020-09-25 17:52:03.230018133 -0300
+++ rt1/step8/show_ipv6_route.ref 2020-09-25 17:53:21.239037966 -0300
--- a/rt1/step7/show_ipv6_route.ref
+++ b/rt1/step8/show_ipv6_route.ref
@@ -79,7 +79,10 @@
"fib":true,
"afi":"ipv6",

View File

@ -1,5 +1,5 @@
--- rt1/step7/show_mpls_table.ref 2020-09-25 17:52:00.769985988 -0300
+++ rt1/step8/show_mpls_table.ref 2020-09-25 17:53:18.671004379 -0300
--- a/rt1/step7/show_mpls_table.ref
+++ b/rt1/step8/show_mpls_table.ref
@@ -71,6 +71,30 @@
}
]

View File

@ -1,5 +1,5 @@
--- rt1/step8/show_ip_route.ref 2020-09-25 17:53:20.003021800 -0300
+++ rt1/step9/show_ip_route.ref 2020-09-25 17:54:37.700038367 -0300
--- a/rt1/step8/show_ip_route.ref
+++ b/rt1/step9/show_ip_route.ref
@@ -85,7 +85,7 @@
"interfaceName":"eth-sw1",
"active":true,

View File

@ -1,5 +1,5 @@
--- rt1/step8/show_ipv6_route.ref 2020-09-25 17:53:21.239037966 -0300
+++ rt1/step9/show_ipv6_route.ref 2020-09-25 17:54:38.912054230 -0300
--- a/rt1/step8/show_ipv6_route.ref
+++ b/rt1/step9/show_ipv6_route.ref
@@ -81,7 +81,7 @@
"interfaceName":"eth-sw1",
"active":true,

View File

@ -1,5 +1,5 @@
--- rt1/step8/show_mpls_table.ref 2020-09-25 17:53:18.671004379 -0300
+++ rt1/step9/show_mpls_table.ref 2020-09-25 17:54:36.428021718 -0300
--- a/rt1/step8/show_mpls_table.ref
+++ b/rt1/step9/show_mpls_table.ref
@@ -71,30 +71,6 @@
}
]

View File

@ -233,7 +233,10 @@
"ip":"10.0.1.3",
"afi":"ipv4",
"interfaceName":"eth-sw1",
"active":true
"active":true,
"labels":[
16060
]
}
]
}

View File

@ -104,7 +104,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4-2",
"interfaceName":"eth-rt4-1",
"active":true,
"backupIndex":[
0
@ -116,7 +116,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4-1",
"interfaceName":"eth-rt4-2",
"active":true,
"backupIndex":[
0
@ -149,6 +149,15 @@
"metric":30,
"installed":true,
"nexthops":[
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4-1",
"active":true,
"labels":[
16051
]
},
{
"fib":true,
"afi":"ipv6",
@ -166,15 +175,6 @@
"labels":[
16051
]
},
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4-1",
"active":true,
"labels":[
16051
]
}
]
}
@ -192,7 +192,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4-2",
"interfaceName":"eth-rt4-1",
"active":true,
"backupIndex":[
0
@ -204,7 +204,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4-1",
"interfaceName":"eth-rt4-2",
"active":true,
"backupIndex":[
0
@ -218,7 +218,10 @@
{
"afi":"ipv6",
"interfaceName":"eth-sw1",
"active":true
"active":true,
"labels":[
16061
]
}
]
}

View File

@ -247,7 +247,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
"outLabel":16060,
"nexthop":"10.0.1.3"
}
]
@ -278,7 +278,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
"outLabel":16061,
"interface":"eth-sw1"
}
]

View File

@ -1,5 +1,5 @@
--- rt2/step1/show_ip_route.ref 2020-09-25 17:46:27.537642781 -0300
+++ rt2/step2/show_ip_route.ref 2020-09-25 17:46:57.306029668 -0300
--- a/rt2/step1/show_ip_route.ref
+++ b/rt2/step2/show_ip_route.ref
@@ -15,36 +15,10 @@
"afi":"ipv4",
"interfaceName":"eth-sw1",
@ -74,7 +74,7 @@
]
}
],
@@ -248,40 +196,12 @@
@@ -251,40 +199,12 @@
{
"ip":"10.0.1.1",
"afi":"ipv4",
@ -117,7 +117,7 @@
}
]
}
@@ -377,24 +297,6 @@
@@ -380,24 +300,6 @@
"ip":"10.0.1.3",
"afi":"ipv4",
"interfaceName":"eth-sw1",
@ -142,7 +142,7 @@
"active":true
}
]
@@ -415,24 +317,6 @@
@@ -418,24 +320,6 @@
"ip":"10.0.1.3",
"afi":"ipv4",
"interfaceName":"eth-sw1",

View File

@ -1,5 +1,5 @@
--- rt2/step1/show_ipv6_route.ref 2020-09-25 17:46:28.865660035 -0300
+++ rt2/step2/show_ipv6_route.ref 2020-09-25 17:46:58.514045373 -0300
--- a/rt2/step1/show_ipv6_route.ref
+++ b/rt2/step2/show_ipv6_route.ref
@@ -14,34 +14,10 @@
"afi":"ipv6",
"interfaceName":"eth-sw1",

View File

@ -1,5 +1,5 @@
--- rt2/step1/show_mpls_table.ref 2020-09-25 17:46:26.261626203 -0300
+++ rt2/step2/show_mpls_table.ref 2020-09-25 17:46:56.086013807 -0300
--- a/rt2/step1/show_mpls_table.ref
+++ b/rt2/step2/show_mpls_table.ref
@@ -7,23 +7,7 @@
"type":"SR (IS-IS)",
"outLabel":3,

View File

@ -1,5 +1,5 @@
--- rt2/step2/show_ip_route.ref 2020-09-25 17:46:57.306029668 -0300
+++ rt2/step3/show_ip_route.ref 2020-09-25 17:48:05.274913964 -0300
--- a/rt2/step2/show_ip_route.ref
+++ b/rt2/step3/show_ip_route.ref
@@ -15,10 +15,36 @@
"afi":"ipv4",
"interfaceName":"eth-sw1",
@ -74,7 +74,7 @@
]
}
],
@@ -196,12 +248,40 @@
@@ -199,12 +251,40 @@
{
"ip":"10.0.1.1",
"afi":"ipv4",
@ -117,7 +117,7 @@
}
]
}
@@ -297,6 +377,24 @@
@@ -300,6 +380,24 @@
"ip":"10.0.1.3",
"afi":"ipv4",
"interfaceName":"eth-sw1",
@ -142,7 +142,7 @@
"active":true
}
]
@@ -317,6 +415,24 @@
@@ -320,6 +418,24 @@
"ip":"10.0.1.3",
"afi":"ipv4",
"interfaceName":"eth-sw1",

View File

@ -1,5 +1,5 @@
--- rt2/step2/show_ipv6_route.ref 2020-09-25 17:46:58.514045373 -0300
+++ rt2/step3/show_ipv6_route.ref 2020-09-25 17:48:06.570930838 -0300
--- a/rt2/step2/show_ipv6_route.ref
+++ b/rt2/step3/show_ipv6_route.ref
@@ -14,10 +14,34 @@
"afi":"ipv6",
"interfaceName":"eth-sw1",

View File

@ -1,5 +1,5 @@
--- rt2/step2/show_mpls_table.ref 2020-09-25 17:46:56.086013807 -0300
+++ rt2/step3/show_mpls_table.ref 2020-09-25 17:48:03.994897300 -0300
--- a/rt2/step2/show_mpls_table.ref
+++ b/rt2/step3/show_mpls_table.ref
@@ -7,7 +7,23 @@
"type":"SR (IS-IS)",
"outLabel":3,

View File

@ -1,5 +1,5 @@
--- rt2/step3/show_ip_route.ref 2020-09-25 17:48:05.274913964 -0300
+++ rt2/step4/show_ip_route.ref 2020-09-25 17:49:01.763649797 -0300
--- a/rt2/step3/show_ip_route.ref
+++ b/rt2/step4/show_ip_route.ref
@@ -15,36 +15,10 @@
"afi":"ipv4",
"interfaceName":"eth-sw1",
@ -147,7 +147,7 @@
]
}
],
@@ -248,40 +177,12 @@
@@ -251,40 +180,12 @@
{
"ip":"10.0.1.1",
"afi":"ipv4",

View File

@ -1,5 +1,5 @@
--- rt2/step3/show_ipv6_route.ref 2020-09-25 17:48:06.570930838 -0300
+++ rt2/step4/show_ipv6_route.ref 2020-09-25 17:49:02.995665853 -0300
--- a/rt2/step3/show_ipv6_route.ref
+++ b/rt2/step4/show_ipv6_route.ref
@@ -14,34 +14,10 @@
"afi":"ipv6",
"interfaceName":"eth-sw1",
@ -100,10 +100,10 @@
]
}
]
@@ -162,19 +107,13 @@
@@ -153,10 +98,7 @@
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4-2",
"interfaceName":"eth-rt4-1",
- "active":true,
- "labels":[
- 16051
@ -112,8 +112,10 @@
},
{
"fib":true,
@@ -171,10 +113,7 @@
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4-1",
"interfaceName":"eth-rt4-2",
- "active":true,
- "labels":[
- 16051

View File

@ -1,5 +1,5 @@
--- rt2/step3/show_mpls_table.ref 2020-09-25 17:48:03.994897300 -0300
+++ rt2/step4/show_mpls_table.ref 2020-09-25 17:49:00.551634001 -0300
--- a/rt2/step3/show_mpls_table.ref
+++ b/rt2/step4/show_mpls_table.ref
@@ -7,23 +7,7 @@
"type":"SR (IS-IS)",
"outLabel":3,

View File

@ -1,5 +1,5 @@
--- rt2/step4/show_ip_route.ref 2020-09-25 17:49:01.763649797 -0300
+++ rt2/step5/show_ip_route.ref 2020-09-25 17:50:12.360570411 -0300
--- a/rt2/step4/show_ip_route.ref
+++ b/rt2/step5/show_ip_route.ref
@@ -15,10 +15,36 @@
"afi":"ipv4",
"interfaceName":"eth-sw1",
@ -147,7 +147,7 @@
]
}
],
@@ -177,12 +248,40 @@
@@ -180,12 +251,40 @@
{
"ip":"10.0.1.1",
"afi":"ipv4",

View File

@ -1,5 +1,5 @@
--- rt2/step4/show_ipv6_route.ref 2020-09-25 17:49:02.995665853 -0300
+++ rt2/step5/show_ipv6_route.ref 2020-09-25 17:50:13.636587060 -0300
--- a/rt2/step4/show_ipv6_route.ref
+++ b/rt2/step5/show_ipv6_route.ref
@@ -14,10 +14,34 @@
"afi":"ipv6",
"interfaceName":"eth-sw1",
@ -100,10 +100,10 @@
]
}
]
@@ -107,13 +162,19 @@
@@ -98,7 +153,10 @@
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4-2",
"interfaceName":"eth-rt4-1",
- "active":true
+ "active":true,
+ "labels":[
@ -112,8 +112,10 @@
},
{
"fib":true,
@@ -113,7 +171,10 @@
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4-1",
"interfaceName":"eth-rt4-2",
- "active":true
+ "active":true,
+ "labels":[

View File

@ -1,5 +1,5 @@
--- rt2/step4/show_mpls_table.ref 2020-09-25 17:49:00.551634001 -0300
+++ rt2/step5/show_mpls_table.ref 2020-09-25 17:50:11.068553553 -0300
--- a/rt2/step4/show_mpls_table.ref
+++ b/rt2/step5/show_mpls_table.ref
@@ -7,7 +7,23 @@
"type":"SR (IS-IS)",
"outLabel":3,

View File

@ -1,5 +1,5 @@
--- rt2/step6/show_ip_route.ref 2020-09-25 17:51:15.313392177 -0300
+++ rt2/step7/show_ip_route.ref 2020-09-25 17:52:02.210004805 -0300
--- a/rt2/step6/show_ip_route.ref
+++ b/rt2/step7/show_ip_route.ref
@@ -15,36 +15,10 @@
"afi":"ipv4",
"interfaceName":"eth-sw1",
@ -144,7 +144,7 @@
}
]
}
@@ -248,40 +169,12 @@
@@ -251,40 +172,12 @@
{
"ip":"10.0.1.1",
"afi":"ipv4",
@ -187,7 +187,7 @@
}
]
}
@@ -296,30 +189,13 @@
@@ -299,30 +192,13 @@
{
"ip":"10.0.2.4",
"afi":"ipv4",
@ -220,7 +220,7 @@
}
]
}
@@ -335,29 +211,12 @@
@@ -338,29 +214,12 @@
"ip":"10.0.2.4",
"afi":"ipv4",
"interfaceName":"eth-rt4-1",
@ -252,7 +252,7 @@
}
]
}
@@ -494,31 +353,14 @@
@@ -497,31 +356,14 @@
"ip":"10.0.2.4",
"afi":"ipv4",
"interfaceName":"eth-rt4-1",

View File

@ -1,5 +1,5 @@
--- rt2/step6/show_ipv6_route.ref 2020-09-25 17:51:16.549408319 -0300
+++ rt2/step7/show_ipv6_route.ref 2020-09-25 17:52:03.438020851 -0300
--- a/rt2/step6/show_ipv6_route.ref
+++ b/rt2/step7/show_ipv6_route.ref
@@ -14,34 +14,10 @@
"afi":"ipv6",
"interfaceName":"eth-sw1",
@ -72,7 +72,7 @@
],
@@ -106,9 +58,6 @@
"afi":"ipv6",
"interfaceName":"eth-rt4-2",
"interfaceName":"eth-rt4-1",
"active":true,
- "backupIndex":[
- 0
@ -82,7 +82,7 @@
]
@@ -118,24 +67,10 @@
"afi":"ipv6",
"interfaceName":"eth-rt4-1",
"interfaceName":"eth-rt4-2",
"active":true,
- "backupIndex":[
- 0
@ -106,6 +106,16 @@
}
],
@@ -153,28 +88,19 @@
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4-1",
- "active":true,
- "labels":[
- 16051
- ]
+ "active":true
},
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-sw1",
@ -123,16 +133,6 @@
- "labels":[
- 16051
- ]
+ "active":true
},
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4-1",
- "active":true,
- "labels":[
- 16051
- ]
+ "active":true
}
]

View File

@ -1,5 +1,5 @@
--- rt2/step6/show_mpls_table.ref 2020-09-25 17:51:14.073375985 -0300
+++ rt2/step7/show_mpls_table.ref 2020-09-25 17:52:00.973988653 -0300
--- a/rt2/step6/show_mpls_table.ref
+++ b/rt2/step7/show_mpls_table.ref
@@ -7,23 +7,7 @@
"type":"SR (IS-IS)",
"outLabel":3,

View File

@ -1,5 +1,5 @@
--- rt2/step7/show_ip_route.ref 2020-09-25 17:52:02.210004805 -0300
+++ rt2/step8/show_ip_route.ref 2020-09-25 17:53:20.207024469 -0300
--- a/rt2/step7/show_ip_route.ref
+++ b/rt2/step8/show_ip_route.ref
@@ -15,10 +15,36 @@
"afi":"ipv4",
"interfaceName":"eth-sw1",
@ -144,7 +144,7 @@
}
]
}
@@ -169,12 +248,40 @@
@@ -172,12 +251,40 @@
{
"ip":"10.0.1.1",
"afi":"ipv4",
@ -187,7 +187,7 @@
}
]
}
@@ -189,13 +296,30 @@
@@ -192,13 +299,30 @@
{
"ip":"10.0.2.4",
"afi":"ipv4",
@ -220,7 +220,7 @@
}
]
}
@@ -211,12 +335,29 @@
@@ -214,12 +338,29 @@
"ip":"10.0.2.4",
"afi":"ipv4",
"interfaceName":"eth-rt4-1",
@ -252,7 +252,7 @@
}
]
}
@@ -353,14 +494,31 @@
@@ -356,14 +497,31 @@
"ip":"10.0.2.4",
"afi":"ipv4",
"interfaceName":"eth-rt4-1",

View File

@ -1,5 +1,5 @@
--- rt2/step7/show_ipv6_route.ref 2020-09-25 17:52:03.438020851 -0300
+++ rt2/step8/show_ipv6_route.ref 2020-09-25 17:53:21.443040633 -0300
--- a/rt2/step7/show_ipv6_route.ref
+++ b/rt2/step8/show_ipv6_route.ref
@@ -14,10 +14,34 @@
"afi":"ipv6",
"interfaceName":"eth-sw1",
@ -72,7 +72,7 @@
],
@@ -58,6 +106,9 @@
"afi":"ipv6",
"interfaceName":"eth-rt4-2",
"interfaceName":"eth-rt4-1",
"active":true,
+ "backupIndex":[
+ 0
@ -82,7 +82,7 @@
]
@@ -67,10 +118,24 @@
"afi":"ipv6",
"interfaceName":"eth-rt4-1",
"interfaceName":"eth-rt4-2",
"active":true,
+ "backupIndex":[
+ 0
@ -106,6 +106,16 @@
}
],
@@ -88,19 +153,28 @@
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4-1",
- "active":true
+ "active":true,
+ "labels":[
+ 16051
+ ]
},
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-sw1",
@ -123,16 +133,6 @@
+ "active":true,
+ "labels":[
+ 16051
+ ]
},
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt4-1",
- "active":true
+ "active":true,
+ "labels":[
+ 16051
+ ]
}
]

View File

@ -1,5 +1,5 @@
--- rt2/step7/show_mpls_table.ref 2020-09-25 17:52:00.973988653 -0300
+++ rt2/step8/show_mpls_table.ref 2020-09-25 17:53:18.923007676 -0300
--- a/rt2/step7/show_mpls_table.ref
+++ b/rt2/step8/show_mpls_table.ref
@@ -7,7 +7,23 @@
"type":"SR (IS-IS)",
"outLabel":3,

View File

@ -1,5 +1,5 @@
--- rt2/step8/show_ip_route.ref 2020-09-25 17:53:20.207024469 -0300
+++ rt2/step9/show_ip_route.ref 2020-09-25 17:54:37.908041089 -0300
--- a/rt2/step8/show_ip_route.ref
+++ b/rt2/step9/show_ip_route.ref
@@ -31,7 +31,7 @@
"interfaceName":"eth-rt4-1",
"active":true,
@ -72,7 +72,7 @@
]
}
]
@@ -271,7 +271,7 @@
@@ -274,7 +274,7 @@
"interfaceName":"eth-rt4-1",
"active":true,
"labels":[
@ -81,7 +81,7 @@
]
},
{
@@ -280,7 +280,7 @@
@@ -283,7 +283,7 @@
"interfaceName":"eth-rt4-2",
"active":true,
"labels":[
@ -90,7 +90,7 @@
]
}
]
@@ -318,7 +318,7 @@
@@ -321,7 +321,7 @@
"interfaceName":"eth-sw1",
"active":true,
"labels":[
@ -99,7 +99,7 @@
]
}
]
@@ -356,7 +356,7 @@
@@ -359,7 +359,7 @@
"interfaceName":"eth-sw1",
"active":true,
"labels":[
@ -108,7 +108,7 @@
]
}
]
@@ -517,7 +517,7 @@
@@ -520,7 +520,7 @@
"interfaceName":"eth-sw1",
"active":true,
"labels":[

View File

@ -1,5 +1,5 @@
--- rt2/step8/show_ipv6_route.ref 2020-09-25 17:53:21.443040633 -0300
+++ rt2/step9/show_ipv6_route.ref 2020-09-25 17:54:39.112056848 -0300
--- a/rt2/step8/show_ipv6_route.ref
+++ b/rt2/step9/show_ipv6_route.ref
@@ -29,7 +29,7 @@
"interfaceName":"eth-rt4-1",
"active":true,
@ -46,7 +46,7 @@
]
}
@@ -155,7 +155,7 @@
"interfaceName":"eth-sw1",
"interfaceName":"eth-rt4-1",
"active":true,
"labels":[
- 16051
@ -55,7 +55,7 @@
},
{
@@ -164,7 +164,7 @@
"interfaceName":"eth-rt4-2",
"interfaceName":"eth-sw1",
"active":true,
"labels":[
- 16051
@ -64,7 +64,7 @@
},
{
@@ -173,7 +173,7 @@
"interfaceName":"eth-rt4-1",
"interfaceName":"eth-rt4-2",
"active":true,
"labels":[
- 16051

View File

@ -1,5 +1,5 @@
--- rt2/step8/show_mpls_table.ref 2020-09-25 17:53:18.923007676 -0300
+++ rt2/step9/show_mpls_table.ref 2020-09-25 17:54:36.640024493 -0300
--- a/rt2/step8/show_mpls_table.ref
+++ b/rt2/step9/show_mpls_table.ref
@@ -17,12 +17,12 @@
"backupNexthops":[
{

View File

@ -233,7 +233,10 @@
"ip":"10.0.1.2",
"afi":"ipv4",
"interfaceName":"eth-sw1",
"active":true
"active":true,
"labels":[
16060
]
}
]
}

View File

@ -101,6 +101,15 @@
"metric":30,
"installed":true,
"nexthops":[
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt5-1",
"active":true,
"labels":[
16041
]
},
{
"fib":true,
"afi":"ipv6",
@ -118,15 +127,6 @@
"labels":[
16041
]
},
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt5-1",
"active":true,
"labels":[
16041
]
}
]
}
@ -144,7 +144,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt5-2",
"interfaceName":"eth-rt5-1",
"active":true,
"backupIndex":[
0
@ -156,7 +156,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt5-1",
"interfaceName":"eth-rt5-2",
"active":true,
"backupIndex":[
0
@ -192,7 +192,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt5-2",
"interfaceName":"eth-rt5-1",
"active":true,
"backupIndex":[
0
@ -204,7 +204,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt5-1",
"interfaceName":"eth-rt5-2",
"active":true,
"backupIndex":[
0
@ -218,7 +218,10 @@
{
"afi":"ipv6",
"interfaceName":"eth-sw1",
"active":true
"active":true,
"labels":[
16061
]
}
]
}

View File

@ -247,7 +247,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
"outLabel":16060,
"nexthop":"10.0.1.2"
}
]
@ -278,7 +278,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
"outLabel":16061,
"interface":"eth-sw1"
}
]

View File

@ -1,5 +1,5 @@
--- rt3/step3/show_ip_route.ref 2020-09-25 17:48:05.506916984 -0300
+++ rt3/step4/show_ip_route.ref 2020-09-25 17:49:01.963652403 -0300
--- a/rt3/step3/show_ip_route.ref
+++ b/rt3/step4/show_ip_route.ref
@@ -15,36 +15,10 @@
"afi":"ipv4",
"interfaceName":"eth-sw1",
@ -144,7 +144,7 @@
]
}
],
@@ -248,40 +169,12 @@
@@ -251,40 +172,12 @@
{
"ip":"10.0.1.1",
"afi":"ipv4",
@ -187,7 +187,7 @@
}
]
}
@@ -372,30 +265,13 @@
@@ -375,30 +268,13 @@
{
"ip":"10.0.4.5",
"afi":"ipv4",
@ -220,7 +220,7 @@
}
]
}
@@ -411,29 +287,12 @@
@@ -414,29 +290,12 @@
"ip":"10.0.4.5",
"afi":"ipv4",
"interfaceName":"eth-rt5-1",
@ -252,7 +252,7 @@
}
]
}
@@ -528,31 +387,14 @@
@@ -531,31 +390,14 @@
"ip":"10.0.4.5",
"afi":"ipv4",
"interfaceName":"eth-rt5-1",

View File

@ -1,5 +1,5 @@
--- rt3/step3/show_ipv6_route.ref 2020-09-25 17:48:06.790933702 -0300
+++ rt3/step4/show_ipv6_route.ref 2020-09-25 17:49:03.199668512 -0300
--- a/rt3/step3/show_ipv6_route.ref
+++ b/rt3/step4/show_ipv6_route.ref
@@ -14,34 +14,10 @@
"afi":"ipv6",
"interfaceName":"eth-sw1",
@ -71,6 +71,16 @@
}
],
@@ -105,28 +57,19 @@
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt5-1",
- "active":true,
- "labels":[
- 16041
- ]
+ "active":true
},
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-sw1",
@ -88,23 +98,13 @@
- "labels":[
- 16041
- ]
+ "active":true
},
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt5-1",
- "active":true,
- "labels":[
- 16041
- ]
+ "active":true
}
]
}
@@ -146,9 +89,6 @@
"afi":"ipv6",
"interfaceName":"eth-rt5-2",
"interfaceName":"eth-rt5-1",
"active":true,
- "backupIndex":[
- 0
@ -114,7 +114,7 @@
]
@@ -158,24 +98,10 @@
"afi":"ipv6",
"interfaceName":"eth-rt5-1",
"interfaceName":"eth-rt5-2",
"active":true,
- "backupIndex":[
- 0

View File

@ -1,5 +1,5 @@
--- rt3/step3/show_mpls_table.ref 2020-09-25 17:48:04.214900164 -0300
+++ rt3/step4/show_mpls_table.ref 2020-09-25 17:49:00.759636711 -0300
--- a/rt3/step3/show_mpls_table.ref
+++ b/rt3/step4/show_mpls_table.ref
@@ -7,23 +7,7 @@
"type":"SR (IS-IS)",
"outLabel":3,

View File

@ -1,5 +1,5 @@
--- rt3/step4/show_ip_route.ref 2020-09-25 17:49:01.963652403 -0300
+++ rt3/step5/show_ip_route.ref 2020-09-25 17:50:12.592573438 -0300
--- a/rt3/step4/show_ip_route.ref
+++ b/rt3/step5/show_ip_route.ref
@@ -15,10 +15,36 @@
"afi":"ipv4",
"interfaceName":"eth-sw1",
@ -144,7 +144,7 @@
]
}
],
@@ -169,12 +248,40 @@
@@ -172,12 +251,40 @@
{
"ip":"10.0.1.1",
"afi":"ipv4",
@ -187,7 +187,7 @@
}
]
}
@@ -265,13 +372,30 @@
@@ -268,13 +375,30 @@
{
"ip":"10.0.4.5",
"afi":"ipv4",
@ -220,7 +220,7 @@
}
]
}
@@ -287,12 +411,29 @@
@@ -290,12 +414,29 @@
"ip":"10.0.4.5",
"afi":"ipv4",
"interfaceName":"eth-rt5-1",
@ -252,7 +252,7 @@
}
]
}
@@ -387,14 +528,31 @@
@@ -390,14 +531,31 @@
"ip":"10.0.4.5",
"afi":"ipv4",
"interfaceName":"eth-rt5-1",

View File

@ -1,5 +1,5 @@
--- rt3/step4/show_ipv6_route.ref 2020-09-25 17:49:03.199668512 -0300
+++ rt3/step5/show_ipv6_route.ref 2020-09-25 17:50:13.840589722 -0300
--- a/rt3/step4/show_ipv6_route.ref
+++ b/rt3/step5/show_ipv6_route.ref
@@ -14,10 +14,34 @@
"afi":"ipv6",
"interfaceName":"eth-sw1",
@ -71,6 +71,16 @@
}
],
@@ -57,19 +105,28 @@
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt5-1",
- "active":true
+ "active":true,
+ "labels":[
+ 16041
+ ]
},
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-sw1",
@ -88,23 +98,13 @@
+ "active":true,
+ "labels":[
+ 16041
+ ]
},
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt5-1",
- "active":true
+ "active":true,
+ "labels":[
+ 16041
+ ]
}
]
}
@@ -89,6 +146,9 @@
"afi":"ipv6",
"interfaceName":"eth-rt5-2",
"interfaceName":"eth-rt5-1",
"active":true,
+ "backupIndex":[
+ 0
@ -114,7 +114,7 @@
]
@@ -98,10 +158,24 @@
"afi":"ipv6",
"interfaceName":"eth-rt5-1",
"interfaceName":"eth-rt5-2",
"active":true,
+ "backupIndex":[
+ 0

View File

@ -1,5 +1,5 @@
--- rt3/step4/show_mpls_table.ref 2020-09-25 17:49:00.759636711 -0300
+++ rt3/step5/show_mpls_table.ref 2020-09-25 17:50:11.280556320 -0300
--- a/rt3/step4/show_mpls_table.ref
+++ b/rt3/step5/show_mpls_table.ref
@@ -7,7 +7,23 @@
"type":"SR (IS-IS)",
"outLabel":3,

View File

@ -1,5 +1,5 @@
--- rt3/step5/show_ip_route.ref 2020-09-25 17:50:12.592573438 -0300
+++ rt3/step6/show_ip_route.ref 2020-09-25 17:51:15.521394894 -0300
--- a/rt3/step5/show_ip_route.ref
+++ b/rt3/step6/show_ip_route.ref
@@ -31,7 +31,7 @@
"interfaceName":"eth-rt5-1",
"active":true,
@ -81,7 +81,7 @@
]
}
],
@@ -271,7 +271,7 @@
@@ -274,7 +274,7 @@
"interfaceName":"eth-rt5-1",
"active":true,
"labels":[
@ -90,7 +90,7 @@
]
},
{
@@ -280,7 +280,7 @@
@@ -283,7 +283,7 @@
"interfaceName":"eth-rt5-2",
"active":true,
"labels":[

View File

@ -1,5 +1,5 @@
--- rt3/step5/show_ipv6_route.ref 2020-09-25 17:50:13.840589722 -0300
+++ rt3/step6/show_ipv6_route.ref 2020-09-25 17:51:16.757411035 -0300
--- a/rt3/step5/show_ipv6_route.ref
+++ b/rt3/step6/show_ipv6_route.ref
@@ -29,7 +29,7 @@
"interfaceName":"eth-rt5-1",
"active":true,
@ -36,8 +36,8 @@
16021
]
}
@@ -116,7 +116,7 @@
"interfaceName":"eth-rt5-2",
@@ -107,7 +107,7 @@
"interfaceName":"eth-rt5-1",
"active":true,
"labels":[
- 16041
@ -46,7 +46,7 @@
},
{
@@ -125,7 +125,7 @@
"interfaceName":"eth-rt5-1",
"interfaceName":"eth-rt5-2",
"active":true,
"labels":[
- 16041

View File

@ -1,5 +1,5 @@
--- rt3/step5/show_mpls_table.ref 2020-09-25 17:50:11.280556320 -0300
+++ rt3/step6/show_mpls_table.ref 2020-09-25 17:51:14.281378700 -0300
--- a/rt3/step5/show_mpls_table.ref
+++ b/rt3/step6/show_mpls_table.ref
@@ -17,12 +17,12 @@
"backupNexthops":[
{

View File

@ -1,5 +1,5 @@
--- rt3/step6/show_ip_route.ref 2020-09-25 17:51:15.521394894 -0300
+++ rt3/step7/show_ip_route.ref 2020-09-25 17:52:02.414007470 -0300
--- a/rt3/step6/show_ip_route.ref
+++ b/rt3/step7/show_ip_route.ref
@@ -158,9 +158,6 @@
"active":true,
"backupIndex":[

View File

@ -1,5 +1,5 @@
--- rt3/step6/show_ipv6_route.ref 2020-09-25 17:51:16.757411035 -0300
+++ rt3/step7/show_ipv6_route.ref 2020-09-25 17:52:03.650023622 -0300
--- a/rt3/step6/show_ipv6_route.ref
+++ b/rt3/step7/show_ipv6_route.ref
@@ -148,9 +148,6 @@
"active":true,
"backupIndex":[

View File

@ -1,5 +1,5 @@
--- rt3/step6/show_mpls_table.ref 2020-09-25 17:51:14.281378700 -0300
+++ rt3/step7/show_mpls_table.ref 2020-09-25 17:52:01.181991371 -0300
--- a/rt3/step6/show_mpls_table.ref
+++ b/rt3/step7/show_mpls_table.ref
@@ -159,68 +159,6 @@
}
]

View File

@ -1,5 +1,5 @@
--- rt3/step7/show_ip_route.ref 2020-09-25 17:52:02.414007470 -0300
+++ rt3/step8/show_ip_route.ref 2020-09-25 17:53:20.419027241 -0300
--- a/rt3/step7/show_ip_route.ref
+++ b/rt3/step8/show_ip_route.ref
@@ -158,6 +158,9 @@
"active":true,
"backupIndex":[

View File

@ -1,5 +1,5 @@
--- rt3/step7/show_ipv6_route.ref 2020-09-25 17:52:03.650023622 -0300
+++ rt3/step8/show_ipv6_route.ref 2020-09-25 17:53:21.643043250 -0300
--- a/rt3/step7/show_ipv6_route.ref
+++ b/rt3/step8/show_ipv6_route.ref
@@ -148,6 +148,9 @@
"active":true,
"backupIndex":[

View File

@ -1,5 +1,5 @@
--- rt3/step7/show_mpls_table.ref 2020-09-25 17:52:01.181991371 -0300
+++ rt3/step8/show_mpls_table.ref 2020-09-25 17:53:19.135010448 -0300
--- a/rt3/step7/show_mpls_table.ref
+++ b/rt3/step8/show_mpls_table.ref
@@ -159,6 +159,68 @@
}
]

View File

@ -1,5 +1,5 @@
--- rt3/step8/show_ip_route.ref 2020-09-25 17:53:20.419027241 -0300
+++ rt3/step9/show_ip_route.ref 2020-09-25 17:54:38.112043759 -0300
--- a/rt3/step8/show_ip_route.ref
+++ b/rt3/step9/show_ip_route.ref
@@ -185,7 +185,7 @@
"active":true,
"labels":[

View File

@ -1,5 +1,5 @@
--- rt3/step8/show_ipv6_route.ref 2020-09-25 17:53:21.643043250 -0300
+++ rt3/step9/show_ipv6_route.ref 2020-09-25 17:54:39.320059571 -0300
--- a/rt3/step8/show_ipv6_route.ref
+++ b/rt3/step9/show_ipv6_route.ref
@@ -173,7 +173,7 @@
"active":true,
"labels":[

View File

@ -1,5 +1,5 @@
--- rt3/step8/show_mpls_table.ref 2020-09-25 17:53:19.135010448 -0300
+++ rt3/step9/show_mpls_table.ref 2020-09-25 17:54:36.852027268 -0300
--- a/rt3/step8/show_mpls_table.ref
+++ b/rt3/step9/show_mpls_table.ref
@@ -159,13 +159,13 @@
}
]
@ -31,7 +31,7 @@
{
"type":"SR (IS-IS)",
- "outLabel":16040,
+ "outLabel":3,
+ "outLabel":16060,
"nexthop":"10.0.1.2"
}
]
@ -63,7 +63,7 @@
{
"type":"SR (IS-IS)",
- "outLabel":16041,
+ "outLabel":3,
+ "outLabel":16061,
"interface":"eth-sw1"
}
]
@ -94,7 +94,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
- "outLabel":3,
- "outLabel":16060,
+ "outLabel":16040,
"nexthop":"10.0.1.2"
}
@ -126,7 +126,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
- "outLabel":3,
- "outLabel":16061,
+ "outLabel":16041,
"interface":"eth-sw1"
}

View File

@ -41,7 +41,10 @@
"ip":"10.0.6.5",
"afi":"ipv4",
"interfaceName":"eth-rt5",
"active":true
"active":true,
"labels":[
16010
]
}
]
}
@ -169,7 +172,10 @@
"ip":"10.0.7.6",
"afi":"ipv4",
"interfaceName":"eth-rt6",
"active":true
"active":true,
"labels":[
16050
]
}
]
}
@ -203,7 +209,10 @@
"ip":"10.0.6.5",
"afi":"ipv4",
"interfaceName":"eth-rt5",
"active":true
"active":true,
"labels":[
16060
]
}
]
}

View File

@ -12,7 +12,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt2-1",
"interfaceName":"eth-rt2-2",
"active":true,
"backupIndex":[
0
@ -24,7 +24,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt2-2",
"interfaceName":"eth-rt2-1",
"active":true,
"backupIndex":[
0
@ -38,7 +38,10 @@
{
"afi":"ipv6",
"interfaceName":"eth-rt5",
"active":true
"active":true,
"labels":[
16011
]
}
]
}
@ -56,7 +59,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt2-1",
"interfaceName":"eth-rt2-2",
"active":true,
"backupIndex":[
0
@ -68,7 +71,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt2-2",
"interfaceName":"eth-rt2-1",
"active":true,
"backupIndex":[
0
@ -101,6 +104,15 @@
"metric":30,
"installed":true,
"nexthops":[
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt2-2",
"active":true,
"labels":[
16031
]
},
{
"fib":true,
"afi":"ipv6",
@ -118,15 +130,6 @@
"labels":[
16031
]
},
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt2-2",
"active":true,
"labels":[
16031
]
}
]
}
@ -158,7 +161,10 @@
{
"afi":"ipv6",
"interfaceName":"eth-rt6",
"active":true
"active":true,
"labels":[
16051
]
}
]
}
@ -190,7 +196,10 @@
{
"afi":"ipv6",
"interfaceName":"eth-rt5",
"active":true
"active":true,
"labels":[
16061
]
}
]
}

View File

@ -25,7 +25,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
"outLabel":16010,
"nexthop":"10.0.6.5"
}
]
@ -56,7 +56,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
"outLabel":16011,
"interface":"eth-rt5"
}
]
@ -188,7 +188,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
"outLabel":16050,
"nexthop":"10.0.7.6"
}
]
@ -210,7 +210,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
"outLabel":16051,
"interface":"eth-rt6"
}
]
@ -232,7 +232,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
"outLabel":16060,
"nexthop":"10.0.6.5"
}
]
@ -254,7 +254,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
"outLabel":16061,
"interface":"eth-rt5"
}
]

View File

@ -1,5 +1,5 @@
--- rt4/step3/show_ip_route.ref 2020-09-25 17:48:05.722919797 -0300
+++ rt4/step4/show_ip_route.ref 2020-09-25 17:49:02.163655010 -0300
--- a/rt4/step3/show_ip_route.ref
+++ b/rt4/step4/show_ip_route.ref
@@ -15,9 +15,6 @@
"afi":"ipv4",
"interfaceName":"eth-rt2-1",
@ -10,29 +10,28 @@
"labels":[
16010
]
@@ -28,21 +25,10 @@
@@ -28,20 +25,6 @@
"afi":"ipv4",
"interfaceName":"eth-rt2-2",
"active":true,
- "backupIndex":[
- 0
- ],
"labels":[
16010
]
}
- "labels":[
- 16010
- ]
- }
- ],
- "backupNexthops":[
- {
- "ip":"10.0.6.5",
- "afi":"ipv4",
- "interfaceName":"eth-rt5",
- "active":true
- }
]
}
],
@@ -62,9 +48,6 @@
- "active":true,
"labels":[
16010
]
@@ -65,9 +48,6 @@
"afi":"ipv4",
"interfaceName":"eth-rt2-1",
"active":true,
@ -42,7 +41,7 @@
"labels":[
3
]
@@ -75,25 +58,10 @@
@@ -78,25 +58,10 @@
"afi":"ipv4",
"interfaceName":"eth-rt2-2",
"active":true,
@ -68,7 +67,7 @@
]
}
],
@@ -156,21 +124,10 @@
@@ -159,24 +124,10 @@
"afi":"ipv4",
"interfaceName":"eth-rt5",
"active":true,
@ -85,12 +84,15 @@
- "ip":"10.0.7.6",
- "afi":"ipv4",
- "interfaceName":"eth-rt6",
- "active":true
- "active":true,
- "labels":[
- 16050
- ]
- }
]
}
],
@@ -190,21 +147,10 @@
@@ -196,24 +147,10 @@
"afi":"ipv4",
"interfaceName":"eth-rt6",
"active":true,
@ -107,12 +109,15 @@
- "ip":"10.0.6.5",
- "afi":"ipv4",
- "interfaceName":"eth-rt5",
- "active":true
- "active":true,
- "labels":[
- 16060
- ]
- }
]
}
],
@@ -223,27 +169,13 @@
@@ -232,27 +169,13 @@
"ip":"10.0.2.2",
"afi":"ipv4",
"interfaceName":"eth-rt2-1",
@ -141,7 +146,7 @@
"active":true
}
]
@@ -259,30 +191,13 @@
@@ -268,30 +191,13 @@
{
"ip":"10.0.2.2",
"afi":"ipv4",
@ -174,7 +179,7 @@
}
]
}
@@ -298,29 +213,12 @@
@@ -307,29 +213,12 @@
"ip":"10.0.2.2",
"afi":"ipv4",
"interfaceName":"eth-rt2-1",
@ -206,7 +211,7 @@
}
]
}
@@ -340,31 +238,6 @@
@@ -349,31 +238,6 @@
"ip":"10.0.6.5",
"afi":"ipv4",
"interfaceName":"eth-rt5",
@ -238,7 +243,7 @@
"active":true
}
]
@@ -385,31 +258,6 @@
@@ -394,31 +258,6 @@
"ip":"10.0.6.5",
"afi":"ipv4",
"interfaceName":"eth-rt5",
@ -270,7 +275,7 @@
"active":true
}
]
@@ -425,18 +273,7 @@
@@ -434,18 +273,7 @@
{
"ip":"10.0.6.5",
"afi":"ipv4",
@ -290,7 +295,7 @@
}
]
}
@@ -451,18 +288,7 @@
@@ -460,18 +288,7 @@
{
"ip":"10.0.7.6",
"afi":"ipv4",

View File

@ -1,16 +1,6 @@
--- rt4/step3/show_ipv6_route.ref 2020-09-25 17:48:06.998936410 -0300
+++ rt4/step4/show_ipv6_route.ref 2020-09-25 17:49:03.399671119 -0300
--- a/rt4/step3/show_ipv6_route.ref
+++ b/rt4/step4/show_ipv6_route.ref
@@ -14,9 +14,6 @@
"afi":"ipv6",
"interfaceName":"eth-rt2-1",
"active":true,
- "backupIndex":[
- 0
- ],
"labels":[
16011
]
@@ -26,20 +23,10 @@
"afi":"ipv6",
"interfaceName":"eth-rt2-2",
"active":true,
@ -20,20 +10,29 @@
"labels":[
16011
]
}
@@ -26,19 +23,6 @@
"afi":"ipv6",
"interfaceName":"eth-rt2-1",
"active":true,
- "backupIndex":[
- 0
- ],
- "labels":[
- 16011
- ]
- }
- ],
- "backupNexthops":[
- {
- "afi":"ipv6",
- "interfaceName":"eth-rt5",
- "active":true
- }
]
}
],
@@ -58,9 +45,6 @@
- "active":true,
"labels":[
16011
]
@@ -61,9 +45,6 @@
"afi":"ipv6",
"interfaceName":"eth-rt2-1",
"interfaceName":"eth-rt2-2",
"active":true,
- "backupIndex":[
- 0
@ -41,9 +40,9 @@
"labels":[
3
]
@@ -70,24 +54,10 @@
@@ -73,24 +54,10 @@
"afi":"ipv6",
"interfaceName":"eth-rt2-2",
"interfaceName":"eth-rt2-1",
"active":true,
- "backupIndex":[
- 0
@ -66,7 +65,7 @@
]
}
],
@@ -146,20 +116,10 @@
@@ -149,23 +116,10 @@
"afi":"ipv6",
"interfaceName":"eth-rt5",
"active":true,
@ -82,12 +81,15 @@
- {
- "afi":"ipv6",
- "interfaceName":"eth-rt6",
- "active":true
- "active":true,
- "labels":[
- 16051
- ]
- }
]
}
],
@@ -178,20 +138,10 @@
@@ -184,23 +138,10 @@
"afi":"ipv6",
"interfaceName":"eth-rt6",
"active":true,
@ -103,7 +105,10 @@
- {
- "afi":"ipv6",
- "interfaceName":"eth-rt5",
- "active":true
- "active":true,
- "labels":[
- 16061
- ]
- }
]
}

View File

@ -1,5 +1,5 @@
--- rt4/step3/show_mpls_table.ref 2020-09-25 17:48:04.418902820 -0300
+++ rt4/step4/show_mpls_table.ref 2020-09-25 17:49:00.959639319 -0300
--- a/rt4/step3/show_mpls_table.ref
+++ b/rt4/step4/show_mpls_table.ref
@@ -7,26 +7,13 @@
"type":"SR (IS-IS)",
"outLabel":16010,
@ -23,7 +23,7 @@
- "backupNexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":3,
- "outLabel":16010,
- "nexthop":"10.0.6.5"
+ "nexthop":"10.0.2.2"
}
@ -52,7 +52,7 @@
- "backupNexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":3,
- "outLabel":16011,
- "interface":"eth-rt5"
+ "interface":"eth-rt2-1"
}
@ -129,7 +129,7 @@
- "backupNexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":3,
- "outLabel":16050,
- "nexthop":"10.0.7.6"
+ "nexthop":"10.0.6.5"
}
@ -148,7 +148,7 @@
- "backupNexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":3,
- "outLabel":16051,
- "interface":"eth-rt6"
+ "interface":"eth-rt5"
}
@ -167,7 +167,7 @@
- "backupNexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":3,
- "outLabel":16060,
- "nexthop":"10.0.6.5"
+ "nexthop":"10.0.7.6"
}
@ -186,7 +186,7 @@
- "backupNexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":3,
- "outLabel":16061,
- "interface":"eth-rt5"
+ "interface":"eth-rt6"
}

View File

@ -1,5 +1,5 @@
--- rt4/step4/show_ip_route.ref 2020-09-25 17:49:02.163655010 -0300
+++ rt4/step5/show_ip_route.ref 2020-09-25 17:50:12.800576153 -0300
--- a/rt4/step4/show_ip_route.ref
+++ b/rt4/step5/show_ip_route.ref
@@ -15,6 +15,9 @@
"afi":"ipv4",
"interfaceName":"eth-rt2-1",
@ -10,29 +10,28 @@
"labels":[
16010
]
@@ -25,10 +28,21 @@
@@ -25,6 +28,20 @@
"afi":"ipv4",
"interfaceName":"eth-rt2-2",
"active":true,
+ "backupIndex":[
+ 0
+ ],
"labels":[
16010
]
}
+ "labels":[
+ 16010
+ ]
+ }
+ ],
+ "backupNexthops":[
+ {
+ "ip":"10.0.6.5",
+ "afi":"ipv4",
+ "interfaceName":"eth-rt5",
+ "active":true
+ }
]
}
],
@@ -48,6 +62,9 @@
+ "active":true,
"labels":[
16010
]
@@ -48,6 +65,9 @@
"afi":"ipv4",
"interfaceName":"eth-rt2-1",
"active":true,
@ -42,7 +41,7 @@
"labels":[
3
]
@@ -58,10 +75,25 @@
@@ -58,10 +78,25 @@
"afi":"ipv4",
"interfaceName":"eth-rt2-2",
"active":true,
@ -68,7 +67,7 @@
]
}
],
@@ -124,10 +156,21 @@
@@ -124,10 +159,24 @@
"afi":"ipv4",
"interfaceName":"eth-rt5",
"active":true,
@ -85,12 +84,15 @@
+ "ip":"10.0.7.6",
+ "afi":"ipv4",
+ "interfaceName":"eth-rt6",
+ "active":true
+ "active":true,
+ "labels":[
+ 16050
+ ]
+ }
]
}
],
@@ -147,10 +190,21 @@
@@ -147,10 +196,24 @@
"afi":"ipv4",
"interfaceName":"eth-rt6",
"active":true,
@ -107,12 +109,15 @@
+ "ip":"10.0.6.5",
+ "afi":"ipv4",
+ "interfaceName":"eth-rt5",
+ "active":true
+ "active":true,
+ "labels":[
+ 16060
+ ]
+ }
]
}
],
@@ -169,13 +223,27 @@
@@ -169,13 +232,27 @@
"ip":"10.0.2.2",
"afi":"ipv4",
"interfaceName":"eth-rt2-1",
@ -141,7 +146,7 @@
"active":true
}
]
@@ -191,13 +259,30 @@
@@ -191,13 +268,30 @@
{
"ip":"10.0.2.2",
"afi":"ipv4",
@ -174,7 +179,7 @@
}
]
}
@@ -213,12 +298,29 @@
@@ -213,12 +307,29 @@
"ip":"10.0.2.2",
"afi":"ipv4",
"interfaceName":"eth-rt2-1",
@ -206,7 +211,7 @@
}
]
}
@@ -238,6 +340,31 @@
@@ -238,6 +349,31 @@
"ip":"10.0.6.5",
"afi":"ipv4",
"interfaceName":"eth-rt5",
@ -238,7 +243,7 @@
"active":true
}
]
@@ -258,6 +385,31 @@
@@ -258,6 +394,31 @@
"ip":"10.0.6.5",
"afi":"ipv4",
"interfaceName":"eth-rt5",
@ -270,7 +275,7 @@
"active":true
}
]
@@ -273,7 +425,18 @@
@@ -273,7 +434,18 @@
{
"ip":"10.0.6.5",
"afi":"ipv4",
@ -290,7 +295,7 @@
}
]
}
@@ -288,7 +451,18 @@
@@ -288,7 +460,18 @@
{
"ip":"10.0.7.6",
"afi":"ipv4",

View File

@ -1,16 +1,6 @@
--- rt4/step4/show_ipv6_route.ref 2020-09-25 17:49:03.399671119 -0300
+++ rt4/step5/show_ipv6_route.ref 2020-09-25 17:50:14.040592332 -0300
--- a/rt4/step4/show_ipv6_route.ref
+++ b/rt4/step5/show_ipv6_route.ref
@@ -14,6 +14,9 @@
"afi":"ipv6",
"interfaceName":"eth-rt2-1",
"active":true,
+ "backupIndex":[
+ 0
+ ],
"labels":[
16011
]
@@ -23,10 +26,20 @@
"afi":"ipv6",
"interfaceName":"eth-rt2-2",
"active":true,
@ -20,20 +10,29 @@
"labels":[
16011
]
}
@@ -23,6 +26,19 @@
"afi":"ipv6",
"interfaceName":"eth-rt2-1",
"active":true,
+ "backupIndex":[
+ 0
+ ],
+ "labels":[
+ 16011
+ ]
+ }
+ ],
+ "backupNexthops":[
+ {
+ "afi":"ipv6",
+ "interfaceName":"eth-rt5",
+ "active":true
+ }
]
}
],
@@ -45,6 +58,9 @@
+ "active":true,
"labels":[
16011
]
@@ -45,6 +61,9 @@
"afi":"ipv6",
"interfaceName":"eth-rt2-1",
"interfaceName":"eth-rt2-2",
"active":true,
+ "backupIndex":[
+ 0
@ -41,9 +40,9 @@
"labels":[
3
]
@@ -54,10 +70,24 @@
@@ -54,10 +73,24 @@
"afi":"ipv6",
"interfaceName":"eth-rt2-2",
"interfaceName":"eth-rt2-1",
"active":true,
+ "backupIndex":[
+ 0
@ -66,7 +65,7 @@
]
}
],
@@ -116,10 +146,20 @@
@@ -116,10 +149,23 @@
"afi":"ipv6",
"interfaceName":"eth-rt5",
"active":true,
@ -82,12 +81,15 @@
+ {
+ "afi":"ipv6",
+ "interfaceName":"eth-rt6",
+ "active":true
+ "active":true,
+ "labels":[
+ 16051
+ ]
+ }
]
}
],
@@ -138,10 +178,20 @@
@@ -138,10 +184,23 @@
"afi":"ipv6",
"interfaceName":"eth-rt6",
"active":true,
@ -103,7 +105,10 @@
+ {
+ "afi":"ipv6",
+ "interfaceName":"eth-rt5",
+ "active":true
+ "active":true,
+ "labels":[
+ 16061
+ ]
+ }
]
}

View File

@ -1,5 +1,5 @@
--- rt4/step4/show_mpls_table.ref 2020-09-25 17:49:00.959639319 -0300
+++ rt4/step5/show_mpls_table.ref 2020-09-25 17:50:11.488559034 -0300
--- a/rt4/step4/show_mpls_table.ref
+++ b/rt4/step5/show_mpls_table.ref
@@ -7,13 +7,26 @@
"type":"SR (IS-IS)",
"outLabel":16010,
@ -24,7 +24,7 @@
+ "backupNexthops":[
+ {
+ "type":"SR (IS-IS)",
+ "outLabel":3,
+ "outLabel":16010,
+ "nexthop":"10.0.6.5"
}
]
@ -53,7 +53,7 @@
+ "backupNexthops":[
+ {
+ "type":"SR (IS-IS)",
+ "outLabel":3,
+ "outLabel":16011,
+ "interface":"eth-rt5"
}
]
@ -130,7 +130,7 @@
+ "backupNexthops":[
+ {
+ "type":"SR (IS-IS)",
+ "outLabel":3,
+ "outLabel":16050,
+ "nexthop":"10.0.7.6"
}
]
@ -149,7 +149,7 @@
+ "backupNexthops":[
+ {
+ "type":"SR (IS-IS)",
+ "outLabel":3,
+ "outLabel":16051,
+ "interface":"eth-rt6"
}
]
@ -168,7 +168,7 @@
+ "backupNexthops":[
+ {
+ "type":"SR (IS-IS)",
+ "outLabel":3,
+ "outLabel":16060,
+ "nexthop":"10.0.6.5"
}
]
@ -187,7 +187,7 @@
+ "backupNexthops":[
+ {
+ "type":"SR (IS-IS)",
+ "outLabel":3,
+ "outLabel":16061,
+ "interface":"eth-rt5"
}
]

View File

@ -1,6 +1,15 @@
--- rt4/step5/show_ip_route.ref 2020-09-25 17:50:12.800576153 -0300
+++ rt4/step6/show_ip_route.ref 2020-09-25 17:51:15.725397558 -0300
@@ -90,7 +90,7 @@
--- a/rt4/step5/show_ip_route.ref
+++ b/rt4/step6/show_ip_route.ref
@@ -43,7 +43,7 @@
"interfaceName":"eth-rt5",
"active":true,
"labels":[
- 16010
+ 30010
]
}
]
@@ -93,7 +93,7 @@
"interfaceName":"eth-rt5",
"active":true,
"labels":[
@ -9,7 +18,7 @@
16020
]
}
@@ -134,7 +134,7 @@
@@ -137,7 +137,7 @@
"interfaceName":"eth-rt5",
"active":true,
"labels":[
@ -18,7 +27,16 @@
]
}
]
@@ -281,7 +281,7 @@
@@ -211,7 +211,7 @@
"interfaceName":"eth-rt5",
"active":true,
"labels":[
- 16060
+ 30060
]
}
]
@@ -290,7 +290,7 @@
"interfaceName":"eth-rt5",
"active":true,
"labels":[
@ -27,7 +45,7 @@
]
}
]
@@ -319,7 +319,7 @@
@@ -328,7 +328,7 @@
"interfaceName":"eth-rt5",
"active":true,
"labels":[

View File

@ -1,6 +1,15 @@
--- rt4/step5/show_ipv6_route.ref 2020-09-25 17:50:14.040592332 -0300
+++ rt4/step6/show_ipv6_route.ref 2020-09-25 17:51:16.969413804 -0300
@@ -84,7 +84,7 @@
--- a/rt4/step5/show_ipv6_route.ref
+++ b/rt4/step6/show_ipv6_route.ref
@@ -40,7 +40,7 @@
"interfaceName":"eth-rt5",
"active":true,
"labels":[
- 16011
+ 30011
]
}
]
@@ -87,7 +87,7 @@
"interfaceName":"eth-rt5",
"active":true,
"labels":[
@ -9,12 +18,21 @@
16021
]
}
@@ -116,7 +116,7 @@
@@ -128,7 +128,7 @@
"interfaceName":"eth-rt5",
"active":true,
"labels":[
- 16031
+ 30031
]
},
{
}
]
@@ -198,7 +198,7 @@
"interfaceName":"eth-rt5",
"active":true,
"labels":[
- 16061
+ 30061
]
}
]

View File

@ -1,5 +1,23 @@
--- rt4/step5/show_mpls_table.ref 2020-09-25 17:50:11.488559034 -0300
+++ rt4/step6/show_mpls_table.ref 2020-09-25 17:51:14.481381312 -0300
--- a/rt4/step5/show_mpls_table.ref
+++ b/rt4/step6/show_mpls_table.ref
@@ -25,7 +25,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
- "outLabel":16010,
+ "outLabel":30010,
"nexthop":"10.0.6.5"
}
]
@@ -56,7 +56,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
- "outLabel":16011,
+ "outLabel":30011,
"interface":"eth-rt5"
}
]
@@ -87,7 +87,7 @@
"backupNexthops":[
{
@ -36,3 +54,21 @@
"installed":true,
"interface":"eth-rt5"
}
@@ -232,7 +232,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
- "outLabel":16060,
+ "outLabel":30060,
"nexthop":"10.0.6.5"
}
]
@@ -254,7 +254,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
- "outLabel":16061,
+ "outLabel":30061,
"interface":"eth-rt5"
}
]

View File

@ -1,6 +1,6 @@
--- rt4/step6/show_ip_route.ref 2020-09-25 17:51:15.725397558 -0300
+++ rt4/step7/show_ip_route.ref 2020-09-25 17:52:02.614010084 -0300
@@ -158,9 +158,6 @@
--- a/rt4/step6/show_ip_route.ref
+++ b/rt4/step7/show_ip_route.ref
@@ -161,9 +161,6 @@
"active":true,
"backupIndex":[
0
@ -10,3 +10,15 @@
]
}
],
@@ -172,10 +169,7 @@
"ip":"10.0.7.6",
"afi":"ipv4",
"interfaceName":"eth-rt6",
- "active":true,
- "labels":[
- 16050
- ]
+ "active":true
}
]
}

View File

@ -1,6 +1,6 @@
--- rt4/step6/show_ipv6_route.ref 2020-09-25 17:51:16.969413804 -0300
+++ rt4/step7/show_ipv6_route.ref 2020-09-25 17:52:03.854026287 -0300
@@ -148,9 +148,6 @@
--- a/rt4/step6/show_ipv6_route.ref
+++ b/rt4/step7/show_ipv6_route.ref
@@ -151,9 +151,6 @@
"active":true,
"backupIndex":[
0
@ -10,3 +10,15 @@
]
}
],
@@ -161,10 +158,7 @@
{
"afi":"ipv6",
"interfaceName":"eth-rt6",
- "active":true,
- "labels":[
- 16051
- ]
+ "active":true
}
]
}

View File

@ -1,5 +1,5 @@
--- rt4/step6/show_mpls_table.ref 2020-09-25 17:51:14.481381312 -0300
+++ rt4/step7/show_mpls_table.ref 2020-09-25 17:52:01.385994037 -0300
--- a/rt4/step6/show_mpls_table.ref
+++ b/rt4/step7/show_mpls_table.ref
@@ -171,50 +171,6 @@
}
]
@ -21,7 +21,7 @@
- "backupNexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":3,
- "outLabel":16050,
- "nexthop":"10.0.7.6"
- }
- ]
@ -43,7 +43,7 @@
- "backupNexthops":[
- {
- "type":"SR (IS-IS)",
- "outLabel":3,
- "outLabel":16051,
- "interface":"eth-rt6"
- }
- ]

View File

@ -1,6 +1,6 @@
--- rt4/step7/show_ip_route.ref 2020-09-25 17:52:02.614010084 -0300
+++ rt4/step8/show_ip_route.ref 2020-09-25 17:53:20.623029909 -0300
@@ -158,6 +158,9 @@
--- a/rt4/step7/show_ip_route.ref
+++ b/rt4/step8/show_ip_route.ref
@@ -161,6 +161,9 @@
"active":true,
"backupIndex":[
0
@ -10,3 +10,15 @@
]
}
],
@@ -169,7 +172,10 @@
"ip":"10.0.7.6",
"afi":"ipv4",
"interfaceName":"eth-rt6",
- "active":true
+ "active":true,
+ "labels":[
+ 16050
+ ]
}
]
}

View File

@ -1,6 +1,6 @@
--- rt4/step7/show_ipv6_route.ref 2020-09-25 17:52:03.854026287 -0300
+++ rt4/step8/show_ipv6_route.ref 2020-09-25 17:53:21.843045865 -0300
@@ -148,6 +148,9 @@
--- a/rt4/step7/show_ipv6_route.ref
+++ b/rt4/step8/show_ipv6_route.ref
@@ -151,6 +151,9 @@
"active":true,
"backupIndex":[
0
@ -10,3 +10,15 @@
]
}
],
@@ -158,7 +161,10 @@
{
"afi":"ipv6",
"interfaceName":"eth-rt6",
- "active":true
+ "active":true,
+ "labels":[
+ 16051
+ ]
}
]
}

View File

@ -1,5 +1,5 @@
--- rt4/step7/show_mpls_table.ref 2020-09-25 17:52:01.385994037 -0300
+++ rt4/step8/show_mpls_table.ref 2020-09-25 17:53:19.371013534 -0300
--- a/rt4/step7/show_mpls_table.ref
+++ b/rt4/step8/show_mpls_table.ref
@@ -171,6 +171,50 @@
}
]
@ -21,7 +21,7 @@
+ "backupNexthops":[
+ {
+ "type":"SR (IS-IS)",
+ "outLabel":3,
+ "outLabel":16050,
+ "nexthop":"10.0.7.6"
+ }
+ ]
@ -43,7 +43,7 @@
+ "backupNexthops":[
+ {
+ "type":"SR (IS-IS)",
+ "outLabel":3,
+ "outLabel":16051,
+ "interface":"eth-rt6"
+ }
+ ]

View File

@ -0,0 +1,11 @@
--- a/rt4/step8/show_ip_route.ref
+++ b/rt4/step9/show_ip_route.ref
@@ -174,7 +174,7 @@
"interfaceName":"eth-rt6",
"active":true,
"labels":[
- 16050
+ 16500
]
}
]

View File

@ -0,0 +1,11 @@
--- a/rt4/step8/show_ipv6_route.ref
+++ b/rt4/step9/show_ipv6_route.ref
@@ -163,7 +163,7 @@
"interfaceName":"eth-rt6",
"active":true,
"labels":[
- 16051
+ 16501
]
}
]

View File

@ -1,5 +1,5 @@
--- rt4/step8/show_mpls_table.ref 2020-09-25 17:53:19.371013534 -0300
+++ rt4/step9/show_mpls_table.ref 2020-09-25 17:54:37.064030042 -0300
--- a/rt4/step8/show_mpls_table.ref
+++ b/rt4/step9/show_mpls_table.ref
@@ -171,15 +171,15 @@
}
]
@ -19,11 +19,13 @@
"backupIndex":[
0
]
@@ -189,19 +189,19 @@
@@ -188,20 +188,20 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
- "outLabel":16050,
- "nexthop":"10.0.7.6"
+ "outLabel":30060,
+ "nexthop":"10.0.6.5"
}
]
@ -43,11 +45,13 @@
"backupIndex":[
0
]
@@ -211,19 +211,19 @@
@@ -210,20 +210,20 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
- "outLabel":16051,
- "interface":"eth-rt6"
+ "outLabel":30061,
+ "interface":"eth-rt5"
}
]
@ -67,11 +71,13 @@
"backupIndex":[
0
]
@@ -233,19 +233,19 @@
@@ -232,20 +232,20 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
- "outLabel":30060,
- "nexthop":"10.0.6.5"
+ "outLabel":16500,
+ "nexthop":"10.0.7.6"
}
]
@ -91,11 +97,13 @@
"backupIndex":[
0
]
@@ -255,7 +255,7 @@
@@ -254,8 +254,8 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
- "outLabel":30061,
- "interface":"eth-rt5"
+ "outLabel":16501,
+ "interface":"eth-rt6"
}
]

View File

@ -41,7 +41,10 @@
"ip":"10.0.6.4",
"afi":"ipv4",
"interfaceName":"eth-rt4",
"active":true
"active":true,
"labels":[
16010
]
}
]
}
@ -169,7 +172,10 @@
"ip":"10.0.8.6",
"afi":"ipv4",
"interfaceName":"eth-rt6",
"active":true
"active":true,
"labels":[
16040
]
}
]
}
@ -203,7 +209,10 @@
"ip":"10.0.6.4",
"afi":"ipv4",
"interfaceName":"eth-rt4",
"active":true
"active":true,
"labels":[
16060
]
}
]
}

View File

@ -12,7 +12,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt3-1",
"interfaceName":"eth-rt3-2",
"active":true,
"backupIndex":[
0
@ -24,7 +24,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt3-2",
"interfaceName":"eth-rt3-1",
"active":true,
"backupIndex":[
0
@ -38,7 +38,10 @@
{
"afi":"ipv6",
"interfaceName":"eth-rt4",
"active":true
"active":true,
"labels":[
16011
]
}
]
}
@ -65,7 +68,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt3-1",
"interfaceName":"eth-rt3-2",
"active":true,
"labels":[
16021
@ -74,7 +77,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt3-2",
"interfaceName":"eth-rt3-1",
"active":true,
"labels":[
16021
@ -96,7 +99,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt3-1",
"interfaceName":"eth-rt3-2",
"active":true,
"backupIndex":[
0
@ -108,7 +111,7 @@
{
"fib":true,
"afi":"ipv6",
"interfaceName":"eth-rt3-2",
"interfaceName":"eth-rt3-1",
"active":true,
"backupIndex":[
0
@ -158,7 +161,10 @@
{
"afi":"ipv6",
"interfaceName":"eth-rt6",
"active":true
"active":true,
"labels":[
16041
]
}
]
}
@ -190,7 +196,10 @@
{
"afi":"ipv6",
"interfaceName":"eth-rt4",
"active":true
"active":true,
"labels":[
16061
]
}
]
}

View File

@ -25,7 +25,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
"outLabel":16010,
"nexthop":"10.0.6.4"
}
]
@ -56,7 +56,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
"outLabel":16011,
"interface":"eth-rt4"
}
]
@ -188,7 +188,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
"outLabel":16040,
"nexthop":"10.0.8.6"
}
]
@ -210,7 +210,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
"outLabel":16041,
"interface":"eth-rt6"
}
]
@ -232,7 +232,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
"outLabel":16060,
"nexthop":"10.0.6.4"
}
]
@ -254,7 +254,7 @@
"backupNexthops":[
{
"type":"SR (IS-IS)",
"outLabel":3,
"outLabel":16061,
"interface":"eth-rt4"
}
]

View File

@ -1,6 +1,18 @@
--- rt5/step3/show_ip_route.ref 2020-09-25 17:48:05.950922766 -0300
+++ rt5/step4/show_ip_route.ref 2020-09-25 17:49:02.363657616 -0300
@@ -81,10 +81,7 @@
--- a/rt5/step3/show_ip_route.ref
+++ b/rt5/step4/show_ip_route.ref
@@ -41,10 +41,7 @@
"ip":"10.0.6.4",
"afi":"ipv4",
"interfaceName":"eth-rt4",
- "active":true,
- "labels":[
- 16010
- ]
+ "active":true
}
]
}
@@ -84,10 +81,7 @@
"ip":"10.0.6.4",
"afi":"ipv4",
"interfaceName":"eth-rt4",
@ -12,7 +24,7 @@
}
]
}
@@ -105,9 +102,6 @@
@@ -108,9 +102,6 @@
"afi":"ipv4",
"interfaceName":"eth-rt3-1",
"active":true,
@ -22,7 +34,7 @@
"labels":[
3
]
@@ -118,25 +112,10 @@
@@ -121,25 +112,10 @@
"afi":"ipv4",
"interfaceName":"eth-rt3-2",
"active":true,
@ -48,7 +60,7 @@
]
}
],
@@ -158,9 +137,6 @@
@@ -161,9 +137,6 @@
"active":true,
"backupIndex":[
0
@ -58,7 +70,31 @@
]
}
],
@@ -349,30 +325,13 @@
@@ -172,10 +145,7 @@
"ip":"10.0.8.6",
"afi":"ipv4",
"interfaceName":"eth-rt6",
- "active":true,
- "labels":[
- 16040
- ]
+ "active":true
}
]
}
@@ -209,10 +179,7 @@
"ip":"10.0.6.4",
"afi":"ipv4",
"interfaceName":"eth-rt4",
- "active":true,
- "labels":[
- 16060
- ]
+ "active":true
}
]
}
@@ -358,30 +325,13 @@
{
"ip":"10.0.4.3",
"afi":"ipv4",
@ -91,7 +127,7 @@
}
]
}
@@ -388,29 +347,12 @@
@@ -397,29 +347,12 @@
"ip":"10.0.4.3",
"afi":"ipv4",
"interfaceName":"eth-rt3-1",

Some files were not shown because too many files have changed in this diff Show More