proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-04 06:32:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: Correct bug for TE metric wrong assignement

Browse Source 
When link-param is enabled for a given interface, TE metric is automatically
assigned to the metric of the interface. However, the metric of the interface
could be unassigned and keep the default value equal to 0. Thus, if the TE
metric is not explicitely modified within the `link-param metric` statement,
TE metric remains set to 0 which is not a valid value especially when
computing constrainted path.

This patch changes the assignement of the default value of the TE metric.
It is set to the metric of the interface only if the latter is not equal to 0.
TE topotests for OSPF and IS-IS have been adjusted accordingly.

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
This commit is contained in:
Olivier Dugeon 2022-01-24 17:09:29 +01:00
parent 3d1ff4bfdb
commit 538f34cb20
14 changed files with 7 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/if.c
View File

@ -1090,9 +1090,6 @@ struct if_link_params *if_link_params_get(struct interface *ifp)
struct if_link_params *iflp =
XCALLOC(MTYPE_IF_LINK_PARAMS, sizeof(struct if_link_params));
/* Set TE metric equal to standard metric */
iflp->te_metric = ifp->metric;
/* Compute default bandwidth based on interface */
iflp->default_bw =
((ifp->bandwidth ? ifp->bandwidth : DEFAULT_BANDWIDTH)
@ -1105,8 +1102,13 @@ struct if_link_params *if_link_params_get(struct interface *ifp)
iflp->unrsv_bw[i] = iflp->default_bw;
/* Update Link parameters status */
iflp->lp_status =
LP_TE_METRIC | LP_MAX_BW | LP_MAX_RSV_BW | LP_UNRSV_BW;
iflp->lp_status = LP_MAX_BW | LP_MAX_RSV_BW | LP_UNRSV_BW;
/* Set TE metric equal to standard metric only if it is set */
if (ifp->metric != 0) {
iflp->te_metric = ifp->metric;
iflp->lp_status |= LP_TE_METRIC;
}
/* Finally attach newly created Link Parameters */
ifp->link_params = iflp;

11
tests/topotests/isis_te_topo1/reference/ted_step1.json
View File

@ -58,7 +58,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:1::1:1",
"remote-address-v6":"2001:db8:1::1:2",
"max-link-bandwidth":176258176.0,
@ -100,7 +99,6 @@
"remote-vertex-id":1,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:1::1:2",
"remote-address-v6":"2001:db8:1::1:1",
"max-link-bandwidth":176258176.0,
@ -142,7 +140,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:3::3:2",
"remote-address-v6":"2001:db8:3::3:3",
"max-link-bandwidth":176258176.0,
@ -184,7 +181,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address-v6":"2001:db8:3::3:3",
"remote-address-v6":"2001:db8:3::3:2",
@ -227,7 +223,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:5::3:4",
"remote-address-v6":"2001:db8:5::4:3",
"max-link-bandwidth":176258176.0,
@ -363,7 +358,6 @@
"remote-vertex-id":1,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.0.2",
"remote-address":"10.0.0.1",
"max-link-bandwidth":176258176.0,
@ -405,7 +399,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.1.1",
"remote-address":"10.0.1.2",
"max-link-bandwidth":176258176.0,
@ -447,7 +440,6 @@
"remote-vertex-id":1,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.1.2",
"remote-address":"10.0.1.1",
"max-link-bandwidth":176258176.0,
@ -489,7 +481,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.3.2",
"remote-address":"10.0.3.3",
"max-link-bandwidth":176258176.0,
@ -531,7 +522,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address":"10.0.3.3",
"remote-address":"10.0.3.2",
@ -618,7 +608,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.4.4",
"remote-address":"10.0.4.2",
"max-link-bandwidth":176258176.0,

7
tests/topotests/isis_te_topo1/reference/ted_step2.json
View File

@ -58,7 +58,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:3::3:2",
"remote-address-v6":"2001:db8:3::3:3",
"max-link-bandwidth":176258176.0,
@ -100,7 +99,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address-v6":"2001:db8:3::3:3",
"remote-address-v6":"2001:db8:3::3:2",
@ -143,7 +141,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:5::3:4",
"remote-address-v6":"2001:db8:5::4:3",
"max-link-bandwidth":176258176.0,
@ -279,7 +276,6 @@
"remote-vertex-id":1,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.0.2",
"remote-address":"10.0.0.1",
"max-link-bandwidth":176258176.0,
@ -321,7 +317,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.3.2",
"remote-address":"10.0.3.3",
"max-link-bandwidth":176258176.0,
@ -363,7 +358,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address":"10.0.3.3",
"remote-address":"10.0.3.2",
@ -450,7 +444,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.4.4",
"remote-address":"10.0.4.2",
"max-link-bandwidth":176258176.0,

8
tests/topotests/isis_te_topo1/reference/ted_step3.json
View File

@ -102,7 +102,6 @@
"remote-vertex-id":1,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8::2",
"max-link-bandwidth":176258176.0,
"max-resv-link-bandwidth":176258176.0,
@ -143,7 +142,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:3::3:2",
"remote-address-v6":"2001:db8:3::3:3",
"max-link-bandwidth":176258176.0,
@ -185,7 +183,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address-v6":"2001:db8:3::3:3",
"remote-address-v6":"2001:db8:3::3:2",
@ -228,7 +225,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:5::3:4",
"remote-address-v6":"2001:db8:5::4:3",
"max-link-bandwidth":176258176.0,
@ -364,7 +360,6 @@
"remote-vertex-id":1,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.0.2",
"remote-address":"10.0.0.1",
"max-link-bandwidth":176258176.0,
@ -406,7 +401,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.3.2",
"remote-address":"10.0.3.3",
"max-link-bandwidth":176258176.0,
@ -448,7 +442,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address":"10.0.3.3",
"remote-address":"10.0.3.2",
@ -535,7 +528,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.4.4",
"remote-address":"10.0.4.2",
"max-link-bandwidth":176258176.0,

8
tests/topotests/isis_te_topo1/reference/ted_step4.json
View File

@ -102,7 +102,6 @@
"remote-vertex-id":1,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8::2",
"max-link-bandwidth":176258176.0,
"max-resv-link-bandwidth":176258176.0,
@ -143,7 +142,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:3::3:2",
"remote-address-v6":"2001:db8:3::3:3",
"max-link-bandwidth":176258176.0,
@ -185,7 +183,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address-v6":"2001:db8:3::3:3",
"remote-address-v6":"2001:db8:3::3:2",
@ -228,7 +225,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:5::3:4",
"remote-address-v6":"2001:db8:5::4:3",
"max-link-bandwidth":176258176.0,
@ -364,7 +360,6 @@
"remote-vertex-id":1,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.0.2",
"remote-address":"10.0.0.1",
"max-link-bandwidth":176258176.0,
@ -406,7 +401,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.3.2",
"remote-address":"10.0.3.3",
"max-link-bandwidth":176258176.0,
@ -448,7 +442,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address":"10.0.3.3",
"remote-address":"10.0.3.2",
@ -535,7 +528,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.4.4",
"remote-address":"10.0.4.2",
"max-link-bandwidth":176258176.0,

12
tests/topotests/isis_te_topo1/reference/ted_step5.json
View File

@ -102,7 +102,6 @@
"remote-vertex-id":1,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8::2",
"max-link-bandwidth":176258176.0,
"max-resv-link-bandwidth":176258176.0,
@ -143,7 +142,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:1::1:1",
"remote-address-v6":"2001:db8:1::1:2",
"max-link-bandwidth":176258176.0,
@ -185,7 +183,6 @@
"remote-vertex-id":1,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:1::1:2",
"remote-address-v6":"2001:db8:1::1:1",
"max-link-bandwidth":176258176.0,
@ -227,7 +224,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:3::3:2",
"remote-address-v6":"2001:db8:3::3:3",
"max-link-bandwidth":176258176.0,
@ -269,7 +265,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address-v6":"2001:db8:3::3:3",
"remote-address-v6":"2001:db8:3::3:2",
@ -312,7 +307,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:5::3:4",
"remote-address-v6":"2001:db8:5::4:3",
"max-link-bandwidth":176258176.0,
@ -448,7 +442,6 @@
"remote-vertex-id":1,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.0.2",
"remote-address":"10.0.0.1",
"max-link-bandwidth":176258176.0,
@ -490,7 +483,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.1.1",
"remote-address":"10.0.1.2",
"max-link-bandwidth":176258176.0,
@ -532,7 +524,6 @@
"remote-vertex-id":1,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.1.2",
"remote-address":"10.0.1.1",
"max-link-bandwidth":176258176.0,
@ -574,7 +565,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.3.2",
"remote-address":"10.0.3.3",
"max-link-bandwidth":176258176.0,
@ -616,7 +606,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address":"10.0.3.3",
"remote-address":"10.0.3.2",
@ -703,7 +692,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.4.4",
"remote-address":"10.0.4.2",
"max-link-bandwidth":176258176.0,

12
tests/topotests/isis_te_topo1/reference/ted_step6.json
View File

@ -102,7 +102,6 @@
"remote-vertex-id":1,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8::2",
"max-link-bandwidth":176258176.0,
"max-resv-link-bandwidth":176258176.0,
@ -143,7 +142,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:1::1:1",
"remote-address-v6":"2001:db8:1::1:2",
"max-link-bandwidth":176258176.0,
@ -185,7 +183,6 @@
"remote-vertex-id":1,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:1::1:2",
"remote-address-v6":"2001:db8:1::1:1",
"max-link-bandwidth":176258176.0,
@ -227,7 +224,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:3::3:2",
"remote-address-v6":"2001:db8:3::3:3",
"max-link-bandwidth":176258176.0,
@ -269,7 +265,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address-v6":"2001:db8:3::3:3",
"remote-address-v6":"2001:db8:3::3:2",
@ -312,7 +307,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address-v6":"2001:db8:5::3:4",
"remote-address-v6":"2001:db8:5::4:3",
"max-link-bandwidth":176258176.0,
@ -448,7 +442,6 @@
"remote-vertex-id":1,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.0.2",
"remote-address":"10.0.0.1",
"max-link-bandwidth":176258176.0,
@ -490,7 +483,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.1.1",
"remote-address":"10.0.1.2",
"max-link-bandwidth":176258176.0,
@ -532,7 +524,6 @@
"remote-vertex-id":1,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.1.2",
"remote-address":"10.0.1.1",
"max-link-bandwidth":176258176.0,
@ -574,7 +565,6 @@
"remote-vertex-id":3,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.3.2",
"remote-address":"10.0.3.3",
"max-link-bandwidth":176258176.0,
@ -616,7 +606,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address":"10.0.3.3",
"remote-address":"10.0.3.2",
@ -702,7 +691,6 @@
"remote-vertex-id":2,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.4.4",
"remote-address":"10.0.4.2",
"max-link-bandwidth":176258176.0,

6
tests/topotests/ospf_te_topo1/reference/ted_step1.json
View File

@ -109,7 +109,6 @@
"remote-vertex-id":167837441,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.0.2",
"remote-address":"10.0.0.1",
"max-link-bandwidth":176258176.0,
@ -151,7 +150,6 @@
"remote-vertex-id":167837442,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.1.1",
"remote-address":"10.0.1.2",
"max-link-bandwidth":176258176.0,
@ -193,7 +191,6 @@
"remote-vertex-id":167837441,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.1.2",
"remote-address":"10.0.1.1",
"max-link-bandwidth":176258176.0,
@ -235,7 +232,6 @@
"remote-vertex-id":167837442,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address":"10.0.3.1",
"remote-address":"10.0.3.2",
@ -278,7 +274,6 @@
"remote-vertex-id":167837443,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.3.2",
"remote-address":"10.0.3.1",
"max-link-bandwidth":176258176.0,
@ -320,7 +315,6 @@
"remote-vertex-id":167837442,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.4.1",
"remote-address":"10.0.4.2",
"max-link-bandwidth":176258176.0,

4
tests/topotests/ospf_te_topo1/reference/ted_step2.json
View File

@ -109,7 +109,6 @@
"remote-vertex-id":167837441,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.0.2",
"remote-address":"10.0.0.1",
"max-link-bandwidth":176258176.0,
@ -151,7 +150,6 @@
"remote-vertex-id":167837442,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address":"10.0.3.1",
"remote-address":"10.0.3.2",
@ -194,7 +192,6 @@
"remote-vertex-id":167837443,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.3.2",
"remote-address":"10.0.3.1",
"max-link-bandwidth":176258176.0,
@ -236,7 +233,6 @@
"remote-vertex-id":167837442,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.4.1",
"remote-address":"10.0.4.2",
"max-link-bandwidth":176258176.0,

4
tests/topotests/ospf_te_topo1/reference/ted_step3.json
View File

@ -101,7 +101,6 @@
"remote-vertex-id":167837441,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.0.2",
"remote-address":"10.0.0.1",
"max-link-bandwidth":176258176.0,
@ -143,7 +142,6 @@
"remote-vertex-id":167837442,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address":"10.0.3.1",
"remote-address":"10.0.3.2",
@ -186,7 +184,6 @@
"remote-vertex-id":167837443,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.3.2",
"remote-address":"10.0.3.1",
"max-link-bandwidth":176258176.0,
@ -228,7 +225,6 @@
"remote-vertex-id":167837442,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.4.1",
"remote-address":"10.0.4.2",
"max-link-bandwidth":176258176.0,

4
tests/topotests/ospf_te_topo1/reference/ted_step4.json
View File

@ -136,7 +136,6 @@
"remote-vertex-id":167837441,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.0.2",
"remote-address":"10.0.0.1",
"max-link-bandwidth":176258176.0,
@ -190,7 +189,6 @@
"remote-vertex-id":167837442,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address":"10.0.3.1",
"remote-address":"10.0.3.2",
@ -233,7 +231,6 @@
"remote-vertex-id":167837443,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.3.2",
"remote-address":"10.0.3.1",
"max-link-bandwidth":176258176.0,
@ -287,7 +284,6 @@
"remote-vertex-id":167837442,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.4.1",
"remote-address":"10.0.4.2",
"max-link-bandwidth":176258176.0,

6
tests/topotests/ospf_te_topo1/reference/ted_step5.json
View File

@ -136,7 +136,6 @@
"remote-vertex-id":167837441,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.0.2",
"remote-address":"10.0.0.1",
"max-link-bandwidth":176258176.0,
@ -190,7 +189,6 @@
"remote-vertex-id":167837442,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.1.1",
"remote-address":"10.0.1.2",
"max-link-bandwidth":176258176.0,
@ -244,7 +242,6 @@
"remote-vertex-id":167837441,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.1.2",
"remote-address":"10.0.1.1",
"max-link-bandwidth":176258176.0,
@ -298,7 +295,6 @@
"remote-vertex-id":167837442,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address":"10.0.3.1",
"remote-address":"10.0.3.2",
@ -341,7 +337,6 @@
"remote-vertex-id":167837443,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.3.2",
"remote-address":"10.0.3.1",
"max-link-bandwidth":176258176.0,
@ -395,7 +390,6 @@
"remote-vertex-id":167837442,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.4.1",
"remote-address":"10.0.4.2",
"max-link-bandwidth":176258176.0,

6
tests/topotests/ospf_te_topo1/reference/ted_step6.json
View File

@ -136,7 +136,6 @@
"remote-vertex-id":167837441,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.0.2",
"remote-address":"10.0.0.1",
"max-link-bandwidth":176258176.0,
@ -190,7 +189,6 @@
"remote-vertex-id":167837442,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.1.1",
"remote-address":"10.0.1.2",
"max-link-bandwidth":176258176.0,
@ -244,7 +242,6 @@
"remote-vertex-id":167837441,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.1.2",
"remote-address":"10.0.1.1",
"max-link-bandwidth":176258176.0,
@ -298,7 +295,6 @@
"remote-vertex-id":167837442,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address":"10.0.3.1",
"remote-address":"10.0.3.2",
@ -341,7 +337,6 @@
"remote-vertex-id":167837443,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.3.2",
"remote-address":"10.0.3.1",
"max-link-bandwidth":176258176.0,
@ -395,7 +390,6 @@
"remote-vertex-id":167837442,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.4.1",
"remote-address":"10.0.4.2",
"max-link-bandwidth":176258176.0,

5
tests/topotests/ospf_te_topo1/reference/ted_step7.json
View File

@ -117,7 +117,6 @@
"remote-vertex-id":167837441,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.0.2",
"remote-address":"10.0.0.1",
"max-link-bandwidth":176258176.0,
@ -171,7 +170,6 @@
"remote-vertex-id":167837442,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.1.1",
"remote-address":"10.0.1.2",
"max-link-bandwidth":176258176.0,
@ -225,7 +223,6 @@
"remote-vertex-id":167837441,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.1.2",
"remote-address":"10.0.1.1",
"max-link-bandwidth":176258176.0,
@ -279,7 +276,6 @@
"remote-vertex-id":167837442,
"metric":10,
"edge-attributes":{
"te-metric":0,
"admin-group":32,
"local-address":"10.0.3.1",
"remote-address":"10.0.3.2",
@ -322,7 +318,6 @@
"remote-vertex-id":167837443,
"metric":10,
"edge-attributes":{
"te-metric":0,
"local-address":"10.0.3.2",
"remote-address":"10.0.3.1",
"max-link-bandwidth":176258176.0,