From: Rafael Zalamena <rzalamena@gmail.com>
Date: Tue, 27 Jun 2017 23:01:16 +0000 (-0300)
Subject: template: change the default dot file
X-Git-Tag: frr-7.1-dev~151^2~299
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=045aaf47ee0e6a9b2fd6e443dd3e9115da20edba;p=matthieu%2Ffrr.git

template: change the default dot file

Make it look like the RIP(ng) dot files with authentic shapes and colors
for routers and switches.
---

diff --git a/tests/topotests/GUIDELINES.md b/tests/topotests/GUIDELINES.md
index 249837a06b..5f745ae7ce 100644
--- a/tests/topotests/GUIDELINES.md
+++ b/tests/topotests/GUIDELINES.md
@@ -123,22 +123,30 @@ graph template {
 
 	# Routers
 	r1 [
-		shape=octagon,
+		shape=doubleoctagon,
 		label="r1",
+		fillcolor="#f08080",
+		style=filled,
 	];
 	r2 [
-		shape=octagon
+		shape=doubleoctagon,
 		label="r2",
+		fillcolor="#f08080",
+		style=filled,
 	];
 
 	# Switches
 	s1 [
-		shape=box,
+		shape=oval,
 		label="s1\n192.168.0.0/24",
+		fillcolor="#d0e0d0",
+		style=filled,
 	];
 	s2 [
-		shape=box,
+		shape=oval,
 		label="s2\n192.168.1.0/24",
+		fillcolor="#d0e0d0",
+		style=filled,
 	];
 
 	# Connections
diff --git a/tests/topotests/example-test/test_template.dot b/tests/topotests/example-test/test_template.dot
index 26def69597..b5e12020ce 100644
--- a/tests/topotests/example-test/test_template.dot
+++ b/tests/topotests/example-test/test_template.dot
@@ -1,24 +1,46 @@
+## Color coding:
+#########################
+##  Main FRR: #f08080  red
+##  Switches: #d0e0d0  gray
+##  RIP:      #19e3d9  Cyan
+##  RIPng:    #fcb314  dark yellow
+##  OSPFv2:   #32b835  Green
+##  OSPFv3:   #19e3d9  Cyan
+##  ISIS IPv4 #fcb314  dark yellow
+##  ISIS IPv6 #9a81ec  purple
+##  BGP IPv4  #eee3d3  beige
+##  BGP IPv6  #fdff00  yellow
+##### Colors (see http://www.color-hex.com/)
+
 graph template {
 	label="template";
 
 	# Routers
 	r1 [
-		shape=octagon,
+		shape=doubleoctagon,
 		label="r1",
+		fillcolor="#f08080",
+		style=filled,
 	];
 	r2 [
-		shape=octagon
+		shape=doubleoctagon
 		label="r2",
+		fillcolor="#f08080",
+		style=filled,
 	];
 
 	# Switches
 	s1 [
-		shape=box,
+		shape=oval,
 		label="s1\n192.168.0.0/24",
+		fillcolor="#d0e0d0",
+		style=filled,
 	];
 	s2 [
-		shape=box,
+		shape=oval,
 		label="s2\n192.168.1.0/24",
+		fillcolor="#d0e0d0",
+		style=filled,
 	];
 
 	# Connections
diff --git a/tests/topotests/example-test/test_template.jpg b/tests/topotests/example-test/test_template.jpg
index d8d7799394..b01ef73f5a 100644
Binary files a/tests/topotests/example-test/test_template.jpg and b/tests/topotests/example-test/test_template.jpg differ