From d0a142aae46789fd9a7e541e61b9b7b52ea742cd Mon Sep 17 00:00:00 2001 From: Philippe Guibert Date: Wed, 19 Jun 2024 16:05:33 +0200 Subject: [PATCH] isisd: override json fields for monitored paths The json output for isis route paths should use caml format. Signed-off-by: Philippe Guibert --- isisd/isis_spf.c | 4 +- .../topotests/isis_topo1/r1/r1_topology.json | 108 ++++---- .../topotests/isis_topo1/r2/r2_topology.json | 108 ++++---- .../topotests/isis_topo1/r3/r3_topology.json | 252 +++++++++--------- .../topotests/isis_topo1/r4/r4_topology.json | 252 +++++++++--------- .../topotests/isis_topo1/r5/r5_topology.json | 204 +++++++------- .../isis_topo1_vrf/r1/r1_topology.json | 84 +++--- .../isis_topo1_vrf/r2/r2_topology.json | 84 +++--- .../isis_topo1_vrf/r3/r3_topology.json | 180 ++++++------- .../isis_topo1_vrf/r4/r4_topology.json | 180 ++++++------- .../isis_topo1_vrf/r5/r5_topology.json | 156 +++++------ 11 files changed, 807 insertions(+), 805 deletions(-) diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c index 86d998c419..d6ce76960b 100644 --- a/isisd/isis_spf.c +++ b/isisd/isis_spf.c @@ -2336,7 +2336,9 @@ static void isis_print_paths(struct vty *vty, struct isis_vertex_queue *queue, vty_out(vty, "%s\n", table); XFREE(MTYPE_TMP, table); } else - *json = ttable_json(tt, "ssdsss"); + *json = ttable_json_with_json_text( + tt, "ssdsss", + "vertex|type|metric|nextHop|interface|parent"); ttable_del(tt); } diff --git a/tests/topotests/isis_topo1/r1/r1_topology.json b/tests/topotests/isis_topo1/r1/r1_topology.json index d52346df6f..6b3374cc4d 100644 --- a/tests/topotests/isis_topo1/r1/r1_topology.json +++ b/tests/topotests/isis_topo1/r1/r1_topology.json @@ -5,92 +5,92 @@ "level-1": { "ipv4-paths": [ { - "Vertex": "r1" + "vertex": "r1" } ], "ipv6-paths": [ { - "Vertex": "r1" + "vertex": "r1" } ] }, "level-2": { "ipv4-paths": [ { - "Vertex": "r1" + "vertex": "r1" }, { - "Metric": 0, - "Parent": "r1(4)", - "Type": "IP internal", - "Vertex": "10.0.20.0/24" + "metric": 0, + "parent": "r1(4)", + "type": "IP internal", + "vertex": "10.0.20.0/24" }, { - "Interface": "r1-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r1(4)", - "Type": "TE-IS", - "Vertex": "r3" + "interface": "r1-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r1(4)", + "type": "TE-IS", + "vertex": "r3" }, { - "Interface": "r1-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r3(4)", - "Type": "IP TE", - "Vertex": "10.0.10.0/24" + "interface": "r1-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r3(4)", + "type": "IP TE", + "vertex": "10.0.10.0/24" }, { - "Interface": "r1-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r3(4)", - "Type": "IP TE", - "Vertex": "10.0.20.0/24" + "interface": "r1-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r3(4)", + "type": "IP TE", + "vertex": "10.0.20.0/24" }, { - "Interface": "r1-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r3(4)", - "Type": "IP TE", - "Vertex": "10.254.0.3/32" + "interface": "r1-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r3(4)", + "type": "IP TE", + "vertex": "10.254.0.3/32" } ], "ipv6-paths": [ { - "Vertex": "r1" + "vertex": "r1" }, { - "Metric": 0, - "Parent": "r1(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:1:1::/64" + "metric": 0, + "parent": "r1(4)", + "type": "IP6 internal", + "vertex": "2001:db8:1:1::/64" }, { - "Interface": "r1-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r1(4)", - "Type": "TE-IS", - "Vertex": "r3" + "interface": "r1-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r1(4)", + "type": "TE-IS", + "vertex": "r3" }, { - "Metric": 10, - "Interface": "r1-eth0", - "Next-Hop": "r3", - "Parent": "r3(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:2:1::/64" + "metric": 10, + "interface": "r1-eth0", + "nextHop": "r3", + "parent": "r3(4)", + "type": "IP6 internal", + "vertex": "2001:db8:2:1::/64" }, { - "Metric": 10, - "Interface": "r1-eth0", - "Next-Hop": "r3", - "Parent": "r3(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:f::3/128" + "metric": 10, + "interface": "r1-eth0", + "nextHop": "r3", + "parent": "r3(4)", + "type": "IP6 internal", + "vertex": "2001:db8:f::3/128" } ] } diff --git a/tests/topotests/isis_topo1/r2/r2_topology.json b/tests/topotests/isis_topo1/r2/r2_topology.json index d0a1f90fd0..8720bc1cac 100644 --- a/tests/topotests/isis_topo1/r2/r2_topology.json +++ b/tests/topotests/isis_topo1/r2/r2_topology.json @@ -5,92 +5,92 @@ "level-1": { "ipv4-paths": [ { - "Vertex": "r2" + "vertex": "r2" } ], "ipv6-paths": [ { - "Vertex": "r2" + "vertex": "r2" } ] }, "level-2": { "ipv4-paths": [ { - "Vertex": "r2" + "vertex": "r2" }, { - "Metric": 0, - "Parent": "r2(4)", - "Type": "IP internal", - "Vertex": "10.0.21.0/24" + "metric": 0, + "parent": "r2(4)", + "type": "IP internal", + "vertex": "10.0.21.0/24" }, { - "Interface": "r2-eth0", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r2(4)", - "Type": "TE-IS", - "Vertex": "r4" + "interface": "r2-eth0", + "metric": 10, + "nextHop": "r4", + "parent": "r2(4)", + "type": "TE-IS", + "vertex": "r4" }, { - "Interface": "r2-eth0", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r4(4)", - "Type": "IP TE", - "Vertex": "10.0.11.0/24" + "interface": "r2-eth0", + "metric": 10, + "nextHop": "r4", + "parent": "r4(4)", + "type": "IP TE", + "vertex": "10.0.11.0/24" }, { - "Interface": "r2-eth0", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r4(4)", - "Type": "IP TE", - "Vertex": "10.0.21.0/24" + "interface": "r2-eth0", + "metric": 10, + "nextHop": "r4", + "parent": "r4(4)", + "type": "IP TE", + "vertex": "10.0.21.0/24" }, { - "Interface": "r2-eth0", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r4(4)", - "Type": "IP TE", - "Vertex": "10.254.0.4/32" + "interface": "r2-eth0", + "metric": 10, + "nextHop": "r4", + "parent": "r4(4)", + "type": "IP TE", + "vertex": "10.254.0.4/32" } ], "ipv6-paths": [ { - "Vertex": "r2" + "vertex": "r2" }, { - "Metric": 0, - "Parent": "r2(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:1:2::/64" + "metric": 0, + "parent": "r2(4)", + "type": "IP6 internal", + "vertex": "2001:db8:1:2::/64" }, { - "Interface": "r2-eth0", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r2(4)", - "Type": "TE-IS", - "Vertex": "r4" + "interface": "r2-eth0", + "metric": 10, + "nextHop": "r4", + "parent": "r2(4)", + "type": "TE-IS", + "vertex": "r4" }, { - "Metric": 10, - "Interface": "r2-eth0", - "Next-Hop": "r4", - "Parent": "r4(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:2:2::/64" + "metric": 10, + "interface": "r2-eth0", + "nextHop": "r4", + "parent": "r4(4)", + "type": "IP6 internal", + "vertex": "2001:db8:2:2::/64" }, { - "Metric": 10, - "Interface": "r2-eth0", - "Next-Hop": "r4", - "Parent": "r4(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:f::4/128" + "metric": 10, + "interface": "r2-eth0", + "nextHop": "r4", + "parent": "r4(4)", + "type": "IP6 internal", + "vertex": "2001:db8:f::4/128" } ] } diff --git a/tests/topotests/isis_topo1/r3/r3_topology.json b/tests/topotests/isis_topo1/r3/r3_topology.json index 9265e62786..568b6dfeed 100644 --- a/tests/topotests/isis_topo1/r3/r3_topology.json +++ b/tests/topotests/isis_topo1/r3/r3_topology.json @@ -5,190 +5,190 @@ "level-1": { "ipv4-paths": [ { - "Vertex": "r3" + "vertex": "r3" }, { - "Metric": 0, - "Parent": "r3(4)", - "Type": "IP internal", - "Vertex": "10.0.10.0/24" + "metric": 0, + "parent": "r3(4)", + "type": "IP internal", + "vertex": "10.0.10.0/24" }, { - "Interface": "r3-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r3(4)", - "Type": "TE-IS", - "Vertex": "r5" + "interface": "r3-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r3(4)", + "type": "TE-IS", + "vertex": "r5" }, { - "Interface": "r3-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r5(4)", - "Type": "IP TE", - "Vertex": "10.0.10.0/24" + "interface": "r3-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r5(4)", + "type": "IP TE", + "vertex": "10.0.10.0/24" }, { - "Interface": "r3-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r5(4)", - "Type": "IP TE", - "Vertex": "10.0.11.0/24" + "interface": "r3-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r5(4)", + "type": "IP TE", + "vertex": "10.0.11.0/24" }, { - "Interface": "r3-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r5(4)", - "Type": "IP TE", - "Vertex": "10.254.0.5/32" + "interface": "r3-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r5(4)", + "type": "IP TE", + "vertex": "10.254.0.5/32" }, { - "Interface": "r3-eth1", - "Metric": 20, - "Next-Hop": "r5", - "Type": "TE-IS", - "Vertex": "r4" + "interface": "r3-eth1", + "metric": 20, + "nextHop": "r5", + "type": "TE-IS", + "vertex": "r4" }, { - "Interface": "r3-eth1", - "Metric": 20, - "Next-Hop": "r5", - "Parent": "r4(4)", - "Type": "IP TE", - "Vertex": "10.0.21.0/24" + "interface": "r3-eth1", + "metric": 20, + "nextHop": "r5", + "parent": "r4(4)", + "type": "IP TE", + "vertex": "10.0.21.0/24" }, { - "Interface": "r3-eth1", - "Metric": 20, - "Next-Hop": "r5", - "Parent": "r4(4)", - "Type": "IP TE", - "Vertex": "10.254.0.4/32" + "interface": "r3-eth1", + "metric": 20, + "nextHop": "r5", + "parent": "r4(4)", + "type": "IP TE", + "vertex": "10.254.0.4/32" } ], "ipv6-paths": [ { - "Vertex": "r3" + "vertex": "r3" }, { - "Metric": 0, - "Parent": "r3(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:2:1::/64" + "metric": 0, + "parent": "r3(4)", + "type": "IP6 internal", + "vertex": "2001:db8:2:1::/64" }, { - "Interface": "r3-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r3(4)", - "Type": "TE-IS", - "Vertex": "r5" + "interface": "r3-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r3(4)", + "type": "TE-IS", + "vertex": "r5" }, { - "Metric": 10, - "Interface": "r3-eth1", - "Next-Hop": "r5", - "Parent": "r5(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:2:2::/64" + "metric": 10, + "interface": "r3-eth1", + "nextHop": "r5", + "parent": "r5(4)", + "type": "IP6 internal", + "vertex": "2001:db8:2:2::/64" }, { - "Metric": 10, - "Interface": "r3-eth1", - "Next-Hop": "r5", - "Parent": "r5(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:f::5/128" + "metric": 10, + "interface": "r3-eth1", + "nextHop": "r5", + "parent": "r5(4)", + "type": "IP6 internal", + "vertex": "2001:db8:f::5/128" }, { - "Interface": "r3-eth1", - "Metric": 20, - "Next-Hop": "r5", - "Type": "TE-IS", - "Vertex": "r4" + "interface": "r3-eth1", + "metric": 20, + "nextHop": "r5", + "type": "TE-IS", + "vertex": "r4" }, { - "Metric": 20, - "Interface": "r3-eth1", - "Next-Hop": "r5", - "Parent": "r4(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:1:2::/64" + "metric": 20, + "interface": "r3-eth1", + "nextHop": "r5", + "parent": "r4(4)", + "type": "IP6 internal", + "vertex": "2001:db8:1:2::/64" }, { - "Metric": 20, - "Interface": "r3-eth1", - "Next-Hop": "r5", - "Parent": "r4(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:f::4/128" + "metric": 20, + "interface": "r3-eth1", + "nextHop": "r5", + "parent": "r4(4)", + "type": "IP6 internal", + "vertex": "2001:db8:f::4/128" } ] }, "level-2": { "ipv4-paths": [ { - "Vertex": "r3" + "vertex": "r3" }, { - "Metric": 0, - "Parent": "r3(4)", - "Type": "IP internal", - "Vertex": "10.0.20.0/24" + "metric": 0, + "parent": "r3(4)", + "type": "IP internal", + "vertex": "10.0.20.0/24" }, { - "Interface": "r3-eth0", - "Metric": 10, - "Next-Hop": "r1", - "Parent": "r3(4)", - "Type": "TE-IS", - "Vertex": "r1" + "interface": "r3-eth0", + "metric": 10, + "nextHop": "r1", + "parent": "r3(4)", + "type": "TE-IS", + "vertex": "r1" }, { - "Interface": "r3-eth0", - "Metric": 10, - "Next-Hop": "r1", - "Parent": "r1(4)", - "Type": "IP TE", - "Vertex": "10.0.20.0/24" + "interface": "r3-eth0", + "metric": 10, + "nextHop": "r1", + "parent": "r1(4)", + "type": "IP TE", + "vertex": "10.0.20.0/24" }, { - "Interface": "r3-eth0", - "Metric": 10, - "Next-Hop": "r1", - "Parent": "r1(4)", - "Type": "IP TE", - "Vertex": "10.254.0.1/32" + "interface": "r3-eth0", + "metric": 10, + "nextHop": "r1", + "parent": "r1(4)", + "type": "IP TE", + "vertex": "10.254.0.1/32" } ], "ipv6-paths": [ { - "Vertex": "r3" + "vertex": "r3" }, { - "Metric": 0, - "Parent": "r3(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:1:1::/64" + "metric": 0, + "parent": "r3(4)", + "type": "IP6 internal", + "vertex": "2001:db8:1:1::/64" }, { - "Interface": "r3-eth0", - "Metric": 10, - "Next-Hop": "r1", - "Parent": "r3(4)", - "Type": "TE-IS", - "Vertex": "r1" + "interface": "r3-eth0", + "metric": 10, + "nextHop": "r1", + "parent": "r3(4)", + "type": "TE-IS", + "vertex": "r1" }, { - "Metric": 10, - "Interface": "r3-eth0", - "Next-Hop": "r1", - "Parent": "r1(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:f::1/128" + "metric": 10, + "interface": "r3-eth0", + "nextHop": "r1", + "parent": "r1(4)", + "type": "IP6 internal", + "vertex": "2001:db8:f::1/128" } ] } diff --git a/tests/topotests/isis_topo1/r4/r4_topology.json b/tests/topotests/isis_topo1/r4/r4_topology.json index 240c7588fc..9a53955cc9 100644 --- a/tests/topotests/isis_topo1/r4/r4_topology.json +++ b/tests/topotests/isis_topo1/r4/r4_topology.json @@ -5,190 +5,190 @@ "level-1": { "ipv4-paths": [ { - "Vertex": "r4" + "vertex": "r4" }, { - "Metric": 0, - "Parent": "r4(4)", - "Type": "IP internal", - "Vertex": "10.0.11.0/24" + "metric": 0, + "parent": "r4(4)", + "type": "IP internal", + "vertex": "10.0.11.0/24" }, { - "Interface": "r4-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r4(4)", - "Type": "TE-IS", - "Vertex": "r5" + "interface": "r4-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r4(4)", + "type": "TE-IS", + "vertex": "r5" }, { - "Interface": "r4-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r5(4)", - "Type": "IP TE", - "Vertex": "10.0.10.0/24" + "interface": "r4-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r5(4)", + "type": "IP TE", + "vertex": "10.0.10.0/24" }, { - "Interface": "r4-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r5(4)", - "Type": "IP TE", - "Vertex": "10.0.11.0/24" + "interface": "r4-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r5(4)", + "type": "IP TE", + "vertex": "10.0.11.0/24" }, { - "Interface": "r4-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r5(4)", - "Type": "IP TE", - "Vertex": "10.254.0.5/32" + "interface": "r4-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r5(4)", + "type": "IP TE", + "vertex": "10.254.0.5/32" }, { - "Interface": "r4-eth1", - "Metric": 20, - "Next-Hop": "r5", - "Type": "TE-IS", - "Vertex": "r3" + "interface": "r4-eth1", + "metric": 20, + "nextHop": "r5", + "type": "TE-IS", + "vertex": "r3" }, { - "Interface": "r4-eth1", - "Metric": 20, - "Next-Hop": "r5", - "Parent": "r3(4)", - "Type": "IP TE", - "Vertex": "10.0.20.0/24" + "interface": "r4-eth1", + "metric": 20, + "nextHop": "r5", + "parent": "r3(4)", + "type": "IP TE", + "vertex": "10.0.20.0/24" }, { - "Interface": "r4-eth1", - "Metric": 20, - "Next-Hop": "r5", - "Parent": "r3(4)", - "Type": "IP TE", - "Vertex": "10.254.0.3/32" + "interface": "r4-eth1", + "metric": 20, + "nextHop": "r5", + "parent": "r3(4)", + "type": "IP TE", + "vertex": "10.254.0.3/32" } ], "ipv6-paths": [ { - "Vertex": "r4" + "vertex": "r4" }, { - "Metric": 0, - "Parent": "r4(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:2:2::/64" + "metric": 0, + "parent": "r4(4)", + "type": "IP6 internal", + "vertex": "2001:db8:2:2::/64" }, { - "Interface": "r4-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r4(4)", - "Type": "TE-IS", - "Vertex": "r5" + "interface": "r4-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r4(4)", + "type": "TE-IS", + "vertex": "r5" }, { - "Metric": 10, - "Interface": "r4-eth1", - "Next-Hop": "r5", - "Parent": "r5(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:2:1::/64" + "metric": 10, + "interface": "r4-eth1", + "nextHop": "r5", + "parent": "r5(4)", + "type": "IP6 internal", + "vertex": "2001:db8:2:1::/64" }, { - "Metric": 10, - "Interface": "r4-eth1", - "Next-Hop": "r5", - "Parent": "r5(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:f::5/128" + "metric": 10, + "interface": "r4-eth1", + "nextHop": "r5", + "parent": "r5(4)", + "type": "IP6 internal", + "vertex": "2001:db8:f::5/128" }, { - "Interface": "r4-eth1", - "Metric": 20, - "Next-Hop": "r5", - "Type": "TE-IS", - "Vertex": "r3" + "interface": "r4-eth1", + "metric": 20, + "nextHop": "r5", + "type": "TE-IS", + "vertex": "r3" }, { - "Metric": 20, - "Interface": "r4-eth1", - "Next-Hop": "r5", - "Parent": "r3(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:1:1::/64" + "metric": 20, + "interface": "r4-eth1", + "nextHop": "r5", + "parent": "r3(4)", + "type": "IP6 internal", + "vertex": "2001:db8:1:1::/64" }, { - "Metric": 20, - "Interface": "r4-eth1", - "Next-Hop": "r5", - "Parent": "r3(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:f::3/128" + "metric": 20, + "interface": "r4-eth1", + "nextHop": "r5", + "parent": "r3(4)", + "type": "IP6 internal", + "vertex": "2001:db8:f::3/128" } ] }, "level-2": { "ipv4-paths": [ { - "Vertex": "r4" + "vertex": "r4" }, { - "Metric": 0, - "Parent": "r4(4)", - "Type": "IP internal", - "Vertex": "10.0.21.0/24" + "metric": 0, + "parent": "r4(4)", + "type": "IP internal", + "vertex": "10.0.21.0/24" }, { - "Interface": "r4-eth0", - "Metric": 10, - "Next-Hop": "r2", - "Parent": "r4(4)", - "Type": "TE-IS", - "Vertex": "r2" + "interface": "r4-eth0", + "metric": 10, + "nextHop": "r2", + "parent": "r4(4)", + "type": "TE-IS", + "vertex": "r2" }, { - "Interface": "r4-eth0", - "Metric": 10, - "Next-Hop": "r2", - "Parent": "r2(4)", - "Type": "IP TE", - "Vertex": "10.0.21.0/24" + "interface": "r4-eth0", + "metric": 10, + "nextHop": "r2", + "parent": "r2(4)", + "type": "IP TE", + "vertex": "10.0.21.0/24" }, { - "Interface": "r4-eth0", - "Metric": 10, - "Next-Hop": "r2", - "Parent": "r2(4)", - "Type": "IP TE", - "Vertex": "10.254.0.2/32" + "interface": "r4-eth0", + "metric": 10, + "nextHop": "r2", + "parent": "r2(4)", + "type": "IP TE", + "vertex": "10.254.0.2/32" } ], "ipv6-paths": [ { - "Vertex": "r4" + "vertex": "r4" }, { - "Metric": 0, - "Parent": "r4(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:1:2::/64" + "metric": 0, + "parent": "r4(4)", + "type": "IP6 internal", + "vertex": "2001:db8:1:2::/64" }, { - "Interface": "r4-eth0", - "Metric": 10, - "Next-Hop": "r2", - "Parent": "r4(4)", - "Type": "TE-IS", - "Vertex": "r2" + "interface": "r4-eth0", + "metric": 10, + "nextHop": "r2", + "parent": "r4(4)", + "type": "TE-IS", + "vertex": "r2" }, { - "Metric": 10, - "Interface": "r4-eth0", - "Next-Hop": "r2", - "Parent": "r2(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:f::2/128" + "metric": 10, + "interface": "r4-eth0", + "nextHop": "r2", + "parent": "r2(4)", + "type": "IP6 internal", + "vertex": "2001:db8:f::2/128" } ] } diff --git a/tests/topotests/isis_topo1/r5/r5_topology.json b/tests/topotests/isis_topo1/r5/r5_topology.json index 37da1a08e3..64590d8eb2 100644 --- a/tests/topotests/isis_topo1/r5/r5_topology.json +++ b/tests/topotests/isis_topo1/r5/r5_topology.json @@ -5,148 +5,148 @@ "level-1": { "ipv4-paths": [ { - "Vertex": "r5" + "vertex": "r5" }, { - "Metric": 0, - "Parent": "r5(4)", - "Type": "IP internal", - "Vertex": "10.0.10.0/24" + "metric": 0, + "parent": "r5(4)", + "type": "IP internal", + "vertex": "10.0.10.0/24" }, { - "Metric": 0, - "Parent": "r5(4)", - "Type": "IP internal", - "Vertex": "10.0.11.0/24" + "metric": 0, + "parent": "r5(4)", + "type": "IP internal", + "vertex": "10.0.11.0/24" }, { - "Interface": "r5-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r5(4)", - "Type": "TE-IS", - "Vertex": "r3" + "interface": "r5-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r5(4)", + "type": "TE-IS", + "vertex": "r3" }, { - "Interface": "r5-eth1", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r5(4)", - "Type": "TE-IS", - "Vertex": "r4" + "interface": "r5-eth1", + "metric": 10, + "nextHop": "r4", + "parent": "r5(4)", + "type": "TE-IS", + "vertex": "r4" }, { - "Interface": "r5-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r3(4)", - "Type": "IP TE", - "Vertex": "10.0.10.0/24" + "interface": "r5-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r3(4)", + "type": "IP TE", + "vertex": "10.0.10.0/24" }, { - "Interface": "r5-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r3(4)", - "Type": "IP TE", - "Vertex": "10.0.20.0/24" + "interface": "r5-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r3(4)", + "type": "IP TE", + "vertex": "10.0.20.0/24" }, { - "Interface": "r5-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r3(4)", - "Type": "IP TE", - "Vertex": "10.254.0.3/32" + "interface": "r5-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r3(4)", + "type": "IP TE", + "vertex": "10.254.0.3/32" }, { - "Interface": "r5-eth1", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r4(4)", - "Type": "IP TE", - "Vertex": "10.0.11.0/24" + "interface": "r5-eth1", + "metric": 10, + "nextHop": "r4", + "parent": "r4(4)", + "type": "IP TE", + "vertex": "10.0.11.0/24" }, { - "Interface": "r5-eth1", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r4(4)", - "Type": "IP TE", - "Vertex": "10.0.21.0/24" + "interface": "r5-eth1", + "metric": 10, + "nextHop": "r4", + "parent": "r4(4)", + "type": "IP TE", + "vertex": "10.0.21.0/24" }, { - "Interface": "r5-eth1", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r4(4)", - "Type": "IP TE", - "Vertex": "10.254.0.4/32" + "interface": "r5-eth1", + "metric": 10, + "nextHop": "r4", + "parent": "r4(4)", + "type": "IP TE", + "vertex": "10.254.0.4/32" } ], "ipv6-paths": [ { - "Vertex": "r5" + "vertex": "r5" }, { - "Metric": 0, - "Parent": "r5(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:2:1::/64" + "metric": 0, + "parent": "r5(4)", + "type": "IP6 internal", + "vertex": "2001:db8:2:1::/64" }, { - "Metric": 0, - "Parent": "r5(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:2:2::/64" + "metric": 0, + "parent": "r5(4)", + "type": "IP6 internal", + "vertex": "2001:db8:2:2::/64" }, { - "Interface": "r5-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r5(4)", - "Type": "TE-IS", - "Vertex": "r3" + "interface": "r5-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r5(4)", + "type": "TE-IS", + "vertex": "r3" }, { - "Interface": "r5-eth1", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r5(4)", - "Type": "TE-IS", - "Vertex": "r4" + "interface": "r5-eth1", + "metric": 10, + "nextHop": "r4", + "parent": "r5(4)", + "type": "TE-IS", + "vertex": "r4" }, { - "Metric": 10, - "Interface": "r5-eth0", - "Next-Hop": "r3", - "Parent": "r3(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:1:1::/64" + "metric": 10, + "interface": "r5-eth0", + "nextHop": "r3", + "parent": "r3(4)", + "type": "IP6 internal", + "vertex": "2001:db8:1:1::/64" }, { - "Metric": 10, - "Interface": "r5-eth0", - "Next-Hop": "r3", - "Parent": "r3(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:f::3/128" + "metric": 10, + "interface": "r5-eth0", + "nextHop": "r3", + "parent": "r3(4)", + "type": "IP6 internal", + "vertex": "2001:db8:f::3/128" }, { - "Metric": 10, - "Interface": "r5-eth1", - "Next-Hop": "r4", - "Parent": "r4(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:1:2::/64" + "metric": 10, + "interface": "r5-eth1", + "nextHop": "r4", + "parent": "r4(4)", + "type": "IP6 internal", + "vertex": "2001:db8:1:2::/64" }, { - "Metric": 10, - "Interface": "r5-eth1", - "Next-Hop": "r4", - "Parent": "r4(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:f::4/128" + "metric": 10, + "interface": "r5-eth1", + "nextHop": "r4", + "parent": "r4(4)", + "type": "IP6 internal", + "vertex": "2001:db8:f::4/128" } ] } diff --git a/tests/topotests/isis_topo1_vrf/r1/r1_topology.json b/tests/topotests/isis_topo1_vrf/r1/r1_topology.json index 8d4ccc84cc..da537c552b 100644 --- a/tests/topotests/isis_topo1_vrf/r1/r1_topology.json +++ b/tests/topotests/isis_topo1_vrf/r1/r1_topology.json @@ -5,76 +5,76 @@ "level-1": { "ipv4-paths": [ { - "Vertex": "r1" + "vertex": "r1" } ], "ipv6-paths": [ { - "Vertex": "r1" + "vertex": "r1" } ] }, "level-2": { "ipv4-paths": [ { - "Vertex": "r1" + "vertex": "r1" }, { - "Metric": 0, - "Parent": "r1(4)", - "Type": "IP internal", - "Vertex": "10.0.20.0/24" + "metric": 0, + "parent": "r1(4)", + "type": "IP internal", + "vertex": "10.0.20.0/24" }, { - "Interface": "r1-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r1(4)", - "Type": "TE-IS", - "Vertex": "r3" + "interface": "r1-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r1(4)", + "type": "TE-IS", + "vertex": "r3" }, { - "Interface": "r1-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r3(4)", - "Type": "IP TE", - "Vertex": "10.0.10.0/24" + "interface": "r1-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r3(4)", + "type": "IP TE", + "vertex": "10.0.10.0/24" }, { - "Interface": "r1-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r3(4)", - "Type": "IP TE", - "Vertex": "10.0.20.0/24" + "interface": "r1-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r3(4)", + "type": "IP TE", + "vertex": "10.0.20.0/24" } ], "ipv6-paths": [ { - "Vertex": "r1" + "vertex": "r1" }, { - "Metric": 0, - "Parent": "r1(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:1:1::/64" + "metric": 0, + "parent": "r1(4)", + "type": "IP6 internal", + "vertex": "2001:db8:1:1::/64" }, { - "Interface": "r1-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r1(4)", - "Type": "TE-IS", - "Vertex": "r3" + "interface": "r1-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r1(4)", + "type": "TE-IS", + "vertex": "r3" }, { - "Metric": 10, - "Interface": "r1-eth0", - "Next-Hop": "r3", - "Parent": "r3(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:2:1::/64" + "metric": 10, + "interface": "r1-eth0", + "nextHop": "r3", + "parent": "r3(4)", + "type": "IP6 internal", + "vertex": "2001:db8:2:1::/64" } ] } diff --git a/tests/topotests/isis_topo1_vrf/r2/r2_topology.json b/tests/topotests/isis_topo1_vrf/r2/r2_topology.json index dc87c42822..bf965659be 100644 --- a/tests/topotests/isis_topo1_vrf/r2/r2_topology.json +++ b/tests/topotests/isis_topo1_vrf/r2/r2_topology.json @@ -5,76 +5,76 @@ "level-1": { "ipv4-paths": [ { - "Vertex": "r2" + "vertex": "r2" } ], "ipv6-paths": [ { - "Vertex": "r2" + "vertex": "r2" } ] }, "level-2": { "ipv4-paths": [ { - "Vertex": "r2" + "vertex": "r2" }, { - "Metric": 0, - "Parent": "r2(4)", - "Type": "IP internal", - "Vertex": "10.0.21.0/24" + "metric": 0, + "parent": "r2(4)", + "type": "IP internal", + "vertex": "10.0.21.0/24" }, { - "Interface": "r2-eth0", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r2(4)", - "Type": "TE-IS", - "Vertex": "r4" + "interface": "r2-eth0", + "metric": 10, + "nextHop": "r4", + "parent": "r2(4)", + "type": "TE-IS", + "vertex": "r4" }, { - "Interface": "r2-eth0", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r4(4)", - "Type": "IP TE", - "Vertex": "10.0.11.0/24" + "interface": "r2-eth0", + "metric": 10, + "nextHop": "r4", + "parent": "r4(4)", + "type": "IP TE", + "vertex": "10.0.11.0/24" }, { - "Interface": "r2-eth0", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r4(4)", - "Type": "IP TE", - "Vertex": "10.0.21.0/24" + "interface": "r2-eth0", + "metric": 10, + "nextHop": "r4", + "parent": "r4(4)", + "type": "IP TE", + "vertex": "10.0.21.0/24" } ], "ipv6-paths": [ { - "Vertex": "r2" + "vertex": "r2" }, { - "Metric": 0, - "Parent": "r2(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:1:2::/64" + "metric": 0, + "parent": "r2(4)", + "type": "IP6 internal", + "vertex": "2001:db8:1:2::/64" }, { - "Interface": "r2-eth0", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r2(4)", - "Type": "TE-IS", - "Vertex": "r4" + "interface": "r2-eth0", + "metric": 10, + "nextHop": "r4", + "parent": "r2(4)", + "type": "TE-IS", + "vertex": "r4" }, { - "Metric": 10, - "Interface": "r2-eth0", - "Next-Hop": "r4", - "Parent": "r4(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:2:2::/64" + "metric": 10, + "interface": "r2-eth0", + "nextHop": "r4", + "parent": "r4(4)", + "type": "IP6 internal", + "vertex": "2001:db8:2:2::/64" } ] } diff --git a/tests/topotests/isis_topo1_vrf/r3/r3_topology.json b/tests/topotests/isis_topo1_vrf/r3/r3_topology.json index 602dc7df55..94592b50a7 100644 --- a/tests/topotests/isis_topo1_vrf/r3/r3_topology.json +++ b/tests/topotests/isis_topo1_vrf/r3/r3_topology.json @@ -5,142 +5,142 @@ "level-1": { "ipv4-paths": [ { - "Vertex": "r3" + "vertex": "r3" }, { - "Metric": 0, - "Parent": "r3(4)", - "Type": "IP internal", - "Vertex": "10.0.10.0/24" + "metric": 0, + "parent": "r3(4)", + "type": "IP internal", + "vertex": "10.0.10.0/24" }, { - "Interface": "r3-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r3(4)", - "Type": "TE-IS", - "Vertex": "r5" + "interface": "r3-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r3(4)", + "type": "TE-IS", + "vertex": "r5" }, { - "Interface": "r3-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r5(4)", - "Type": "IP TE", - "Vertex": "10.0.10.0/24" + "interface": "r3-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r5(4)", + "type": "IP TE", + "vertex": "10.0.10.0/24" }, { - "Interface": "r3-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r5(4)", - "Type": "IP TE", - "Vertex": "10.0.11.0/24" + "interface": "r3-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r5(4)", + "type": "IP TE", + "vertex": "10.0.11.0/24" }, { - "Interface": "r3-eth1", - "Metric": 20, - "Next-Hop": "r5", - "Type": "TE-IS", - "Vertex": "r4" + "interface": "r3-eth1", + "metric": 20, + "nextHop": "r5", + "type": "TE-IS", + "vertex": "r4" }, { - "Interface": "r3-eth1", - "Metric": 20, - "Next-Hop": "r5", - "Parent": "r4(4)", - "Type": "IP TE", - "Vertex": "10.0.21.0/24" + "interface": "r3-eth1", + "metric": 20, + "nextHop": "r5", + "parent": "r4(4)", + "type": "IP TE", + "vertex": "10.0.21.0/24" } ], "ipv6-paths": [ { - "Vertex": "r3" + "vertex": "r3" }, { - "Metric": 0, - "Parent": "r3(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:2:1::/64" + "metric": 0, + "parent": "r3(4)", + "type": "IP6 internal", + "vertex": "2001:db8:2:1::/64" }, { - "Interface": "r3-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r3(4)", - "Type": "TE-IS", - "Vertex": "r5" + "interface": "r3-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r3(4)", + "type": "TE-IS", + "vertex": "r5" }, { - "Metric": 10, - "Interface": "r3-eth1", - "Next-Hop": "r5", - "Parent": "r5(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:2:2::/64" + "metric": 10, + "interface": "r3-eth1", + "nextHop": "r5", + "parent": "r5(4)", + "type": "IP6 internal", + "vertex": "2001:db8:2:2::/64" }, { - "Interface": "r3-eth1", - "Metric": 20, - "Next-Hop": "r5", - "Type": "TE-IS", - "Vertex": "r4" + "interface": "r3-eth1", + "metric": 20, + "nextHop": "r5", + "type": "TE-IS", + "vertex": "r4" }, { - "Metric": 20, - "Interface": "r3-eth1", - "Next-Hop": "r5", - "Parent": "r4(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:1:2::/64" + "metric": 20, + "interface": "r3-eth1", + "nextHop": "r5", + "parent": "r4(4)", + "type": "IP6 internal", + "vertex": "2001:db8:1:2::/64" } ] }, "level-2": { "ipv4-paths": [ { - "Vertex": "r3" + "vertex": "r3" }, { - "Metric": 0, - "Parent": "r3(4)", - "Type": "IP internal", - "Vertex": "10.0.20.0/24" + "metric": 0, + "parent": "r3(4)", + "type": "IP internal", + "vertex": "10.0.20.0/24" }, { - "Interface": "r3-eth0", - "Metric": 10, - "Next-Hop": "r1", - "Parent": "r3(4)", - "Type": "TE-IS", - "Vertex": "r1" + "interface": "r3-eth0", + "metric": 10, + "nextHop": "r1", + "parent": "r3(4)", + "type": "TE-IS", + "vertex": "r1" }, { - "Interface": "r3-eth0", - "Metric": 10, - "Next-Hop": "r1", - "Parent": "r1(4)", - "Type": "IP TE", - "Vertex": "10.0.20.0/24" + "interface": "r3-eth0", + "metric": 10, + "nextHop": "r1", + "parent": "r1(4)", + "type": "IP TE", + "vertex": "10.0.20.0/24" } ], "ipv6-paths": [ { - "Vertex": "r3" + "vertex": "r3" }, { - "Metric": 0, - "Parent": "r3(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:1:1::/64" + "metric": 0, + "parent": "r3(4)", + "type": "IP6 internal", + "vertex": "2001:db8:1:1::/64" }, { - "Interface": "r3-eth0", - "Metric": 10, - "Next-Hop": "r1", - "Parent": "r3(4)", - "Type": "TE-IS", - "Vertex": "r1" + "interface": "r3-eth0", + "metric": 10, + "nextHop": "r1", + "parent": "r3(4)", + "type": "TE-IS", + "vertex": "r1" } ] } diff --git a/tests/topotests/isis_topo1_vrf/r4/r4_topology.json b/tests/topotests/isis_topo1_vrf/r4/r4_topology.json index f4c1bb3768..b8295e87b9 100644 --- a/tests/topotests/isis_topo1_vrf/r4/r4_topology.json +++ b/tests/topotests/isis_topo1_vrf/r4/r4_topology.json @@ -5,142 +5,142 @@ "level-1": { "ipv4-paths": [ { - "Vertex": "r4" + "vertex": "r4" }, { - "Metric": 0, - "Parent": "r4(4)", - "Type": "IP internal", - "Vertex": "10.0.11.0/24" + "metric": 0, + "parent": "r4(4)", + "type": "IP internal", + "vertex": "10.0.11.0/24" }, { - "Interface": "r4-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r4(4)", - "Type": "TE-IS", - "Vertex": "r5" + "interface": "r4-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r4(4)", + "type": "TE-IS", + "vertex": "r5" }, { - "Interface": "r4-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r5(4)", - "Type": "IP TE", - "Vertex": "10.0.10.0/24" + "interface": "r4-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r5(4)", + "type": "IP TE", + "vertex": "10.0.10.0/24" }, { - "Interface": "r4-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r5(4)", - "Type": "IP TE", - "Vertex": "10.0.11.0/24" + "interface": "r4-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r5(4)", + "type": "IP TE", + "vertex": "10.0.11.0/24" }, { - "Interface": "r4-eth1", - "Metric": 20, - "Next-Hop": "r5", - "Type": "TE-IS", - "Vertex": "r3" + "interface": "r4-eth1", + "metric": 20, + "nextHop": "r5", + "type": "TE-IS", + "vertex": "r3" }, { - "Interface": "r4-eth1", - "Metric": 20, - "Next-Hop": "r5", - "Parent": "r3(4)", - "Type": "IP TE", - "Vertex": "10.0.20.0/24" + "interface": "r4-eth1", + "metric": 20, + "nextHop": "r5", + "parent": "r3(4)", + "type": "IP TE", + "vertex": "10.0.20.0/24" } ], "ipv6-paths": [ { - "Vertex": "r4" + "vertex": "r4" }, { - "Metric": 0, - "Parent": "r4(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:2:2::/64" + "metric": 0, + "parent": "r4(4)", + "type": "IP6 internal", + "vertex": "2001:db8:2:2::/64" }, { - "Interface": "r4-eth1", - "Metric": 10, - "Next-Hop": "r5", - "Parent": "r4(4)", - "Type": "TE-IS", - "Vertex": "r5" + "interface": "r4-eth1", + "metric": 10, + "nextHop": "r5", + "parent": "r4(4)", + "type": "TE-IS", + "vertex": "r5" }, { - "Metric": 10, - "Interface": "r4-eth1", - "Next-Hop": "r5", - "Parent": "r5(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:2:1::/64" + "metric": 10, + "interface": "r4-eth1", + "nextHop": "r5", + "parent": "r5(4)", + "type": "IP6 internal", + "vertex": "2001:db8:2:1::/64" }, { - "Interface": "r4-eth1", - "Metric": 20, - "Next-Hop": "r5", - "Type": "TE-IS", - "Vertex": "r3" + "interface": "r4-eth1", + "metric": 20, + "nextHop": "r5", + "type": "TE-IS", + "vertex": "r3" }, { - "Metric": 20, - "Interface": "r4-eth1", - "Next-Hop": "r5", - "Parent": "r3(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:1:1::/64" + "metric": 20, + "interface": "r4-eth1", + "nextHop": "r5", + "parent": "r3(4)", + "type": "IP6 internal", + "vertex": "2001:db8:1:1::/64" } ] }, "level-2": { "ipv4-paths": [ { - "Vertex": "r4" + "vertex": "r4" }, { - "Metric": 0, - "Parent": "r4(4)", - "Type": "IP internal", - "Vertex": "10.0.21.0/24" + "metric": 0, + "parent": "r4(4)", + "type": "IP internal", + "vertex": "10.0.21.0/24" }, { - "Interface": "r4-eth0", - "Metric": 10, - "Next-Hop": "r2", - "Parent": "r4(4)", - "Type": "TE-IS", - "Vertex": "r2" + "interface": "r4-eth0", + "metric": 10, + "nextHop": "r2", + "parent": "r4(4)", + "type": "TE-IS", + "vertex": "r2" }, { - "Interface": "r4-eth0", - "Metric": 10, - "Next-Hop": "r2", - "Parent": "r2(4)", - "Type": "IP TE", - "Vertex": "10.0.21.0/24" + "interface": "r4-eth0", + "metric": 10, + "nextHop": "r2", + "parent": "r2(4)", + "type": "IP TE", + "vertex": "10.0.21.0/24" } ], "ipv6-paths": [ { - "Vertex": "r4" + "vertex": "r4" }, { - "Metric": 0, - "Parent": "r4(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:1:2::/64" + "metric": 0, + "parent": "r4(4)", + "type": "IP6 internal", + "vertex": "2001:db8:1:2::/64" }, { - "Interface": "r4-eth0", - "Metric": 10, - "Next-Hop": "r2", - "Parent": "r4(4)", - "Type": "TE-IS", - "Vertex": "r2" + "interface": "r4-eth0", + "metric": 10, + "nextHop": "r2", + "parent": "r4(4)", + "type": "TE-IS", + "vertex": "r2" } ] } diff --git a/tests/topotests/isis_topo1_vrf/r5/r5_topology.json b/tests/topotests/isis_topo1_vrf/r5/r5_topology.json index 669f31c474..8b5159cbfb 100644 --- a/tests/topotests/isis_topo1_vrf/r5/r5_topology.json +++ b/tests/topotests/isis_topo1_vrf/r5/r5_topology.json @@ -5,116 +5,116 @@ "level-1": { "ipv4-paths": [ { - "Vertex": "r5" + "vertex": "r5" }, { - "Metric": 0, - "Parent": "r5(4)", - "Type": "IP internal", - "Vertex": "10.0.10.0/24" + "metric": 0, + "parent": "r5(4)", + "type": "IP internal", + "vertex": "10.0.10.0/24" }, { - "Metric": 0, - "Parent": "r5(4)", - "Type": "IP internal", - "Vertex": "10.0.11.0/24" + "metric": 0, + "parent": "r5(4)", + "type": "IP internal", + "vertex": "10.0.11.0/24" }, { - "Interface": "r5-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r5(4)", - "Type": "TE-IS", - "Vertex": "r3" + "interface": "r5-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r5(4)", + "type": "TE-IS", + "vertex": "r3" }, { - "Interface": "r5-eth1", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r5(4)", - "Type": "TE-IS", - "Vertex": "r4" + "interface": "r5-eth1", + "metric": 10, + "nextHop": "r4", + "parent": "r5(4)", + "type": "TE-IS", + "vertex": "r4" }, { - "Interface": "r5-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r3(4)", - "Type": "IP TE", - "Vertex": "10.0.10.0/24" + "interface": "r5-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r3(4)", + "type": "IP TE", + "vertex": "10.0.10.0/24" }, { - "Interface": "r5-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r3(4)", - "Type": "IP TE", - "Vertex": "10.0.20.0/24" + "interface": "r5-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r3(4)", + "type": "IP TE", + "vertex": "10.0.20.0/24" }, { - "Interface": "r5-eth1", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r4(4)", - "Type": "IP TE", - "Vertex": "10.0.11.0/24" + "interface": "r5-eth1", + "metric": 10, + "nextHop": "r4", + "parent": "r4(4)", + "type": "IP TE", + "vertex": "10.0.11.0/24" }, { - "Interface": "r5-eth1", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r4(4)", - "Type": "IP TE", - "Vertex": "10.0.21.0/24" + "interface": "r5-eth1", + "metric": 10, + "nextHop": "r4", + "parent": "r4(4)", + "type": "IP TE", + "vertex": "10.0.21.0/24" } ], "ipv6-paths": [ { - "Vertex": "r5" + "vertex": "r5" }, { - "Metric": 0, - "Parent": "r5(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:2:1::/64" + "metric": 0, + "parent": "r5(4)", + "type": "IP6 internal", + "vertex": "2001:db8:2:1::/64" }, { - "Metric": 0, - "Parent": "r5(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:2:2::/64" + "metric": 0, + "parent": "r5(4)", + "type": "IP6 internal", + "vertex": "2001:db8:2:2::/64" }, { - "Interface": "r5-eth0", - "Metric": 10, - "Next-Hop": "r3", - "Parent": "r5(4)", - "Type": "TE-IS", - "Vertex": "r3" + "interface": "r5-eth0", + "metric": 10, + "nextHop": "r3", + "parent": "r5(4)", + "type": "TE-IS", + "vertex": "r3" }, { - "Interface": "r5-eth1", - "Metric": 10, - "Next-Hop": "r4", - "Parent": "r5(4)", - "Type": "TE-IS", - "Vertex": "r4" + "interface": "r5-eth1", + "metric": 10, + "nextHop": "r4", + "parent": "r5(4)", + "type": "TE-IS", + "vertex": "r4" }, { - "Metric": 10, - "Interface": "r5-eth0", - "Next-Hop": "r3", - "Parent": "r3(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:1:1::/64" + "metric": 10, + "interface": "r5-eth0", + "nextHop": "r3", + "parent": "r3(4)", + "type": "IP6 internal", + "vertex": "2001:db8:1:1::/64" }, { - "Metric": 10, - "Interface": "r5-eth1", - "Next-Hop": "r4", - "Parent": "r4(4)", - "Type": "IP6 internal", - "Vertex": "2001:db8:1:2::/64" + "metric": 10, + "interface": "r5-eth1", + "nextHop": "r4", + "parent": "r4(4)", + "type": "IP6 internal", + "vertex": "2001:db8:1:2::/64" } ] } -- 2.39.5