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 cb3ff37fbc8e719e63dd7514214ac2a301212dbb..0e90c2810ee635f010a76d54431f322605bc4b13 100644 (file)
--- 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 f5d32a02a16879076d3d585e01b62b1d9dd2aab7..7d66a2a3061a4e53a365cbf47102e309f02828da 100644 (file)
--- 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 f998c4697d7d9e0a8b759e24466664047efbf2a0..cb1adde239c7c324e1b17b0544e28b6f4db8fa7a 100644 (file)
Binary files a/tests/topotests/ripng-topo1/test_ripng_topo1.pdf and b/tests/topotests/ripng-topo1/test_ripng_topo1.pdf differ