From: Martin Winter Date: Sat, 8 Apr 2017 21:52:41 +0000 (-0700) Subject: ripng-topo1: Fix duplicate IP (Thanks Renato!) and documentation typos X-Git-Tag: frr-7.1-dev~151^2~338 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e341b1927d7ae99e477ea28c7d460f70cb3f4297;p=mirror%2Ffrr.git ripng-topo1: Fix duplicate IP (Thanks Renato!) and documentation typos --- diff --git a/tests/topotests/ripng-topo1/r2/zebra.conf b/tests/topotests/ripng-topo1/r2/zebra.conf index cb3ff37fbc..0e90c2810e 100644 --- a/tests/topotests/ripng-topo1/r2/zebra.conf +++ b/tests/topotests/ripng-topo1/r2/zebra.conf @@ -9,7 +9,7 @@ interface r2-eth0 ! interface r2-eth1 description to sw3 - RIPng interface - ipv6 address fc00:6::2/62 + ipv6 address fc00:6::1/62 no link-detect ! ip forwarding diff --git a/tests/topotests/ripng-topo1/test_ripng_topo1.dot b/tests/topotests/ripng-topo1/test_ripng_topo1.dot index f5d32a02a1..7d66a2a306 100644 --- a/tests/topotests/ripng-topo1/test_ripng_topo1.dot +++ b/tests/topotests/ripng-topo1/test_ripng_topo1.dot @@ -46,14 +46,14 @@ graph test_ripng_topo1 { ###################### # Network Connections ###################### - R1 -- SW1_R1_stub [label = "eth0\n.1\n::1"]; + R1 -- SW1_R1_stub [label = "r1-eth0\n::1"]; # RIPng Network - R1 -- SW2_R1_R2 [label = "eth2\n::1"]; - SW2_R1_R2 -- R2 [label = "eth0\n::2"]; - R2 -- SW3_R2_R3 [label = "eth1\n::1"]; - SW3_R2_R3 -- R3 [label = "eth1\n::2"]; - R3 -- SW4_R3 [label = "eth0\n::1"]; + R1 -- SW2_R1_R2 [label = "r1-eth1\n::1"]; + SW2_R1_R2 -- R2 [label = "r2-eth0\n::2"]; + R2 -- SW3_R2_R3 [label = "r2-eth1\n::1"]; + SW3_R2_R3 -- R3 [label = "r3-eth1\n::2"]; + R3 -- SW4_R3 [label = "r3-eth0\n::1"]; SW4_R3 -- Net_R3_remote [label = ":10"]; } diff --git a/tests/topotests/ripng-topo1/test_ripng_topo1.pdf b/tests/topotests/ripng-topo1/test_ripng_topo1.pdf index f998c4697d..cb1adde239 100644 Binary files a/tests/topotests/ripng-topo1/test_ripng_topo1.pdf and b/tests/topotests/ripng-topo1/test_ripng_topo1.pdf differ