From c62067c1a60e70c259aa4fb576f6acd106f5c612 Mon Sep 17 00:00:00 2001 From: Olivier Dugeon Date: Thu, 2 Mar 2023 13:59:00 +0100 Subject: [PATCH] tests: Update TE topotests to follow new Edge Key Following replacement of Edge Key type (uint64_t by new structure), this patch updates the various TE topotests to the new Edge Key references. Signed-off-by: Olivier Dugeon --- .../cspf_topo1/reference/sharp-ted.json | 28 ++++++++-------- .../isis_te_topo1/reference/ted_step1.json | 28 ++++++++-------- .../isis_te_topo1/reference/ted_step10.json | 32 +++++++++---------- .../isis_te_topo1/reference/ted_step2.json | 20 ++++++------ .../isis_te_topo1/reference/ted_step3.json | 24 +++++++------- .../isis_te_topo1/reference/ted_step4.json | 24 +++++++------- .../isis_te_topo1/reference/ted_step5.json | 32 +++++++++---------- .../isis_te_topo1/reference/ted_step6.json | 32 +++++++++---------- .../isis_te_topo1/reference/ted_step7.json | 32 +++++++++---------- .../isis_te_topo1/reference/ted_step8.json | 32 +++++++++---------- .../ospf_te_topo1/reference/ted_step1.json | 18 +++++------ .../ospf_te_topo1/reference/ted_step2.json | 14 ++++---- .../ospf_te_topo1/reference/ted_step3.json | 12 +++---- .../ospf_te_topo1/reference/ted_step4.json | 12 +++---- .../ospf_te_topo1/reference/ted_step5.json | 16 +++++----- .../ospf_te_topo1/reference/ted_step6.json | 16 +++++----- .../ospf_te_topo1/reference/ted_step7.json | 12 +++---- 17 files changed, 192 insertions(+), 192 deletions(-) diff --git a/tests/topotests/cspf_topo1/reference/sharp-ted.json b/tests/topotests/cspf_topo1/reference/sharp-ted.json index da240e87a3..359b655f01 100644 --- a/tests/topotests/cspf_topo1/reference/sharp-ted.json +++ b/tests/topotests/cspf_topo1/reference/sharp-ted.json @@ -53,7 +53,7 @@ ], "edges":[ { - "edge-id":65537, + "edge-id":"2001:db8:1::1:1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -96,7 +96,7 @@ } }, { - "edge-id":65538, + "edge-id":"2001:db8:1::1:2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -139,7 +139,7 @@ } }, { - "edge-id":196610, + "edge-id":"2001:db8:3::3:2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -182,7 +182,7 @@ } }, { - "edge-id":196611, + "edge-id":"2001:db8:3::3:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -226,7 +226,7 @@ } }, { - "edge-id":196612, + "edge-id":"2001:db8:5::3:4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", @@ -275,7 +275,7 @@ ] }, { - "edge-id":262147, + "edge-id":"2001:db8:5::4:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -318,7 +318,7 @@ } }, { - "edge-id":167772161, + "edge-id":"10.0.0.1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -362,7 +362,7 @@ } }, { - "edge-id":167772162, + "edge-id":"10.0.0.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -405,7 +405,7 @@ } }, { - "edge-id":167772417, + "edge-id":"10.0.1.1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -448,7 +448,7 @@ } }, { - "edge-id":167772418, + "edge-id":"10.0.1.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -491,7 +491,7 @@ } }, { - "edge-id":167772930, + "edge-id":"10.0.3.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -534,7 +534,7 @@ } }, { - "edge-id":167772931, + "edge-id":"10.0.3.3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -578,7 +578,7 @@ } }, { - "edge-id":167773186, + "edge-id":"10.0.4.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -622,7 +622,7 @@ } }, { - "edge-id":167773188, + "edge-id":"10.0.4.4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", diff --git a/tests/topotests/isis_te_topo1/reference/ted_step1.json b/tests/topotests/isis_te_topo1/reference/ted_step1.json index d7711b7e59..b70626e85d 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step1.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step1.json @@ -50,7 +50,7 @@ ], "edges":[ { - "edge-id":65537, + "edge-id":"2001:db8:1::1:1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -91,7 +91,7 @@ } }, { - "edge-id":65538, + "edge-id":"2001:db8:1::1:2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -132,7 +132,7 @@ } }, { - "edge-id":196610, + "edge-id":"2001:db8:3::3:2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -173,7 +173,7 @@ } }, { - "edge-id":196611, + "edge-id":"2001:db8:3::3:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -215,7 +215,7 @@ } }, { - "edge-id":196612, + "edge-id":"2001:db8:5::3:4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", @@ -263,7 +263,7 @@ ] }, { - "edge-id":262147, + "edge-id":"2001:db8:5::4:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -306,7 +306,7 @@ } }, { - "edge-id":167772161, + "edge-id":"10.0.0.1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -350,7 +350,7 @@ } }, { - "edge-id":167772162, + "edge-id":"10.0.0.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -391,7 +391,7 @@ } }, { - "edge-id":167772417, + "edge-id":"10.0.1.1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -432,7 +432,7 @@ } }, { - "edge-id":167772418, + "edge-id":"10.0.1.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -473,7 +473,7 @@ } }, { - "edge-id":167772930, + "edge-id":"10.0.3.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -514,7 +514,7 @@ } }, { - "edge-id":167772931, + "edge-id":"10.0.3.3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -556,7 +556,7 @@ } }, { - "edge-id":167773186, + "edge-id":"10.0.4.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -600,7 +600,7 @@ } }, { - "edge-id":167773188, + "edge-id":"10.0.4.4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", diff --git a/tests/topotests/isis_te_topo1/reference/ted_step10.json b/tests/topotests/isis_te_topo1/reference/ted_step10.json index 7d017b3430..f029e5aab0 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step10.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step10.json @@ -50,7 +50,7 @@ ], "edges":[ { - "edge-id":1, + "edge-id":"2001:db8::1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -108,7 +108,7 @@ } }, { - "edge-id":2, + "edge-id":"2001:db8::2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -148,7 +148,7 @@ } }, { - "edge-id":65537, + "edge-id":"2001:db8:1::1:1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -189,7 +189,7 @@ } }, { - "edge-id":65538, + "edge-id":"2001:db8:1::1:2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -230,7 +230,7 @@ } }, { - "edge-id":196610, + "edge-id":"2001:db8:3::3:2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -271,7 +271,7 @@ } }, { - "edge-id":196611, + "edge-id":"2001:db8:3::3:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -313,7 +313,7 @@ } }, { - "edge-id":196612, + "edge-id":"2001:db8:5::3:4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", @@ -361,7 +361,7 @@ ] }, { - "edge-id":262147, + "edge-id":"2001:db8:5::4:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -404,7 +404,7 @@ } }, { - "edge-id":167772161, + "edge-id":"10.0.0.1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -462,7 +462,7 @@ } }, { - "edge-id":167772162, + "edge-id":"10.0.0.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -503,7 +503,7 @@ } }, { - "edge-id":167772417, + "edge-id":"10.0.1.1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -544,7 +544,7 @@ } }, { - "edge-id":167772418, + "edge-id":"10.0.1.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -585,7 +585,7 @@ } }, { - "edge-id":167772930, + "edge-id":"10.0.3.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -626,7 +626,7 @@ } }, { - "edge-id":167772931, + "edge-id":"10.0.3.3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -668,7 +668,7 @@ } }, { - "edge-id":167773186, + "edge-id":"10.0.4.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -711,7 +711,7 @@ } }, { - "edge-id":167773188, + "edge-id":"10.0.4.4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", diff --git a/tests/topotests/isis_te_topo1/reference/ted_step2.json b/tests/topotests/isis_te_topo1/reference/ted_step2.json index 7b2074b69c..aa2bafb15a 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step2.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step2.json @@ -50,7 +50,7 @@ ], "edges":[ { - "edge-id":196610, + "edge-id":"2001:db8:3::3:2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -91,7 +91,7 @@ } }, { - "edge-id":196611, + "edge-id":"2001:db8:3::3:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -133,7 +133,7 @@ } }, { - "edge-id":196612, + "edge-id":"2001:db8:5::3:4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", @@ -181,7 +181,7 @@ ] }, { - "edge-id":262147, + "edge-id":"2001:db8:5::4:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -224,7 +224,7 @@ } }, { - "edge-id":167772161, + "edge-id":"10.0.0.1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -268,7 +268,7 @@ } }, { - "edge-id":167772162, + "edge-id":"10.0.0.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -309,7 +309,7 @@ } }, { - "edge-id":167772930, + "edge-id":"10.0.3.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -350,7 +350,7 @@ } }, { - "edge-id":167772931, + "edge-id":"10.0.3.3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -392,7 +392,7 @@ } }, { - "edge-id":167773186, + "edge-id":"10.0.4.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -436,7 +436,7 @@ } }, { - "edge-id":167773188, + "edge-id":"10.0.4.4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", diff --git a/tests/topotests/isis_te_topo1/reference/ted_step3.json b/tests/topotests/isis_te_topo1/reference/ted_step3.json index 528138477a..de6d108bb3 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step3.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step3.json @@ -50,7 +50,7 @@ ], "edges":[ { - "edge-id":1, + "edge-id":"2001:db8::1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -94,7 +94,7 @@ } }, { - "edge-id":2, + "edge-id":"2001:db8::2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -134,7 +134,7 @@ } }, { - "edge-id":196610, + "edge-id":"2001:db8:3::3:2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -175,7 +175,7 @@ } }, { - "edge-id":196611, + "edge-id":"2001:db8:3::3:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -217,7 +217,7 @@ } }, { - "edge-id":196612, + "edge-id":"2001:db8:5::3:4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", @@ -265,7 +265,7 @@ ] }, { - "edge-id":262147, + "edge-id":"2001:db8:5::4:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -308,7 +308,7 @@ } }, { - "edge-id":167772161, + "edge-id":"10.0.0.1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -352,7 +352,7 @@ } }, { - "edge-id":167772162, + "edge-id":"10.0.0.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -393,7 +393,7 @@ } }, { - "edge-id":167772930, + "edge-id":"10.0.3.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -434,7 +434,7 @@ } }, { - "edge-id":167772931, + "edge-id":"10.0.3.3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -476,7 +476,7 @@ } }, { - "edge-id":167773186, + "edge-id":"10.0.4.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -520,7 +520,7 @@ } }, { - "edge-id":167773188, + "edge-id":"10.0.4.4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", diff --git a/tests/topotests/isis_te_topo1/reference/ted_step4.json b/tests/topotests/isis_te_topo1/reference/ted_step4.json index 528138477a..de6d108bb3 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step4.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step4.json @@ -50,7 +50,7 @@ ], "edges":[ { - "edge-id":1, + "edge-id":"2001:db8::1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -94,7 +94,7 @@ } }, { - "edge-id":2, + "edge-id":"2001:db8::2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -134,7 +134,7 @@ } }, { - "edge-id":196610, + "edge-id":"2001:db8:3::3:2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -175,7 +175,7 @@ } }, { - "edge-id":196611, + "edge-id":"2001:db8:3::3:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -217,7 +217,7 @@ } }, { - "edge-id":196612, + "edge-id":"2001:db8:5::3:4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", @@ -265,7 +265,7 @@ ] }, { - "edge-id":262147, + "edge-id":"2001:db8:5::4:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -308,7 +308,7 @@ } }, { - "edge-id":167772161, + "edge-id":"10.0.0.1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -352,7 +352,7 @@ } }, { - "edge-id":167772162, + "edge-id":"10.0.0.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -393,7 +393,7 @@ } }, { - "edge-id":167772930, + "edge-id":"10.0.3.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -434,7 +434,7 @@ } }, { - "edge-id":167772931, + "edge-id":"10.0.3.3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -476,7 +476,7 @@ } }, { - "edge-id":167773186, + "edge-id":"10.0.4.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -520,7 +520,7 @@ } }, { - "edge-id":167773188, + "edge-id":"10.0.4.4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", diff --git a/tests/topotests/isis_te_topo1/reference/ted_step5.json b/tests/topotests/isis_te_topo1/reference/ted_step5.json index 72e441d186..7daee99297 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step5.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step5.json @@ -50,7 +50,7 @@ ], "edges":[ { - "edge-id":1, + "edge-id":"2001:db8::1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -94,7 +94,7 @@ } }, { - "edge-id":2, + "edge-id":"2001:db8::2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -134,7 +134,7 @@ } }, { - "edge-id":65537, + "edge-id":"2001:db8:1::1:1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -175,7 +175,7 @@ } }, { - "edge-id":65538, + "edge-id":"2001:db8:1::1:2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -216,7 +216,7 @@ } }, { - "edge-id":196610, + "edge-id":"2001:db8:3::3:2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -257,7 +257,7 @@ } }, { - "edge-id":196611, + "edge-id":"2001:db8:3::3:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -299,7 +299,7 @@ } }, { - "edge-id":196612, + "edge-id":"2001:db8:5::3:4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", @@ -347,7 +347,7 @@ ] }, { - "edge-id":262147, + "edge-id":"2001:db8:5::4:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -390,7 +390,7 @@ } }, { - "edge-id":167772161, + "edge-id":"10.0.0.1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -434,7 +434,7 @@ } }, { - "edge-id":167772162, + "edge-id":"10.0.0.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -475,7 +475,7 @@ } }, { - "edge-id":167772417, + "edge-id":"10.0.1.1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -516,7 +516,7 @@ } }, { - "edge-id":167772418, + "edge-id":"10.0.1.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -557,7 +557,7 @@ } }, { - "edge-id":167772930, + "edge-id":"10.0.3.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -598,7 +598,7 @@ } }, { - "edge-id":167772931, + "edge-id":"10.0.3.3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -640,7 +640,7 @@ } }, { - "edge-id":167773186, + "edge-id":"10.0.4.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -684,7 +684,7 @@ } }, { - "edge-id":167773188, + "edge-id":"10.0.4.4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", diff --git a/tests/topotests/isis_te_topo1/reference/ted_step6.json b/tests/topotests/isis_te_topo1/reference/ted_step6.json index a5f50c3eba..289eb1ebc2 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step6.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step6.json @@ -50,7 +50,7 @@ ], "edges":[ { - "edge-id":1, + "edge-id":"2001:db8::1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -94,7 +94,7 @@ } }, { - "edge-id":2, + "edge-id":"2001:db8::2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -134,7 +134,7 @@ } }, { - "edge-id":65537, + "edge-id":"2001:db8:1::1:1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -175,7 +175,7 @@ } }, { - "edge-id":65538, + "edge-id":"2001:db8:1::1:2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -216,7 +216,7 @@ } }, { - "edge-id":196610, + "edge-id":"2001:db8:3::3:2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -257,7 +257,7 @@ } }, { - "edge-id":196611, + "edge-id":"2001:db8:3::3:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -299,7 +299,7 @@ } }, { - "edge-id":196612, + "edge-id":"2001:db8:5::3:4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", @@ -347,7 +347,7 @@ ] }, { - "edge-id":262147, + "edge-id":"2001:db8:5::4:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -390,7 +390,7 @@ } }, { - "edge-id":167772161, + "edge-id":"10.0.0.1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -434,7 +434,7 @@ } }, { - "edge-id":167772162, + "edge-id":"10.0.0.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -475,7 +475,7 @@ } }, { - "edge-id":167772417, + "edge-id":"10.0.1.1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -516,7 +516,7 @@ } }, { - "edge-id":167772418, + "edge-id":"10.0.1.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -557,7 +557,7 @@ } }, { - "edge-id":167772930, + "edge-id":"10.0.3.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -598,7 +598,7 @@ } }, { - "edge-id":167772931, + "edge-id":"10.0.3.3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -640,7 +640,7 @@ } }, { - "edge-id":167773186, + "edge-id":"10.0.4.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -683,7 +683,7 @@ } }, { - "edge-id":167773188, + "edge-id":"10.0.4.4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", diff --git a/tests/topotests/isis_te_topo1/reference/ted_step7.json b/tests/topotests/isis_te_topo1/reference/ted_step7.json index 447febce48..18eb42fd32 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step7.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step7.json @@ -50,7 +50,7 @@ ], "edges":[ { - "edge-id":1, + "edge-id":"2001:db8::1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -109,7 +109,7 @@ } }, { - "edge-id":2, + "edge-id":"2001:db8::2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -149,7 +149,7 @@ } }, { - "edge-id":65537, + "edge-id":"2001:db8:1::1:1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -190,7 +190,7 @@ } }, { - "edge-id":65538, + "edge-id":"2001:db8:1::1:2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -231,7 +231,7 @@ } }, { - "edge-id":196610, + "edge-id":"2001:db8:3::3:2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -272,7 +272,7 @@ } }, { - "edge-id":196611, + "edge-id":"2001:db8:3::3:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -314,7 +314,7 @@ } }, { - "edge-id":196612, + "edge-id":"2001:db8:5::3:4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", @@ -362,7 +362,7 @@ ] }, { - "edge-id":262147, + "edge-id":"2001:db8:5::4:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -405,7 +405,7 @@ } }, { - "edge-id":167772161, + "edge-id":"10.0.0.1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -464,7 +464,7 @@ } }, { - "edge-id":167772162, + "edge-id":"10.0.0.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -505,7 +505,7 @@ } }, { - "edge-id":167772417, + "edge-id":"10.0.1.1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -546,7 +546,7 @@ } }, { - "edge-id":167772418, + "edge-id":"10.0.1.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -587,7 +587,7 @@ } }, { - "edge-id":167772930, + "edge-id":"10.0.3.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -628,7 +628,7 @@ } }, { - "edge-id":167772931, + "edge-id":"10.0.3.3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -670,7 +670,7 @@ } }, { - "edge-id":167773186, + "edge-id":"10.0.4.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -713,7 +713,7 @@ } }, { - "edge-id":167773188, + "edge-id":"10.0.4.4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", diff --git a/tests/topotests/isis_te_topo1/reference/ted_step8.json b/tests/topotests/isis_te_topo1/reference/ted_step8.json index 510e034eba..ede36cf93d 100644 --- a/tests/topotests/isis_te_topo1/reference/ted_step8.json +++ b/tests/topotests/isis_te_topo1/reference/ted_step8.json @@ -50,7 +50,7 @@ ], "edges":[ { - "edge-id":1, + "edge-id":"2001:db8::1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -109,7 +109,7 @@ } }, { - "edge-id":2, + "edge-id":"2001:db8::2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -149,7 +149,7 @@ } }, { - "edge-id":65537, + "edge-id":"2001:db8:1::1:1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -190,7 +190,7 @@ } }, { - "edge-id":65538, + "edge-id":"2001:db8:1::1:2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -231,7 +231,7 @@ } }, { - "edge-id":196610, + "edge-id":"2001:db8:3::3:2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -272,7 +272,7 @@ } }, { - "edge-id":196611, + "edge-id":"2001:db8:3::3:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -314,7 +314,7 @@ } }, { - "edge-id":196612, + "edge-id":"2001:db8:5::3:4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", @@ -362,7 +362,7 @@ ] }, { - "edge-id":262147, + "edge-id":"2001:db8:5::4:3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -405,7 +405,7 @@ } }, { - "edge-id":167772161, + "edge-id":"10.0.0.1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -464,7 +464,7 @@ } }, { - "edge-id":167772162, + "edge-id":"10.0.0.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -505,7 +505,7 @@ } }, { - "edge-id":167772417, + "edge-id":"10.0.1.1", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0001", @@ -546,7 +546,7 @@ } }, { - "edge-id":167772418, + "edge-id":"10.0.1.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -587,7 +587,7 @@ } }, { - "edge-id":167772930, + "edge-id":"10.0.3.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -628,7 +628,7 @@ } }, { - "edge-id":167772931, + "edge-id":"10.0.3.3", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0003", @@ -670,7 +670,7 @@ } }, { - "edge-id":167773186, + "edge-id":"10.0.4.2", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0002", @@ -713,7 +713,7 @@ } }, { - "edge-id":167773188, + "edge-id":"10.0.4.4", "status":"Sync", "origin":"ISIS_L2", "advertised-router":"0000.0000.0004", diff --git a/tests/topotests/ospf_te_topo1/reference/ted_step1.json b/tests/topotests/ospf_te_topo1/reference/ted_step1.json index 18aee4ffab..8b2413a894 100644 --- a/tests/topotests/ospf_te_topo1/reference/ted_step1.json +++ b/tests/topotests/ospf_te_topo1/reference/ted_step1.json @@ -57,7 +57,7 @@ ], "edges":[ { - "edge-id":167772161, + "edge-id":"10.0.0.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.1", @@ -101,7 +101,7 @@ } }, { - "edge-id":167772162, + "edge-id":"10.0.0.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -142,7 +142,7 @@ } }, { - "edge-id":167772417, + "edge-id":"10.0.1.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.1", @@ -183,7 +183,7 @@ } }, { - "edge-id":167772418, + "edge-id":"10.0.1.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -224,7 +224,7 @@ } }, { - "edge-id":167772929, + "edge-id":"10.0.3.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.3", @@ -266,7 +266,7 @@ } }, { - "edge-id":167772930, + "edge-id":"10.0.3.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -307,7 +307,7 @@ } }, { - "edge-id":167773185, + "edge-id":"10.0.4.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.4", @@ -360,7 +360,7 @@ ] }, { - "edge-id":167773186, + "edge-id":"10.0.4.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -404,7 +404,7 @@ } }, { - "edge-id":167773441, + "edge-id":"10.0.5.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.3", diff --git a/tests/topotests/ospf_te_topo1/reference/ted_step2.json b/tests/topotests/ospf_te_topo1/reference/ted_step2.json index 1ed7272560..625b57d15c 100644 --- a/tests/topotests/ospf_te_topo1/reference/ted_step2.json +++ b/tests/topotests/ospf_te_topo1/reference/ted_step2.json @@ -57,7 +57,7 @@ ], "edges":[ { - "edge-id":167772161, + "edge-id":"10.0.0.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.1", @@ -101,7 +101,7 @@ } }, { - "edge-id":167772162, + "edge-id":"10.0.0.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -142,7 +142,7 @@ } }, { - "edge-id":167772929, + "edge-id":"10.0.3.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.3", @@ -184,7 +184,7 @@ } }, { - "edge-id":167772930, + "edge-id":"10.0.3.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -225,7 +225,7 @@ } }, { - "edge-id":167773185, + "edge-id":"10.0.4.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.4", @@ -278,7 +278,7 @@ ] }, { - "edge-id":167773186, + "edge-id":"10.0.4.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -322,7 +322,7 @@ } }, { - "edge-id":167773441, + "edge-id":"10.0.5.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.3", diff --git a/tests/topotests/ospf_te_topo1/reference/ted_step3.json b/tests/topotests/ospf_te_topo1/reference/ted_step3.json index 0e79670c78..4cfec0f608 100644 --- a/tests/topotests/ospf_te_topo1/reference/ted_step3.json +++ b/tests/topotests/ospf_te_topo1/reference/ted_step3.json @@ -49,7 +49,7 @@ ], "edges":[ { - "edge-id":167772161, + "edge-id":"10.0.0.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.1", @@ -93,7 +93,7 @@ } }, { - "edge-id":167772162, + "edge-id":"10.0.0.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -134,7 +134,7 @@ } }, { - "edge-id":167772929, + "edge-id":"10.0.3.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.3", @@ -176,7 +176,7 @@ } }, { - "edge-id":167772930, + "edge-id":"10.0.3.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -217,7 +217,7 @@ } }, { - "edge-id":167773185, + "edge-id":"10.0.4.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.4", @@ -270,7 +270,7 @@ ] }, { - "edge-id":167773186, + "edge-id":"10.0.4.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", diff --git a/tests/topotests/ospf_te_topo1/reference/ted_step4.json b/tests/topotests/ospf_te_topo1/reference/ted_step4.json index 860dcb3f21..e8e24d9805 100644 --- a/tests/topotests/ospf_te_topo1/reference/ted_step4.json +++ b/tests/topotests/ospf_te_topo1/reference/ted_step4.json @@ -72,7 +72,7 @@ ], "edges":[ { - "edge-id":167772161, + "edge-id":"10.0.0.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.1", @@ -128,7 +128,7 @@ ] }, { - "edge-id":167772162, + "edge-id":"10.0.0.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -181,7 +181,7 @@ ] }, { - "edge-id":167772929, + "edge-id":"10.0.3.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.3", @@ -223,7 +223,7 @@ } }, { - "edge-id":167772930, + "edge-id":"10.0.3.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -276,7 +276,7 @@ ] }, { - "edge-id":167773185, + "edge-id":"10.0.4.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.4", @@ -329,7 +329,7 @@ ] }, { - "edge-id":167773186, + "edge-id":"10.0.4.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", diff --git a/tests/topotests/ospf_te_topo1/reference/ted_step5.json b/tests/topotests/ospf_te_topo1/reference/ted_step5.json index 615a691c45..4713cc0115 100644 --- a/tests/topotests/ospf_te_topo1/reference/ted_step5.json +++ b/tests/topotests/ospf_te_topo1/reference/ted_step5.json @@ -72,7 +72,7 @@ ], "edges":[ { - "edge-id":167772161, + "edge-id":"10.0.0.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.1", @@ -128,7 +128,7 @@ ] }, { - "edge-id":167772162, + "edge-id":"10.0.0.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -181,7 +181,7 @@ ] }, { - "edge-id":167772417, + "edge-id":"10.0.1.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.1", @@ -234,7 +234,7 @@ ] }, { - "edge-id":167772418, + "edge-id":"10.0.1.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -287,7 +287,7 @@ ] }, { - "edge-id":167772929, + "edge-id":"10.0.3.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.3", @@ -329,7 +329,7 @@ } }, { - "edge-id":167772930, + "edge-id":"10.0.3.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -382,7 +382,7 @@ ] }, { - "edge-id":167773185, + "edge-id":"10.0.4.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.4", @@ -435,7 +435,7 @@ ] }, { - "edge-id":167773186, + "edge-id":"10.0.4.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", diff --git a/tests/topotests/ospf_te_topo1/reference/ted_step6.json b/tests/topotests/ospf_te_topo1/reference/ted_step6.json index 3b84d25808..aaac07b051 100644 --- a/tests/topotests/ospf_te_topo1/reference/ted_step6.json +++ b/tests/topotests/ospf_te_topo1/reference/ted_step6.json @@ -72,7 +72,7 @@ ], "edges":[ { - "edge-id":167772161, + "edge-id":"10.0.0.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.1", @@ -128,7 +128,7 @@ ] }, { - "edge-id":167772162, + "edge-id":"10.0.0.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -181,7 +181,7 @@ ] }, { - "edge-id":167772417, + "edge-id":"10.0.1.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.1", @@ -234,7 +234,7 @@ ] }, { - "edge-id":167772418, + "edge-id":"10.0.1.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -287,7 +287,7 @@ ] }, { - "edge-id":167772929, + "edge-id":"10.0.3.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.3", @@ -329,7 +329,7 @@ } }, { - "edge-id":167772930, + "edge-id":"10.0.3.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -382,7 +382,7 @@ ] }, { - "edge-id":167773185, + "edge-id":"10.0.4.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.4", @@ -437,7 +437,7 @@ ] }, { - "edge-id":167773186, + "edge-id":"10.0.4.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", diff --git a/tests/topotests/ospf_te_topo1/reference/ted_step7.json b/tests/topotests/ospf_te_topo1/reference/ted_step7.json index 83f8a1d5d6..56ed1f176b 100644 --- a/tests/topotests/ospf_te_topo1/reference/ted_step7.json +++ b/tests/topotests/ospf_te_topo1/reference/ted_step7.json @@ -53,7 +53,7 @@ ], "edges":[ { - "edge-id":167772161, + "edge-id":"10.0.0.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.1", @@ -109,7 +109,7 @@ ] }, { - "edge-id":167772162, + "edge-id":"10.0.0.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -162,7 +162,7 @@ ] }, { - "edge-id":167772417, + "edge-id":"10.0.1.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.1", @@ -215,7 +215,7 @@ ] }, { - "edge-id":167772418, + "edge-id":"10.0.1.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2", @@ -268,7 +268,7 @@ ] }, { - "edge-id":167772929, + "edge-id":"10.0.3.1", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.3", @@ -310,7 +310,7 @@ } }, { - "edge-id":167772930, + "edge-id":"10.0.3.2", "status":"Sync", "origin":"OSPFv2", "advertised-router":"10.0.255.2",