ospf-topo1: Add IPv6 addresses to diagram

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>

diff --git a/tests/topotests/ospf-topo1/test_ospf_topo1.dot b/tests/topotests/ospf-topo1/test_ospf_topo1.dot
index fc5a6f4630beeee81a761ea54e05be24345d56c7..469a7ea792a80830f82086b6160089445731ac41 100644 (file)
--- a/tests/topotests/ospf-topo1/test_ospf_topo1.dot
+++ b/tests/topotests/ospf-topo1/test_ospf_topo1.dot
@@ -43,37 +43,37 @@ graph ospf_topo1 {
 
        # Switches
        s1 [
-               label="s1\n10.0.1.0/24",
+               label="s1\n10.0.1.0/24\n2001:db8:1::/64",
                shape=oval,
                fillcolor="#d0e0d0",
                style=filled,
        ];
        s2 [
-               label="s2\n10.0.2.0/24",
+               label="s2\n10.0.2.0/24\n2001:db8:2::/64",
                shape=oval,
                fillcolor="#d0e0d0",
                style=filled,
        ];
        s3 [
-               label="s3\n10.0.3.0/24",
+               label="s3\n10.0.3.0/24\n2001:db8:3::/64",
                shape=oval,
                fillcolor="#d0e0d0",
                style=filled,
        ];
        s4 [
-               label="s4\n10.0.10.0/24",
+               label="s4\n10.0.10.0/24\n2001:db8:100::/64",
                shape=oval,
                fillcolor="#d0e0d0",
                style=filled,
        ];
        s5 [
-               label="s5\n172.16.0.0/24",
+               label="s5\n172.16.0.0/24\n2001:db8:200::/64",
                shape=oval,
                fillcolor="#d0e0d0",
                style=filled,
        ];
        s6 [
-               label="s6\n172.16.1.0/24",
+               label="s6\n172.16.1.0/24\n2001:db8:300::/64",
                shape=oval,
                fillcolor="#d0e0d0",
                style=filled,
@@ -83,22 +83,22 @@ graph ospf_topo1 {
   subgraph cluster0 {
     label="area 0"
 
-    r1 -- s1 [label="eth0\n.1"];
-         r1 -- s3 [label="eth1\n.2"];
+         r1 -- s1 [label="eth0\n.1\n::1"];
+         r1 -- s3 [label="eth1\n.2\n::2"];
 
-         r2 -- s2 [label="eth0\n.1"];
-         r2 -- s3 [label="eth1\n.3"];
+         r2 -- s2 [label="eth0\n.1\n::1"];
+         r2 -- s3 [label="eth1\n.3\n::3"];
 
-         r3 -- s3 [label="eth0\n.1"];
-         r3 -- s4 [label="eth1\n.1"];
+         r3 -- s3 [label="eth0\n.1\n::1"];
+         r3 -- s4 [label="eth1\n.1\n::1"];
   }
 
   subgraph cluster1 {
     label="area 1"
 
-         r3 -- s5 [label="eth2\n.2"];
+         r3 -- s5 [label="eth2\n.2\n::2"];
 
-         r4 -- s5 [label="eth0\n.1"];
-         r4 -- s6 [label="eth1\n.100"];
+         r4 -- s5 [label="eth0\n.1\n::1"];
+         r4 -- s6 [label="eth1\n.100\n::100"];
   }
 }

diff --git a/tests/topotests/ospf-topo1/test_ospf_topo1.jpg b/tests/topotests/ospf-topo1/test_ospf_topo1.jpg
index 974357c20ad3fe3a143cc63930c3f4d6af2f1f16..1e931709e03fdefbb85faa3445ea9bce211e327d 100644 (file)
Binary files a/tests/topotests/ospf-topo1/test_ospf_topo1.jpg and b/tests/topotests/ospf-topo1/test_ospf_topo1.jpg differ