diff --git a/tests/topotests/ospf_te_topo1/r1/zebra.conf b/tests/topotests/ospf_te_topo1/r1/zebra.conf index 7c5dc3ffe0..c47789a166 100644 --- a/tests/topotests/ospf_te_topo1/r1/zebra.conf +++ b/tests/topotests/ospf_te_topo1/r1/zebra.conf @@ -7,6 +7,7 @@ interface r1-eth0 link-params metric 20 delay 10000 + max-bw 10e+10 ava-bw 1.25e+08 enable exit-link-params diff --git a/tests/topotests/ospf_te_topo1/r2/zebra.conf b/tests/topotests/ospf_te_topo1/r2/zebra.conf index 69e10191f3..a9771f70ca 100644 --- a/tests/topotests/ospf_te_topo1/r2/zebra.conf +++ b/tests/topotests/ospf_te_topo1/r2/zebra.conf @@ -25,6 +25,7 @@ interface r2-eth3 link-params metric 30 delay 25000 + max-bw 10e+10 use-bw 1.25e+8 enable exit-link-params diff --git a/tests/topotests/ospf_te_topo1/reference/ted_step1.json b/tests/topotests/ospf_te_topo1/reference/ted_step1.json index d6bfca63f0..18aee4ffab 100644 --- a/tests/topotests/ospf_te_topo1/reference/ted_step1.json +++ b/tests/topotests/ospf_te_topo1/reference/ted_step1.json @@ -68,32 +68,32 @@ "te-metric":20, "local-address":"10.0.0.1", "remote-address":"10.0.0.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":99999997952, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ], "delay":10000, @@ -111,32 +111,32 @@ "edge-attributes":{ "local-address":"10.0.0.2", "remote-address":"10.0.0.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] } @@ -152,32 +152,32 @@ "edge-attributes":{ "local-address":"10.0.1.1", "remote-address":"10.0.1.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] } @@ -193,32 +193,32 @@ "edge-attributes":{ "local-address":"10.0.1.2", "remote-address":"10.0.1.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] } @@ -235,32 +235,32 @@ "admin-group":32, "local-address":"10.0.3.1", "remote-address":"10.0.3.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] } @@ -276,32 +276,32 @@ "edge-attributes":{ "local-address":"10.0.3.2", "remote-address":"10.0.3.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] } @@ -317,32 +317,32 @@ "edge-attributes":{ "local-address":"10.0.4.1", "remote-address":"10.0.4.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -371,32 +371,32 @@ "te-metric":30, "local-address":"10.0.4.2", "remote-address":"10.0.4.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":99999997952, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ], "delay":25000, @@ -414,32 +414,32 @@ "edge-attributes":{ "te-metric":10, "local-address":"10.0.5.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ], "remote-asn":65535, diff --git a/tests/topotests/ospf_te_topo1/reference/ted_step2.json b/tests/topotests/ospf_te_topo1/reference/ted_step2.json index ec30af6035..1ed7272560 100644 --- a/tests/topotests/ospf_te_topo1/reference/ted_step2.json +++ b/tests/topotests/ospf_te_topo1/reference/ted_step2.json @@ -68,32 +68,32 @@ "te-metric":20, "local-address":"10.0.0.1", "remote-address":"10.0.0.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":99999997952, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ], "delay":10000, @@ -111,32 +111,32 @@ "edge-attributes":{ "local-address":"10.0.0.2", "remote-address":"10.0.0.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] } @@ -153,32 +153,32 @@ "admin-group":32, "local-address":"10.0.3.1", "remote-address":"10.0.3.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] } @@ -194,32 +194,32 @@ "edge-attributes":{ "local-address":"10.0.3.2", "remote-address":"10.0.3.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] } @@ -235,32 +235,32 @@ "edge-attributes":{ "local-address":"10.0.4.1", "remote-address":"10.0.4.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -289,32 +289,32 @@ "te-metric":30, "local-address":"10.0.4.2", "remote-address":"10.0.4.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":99999997952, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ], "delay":25000, @@ -332,32 +332,32 @@ "edge-attributes":{ "te-metric":10, "local-address":"10.0.5.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ], "remote-asn":65535, diff --git a/tests/topotests/ospf_te_topo1/reference/ted_step3.json b/tests/topotests/ospf_te_topo1/reference/ted_step3.json index 853704b4f6..0e79670c78 100644 --- a/tests/topotests/ospf_te_topo1/reference/ted_step3.json +++ b/tests/topotests/ospf_te_topo1/reference/ted_step3.json @@ -60,32 +60,32 @@ "te-metric":20, "local-address":"10.0.0.1", "remote-address":"10.0.0.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":99999997952, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ], "delay":10000, @@ -103,32 +103,32 @@ "edge-attributes":{ "local-address":"10.0.0.2", "remote-address":"10.0.0.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] } @@ -145,32 +145,32 @@ "admin-group":32, "local-address":"10.0.3.1", "remote-address":"10.0.3.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] } @@ -186,32 +186,32 @@ "edge-attributes":{ "local-address":"10.0.3.2", "remote-address":"10.0.3.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] } @@ -227,32 +227,32 @@ "edge-attributes":{ "local-address":"10.0.4.1", "remote-address":"10.0.4.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -281,32 +281,32 @@ "te-metric":30, "local-address":"10.0.4.2", "remote-address":"10.0.4.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":99999997952, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ], "delay":25000, diff --git a/tests/topotests/ospf_te_topo1/reference/ted_step4.json b/tests/topotests/ospf_te_topo1/reference/ted_step4.json index 0aa57713c0..860dcb3f21 100644 --- a/tests/topotests/ospf_te_topo1/reference/ted_step4.json +++ b/tests/topotests/ospf_te_topo1/reference/ted_step4.json @@ -83,32 +83,32 @@ "te-metric":20, "local-address":"10.0.0.1", "remote-address":"10.0.0.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":99999997952, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ], "delay":10000, @@ -138,32 +138,32 @@ "edge-attributes":{ "local-address":"10.0.0.2", "remote-address":"10.0.0.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -192,32 +192,32 @@ "admin-group":32, "local-address":"10.0.3.1", "remote-address":"10.0.3.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] } @@ -233,32 +233,32 @@ "edge-attributes":{ "local-address":"10.0.3.2", "remote-address":"10.0.3.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -286,32 +286,32 @@ "edge-attributes":{ "local-address":"10.0.4.1", "remote-address":"10.0.4.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -340,32 +340,32 @@ "te-metric":30, "local-address":"10.0.4.2", "remote-address":"10.0.4.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":99999997952, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ], "delay":25000, diff --git a/tests/topotests/ospf_te_topo1/reference/ted_step5.json b/tests/topotests/ospf_te_topo1/reference/ted_step5.json index 07637f3048..615a691c45 100644 --- a/tests/topotests/ospf_te_topo1/reference/ted_step5.json +++ b/tests/topotests/ospf_te_topo1/reference/ted_step5.json @@ -83,32 +83,32 @@ "te-metric":20, "local-address":"10.0.0.1", "remote-address":"10.0.0.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":99999997952, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ], "delay":10000, @@ -138,32 +138,32 @@ "edge-attributes":{ "local-address":"10.0.0.2", "remote-address":"10.0.0.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -191,32 +191,32 @@ "edge-attributes":{ "local-address":"10.0.1.1", "remote-address":"10.0.1.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -244,32 +244,32 @@ "edge-attributes":{ "local-address":"10.0.1.2", "remote-address":"10.0.1.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -298,32 +298,32 @@ "admin-group":32, "local-address":"10.0.3.1", "remote-address":"10.0.3.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] } @@ -339,32 +339,32 @@ "edge-attributes":{ "local-address":"10.0.3.2", "remote-address":"10.0.3.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -392,32 +392,32 @@ "edge-attributes":{ "local-address":"10.0.4.1", "remote-address":"10.0.4.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -446,32 +446,32 @@ "te-metric":30, "local-address":"10.0.4.2", "remote-address":"10.0.4.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":99999997952, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ], "delay":25000, diff --git a/tests/topotests/ospf_te_topo1/reference/ted_step6.json b/tests/topotests/ospf_te_topo1/reference/ted_step6.json index e9eee96ff4..3b84d25808 100644 --- a/tests/topotests/ospf_te_topo1/reference/ted_step6.json +++ b/tests/topotests/ospf_te_topo1/reference/ted_step6.json @@ -83,32 +83,32 @@ "te-metric":20, "local-address":"10.0.0.1", "remote-address":"10.0.0.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":99999997952, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ], "delay":10000, @@ -138,32 +138,32 @@ "edge-attributes":{ "local-address":"10.0.0.2", "remote-address":"10.0.0.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -191,32 +191,32 @@ "edge-attributes":{ "local-address":"10.0.1.1", "remote-address":"10.0.1.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -244,32 +244,32 @@ "edge-attributes":{ "local-address":"10.0.1.2", "remote-address":"10.0.1.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -298,32 +298,32 @@ "admin-group":32, "local-address":"10.0.3.1", "remote-address":"10.0.3.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] } @@ -339,32 +339,32 @@ "edge-attributes":{ "local-address":"10.0.3.2", "remote-address":"10.0.3.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -392,32 +392,32 @@ "edge-attributes":{ "local-address":"10.0.4.1", "remote-address":"10.0.4.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ], "delay":20000, @@ -448,32 +448,32 @@ "te-metric":30, "local-address":"10.0.4.2", "remote-address":"10.0.4.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":99999997952, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ], "delay":25000 diff --git a/tests/topotests/ospf_te_topo1/reference/ted_step7.json b/tests/topotests/ospf_te_topo1/reference/ted_step7.json index f912ae4a87..83f8a1d5d6 100644 --- a/tests/topotests/ospf_te_topo1/reference/ted_step7.json +++ b/tests/topotests/ospf_te_topo1/reference/ted_step7.json @@ -64,32 +64,32 @@ "te-metric":20, "local-address":"10.0.0.1", "remote-address":"10.0.0.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":99999997952, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ], "delay":10000, @@ -119,32 +119,32 @@ "edge-attributes":{ "local-address":"10.0.0.2", "remote-address":"10.0.0.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -172,32 +172,32 @@ "edge-attributes":{ "local-address":"10.0.1.1", "remote-address":"10.0.1.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -225,32 +225,32 @@ "edge-attributes":{ "local-address":"10.0.1.2", "remote-address":"10.0.1.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] }, @@ -279,32 +279,32 @@ "admin-group":32, "local-address":"10.0.3.1", "remote-address":"10.0.3.2", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] } @@ -320,32 +320,32 @@ "edge-attributes":{ "local-address":"10.0.3.2", "remote-address":"10.0.3.1", - "max-link-bandwidth":176258176.0, - "max-resv-link-bandwidth":176258176.0, + "max-link-bandwidth":1250000, + "max-resv-link-bandwidth":1250000, "unreserved-bandwidth":[ { - "class-type-0":176258176.0 + "class-type-0":1250000 }, { - "class-type-1":176258176.0 + "class-type-1":1250000 }, { - "class-type-2":176258176.0 + "class-type-2":1250000 }, { - "class-type-3":176258176.0 + "class-type-3":1250000 }, { - "class-type-4":176258176.0 + "class-type-4":1250000 }, { - "class-type-5":176258176.0 + "class-type-5":1250000 }, { - "class-type-6":176258176.0 + "class-type-6":1250000 }, { - "class-type-7":176258176.0 + "class-type-7":1250000 } ] },