ospf-topo: show areas in the topology dot/jpg

diff --git a/tests/topotests/ospf-topo1/test_ospf_topo1.dot b/tests/topotests/ospf-topo1/test_ospf_topo1.dot
index 25ee214b1c3d703adfe12f47fe71bdcee0635462..fc5a6f4630beeee81a761ea54e05be24345d56c7 100644 (file)
--- a/tests/topotests/ospf-topo1/test_ospf_topo1.dot
+++ b/tests/topotests/ospf-topo1/test_ospf_topo1.dot
@@ -80,16 +80,25 @@ graph ospf_topo1 {
        ];
 
        # Connections
-       r1 -- s1 [label="eth0\n.1"];
-       r1 -- s3 [label="eth1\n.2"];
+  subgraph cluster0 {
+    label="area 0"
 
-       r2 -- s2 [label="eth0\n.1"];
-       r2 -- s3 [label="eth1\n.3"];
+    r1 -- s1 [label="eth0\n.1"];
+         r1 -- s3 [label="eth1\n.2"];
 
-       r3 -- s3 [label="eth0\n.1"];
-       r3 -- s4 [label="eth1\n.1"];
-       r3 -- s5 [label="eth2\n.2"];
+         r2 -- s2 [label="eth0\n.1"];
+         r2 -- s3 [label="eth1\n.3"];
 
-       r4 -- s5 [label="eth0\n.1"];
-       r4 -- s6 [label="eth1\n.100"];
+         r3 -- s3 [label="eth0\n.1"];
+         r3 -- s4 [label="eth1\n.1"];
+  }
+
+  subgraph cluster1 {
+    label="area 1"
+
+         r3 -- s5 [label="eth2\n.2"];
+
+         r4 -- s5 [label="eth0\n.1"];
+         r4 -- s6 [label="eth1\n.100"];
+  }
 }

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