From 77cd7c6860d9fe5bbbb30cb00559fe2509d47432 Mon Sep 17 00:00:00 2001
From: Ahmed Karic <ahmkar@addiva.se>
Date: Mon, 9 Sep 2024 10:28:29 +0200
Subject: [PATCH] test/infamy: cosmetic update in topology (.dot) files

---
 test/infamy/topologies/1x2.dot         |  2 +-
 test/infamy/topologies/2x4.dot         |  4 +-
 test/infamy/topologies/ring-4-duts.dot | 76 +++++++++++++-------------
 3 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/test/infamy/topologies/1x2.dot b/test/infamy/topologies/1x2.dot
index 1e367f14..0e18dc9c 100644
--- a/test/infamy/topologies/1x2.dot
+++ b/test/infamy/topologies/1x2.dot
@@ -7,7 +7,7 @@ graph "1x2" {
 	edge [color="cornflowerblue", penwidth="2"];
 
 	host [
-	    label="host | { <tgt> tgt | <data> | data }",
+	    label="host | { <tgt> tgt | <data> data }",
 	    pos="0,12!",
 	    kind="controller",
 	];
diff --git a/test/infamy/topologies/2x4.dot b/test/infamy/topologies/2x4.dot
index 720baa3b..827c190a 100644
--- a/test/infamy/topologies/2x4.dot
+++ b/test/infamy/topologies/2x4.dot
@@ -13,14 +13,14 @@ graph "2x4" {
 	];
 
         dut1 [
-	    label="{ <mgmt> mgmt | <data0> data0 | <data1> data1 } | dut1 | { <data2> data2 }",
+	    label="{ <mgmt> mgmt | <data0> data0 | <data1> data1 } | { \n dut1 \n\n |  <data2> data2 }",
 	    pos="10,18!",
 
 	    kind="infix",
 	];
 
         dut2 [
-		label="{ <mgmt> mgmt | <data0> data0 | <data1> data1 } | dut2 | { <data2> data2 }",
+		label="{ <mgmt> mgmt | <data0> data0 | <data1> data1 } | { <data2> data2 | \n dut2 \n\n }",
 	    pos="10,12!",
 
 	    kind="infix",
diff --git a/test/infamy/topologies/ring-4-duts.dot b/test/infamy/topologies/ring-4-duts.dot
index 844e7b96..0253dbee 100644
--- a/test/infamy/topologies/ring-4-duts.dot
+++ b/test/infamy/topologies/ring-4-duts.dot
@@ -1,59 +1,61 @@
 graph "ring-4-duts" {
 	layout="neato";
-	overlap="false";
+	overlap=false;
 	esep="+20";
-
+	splines=true;
+	size=10;
+	
         node [shape=record, fontname="monospace"];
 	edge [color="cornflowerblue", penwidth="2"];
 
 	host [
-	    label="host | { <mgmt1> mgmt1 | <data1> data1 | <mgmt2> mgmt2 | <data2> data20 | <data2>  data2  | <mgmt3> mgmt3 |  <data3>  data3 | <mgmt4> mgmt4 |  <data4>  data4 }",
-	    pos="0,15!",
-	    kind="controller",
+		label=" { host | { <mgmt4> mgmt4 | <data4> data4 | <mgmt1> mgmt1 | <data1> data1 | <data2> data2 | <mgmt2> mgmt2 | <data3> data3 | <mgmt3> mgmt3 } }",
+		pos="150,200!"
+		kind="controller",
 	];
 
-        dut1 [
-	    label="{ <mgmt> mgmt | <data> data | <ring1> ring1 } | dut1 | { <ring2> ring2 | <cross> cross }",
-	    pos="10,18!",
-	    kind="infix",
+	R1 [
+		label="{ { <mgmt> mgmt | <data> data } | \n R1 \n 10.0.0.1/32 \n(lo) } | { <ring1> ring1 | <cross> cross | <ring2> ring2 }",
+		pos="50,150!",
+		kind="infix",
 	];
 
-        dut2 [
-	     label="{ <mgmt> mgmt | <data> data | <ring1> ring1 } | dut2 | { <ring2> ring2 | <cross> cross }",
-	      pos="10,12!",
-	      kind="infix",
+	R4 [
+		label="{ { <mgmt> mgmt | <data> data } | \n R4 \n 10.0.0.4/32 \n(lo) } | { <ring1> ring1 | <cross> cross | <ring2> ring2 }",
+		pos="50,50!"
+		kind="infix",
 	];
 
-        dut3 [
-	     label="{ <mgmt> mgmt | <data> data | <ring1> ring1 } | dut2 | { <ring2> ring2 | <cross> cross}",
-	      pos="10,12!",
-	      kind="infix",
+        R2 [
+		label="{ <ring2> ring2 | <cross> cross | <ring1> ring1 } | { { <data> data | <mgmt> mgmt } | \n R2 \n10.0.0.2/32 \n(lo) }",
+		pos="250,150!"
+		kind="infix",
 	];
 
-        dut4 [
-	     label="{ <mgmt> mgmt | <data> data | <ring1> ring1 } | dut2 | { <ring2> ring2 | <cross> cross }",
-	     pos="10,12!",
-	     kind="infix",
-	];
+        R3 [
+		label="{ <ring2> ring2 | <cross> cross | <ring1> ring1 } | { { <data> data | <mgmt> mgmt } | \n R3 \n10.0.0.3/32 \n(lo) }",
+		pos="250,50!"
+		kind="infix",
+	];   
 
-	host:mgmt1 -- dut1:mgmt [kind=mgmt]
-	host:mgmt2 -- dut2:mgmt [kind=mgmt]
-	host:mgmt3 -- dut3:mgmt [kind=mgmt]
-	host:mgmt4 -- dut4:mgmt [kind=mgmt]
+	host:mgmt1 -- R1:mgmt [kind=mgmt, color="lightgray"]
+	host:mgmt2 -- R2:mgmt [kind=mgmt, color="lightgray"]
+	host:mgmt3 -- R3:mgmt [kind=mgmt, color="lightgray"]
+	host:mgmt4 -- R4:mgmt [kind=mgmt, color="lightgray"]
 
-	# Host-Dut links
-	host:data1 -- dut1:data
-	host:data2 -- dut2:data
-	host:data3 -- dut3:data
-	host:data4 -- dut4:data
+	# host-Dut links
+	host:data1 -- R1:data [color="darkgreen"]
+	host:data2 -- R2:data [color="darkgreen"]
+	host:data3 -- R3:data [color="darkgreen"]
+	host:data4 -- R4:data [color="darkgreen"]
 
 	# Ring
-	dut1:ring1 -- dut2:ring2
-	dut2:ring1 -- dut3:ring2
-	dut3:ring1 -- dut4:ring2
-	dut4:ring1 -- dut1:ring2
+	R1:ring1 -- R2:ring2 [color="blue",headlabel=".2", label="10.0.12.1/30", taillabel=".1", labeldistance=1, fontcolor="blue"]
+	R2:ring1 -- R3:ring2 [color="blue",headlabel=".2", label="10.0.23.0/30", taillabel=".1", labeldistance=1, fontcolor="blue"] 
+	R3:ring1 -- R4:ring2 [color="blue",headlabel=".2", label="192.168.4.0/24", taillabel=".1", labeldistance=1 fontcolor="blue"]
+	R4:ring1 -- R1:ring2 [color="blue",headlabel=".2", label="10.0.41.0/30", taillabel=".1", labeldistance=1, fontcolor="blue"]
 
 	# Cross
-	dut1:cross -- dut3:cross
-	dut2:cross -- dut4:cross
+	R1:cross -- R3:cross [color="black", label="10.0.13.0/30\n\n"]
+	R2:cross -- R4:cross [color="brown", label="\n\n10.0.24.0/30", fontcolor="brown"]
 }