tests: use correct metric type and value for OSPFv3 redistributed routes

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

diff --git a/tests/topotests/bfd_topo2/r4/ipv6_routes.json b/tests/topotests/bfd_topo2/r4/ipv6_routes.json
index c828575c8489824e01c5d34f5df8ab941f835dec..eb571d5d1cd324eb4e4a251fe01f7b86a660c29d 100644 (file)
--- a/tests/topotests/bfd_topo2/r4/ipv6_routes.json
+++ b/tests/topotests/bfd_topo2/r4/ipv6_routes.json
@@ -35,7 +35,7 @@
     {
       "distance": 110,
       "protocol": "ospf6",
-      "metric": 10,
+      "metric": 20,
       "selected": true,
       "installed": true,
       "prefix": "2001:db8:1::/64",

diff --git a/tests/topotests/ospf6_topo1/r1/show_ipv6_route.ref b/tests/topotests/ospf6_topo1/r1/show_ipv6_route.ref
index a2ddf7c5ae154cc6b1ee7979607d39f46f811a17..96489b07562f29546f9483b10b8ae52d87164750 100644 (file)
--- a/tests/topotests/ospf6_topo1/r1/show_ipv6_route.ref
+++ b/tests/topotests/ospf6_topo1/r1/show_ipv6_route.ref
@@ -4,6 +4,6 @@ O>* fc00:3:3:3::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r1-sw5, weight 1, XX
 O>* fc00:4:4:4::/64 [110/30] via fe80::XXXX:XXXX:XXXX:XXXX, r1-sw5, weight 1, XX:XX:XX
 O   fc00:a:a:a::/64 [110/10] is directly connected, r1-sw5, weight 1, XX:XX:XX
 O>* fc00:b:b:b::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r1-sw5, weight 1, XX:XX:XX
-O>* fc00:2222:2222:2222::/64 [110/10] via fe80::XXXX:XXXX:XXXX:XXXX, r1-sw5, weight 1, XX:XX:XX
-O>* fc00:3333:3333:3333::/64 [110/10] via fe80::XXXX:XXXX:XXXX:XXXX, r1-sw5, weight 1, XX:XX:XX
+O>* fc00:2222:2222:2222::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r1-sw5, weight 1, XX:XX:XX
+O>* fc00:3333:3333:3333::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r1-sw5, weight 1, XX:XX:XX
 O>* fc00:4444:4444:4444::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r1-sw5, weight 1, XX:XX:XX

diff --git a/tests/topotests/ospf6_topo1/r2/show_ipv6_route.ref b/tests/topotests/ospf6_topo1/r2/show_ipv6_route.ref
index 1f642b1b2234d12f243953d1ab1c2c1ad864b182..78c1ad883061424f3866e758f5abbb5f5fdcd126 100644 (file)
--- a/tests/topotests/ospf6_topo1/r2/show_ipv6_route.ref
+++ b/tests/topotests/ospf6_topo1/r2/show_ipv6_route.ref
@@ -4,7 +4,7 @@ O>* fc00:3:3:3::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r2-sw5, weight 1, XX
 O>* fc00:4:4:4::/64 [110/30] via fe80::XXXX:XXXX:XXXX:XXXX, r2-sw5, weight 1, XX:XX:XX
 O   fc00:a:a:a::/64 [110/10] is directly connected, r2-sw5, weight 1, XX:XX:XX
 O>* fc00:b:b:b::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r2-sw5, weight 1, XX:XX:XX
-O>* fc00:1111:1111:1111::/64 [110/10] via fe80::XXXX:XXXX:XXXX:XXXX, r2-sw5, weight 1, XX:XX:XX
-O>* fc00:3333:3333:3333::/64 [110/10] via fe80::XXXX:XXXX:XXXX:XXXX, r2-sw5, weight 1, XX:XX:XX
+O>* fc00:1111:1111:1111::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r2-sw5, weight 1, XX:XX:XX
+O>* fc00:3333:3333:3333::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r2-sw5, weight 1, XX:XX:XX
 O>* fc00:4444:4444:4444::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r2-sw5, weight 1, XX:XX:XX
 

diff --git a/tests/topotests/ospf6_topo1/r3/show_ipv6_route.ref b/tests/topotests/ospf6_topo1/r3/show_ipv6_route.ref
index 8e3afa583ab82c0313664fb744f1adfe635c6343..dc0acbe0c5dc01b0be53618cd7efb083a8eb18a6 100644 (file)
--- a/tests/topotests/ospf6_topo1/r3/show_ipv6_route.ref
+++ b/tests/topotests/ospf6_topo1/r3/show_ipv6_route.ref
@@ -4,7 +4,7 @@ O   fc00:3:3:3::/64 [110/10] is directly connected, r3-stubnet, weight 1, XX:XX:
 O>* fc00:4:4:4::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r3-sw6, weight 1, XX:XX:XX
 O   fc00:a:a:a::/64 [110/10] is directly connected, r3-sw5, weight 1, XX:XX:XX
 O   fc00:b:b:b::/64 [110/10] is directly connected, r3-sw6, weight 1, XX:XX:XX
-O>* fc00:1111:1111:1111::/64 [110/10] via fe80::XXXX:XXXX:XXXX:XXXX, r3-sw5, weight 1, XX:XX:XX
-O>* fc00:2222:2222:2222::/64 [110/10] via fe80::XXXX:XXXX:XXXX:XXXX, r3-sw5, weight 1, XX:XX:XX
-O>* fc00:4444:4444:4444::/64 [110/10] via fe80::XXXX:XXXX:XXXX:XXXX, r3-sw6, weight 1, XX:XX:XX
+O>* fc00:1111:1111:1111::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r3-sw5, weight 1, XX:XX:XX
+O>* fc00:2222:2222:2222::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r3-sw5, weight 1, XX:XX:XX
+O>* fc00:4444:4444:4444::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r3-sw6, weight 1, XX:XX:XX
 

diff --git a/tests/topotests/ospf6_topo1/r4/show_ipv6_route.ref b/tests/topotests/ospf6_topo1/r4/show_ipv6_route.ref
index 0df652ffb31d2ee1aea3e58fb991bc284abb383b..730fd9f2d5956dea10e28d2afc7b08885a078c74 100644 (file)
--- a/tests/topotests/ospf6_topo1/r4/show_ipv6_route.ref
+++ b/tests/topotests/ospf6_topo1/r4/show_ipv6_route.ref
@@ -6,4 +6,4 @@ O>* fc00:a:a:a::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r4-sw6, weight 1, XX
 O   fc00:b:b:b::/64 [110/10] is directly connected, r4-sw6, weight 1, XX:XX:XX
 O>* fc00:1111:1111:1111::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r4-sw6, weight 1, XX:XX:XX
 O>* fc00:2222:2222:2222::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r4-sw6, weight 1, XX:XX:XX
-O>* fc00:3333:3333:3333::/64 [110/10] via fe80::XXXX:XXXX:XXXX:XXXX, r4-sw6, weight 1, XX:XX:XX
+O>* fc00:3333:3333:3333::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r4-sw6, weight 1, XX:XX:XX

diff --git a/tests/topotests/ospf6_topo1_vrf/r1/show_ipv6_vrf_route.ref b/tests/topotests/ospf6_topo1_vrf/r1/show_ipv6_vrf_route.ref
index a2ddf7c5ae154cc6b1ee7979607d39f46f811a17..96489b07562f29546f9483b10b8ae52d87164750 100644 (file)
--- a/tests/topotests/ospf6_topo1_vrf/r1/show_ipv6_vrf_route.ref
+++ b/tests/topotests/ospf6_topo1_vrf/r1/show_ipv6_vrf_route.ref
@@ -4,6 +4,6 @@ O>* fc00:3:3:3::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r1-sw5, weight 1, XX
 O>* fc00:4:4:4::/64 [110/30] via fe80::XXXX:XXXX:XXXX:XXXX, r1-sw5, weight 1, XX:XX:XX
 O   fc00:a:a:a::/64 [110/10] is directly connected, r1-sw5, weight 1, XX:XX:XX
 O>* fc00:b:b:b::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r1-sw5, weight 1, XX:XX:XX
-O>* fc00:2222:2222:2222::/64 [110/10] via fe80::XXXX:XXXX:XXXX:XXXX, r1-sw5, weight 1, XX:XX:XX
-O>* fc00:3333:3333:3333::/64 [110/10] via fe80::XXXX:XXXX:XXXX:XXXX, r1-sw5, weight 1, XX:XX:XX
+O>* fc00:2222:2222:2222::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r1-sw5, weight 1, XX:XX:XX
+O>* fc00:3333:3333:3333::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r1-sw5, weight 1, XX:XX:XX
 O>* fc00:4444:4444:4444::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r1-sw5, weight 1, XX:XX:XX

diff --git a/tests/topotests/ospf6_topo1_vrf/r2/show_ipv6_vrf_route.ref b/tests/topotests/ospf6_topo1_vrf/r2/show_ipv6_vrf_route.ref
index 328961941464960f15022cc62a73110b20a19a66..4c390f7cd645498a902583113d71e6374ff94eaa 100644 (file)
--- a/tests/topotests/ospf6_topo1_vrf/r2/show_ipv6_vrf_route.ref
+++ b/tests/topotests/ospf6_topo1_vrf/r2/show_ipv6_vrf_route.ref
@@ -4,6 +4,6 @@ O>* fc00:3:3:3::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r2-sw5, weight 1, XX
 O>* fc00:4:4:4::/64 [110/30] via fe80::XXXX:XXXX:XXXX:XXXX, r2-sw5, weight 1, XX:XX:XX
 O   fc00:a:a:a::/64 [110/10] is directly connected, r2-sw5, weight 1, XX:XX:XX
 O>* fc00:b:b:b::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r2-sw5, weight 1, XX:XX:XX
-O>* fc00:1111:1111:1111::/64 [110/10] via fe80::XXXX:XXXX:XXXX:XXXX, r2-sw5, weight 1, XX:XX:XX
-O>* fc00:3333:3333:3333::/64 [110/10] via fe80::XXXX:XXXX:XXXX:XXXX, r2-sw5, weight 1, XX:XX:XX
+O>* fc00:1111:1111:1111::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r2-sw5, weight 1, XX:XX:XX
+O>* fc00:3333:3333:3333::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r2-sw5, weight 1, XX:XX:XX
 O>* fc00:4444:4444:4444::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r2-sw5, weight 1, XX:XX:XX

diff --git a/tests/topotests/ospf6_topo1_vrf/r3/show_ipv6_vrf_route.ref b/tests/topotests/ospf6_topo1_vrf/r3/show_ipv6_vrf_route.ref
index ac713190ff107698e3f2c32b242e7b20bfa16219..989213f963b5d40243bfa882d6db3f10e39f846d 100644 (file)
--- a/tests/topotests/ospf6_topo1_vrf/r3/show_ipv6_vrf_route.ref
+++ b/tests/topotests/ospf6_topo1_vrf/r3/show_ipv6_vrf_route.ref
@@ -4,6 +4,6 @@ O   fc00:3:3:3::/64 [110/10] is directly connected, r3-stubnet, weight 1, XX:XX:
 O>* fc00:4:4:4::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r3-sw6, weight 1, XX:XX:XX
 O   fc00:a:a:a::/64 [110/10] is directly connected, r3-sw5, weight 1, XX:XX:XX
 O   fc00:b:b:b::/64 [110/10] is directly connected, r3-sw6, weight 1, XX:XX:XX
-O>* fc00:1111:1111:1111::/64 [110/10] via fe80::XXXX:XXXX:XXXX:XXXX, r3-sw5, weight 1, XX:XX:XX
-O>* fc00:2222:2222:2222::/64 [110/10] via fe80::XXXX:XXXX:XXXX:XXXX, r3-sw5, weight 1, XX:XX:XX
-O>* fc00:4444:4444:4444::/64 [110/10] via fe80::XXXX:XXXX:XXXX:XXXX, r3-sw6, weight 1, XX:XX:XX
+O>* fc00:1111:1111:1111::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r3-sw5, weight 1, XX:XX:XX
+O>* fc00:2222:2222:2222::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r3-sw5, weight 1, XX:XX:XX
+O>* fc00:4444:4444:4444::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r3-sw6, weight 1, XX:XX:XX

diff --git a/tests/topotests/ospf6_topo1_vrf/r4/show_ipv6_vrf_route.ref b/tests/topotests/ospf6_topo1_vrf/r4/show_ipv6_vrf_route.ref
index 0df652ffb31d2ee1aea3e58fb991bc284abb383b..730fd9f2d5956dea10e28d2afc7b08885a078c74 100644 (file)
--- a/tests/topotests/ospf6_topo1_vrf/r4/show_ipv6_vrf_route.ref
+++ b/tests/topotests/ospf6_topo1_vrf/r4/show_ipv6_vrf_route.ref
@@ -6,4 +6,4 @@ O>* fc00:a:a:a::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r4-sw6, weight 1, XX
 O   fc00:b:b:b::/64 [110/10] is directly connected, r4-sw6, weight 1, XX:XX:XX
 O>* fc00:1111:1111:1111::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r4-sw6, weight 1, XX:XX:XX
 O>* fc00:2222:2222:2222::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r4-sw6, weight 1, XX:XX:XX
-O>* fc00:3333:3333:3333::/64 [110/10] via fe80::XXXX:XXXX:XXXX:XXXX, r4-sw6, weight 1, XX:XX:XX
+O>* fc00:3333:3333:3333::/64 [110/20] via fe80::XXXX:XXXX:XXXX:XXXX, r4-sw6, weight 1, XX:XX:XX

diff --git a/tests/topotests/ospf_topo1/r1/ospf6route.txt b/tests/topotests/ospf_topo1/r1/ospf6route.txt
index 1bfd6942ea643ab32cc3d4c9a4fd39f24c093bd3..d01511c0ee9fcee95432dc760fe5aa277a2707ca 100644 (file)
--- a/tests/topotests/ospf_topo1/r1/ospf6route.txt
+++ b/tests/topotests/ospf_topo1/r1/ospf6route.txt
@@ -1,13 +1,13 @@
 *N IA 2001:db8:1::/64                ::                        r1-eth0 00:02:11
 *N IA 2001:db8:2::/64                fe80::b038:bcff:fe27:e2d6 r1-eth1 00:02:06
- N E1 2001:db8:2::/64                fe80::b038:bcff:fe27:e2d6 r1-eth1 00:02:06
+ N E2 2001:db8:2::/64                fe80::b038:bcff:fe27:e2d6 r1-eth1 00:02:06
 *N IA 2001:db8:3::/64                ::                        r1-eth1 00:02:11
- N E1 2001:db8:3::/64                fe80::50b7:d8ff:fe5f:8ff0 r1-eth1 00:02:06
- N E1 2001:db8:3::/64                fe80::b038:bcff:fe27:e2d6 r1-eth1 00:02:06
+ N E2 2001:db8:3::/64                fe80::50b7:d8ff:fe5f:8ff0 r1-eth1 00:02:06
+ N E2 2001:db8:3::/64                fe80::b038:bcff:fe27:e2d6 r1-eth1 00:02:06
 *N IA 2001:db8:100::/64              fe80::50b7:d8ff:fe5f:8ff0 r1-eth1 00:02:06
- N E1 2001:db8:100::/64              fe80::50b7:d8ff:fe5f:8ff0 r1-eth1 00:02:06
+ N E2 2001:db8:100::/64              fe80::50b7:d8ff:fe5f:8ff0 r1-eth1 00:02:06
 *N IE 2001:db8:200::/64              fe80::50b7:d8ff:fe5f:8ff0 r1-eth1 00:02:06
- N E1 2001:db8:200::/64              fe80::50b7:d8ff:fe5f:8ff0 r1-eth1 00:02:06
- N E1 2001:db8:200::/64              fe80::50b7:d8ff:fe5f:8ff0 r1-eth1 00:02:04
+ N E2 2001:db8:200::/64              fe80::50b7:d8ff:fe5f:8ff0 r1-eth1 00:02:06
+ N E2 2001:db8:200::/64              fe80::50b7:d8ff:fe5f:8ff0 r1-eth1 00:02:04
 *N IE 2001:db8:300::/64              fe80::50b7:d8ff:fe5f:8ff0 r1-eth1 00:02:04
- N E1 2001:db8:300::/64              fe80::50b7:d8ff:fe5f:8ff0 r1-eth1 00:02:04
+ N E2 2001:db8:300::/64              fe80::50b7:d8ff:fe5f:8ff0 r1-eth1 00:02:04

diff --git a/tests/topotests/ospf_topo1/r1/ospf6route_down.txt b/tests/topotests/ospf_topo1/r1/ospf6route_down.txt
index 1ce96c86c035aa067e3093a8c8143bb7793c1dfe..57113d049f295e2340ecf6b05f9f5264269c427e 100644 (file)
--- a/tests/topotests/ospf_topo1/r1/ospf6route_down.txt
+++ b/tests/topotests/ospf_topo1/r1/ospf6route_down.txt
@@ -1,5 +1,5 @@
 *N IA 2001:db8:1::/64                ::                        r1-eth0 00:01:51
 *N IA 2001:db8:2::/64                fe80::281a:23ff:fe22:8a40 r1-eth1 00:00:52
- N E1 2001:db8:2::/64                fe80::281a:23ff:fe22:8a40 r1-eth1 00:00:52
+ N E2 2001:db8:2::/64                fe80::281a:23ff:fe22:8a40 r1-eth1 00:00:52
 *N IA 2001:db8:3::/64                ::                        r1-eth1 00:00:52
- N E1 2001:db8:3::/64                fe80::281a:23ff:fe22:8a40 r1-eth1 00:00:52
+ N E2 2001:db8:3::/64                fe80::281a:23ff:fe22:8a40 r1-eth1 00:00:52

diff --git a/tests/topotests/ospf_topo1/r1/ospf6route_ecmp.txt b/tests/topotests/ospf_topo1/r1/ospf6route_ecmp.txt
index 4df6e5ec005eddf0448d034d7532537c3e449a0f..48e9209a04ad79ac9bf2f42cbb3bdc860d1af54a 100644 (file)
--- a/tests/topotests/ospf_topo1/r1/ospf6route_ecmp.txt
+++ b/tests/topotests/ospf_topo1/r1/ospf6route_ecmp.txt
@@ -1,13 +1,13 @@
 *N IA 2001:db8:1::/64                ::                        r1-eth0 00:06:13
 *N IA 2001:db8:2::/64                fe80::e8bb:62ff:fee8:7022 r1-eth1 00:06:08
- N E1 2001:db8:2::/64                fe80::e8bb:62ff:fee8:7022 r1-eth1 00:06:08
+ N E2 2001:db8:2::/64                fe80::e8bb:62ff:fee8:7022 r1-eth1 00:06:08
 *N IA 2001:db8:3::/64                ::                        r1-eth1 00:06:13
- N E1 2001:db8:3::/64                fe80::400f:dff:fe35:a1e7  r1-eth1 00:06:08
+ N E2 2001:db8:3::/64                fe80::400f:dff:fe35:a1e7  r1-eth1 00:06:08
                                      fe80::e8bb:62ff:fee8:7022 r1-eth1 
 *N IA 2001:db8:100::/64              fe80::400f:dff:fe35:a1e7  r1-eth1 00:06:08
- N E1 2001:db8:100::/64              fe80::400f:dff:fe35:a1e7  r1-eth1 00:06:08
+ N E2 2001:db8:100::/64              fe80::400f:dff:fe35:a1e7  r1-eth1 00:06:08
 *N IE 2001:db8:200::/64              fe80::400f:dff:fe35:a1e7  r1-eth1 00:06:08
- N E1 2001:db8:200::/64              fe80::400f:dff:fe35:a1e7  r1-eth1 00:06:08
- N E1 2001:db8:200::/64              fe80::400f:dff:fe35:a1e7  r1-eth1 00:06:07
+ N E2 2001:db8:200::/64              fe80::400f:dff:fe35:a1e7  r1-eth1 00:06:08
+ N E2 2001:db8:200::/64              fe80::400f:dff:fe35:a1e7  r1-eth1 00:06:07
 *N IE 2001:db8:300::/64              fe80::400f:dff:fe35:a1e7  r1-eth1 00:06:07
- N E1 2001:db8:300::/64              fe80::400f:dff:fe35:a1e7  r1-eth1 00:06:07
+ N E2 2001:db8:300::/64              fe80::400f:dff:fe35:a1e7  r1-eth1 00:06:07

diff --git a/tests/topotests/ospf_topo1/r2/ospf6route.txt b/tests/topotests/ospf_topo1/r2/ospf6route.txt
index 7d3ce5b2070e65018c91364ee18a204a85f06579..71c84d2ebd17deb9935fdad5d1032e1159245c7e 100644 (file)
--- a/tests/topotests/ospf_topo1/r2/ospf6route.txt
+++ b/tests/topotests/ospf_topo1/r2/ospf6route.txt
@@ -1,13 +1,13 @@
 *N IA 2001:db8:1::/64                fe80::b49b:4cff:fe80:4e87 r2-eth1 00:03:34
- N E1 2001:db8:1::/64                fe80::b49b:4cff:fe80:4e87 r2-eth1 00:03:34
+ N E2 2001:db8:1::/64                fe80::b49b:4cff:fe80:4e87 r2-eth1 00:03:34
 *N IA 2001:db8:2::/64                ::                        r2-eth0 00:03:39
 *N IA 2001:db8:3::/64                ::                        r2-eth1 00:03:34
- N E1 2001:db8:3::/64                fe80::b49b:4cff:fe80:4e87 r2-eth1 00:03:34
- N E1 2001:db8:3::/64                fe80::50b7:d8ff:fe5f:8ff0 r2-eth1 00:03:34
+ N E2 2001:db8:3::/64                fe80::b49b:4cff:fe80:4e87 r2-eth1 00:03:34
+ N E2 2001:db8:3::/64                fe80::50b7:d8ff:fe5f:8ff0 r2-eth1 00:03:34
 *N IA 2001:db8:100::/64              fe80::50b7:d8ff:fe5f:8ff0 r2-eth1 00:03:34
- N E1 2001:db8:100::/64              fe80::50b7:d8ff:fe5f:8ff0 r2-eth1 00:03:34
+ N E2 2001:db8:100::/64              fe80::50b7:d8ff:fe5f:8ff0 r2-eth1 00:03:34
 *N IE 2001:db8:200::/64              fe80::50b7:d8ff:fe5f:8ff0 r2-eth1 00:03:34
- N E1 2001:db8:200::/64              fe80::50b7:d8ff:fe5f:8ff0 r2-eth1 00:03:34
- N E1 2001:db8:200::/64              fe80::50b7:d8ff:fe5f:8ff0 r2-eth1 00:03:32
+ N E2 2001:db8:200::/64              fe80::50b7:d8ff:fe5f:8ff0 r2-eth1 00:03:34
+ N E2 2001:db8:200::/64              fe80::50b7:d8ff:fe5f:8ff0 r2-eth1 00:03:32
 *N IE 2001:db8:300::/64              fe80::50b7:d8ff:fe5f:8ff0 r2-eth1 00:03:32
- N E1 2001:db8:300::/64              fe80::50b7:d8ff:fe5f:8ff0 r2-eth1 00:03:32
+ N E2 2001:db8:300::/64              fe80::50b7:d8ff:fe5f:8ff0 r2-eth1 00:03:32

diff --git a/tests/topotests/ospf_topo1/r2/ospf6route_down.txt b/tests/topotests/ospf_topo1/r2/ospf6route_down.txt
index acfffc9f1cafd326829492002eb4312ef0298ad1..a1f041218b8ad394eb65628d4e0a36dd171a7b75 100644 (file)
--- a/tests/topotests/ospf_topo1/r2/ospf6route_down.txt
+++ b/tests/topotests/ospf_topo1/r2/ospf6route_down.txt
@@ -1,5 +1,5 @@
 *N IA 2001:db8:1::/64                fe80::fc0b:daff:fe31:6791 r2-eth1 00:06:19
- N E1 2001:db8:1::/64                fe80::fc0b:daff:fe31:6791 r2-eth1 00:06:19
+ N E2 2001:db8:1::/64                fe80::fc0b:daff:fe31:6791 r2-eth1 00:06:19
 *N IA 2001:db8:2::/64                ::                        r2-eth0 00:07:17
 *N IA 2001:db8:3::/64                ::                        r2-eth1 00:06:27
- N E1 2001:db8:3::/64                fe80::fc0b:daff:fe31:6791 r2-eth1 00:06:19
+ N E2 2001:db8:3::/64                fe80::fc0b:daff:fe31:6791 r2-eth1 00:06:19

diff --git a/tests/topotests/ospf_topo1/r2/ospf6route_ecmp.txt b/tests/topotests/ospf_topo1/r2/ospf6route_ecmp.txt
index f58b501e315904ac3385e6d9a83d8306cea76883..0c06d234cf599088da6afe0a4d135cd0ea11ecd3 100644 (file)
--- a/tests/topotests/ospf_topo1/r2/ospf6route_ecmp.txt
+++ b/tests/topotests/ospf_topo1/r2/ospf6route_ecmp.txt
@@ -1,13 +1,13 @@
 *N IA 2001:db8:1::/64                fe80::98cd:28ff:fe5e:3d93 r2-eth1 00:07:04
- N E1 2001:db8:1::/64                fe80::98cd:28ff:fe5e:3d93 r2-eth1 00:07:04
+ N E2 2001:db8:1::/64                fe80::98cd:28ff:fe5e:3d93 r2-eth1 00:07:04
 *N IA 2001:db8:2::/64                ::                        r2-eth0 00:07:09
 *N IA 2001:db8:3::/64                ::                        r2-eth1 00:07:04
- N E1 2001:db8:3::/64                fe80::400f:dff:fe35:a1e7  r2-eth1 00:07:04
+ N E2 2001:db8:3::/64                fe80::400f:dff:fe35:a1e7  r2-eth1 00:07:04
                                      fe80::98cd:28ff:fe5e:3d93 r2-eth1 
 *N IA 2001:db8:100::/64              fe80::400f:dff:fe35:a1e7  r2-eth1 00:07:04
- N E1 2001:db8:100::/64              fe80::400f:dff:fe35:a1e7  r2-eth1 00:07:04
+ N E2 2001:db8:100::/64              fe80::400f:dff:fe35:a1e7  r2-eth1 00:07:04
 *N IE 2001:db8:200::/64              fe80::400f:dff:fe35:a1e7  r2-eth1 00:07:04
- N E1 2001:db8:200::/64              fe80::400f:dff:fe35:a1e7  r2-eth1 00:07:04
- N E1 2001:db8:200::/64              fe80::400f:dff:fe35:a1e7  r2-eth1 00:07:03
+ N E2 2001:db8:200::/64              fe80::400f:dff:fe35:a1e7  r2-eth1 00:07:04
+ N E2 2001:db8:200::/64              fe80::400f:dff:fe35:a1e7  r2-eth1 00:07:03
 *N IE 2001:db8:300::/64              fe80::400f:dff:fe35:a1e7  r2-eth1 00:07:03
- N E1 2001:db8:300::/64              fe80::400f:dff:fe35:a1e7  r2-eth1 00:07:03
+ N E2 2001:db8:300::/64              fe80::400f:dff:fe35:a1e7  r2-eth1 00:07:03

diff --git a/tests/topotests/ospf_topo1/r3/ospf6route.txt b/tests/topotests/ospf_topo1/r3/ospf6route.txt
index b123c426507b9b053aa3c20bff903610b6fc219b..69c99b4fd13a9761874df9707ea0f43065ed0d11 100644 (file)
--- a/tests/topotests/ospf_topo1/r3/ospf6route.txt
+++ b/tests/topotests/ospf_topo1/r3/ospf6route.txt
@@ -1,12 +1,12 @@
 *N IA 2001:db8:1::/64                fe80::b49b:4cff:fe80:4e87 r3-eth0 00:04:03
- N E1 2001:db8:1::/64                fe80::b49b:4cff:fe80:4e87 r3-eth0 00:04:03
+ N E2 2001:db8:1::/64                fe80::b49b:4cff:fe80:4e87 r3-eth0 00:04:03
 *N IA 2001:db8:2::/64                fe80::b038:bcff:fe27:e2d6 r3-eth0 00:04:03
- N E1 2001:db8:2::/64                fe80::b038:bcff:fe27:e2d6 r3-eth0 00:04:03
+ N E2 2001:db8:2::/64                fe80::b038:bcff:fe27:e2d6 r3-eth0 00:04:03
 *N IA 2001:db8:3::/64                ::                        r3-eth0 00:04:08
- N E1 2001:db8:3::/64                fe80::b49b:4cff:fe80:4e87 r3-eth0 00:04:03
- N E1 2001:db8:3::/64                fe80::b038:bcff:fe27:e2d6 r3-eth0 00:04:03
+ N E2 2001:db8:3::/64                fe80::b49b:4cff:fe80:4e87 r3-eth0 00:04:03
+ N E2 2001:db8:3::/64                fe80::b038:bcff:fe27:e2d6 r3-eth0 00:04:03
 *N IA 2001:db8:100::/64              ::                        r3-eth1 00:04:08
 *N IA 2001:db8:200::/64              ::                        r3-eth2 00:04:05
- N E1 2001:db8:200::/64              fe80::78e0:deff:feb1:ec0  r3-eth2 00:04:00
+ N E2 2001:db8:200::/64              fe80::78e0:deff:feb1:ec0  r3-eth2 00:04:00
 *N IA 2001:db8:300::/64              fe80::78e0:deff:feb1:ec0  r3-eth2 00:04:00
- N E1 2001:db8:300::/64              fe80::78e0:deff:feb1:ec0  r3-eth2 00:04:00
+ N E2 2001:db8:300::/64              fe80::78e0:deff:feb1:ec0  r3-eth2 00:04:00

diff --git a/tests/topotests/ospf_topo1/r3/ospf6route_down.txt b/tests/topotests/ospf_topo1/r3/ospf6route_down.txt
index ed69a8376b0d449eda27a2c3b632d406538d4751..645ee0bfc4391535f23a9e0ef0a086432dacf67d 100644 (file)
--- a/tests/topotests/ospf_topo1/r3/ospf6route_down.txt
+++ b/tests/topotests/ospf_topo1/r3/ospf6route_down.txt
@@ -1,5 +1,5 @@
 *N IA 2001:db8:100::/64              ::                        r3-eth1 00:08:06
 *N IA 2001:db8:200::/64              ::                        r3-eth2 00:08:04
- N E1 2001:db8:200::/64              fe80::80a6:c3ff:fea9:88be r3-eth2 00:07:59
+ N E2 2001:db8:200::/64              fe80::80a6:c3ff:fea9:88be r3-eth2 00:07:59
 *N IA 2001:db8:300::/64              fe80::80a6:c3ff:fea9:88be r3-eth2 00:07:59
- N E1 2001:db8:300::/64              fe80::80a6:c3ff:fea9:88be r3-eth2 00:07:59
+ N E2 2001:db8:300::/64              fe80::80a6:c3ff:fea9:88be r3-eth2 00:07:59

diff --git a/tests/topotests/ospf_topo1/r3/ospf6route_ecmp.txt b/tests/topotests/ospf_topo1/r3/ospf6route_ecmp.txt
index 54e575adcb5e555ecf04d5c157857bd7c569022c..ecd51be4ef9aa24c1f59b2df269702ede2b1050d 100644 (file)
--- a/tests/topotests/ospf_topo1/r3/ospf6route_ecmp.txt
+++ b/tests/topotests/ospf_topo1/r3/ospf6route_ecmp.txt
@@ -1,12 +1,12 @@
 *N IA 2001:db8:1::/64                fe80::98cd:28ff:fe5e:3d93 r3-eth0 00:08:58
- N E1 2001:db8:1::/64                fe80::98cd:28ff:fe5e:3d93 r3-eth0 00:08:58
+ N E2 2001:db8:1::/64                fe80::98cd:28ff:fe5e:3d93 r3-eth0 00:08:58
 *N IA 2001:db8:2::/64                fe80::e8bb:62ff:fee8:7022 r3-eth0 00:08:58
- N E1 2001:db8:2::/64                fe80::e8bb:62ff:fee8:7022 r3-eth0 00:08:58
+ N E2 2001:db8:2::/64                fe80::e8bb:62ff:fee8:7022 r3-eth0 00:08:58
 *N IA 2001:db8:3::/64                ::                        r3-eth0 00:09:03
- N E1 2001:db8:3::/64                fe80::98cd:28ff:fe5e:3d93 r3-eth0 00:08:58
+ N E2 2001:db8:3::/64                fe80::98cd:28ff:fe5e:3d93 r3-eth0 00:08:58
                                      fe80::e8bb:62ff:fee8:7022 r3-eth0 
 *N IA 2001:db8:100::/64              ::                        r3-eth1 00:09:03
 *N IA 2001:db8:200::/64              ::                        r3-eth2 00:09:02
- N E1 2001:db8:200::/64              fe80::d0dc:aff:fec5:5973  r3-eth2 00:08:57
+ N E2 2001:db8:200::/64              fe80::d0dc:aff:fec5:5973  r3-eth2 00:08:57
 *N IA 2001:db8:300::/64              fe80::d0dc:aff:fec5:5973  r3-eth2 00:08:57
- N E1 2001:db8:300::/64              fe80::d0dc:aff:fec5:5973  r3-eth2 00:08:57
+ N E2 2001:db8:300::/64              fe80::d0dc:aff:fec5:5973  r3-eth2 00:08:57

diff --git a/tests/topotests/ospf_topo1/r4/ospf6route.txt b/tests/topotests/ospf_topo1/r4/ospf6route.txt
index ceeee2cac8d35b2c6249b34a78ebbad3f062fd67..3a4f5efdf0c052f30cac297d3b15a48707d2798b 100644 (file)
--- a/tests/topotests/ospf_topo1/r4/ospf6route.txt
+++ b/tests/topotests/ospf_topo1/r4/ospf6route.txt
@@ -1,13 +1,13 @@
 *N IE 2001:db8:1::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
- N E1 2001:db8:1::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+ N E2 2001:db8:1::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
 *N IE 2001:db8:2::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
- N E1 2001:db8:2::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+ N E2 2001:db8:2::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
 *N IE 2001:db8:3::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
- N E1 2001:db8:3::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
- N E1 2001:db8:3::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
- N E1 2001:db8:3::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+ N E2 2001:db8:3::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+ N E2 2001:db8:3::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+ N E2 2001:db8:3::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
 *N IE 2001:db8:100::/64              fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
- N E1 2001:db8:100::/64              fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+ N E2 2001:db8:100::/64              fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
 *N IA 2001:db8:200::/64              ::                        r4-eth0 00:04:30
- N E1 2001:db8:200::/64              fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+ N E2 2001:db8:200::/64              fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
 *N IA 2001:db8:300::/64              ::                        r4-eth1 00:04:30

diff --git a/tests/topotests/ospf_topo1/r4/ospf6route_down.txt b/tests/topotests/ospf_topo1/r4/ospf6route_down.txt
index 4ad636dd981effe891a943c16fa0a0d8952de896..165f8dbdf8a6d33aac5809e5cb391e82af88762e 100644 (file)
--- a/tests/topotests/ospf_topo1/r4/ospf6route_down.txt
+++ b/tests/topotests/ospf_topo1/r4/ospf6route_down.txt
@@ -1,5 +1,5 @@
 *N IE 2001:db8:100::/64              fe80::b44b:a1ff:fe48:3d69 r4-eth0 00:01:45
- N E1 2001:db8:100::/64              fe80::b44b:a1ff:fe48:3d69 r4-eth0 00:01:45
+ N E2 2001:db8:100::/64              fe80::b44b:a1ff:fe48:3d69 r4-eth0 00:01:45
 *N IA 2001:db8:200::/64              ::                        r4-eth0 00:01:50
- N E1 2001:db8:200::/64              fe80::b44b:a1ff:fe48:3d69 r4-eth0 00:01:45
+ N E2 2001:db8:200::/64              fe80::b44b:a1ff:fe48:3d69 r4-eth0 00:01:45
 *N IA 2001:db8:300::/64              ::                        r4-eth1 00:01:50

diff --git a/tests/topotests/ospf_topo1/r4/ospf6route_ecmp.txt b/tests/topotests/ospf_topo1/r4/ospf6route_ecmp.txt
index b5cb10b72b59080dde28a0d7a5e43e1d144cb963..d0d72a876f5668f684a530112f457f70edaddfec 100644 (file)
--- a/tests/topotests/ospf_topo1/r4/ospf6route_ecmp.txt
+++ b/tests/topotests/ospf_topo1/r4/ospf6route_ecmp.txt
@@ -1,12 +1,12 @@
 *N IE 2001:db8:1::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
- N E1 2001:db8:1::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
+ N E2 2001:db8:1::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
 *N IE 2001:db8:2::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
- N E1 2001:db8:2::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
+ N E2 2001:db8:2::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
 *N IE 2001:db8:3::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
- N E1 2001:db8:3::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
- N E1 2001:db8:3::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
+ N E2 2001:db8:3::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
+ N E2 2001:db8:3::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
 *N IE 2001:db8:100::/64              fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
- N E1 2001:db8:100::/64              fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
+ N E2 2001:db8:100::/64              fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
 *N IA 2001:db8:200::/64              ::                        r4-eth0 00:09:17
- N E1 2001:db8:200::/64              fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
+ N E2 2001:db8:200::/64              fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
 *N IA 2001:db8:300::/64              ::                        r4-eth1 00:09:18