From d3a61b516121e218838beda19ad63494bf7450db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= <lazzer@gmail.com>
Date: Sat, 13 Jan 2024 21:50:13 +0100
Subject: [PATCH] Add new physical topology for virtual tests with 4 duts

Also add a matching standard topology.
---
 test/infamy/topologies/ring-4-duts.dot | 59 ++++++++++++++++++++
 test/virt/quad/topology.dot.in         | 74 ++++++++++++++++++++++++++
 2 files changed, 133 insertions(+)
 create mode 100644 test/infamy/topologies/ring-4-duts.dot
 create mode 100644 test/virt/quad/topology.dot.in

diff --git a/test/infamy/topologies/ring-4-duts.dot b/test/infamy/topologies/ring-4-duts.dot
new file mode 100644
index 00000000..844e7b96
--- /dev/null
+++ b/test/infamy/topologies/ring-4-duts.dot
@@ -0,0 +1,59 @@
+graph "ring-4-duts" {
+	layout="neato";
+	overlap="false";
+	esep="+20";
+
+        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",
+	];
+
+        dut1 [
+	    label="{ <mgmt> mgmt | <data> data | <ring1> ring1 } | dut1 | { <ring2> ring2 | <cross> cross }",
+	    pos="10,18!",
+	    kind="infix",
+	];
+
+        dut2 [
+	     label="{ <mgmt> mgmt | <data> data | <ring1> ring1 } | dut2 | { <ring2> ring2 | <cross> cross }",
+	      pos="10,12!",
+	      kind="infix",
+	];
+
+        dut3 [
+	     label="{ <mgmt> mgmt | <data> data | <ring1> ring1 } | dut2 | { <ring2> ring2 | <cross> cross}",
+	      pos="10,12!",
+	      kind="infix",
+	];
+
+        dut4 [
+	     label="{ <mgmt> mgmt | <data> data | <ring1> ring1 } | dut2 | { <ring2> ring2 | <cross> cross }",
+	     pos="10,12!",
+	     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-Dut links
+	host:data1 -- dut1:data
+	host:data2 -- dut2:data
+	host:data3 -- dut3:data
+	host:data4 -- dut4:data
+
+	# Ring
+	dut1:ring1 -- dut2:ring2
+	dut2:ring1 -- dut3:ring2
+	dut3:ring1 -- dut4:ring2
+	dut4:ring1 -- dut1:ring2
+
+	# Cross
+	dut1:cross -- dut3:cross
+	dut2:cross -- dut4:cross
+}
diff --git a/test/virt/quad/topology.dot.in b/test/virt/quad/topology.dot.in
new file mode 100644
index 00000000..a72974cd
--- /dev/null
+++ b/test/virt/quad/topology.dot.in
@@ -0,0 +1,74 @@
+graph "quad" {
+	layout="neato";
+	overlap="false";
+	splines="true";
+	esep="+20";
+
+        node [shape=record, fontname="monospace"];
+	edge [color="cornflowerblue", penwidth="2"];
+
+	qn_template="infix-x86_64";
+	qn_append="quiet";
+
+        host [
+	    label="host | { <d1a> d1a | <d1b> d1b | <d1c> d1c | <d2a> d2a | <d2b> d2b | <d2c> d2c | <d2a> d3a | <d3b> d3b | <d3c> d3c | <d4a> d4a | <d4b> d4b | <d4c> d4c }}",
+	    color="grey",fontcolor="grey",pos="0,15!",
+	    kind="controller",
+	];
+
+        dut1 [
+	    label="{ <eth0> eth0 | <eth1> eth1 | <eth2> eth2 } | dut1 | { <eth3> eth3 | <eth4> eth4 | <eth5> eth5 | <eth6> eth6 | <eth7> eth7}",
+	    pos="10,18!",
+	    kind="infix",
+	    qn_console=9001,
+	    qn_mem="384M"
+	    ];
+        dut2 [
+	    label="{ <eth0> eth0 | <eth1> eth1 | <eth2> eth2 } | dut2 | { <eth3> eth3 | <eth4> eth4 | <eth5> eth5  | <eth6> eth6 | <eth7> eth7}",
+	    pos="10,12!",
+	    kind="infix",
+	    qn_console=9002,
+	    qn_mem="384M"
+	];
+	dut3 [
+	    label="{ <eth0> eth0 | <eth1> eth1 | <eth2> eth2 } | dut2 | { <eth3> eth3 | <eth4> eth4 | <eth5> eth5  | <eth6> eth6 | <eth7> eth7}",
+	    pos="10,12!",
+	    kind="infix",
+	    qn_console=9003,
+	    qn_mem="384M"
+	];
+
+	dut4 [
+	    label="{ <eth0> eth0 | <eth1> eth1 | <eth2> eth2 } | dut2 | { <eth3> eth3 | <eth4> eth4 | <eth5> eth5  | <eth6> eth6 | <eth7> eth7}",
+	    pos="10,12!",
+	    kind="infix",
+	    qn_console=9004,
+	    qn_mem="384M"
+	];
+
+	host:d1a -- dut1:eth0 [kind=mgmt]
+	host:d1b -- dut1:eth1
+	host:d1c -- dut1:eth2
+
+	host:d2a -- dut2:eth0 [kind=mgmt]
+	host:d2b -- dut2:eth1
+	host:d2c -- dut2:eth2
+
+	host:d3a -- dut3:eth0 [kind=mgmt]
+	host:d3b -- dut3:eth1
+	host:d3c -- dut3:eth2
+
+	host:d4a -- dut4:eth0 [kind=mgmt]
+	host:d4b -- dut4:eth1
+	host:d4c -- dut4:eth2
+
+	# Ring
+	dut1:eth4 -- dut2:eth3
+	dut2:eth4 -- dut3:eth3
+	dut3:eth4 -- dut4:eth3
+	dut4:eth4 -- dut1:eth3
+
+	# Cross-links
+	dut3:eth5 -- dut1:eth5
+	dut2:eth5 -- dut4:eth5
+}