diff --git a/test/case/ietf_hardware/usb/Readme.adoc b/test/case/ietf_hardware/usb/Readme.adoc index fb2fd906..2c8645b7 100644 --- a/test/case/ietf_hardware/usb/Readme.adoc +++ b/test/case/ietf_hardware/usb/Readme.adoc @@ -12,14 +12,14 @@ port is handled correctly. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_hardware/usb/topology.png[USB configuration topology] +image::../../test/case/ietf_hardware/usb/topology.svg[USB configuration topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::usb/topology.png[USB configuration topology] +image::usb/topology.svg[USB configuration topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[USB configuration topology] +image::topology.svg[USB configuration topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_hardware/usb/topology.png b/test/case/ietf_hardware/usb/topology.png deleted file mode 100644 index a9abc191..00000000 Binary files a/test/case/ietf_hardware/usb/topology.png and /dev/null differ diff --git a/test/case/ietf_hardware/usb/topology.svg b/test/case/ietf_hardware/usb/topology.svg new file mode 100644 index 00000000..6fc6f47a --- /dev/null +++ b/test/case/ietf_hardware/usb/topology.svg @@ -0,0 +1,33 @@ + + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_hardware/usb_two_ports/Readme.adoc b/test/case/ietf_hardware/usb_two_ports/Readme.adoc index 4e474831..c9928018 100644 --- a/test/case/ietf_hardware/usb_two_ports/Readme.adoc +++ b/test/case/ietf_hardware/usb_two_ports/Readme.adoc @@ -5,14 +5,14 @@ when having two USB ports. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_hardware/usb_two_ports/topology.png[USB configuration with two USB ports topology] +image::../../test/case/ietf_hardware/usb_two_ports/topology.svg[USB configuration with two USB ports topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::usb_two_ports/topology.png[USB configuration with two USB ports topology] +image::usb_two_ports/topology.svg[USB configuration with two USB ports topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[USB configuration with two USB ports topology] +image::topology.svg[USB configuration with two USB ports topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_hardware/usb_two_ports/topology.png b/test/case/ietf_hardware/usb_two_ports/topology.png deleted file mode 100644 index a9abc191..00000000 Binary files a/test/case/ietf_hardware/usb_two_ports/topology.png and /dev/null differ diff --git a/test/case/ietf_hardware/usb_two_ports/topology.svg b/test/case/ietf_hardware/usb_two_ports/topology.svg new file mode 100644 index 00000000..6fc6f47a --- /dev/null +++ b/test/case/ietf_hardware/usb_two_ports/topology.svg @@ -0,0 +1,33 @@ + + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_interfaces/bridge_basic/Readme.adoc b/test/case/ietf_interfaces/bridge_basic/Readme.adoc index e0f2c420..b43fcef5 100644 --- a/test/case/ietf_interfaces/bridge_basic/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_basic/Readme.adoc @@ -12,14 +12,14 @@ Test basic connectivity to a bridge ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/bridge_basic/topology.png[Bridge basic topology] +image::../../test/case/ietf_interfaces/bridge_basic/topology.svg[Bridge basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::bridge_basic/topology.png[Bridge basic topology] +image::bridge_basic/topology.svg[Bridge basic topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Bridge basic topology] +image::topology.svg[Bridge basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/bridge_basic/topology.dot b/test/case/ietf_interfaces/bridge_basic/topology.dot index 448f1b45..c2b75ac2 100644 --- a/test/case/ietf_interfaces/bridge_basic/topology.dot +++ b/test/case/ietf_interfaces/bridge_basic/topology.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data }", diff --git a/test/case/ietf_interfaces/bridge_basic/topology.png b/test/case/ietf_interfaces/bridge_basic/topology.png deleted file mode 100644 index 50030754..00000000 Binary files a/test/case/ietf_interfaces/bridge_basic/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/bridge_basic/topology.svg b/test/case/ietf_interfaces/bridge_basic/topology.svg new file mode 100644 index 00000000..8a967960 --- /dev/null +++ b/test/case/ietf_interfaces/bridge_basic/topology.svg @@ -0,0 +1,44 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target +10.0.0.2/24 (br0) + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + +10.0.0.1/24 + + + diff --git a/test/case/ietf_interfaces/bridge_fwd_dual_dut/Readme.adoc b/test/case/ietf_interfaces/bridge_fwd_dual_dut/Readme.adoc index 1774c293..cc5c0a5a 100644 --- a/test/case/ietf_interfaces/bridge_fwd_dual_dut/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_fwd_dual_dut/Readme.adoc @@ -24,14 +24,14 @@ Ping through two bridges on two different DUTs. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.png[Bridge forwarding dual DUTs topology] +image::../../test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.svg[Bridge forwarding dual DUTs topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::bridge_fwd_dual_dut/topology.png[Bridge forwarding dual DUTs topology] +image::bridge_fwd_dual_dut/topology.svg[Bridge forwarding dual DUTs topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Bridge forwarding dual DUTs topology] +image::topology.svg[Bridge forwarding dual DUTs topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.dot b/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.dot index b0789134..ce90105e 100644 --- a/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.dot +++ b/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.dot @@ -3,8 +3,8 @@ graph "2x4" { overlap="false"; esep="+26"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt1 | data11 | <> \n\n\n| mgmt2 | data21 | data22 }", diff --git a/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.png b/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.png deleted file mode 100644 index ef229365..00000000 Binary files a/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.svg b/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.svg new file mode 100644 index 00000000..11455bb4 --- /dev/null +++ b/test/case/ietf_interfaces/bridge_fwd_dual_dut/topology.svg @@ -0,0 +1,88 @@ + + + + + + +2x4 + + + +host + +host + +mgmt1 + +data11 + + +mgmt2 + +data21 + +data22 + + + +dut1 + +mgmt + +data1 + +dut1 + +link + + + +host:mgmt1--dut1:mgmt + + + + +host:data11--dut1:data1 + +10.0.0.2 + + + +dut2 + +mgmt + +data1 + +data2 + +link + + dut2 + + + +host:mgmt2--dut2:mgmt + + + + +host:data21--dut2:data1 + +10.0.0.3 + + + +host:data22--dut2:data2 + +10.0.0.4 + + + +dut1:link--dut2:link + + + + diff --git a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/Readme.adoc b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/Readme.adoc index 3e607c4b..fc530c39 100644 --- a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/Readme.adoc @@ -24,14 +24,14 @@ Tests forwarding through a DUT with two bridged interfaces on one DUT. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.png[Bridge forwarding single DUTs topology] +image::../../test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.svg[Bridge forwarding single DUTs topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::bridge_fwd_sgl_dut/topology.png[Bridge forwarding single DUTs topology] +image::bridge_fwd_sgl_dut/topology.svg[Bridge forwarding single DUTs topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Bridge forwarding single DUTs topology] +image::topology.svg[Bridge forwarding single DUTs topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.dot b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.dot index 2daa01c9..893adc73 100644 --- a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.dot +++ b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.dot @@ -3,8 +3,8 @@ graph "1x3" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data1 | data2 }", diff --git a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.png b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.png deleted file mode 100644 index aa3517c8..00000000 Binary files a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.svg b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.svg new file mode 100644 index 00000000..5ddf07e2 --- /dev/null +++ b/test/case/ietf_interfaces/bridge_fwd_sgl_dut/topology.svg @@ -0,0 +1,53 @@ + + + + + + +1x3 + + + +host + +host + +mgmt + +data1 + +data2 + + + +target + +mgmt + +data1 + +data2 + +target + + + +host:mgmt--target:mgmt + + + + +host:data1--target:data1 + +10.0.0.1 + + + +host:data2--target:data2 + +10.0.0.2 + + + diff --git a/test/case/ietf_interfaces/bridge_veth/Readme.adoc b/test/case/ietf_interfaces/bridge_veth/Readme.adoc index 9df98675..b801d649 100644 --- a/test/case/ietf_interfaces/bridge_veth/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_veth/Readme.adoc @@ -14,14 +14,14 @@ PING --> br0 ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/bridge_veth/topology.png[Bridge with a physical port and a veth topology] +image::../../test/case/ietf_interfaces/bridge_veth/topology.svg[Bridge with a physical port and a veth topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::bridge_veth/topology.png[Bridge with a physical port and a veth topology] +image::bridge_veth/topology.svg[Bridge with a physical port and a veth topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Bridge with a physical port and a veth topology] +image::topology.svg[Bridge with a physical port and a veth topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/bridge_veth/topology.dot b/test/case/ietf_interfaces/bridge_veth/topology.dot index 393a1078..1597ff1c 100644 --- a/test/case/ietf_interfaces/bridge_veth/topology.dot +++ b/test/case/ietf_interfaces/bridge_veth/topology.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data }", diff --git a/test/case/ietf_interfaces/bridge_veth/topology.png b/test/case/ietf_interfaces/bridge_veth/topology.png deleted file mode 100644 index 44a02cfb..00000000 Binary files a/test/case/ietf_interfaces/bridge_veth/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/bridge_veth/topology.svg b/test/case/ietf_interfaces/bridge_veth/topology.svg new file mode 100644 index 00000000..3c550c11 --- /dev/null +++ b/test/case/ietf_interfaces/bridge_veth/topology.svg @@ -0,0 +1,44 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target(br0:veth) +10.0.0.2/24 + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + +10.0.0.1/24 + + + diff --git a/test/case/ietf_interfaces/bridge_vlan/Readme.adoc b/test/case/ietf_interfaces/bridge_vlan/Readme.adoc index 8a97a556..f6b0694a 100644 --- a/test/case/ietf_interfaces/bridge_vlan/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_vlan/Readme.adoc @@ -13,14 +13,14 @@ Basic test of VLAN functionality in a bridge, tagged/untagged traffic and a VLAN ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/bridge_vlan/topology.png[Bridge VLAN topology] +image::../../test/case/ietf_interfaces/bridge_vlan/topology.svg[Bridge VLAN topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::bridge_vlan/topology.png[Bridge VLAN topology] +image::bridge_vlan/topology.svg[Bridge VLAN topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Bridge VLAN topology] +image::topology.svg[Bridge VLAN topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/bridge_vlan/topology.dot b/test/case/ietf_interfaces/bridge_vlan/topology.dot index c64c6e85..3301cbda 100644 --- a/test/case/ietf_interfaces/bridge_vlan/topology.dot +++ b/test/case/ietf_interfaces/bridge_vlan/topology.dot @@ -3,8 +3,8 @@ graph "2x2" { overlap="false"; esep="+40"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt1 | data | mgmt2 }", diff --git a/test/case/ietf_interfaces/bridge_vlan/topology.png b/test/case/ietf_interfaces/bridge_vlan/topology.png deleted file mode 100644 index 12d93da8..00000000 Binary files a/test/case/ietf_interfaces/bridge_vlan/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/bridge_vlan/topology.svg b/test/case/ietf_interfaces/bridge_vlan/topology.svg new file mode 100644 index 00000000..39d06ca0 --- /dev/null +++ b/test/case/ietf_interfaces/bridge_vlan/topology.svg @@ -0,0 +1,68 @@ + + + + + + +2x2 + + + +host + +host + +mgmt1 + +data + +mgmt2 + + + +dut1 + +mgmt + +data + +link + +dut1 +(10.0.0.2) + + + +host:mgmt1--dut1:mgmt + + + + +host:data--dut1:data + + + + +dut2 + +link + +mgmt + +dut2 +(10.0.0.3) + + + +host:mgmt2--dut2:mgmt + + + + +dut1:link--dut2:link + + + + diff --git a/test/case/ietf_interfaces/bridge_vlan_separation/Readme.adoc b/test/case/ietf_interfaces/bridge_vlan_separation/Readme.adoc index 1d8e6ea5..459f8ebe 100644 --- a/test/case/ietf_interfaces/bridge_vlan_separation/Readme.adoc +++ b/test/case/ietf_interfaces/bridge_vlan_separation/Readme.adoc @@ -23,14 +23,14 @@ Test that two VLANs are correctly separated in the bridge ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/bridge_vlan_separation/topology.png[Bridge VLAN separation topology] +image::../../test/case/ietf_interfaces/bridge_vlan_separation/topology.svg[Bridge VLAN separation topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::bridge_vlan_separation/topology.png[Bridge VLAN separation topology] +image::bridge_vlan_separation/topology.svg[Bridge VLAN separation topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Bridge VLAN separation topology] +image::topology.svg[Bridge VLAN separation topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/bridge_vlan_separation/topology.dot b/test/case/ietf_interfaces/bridge_vlan_separation/topology.dot index 78fe1c7c..852ba0ee 100644 --- a/test/case/ietf_interfaces/bridge_vlan_separation/topology.dot +++ b/test/case/ietf_interfaces/bridge_vlan_separation/topology.dot @@ -3,8 +3,8 @@ graph "2x4" { overlap="false"; esep="+22"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt1 | data10 | data11 | <> \n\n\n | mgmt2 | data20 | data21 }", diff --git a/test/case/ietf_interfaces/bridge_vlan_separation/topology.png b/test/case/ietf_interfaces/bridge_vlan_separation/topology.png deleted file mode 100644 index 5f1d027a..00000000 Binary files a/test/case/ietf_interfaces/bridge_vlan_separation/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/bridge_vlan_separation/topology.svg b/test/case/ietf_interfaces/bridge_vlan_separation/topology.svg new file mode 100644 index 00000000..e490c458 --- /dev/null +++ b/test/case/ietf_interfaces/bridge_vlan_separation/topology.svg @@ -0,0 +1,103 @@ + + + + + + +2x4 + + + +host + +host + +mgmt1 + +data10 + +data11 + + +mgmt2 + +data20 + +data21 + + + +dut1 + +mgmt + +data1 + +data2 + + dut1 + +link + + + +host:mgmt1--dut1:mgmt + + + + +host:data10--dut1:data1 + +VLAN10 U +10.0.0.1 + + + +host:data11--dut1:data2 + +VLAN20 U +10.0.0.2 + + + +dut2 + +mgmt + +data1 + +data2 + +link + + dut2 + + + +host:mgmt2--dut2:mgmt + + + + +host:data20--dut2:data1 + +VLAN10 U +10.0.0.3 + + + +host:data21--dut2:data2 + +VLAN20 U +10.0.0.4 + + + +dut1:link--dut2:link + +VLAN 10,20 T + + + diff --git a/test/case/ietf_interfaces/dual_bridge/Readme.adoc b/test/case/ietf_interfaces/dual_bridge/Readme.adoc index 0b30402f..37a64b53 100644 --- a/test/case/ietf_interfaces/dual_bridge/Readme.adoc +++ b/test/case/ietf_interfaces/dual_bridge/Readme.adoc @@ -10,14 +10,14 @@ PC - target:data veth0a - veth0b ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/dual_bridge/topology.png[Dual bridges on one device topology] +image::../../test/case/ietf_interfaces/dual_bridge/topology.svg[Dual bridges on one device topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::dual_bridge/topology.png[Dual bridges on one device topology] +image::dual_bridge/topology.svg[Dual bridges on one device topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Dual bridges on one device topology] +image::topology.svg[Dual bridges on one device topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/dual_bridge/topology.png b/test/case/ietf_interfaces/dual_bridge/topology.png deleted file mode 100644 index 5444e060..00000000 Binary files a/test/case/ietf_interfaces/dual_bridge/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/dual_bridge/topology.svg b/test/case/ietf_interfaces/dual_bridge/topology.svg new file mode 100644 index 00000000..ff3d246b --- /dev/null +++ b/test/case/ietf_interfaces/dual_bridge/topology.svg @@ -0,0 +1,42 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + + + + diff --git a/test/case/ietf_interfaces/iface_enable_disable/Readme.adoc b/test/case/ietf_interfaces/iface_enable_disable/Readme.adoc index f6a64142..d1b29c6b 100644 --- a/test/case/ietf_interfaces/iface_enable_disable/Readme.adoc +++ b/test/case/ietf_interfaces/iface_enable_disable/Readme.adoc @@ -7,14 +7,14 @@ Both admin-status and oper-status are verified. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/iface_enable_disable/topology.png[Interface status topology] +image::../../test/case/ietf_interfaces/iface_enable_disable/topology.svg[Interface status topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::iface_enable_disable/topology.png[Interface status topology] +image::iface_enable_disable/topology.svg[Interface status topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Interface status topology] +image::topology.svg[Interface status topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/iface_enable_disable/topology.dot b/test/case/ietf_interfaces/iface_enable_disable/topology.dot index 06dba991..27b10ed7 100644 --- a/test/case/ietf_interfaces/iface_enable_disable/topology.dot +++ b/test/case/ietf_interfaces/iface_enable_disable/topology.dot @@ -3,8 +3,8 @@ graph "2x4" { overlap="false"; esep="+40"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt1 | data | mgmt2 }", @@ -30,6 +30,6 @@ graph "2x4" { host:data -- target1:data [color=black, fontcolor=black, taillabel="10.10.10.1/24"] host:mgmt2 -- target2:mgmt [kind=mgmt, color="lightgrey"] - + target1:link -- target2:link [color=black, fontcolor=black, headlabel="10.10.10.2/24"] } \ No newline at end of file diff --git a/test/case/ietf_interfaces/iface_enable_disable/topology.png b/test/case/ietf_interfaces/iface_enable_disable/topology.png deleted file mode 100644 index f2c67ca9..00000000 Binary files a/test/case/ietf_interfaces/iface_enable_disable/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/iface_enable_disable/topology.svg b/test/case/ietf_interfaces/iface_enable_disable/topology.svg new file mode 100644 index 00000000..a2b78871 --- /dev/null +++ b/test/case/ietf_interfaces/iface_enable_disable/topology.svg @@ -0,0 +1,68 @@ + + + + + + +2x4 + + + +host + +host + +mgmt1 + +data + +mgmt2 + + + +target1 + +mgmt + +data + +link + + dut1 + + + +host:mgmt1--target1:mgmt + + + + +host:data--target1:data + +10.10.10.1/24 + + + +target2 + +link + +mgmt + + dut2 + + + +host:mgmt2--target2:mgmt + + + + +target1:link--target2:link + +10.10.10.2/24 + + + diff --git a/test/case/ietf_interfaces/iface_phys_address/Readme.adoc b/test/case/ietf_interfaces/iface_phys_address/Readme.adoc index 5dedf837..be0a44e9 100644 --- a/test/case/ietf_interfaces/iface_phys_address/Readme.adoc +++ b/test/case/ietf_interfaces/iface_phys_address/Readme.adoc @@ -6,14 +6,14 @@ an offset applied. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/iface_phys_address/topology.png[Custom MAC address on interface topology] +image::../../test/case/ietf_interfaces/iface_phys_address/topology.svg[Custom MAC address on interface topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::iface_phys_address/topology.png[Custom MAC address on interface topology] +image::iface_phys_address/topology.svg[Custom MAC address on interface topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Custom MAC address on interface topology] +image::topology.svg[Custom MAC address on interface topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/iface_phys_address/topology.png b/test/case/ietf_interfaces/iface_phys_address/topology.png deleted file mode 100644 index 5444e060..00000000 Binary files a/test/case/ietf_interfaces/iface_phys_address/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/iface_phys_address/topology.svg b/test/case/ietf_interfaces/iface_phys_address/topology.svg new file mode 100644 index 00000000..ff3d246b --- /dev/null +++ b/test/case/ietf_interfaces/iface_phys_address/topology.svg @@ -0,0 +1,42 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + + + + diff --git a/test/case/ietf_interfaces/igmp_basic/Readme.adoc b/test/case/ietf_interfaces/igmp_basic/Readme.adoc index 49a7b2bc..db7b60cc 100644 --- a/test/case/ietf_interfaces/igmp_basic/Readme.adoc +++ b/test/case/ietf_interfaces/igmp_basic/Readme.adoc @@ -18,14 +18,14 @@ the flooding stops as soon a join arrives ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/igmp_basic/topology.png[IGMP basic topology] +image::../../test/case/ietf_interfaces/igmp_basic/topology.svg[IGMP basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::igmp_basic/topology.png[IGMP basic topology] +image::igmp_basic/topology.svg[IGMP basic topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[IGMP basic topology] +image::topology.svg[IGMP basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/igmp_basic/topology.dot b/test/case/ietf_interfaces/igmp_basic/topology.dot index 673f9e2c..55a85886 100644 --- a/test/case/ietf_interfaces/igmp_basic/topology.dot +++ b/test/case/ietf_interfaces/igmp_basic/topology.dot @@ -3,8 +3,8 @@ graph "1x4" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data1 | data2 | data3 }", diff --git a/test/case/ietf_interfaces/igmp_basic/topology.png b/test/case/ietf_interfaces/igmp_basic/topology.png deleted file mode 100644 index 1c448527..00000000 Binary files a/test/case/ietf_interfaces/igmp_basic/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/igmp_basic/topology.svg b/test/case/ietf_interfaces/igmp_basic/topology.svg new file mode 100644 index 00000000..ca4fff80 --- /dev/null +++ b/test/case/ietf_interfaces/igmp_basic/topology.svg @@ -0,0 +1,65 @@ + + + + + + +1x4 + + + +host + +host + +mgmt + +data1 + +data2 + +data3 + + + +target + +mgmt + +data1 + +data2 + +data3 + +target +(br0) +10.0.0.1/24 + + + +host:mgmt--target:mgmt + + + + +host:data1--target:data1 + +10.0.0.2/24 + + + +host:data2--target:data2 + +10.0.0.3/24 + + + +host:data3--target:data3 + +10.0.0.4/24 + + + diff --git a/test/case/ietf_interfaces/igmp_vlan/Readme.adoc b/test/case/ietf_interfaces/igmp_vlan/Readme.adoc index 0d20d38b..703e13fb 100644 --- a/test/case/ietf_interfaces/igmp_vlan/Readme.adoc +++ b/test/case/ietf_interfaces/igmp_vlan/Readme.adoc @@ -21,14 +21,14 @@ Test tagged IGMP control traffic and that VLAN separation is respected for multi ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/igmp_vlan/topology.png[IGMP VLAN topology] +image::../../test/case/ietf_interfaces/igmp_vlan/topology.svg[IGMP VLAN topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::igmp_vlan/topology.png[IGMP VLAN topology] +image::igmp_vlan/topology.svg[IGMP VLAN topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[IGMP VLAN topology] +image::topology.svg[IGMP VLAN topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/igmp_vlan/topology.dot b/test/case/ietf_interfaces/igmp_vlan/topology.dot index dc97ed5f..8f5db791 100644 --- a/test/case/ietf_interfaces/igmp_vlan/topology.dot +++ b/test/case/ietf_interfaces/igmp_vlan/topology.dot @@ -3,8 +3,8 @@ graph "2x4" { overlap="false"; esep="+23"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt1 | data11 | data12 | <> \n\n\n | mgmt2 | data21 | data22 }", diff --git a/test/case/ietf_interfaces/igmp_vlan/topology.png b/test/case/ietf_interfaces/igmp_vlan/topology.png deleted file mode 100644 index d37f0967..00000000 Binary files a/test/case/ietf_interfaces/igmp_vlan/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/igmp_vlan/topology.svg b/test/case/ietf_interfaces/igmp_vlan/topology.svg new file mode 100644 index 00000000..fcedc81a --- /dev/null +++ b/test/case/ietf_interfaces/igmp_vlan/topology.svg @@ -0,0 +1,107 @@ + + + + + + +2x4 + + + +host + +host + +mgmt1 + +data11 + +data12 + + +mgmt2 + +data21 + +data22 + + + +dut1 + +mgmt + +data1 + +data2 + +dut1 +VLAN55: 10.0.1.1 +VLAN77: 10.0.2.1 + +link + + + +host:mgmt1--dut1:mgmt + + + + +host:data11--dut1:data1 + +VLAN55 U +10.0.1.11 + + + +host:data12--dut1:data2 + +VLAN77 U +10.0.2.11 + + + +dut2 + +mgmt + +data1 + +data2 + +link + +dut2 +VLAN55: 10.0.1.2 +VLAN77: 10.0.2.2 + + + +host:mgmt2--dut2:mgmt + + + + +host:data21--dut2:data1 + +VLAN55 U +10.0.1.22 + + + +host:data22--dut2:data2 + +VLAN77 U +10.0.2.22 + + + +dut1:link--dut2:link + +VLAN 1,2 T + + + diff --git a/test/case/ietf_interfaces/ipv4_address/Readme.adoc b/test/case/ietf_interfaces/ipv4_address/Readme.adoc index a67b1f43..7a411d5f 100644 --- a/test/case/ietf_interfaces/ipv4_address/Readme.adoc +++ b/test/case/ietf_interfaces/ipv4_address/Readme.adoc @@ -4,14 +4,14 @@ Test that it is possible to set and remove the IPv4 address on an interface ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/ipv4_address/topology.png[Interface with IPv4 topology] +image::../../test/case/ietf_interfaces/ipv4_address/topology.svg[Interface with IPv4 topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::ipv4_address/topology.png[Interface with IPv4 topology] +image::ipv4_address/topology.svg[Interface with IPv4 topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Interface with IPv4 topology] +image::topology.svg[Interface with IPv4 topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/ipv4_address/topology.png b/test/case/ietf_interfaces/ipv4_address/topology.png deleted file mode 100644 index a9abc191..00000000 Binary files a/test/case/ietf_interfaces/ipv4_address/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/ipv4_address/topology.svg b/test/case/ietf_interfaces/ipv4_address/topology.svg new file mode 100644 index 00000000..6fc6f47a --- /dev/null +++ b/test/case/ietf_interfaces/ipv4_address/topology.svg @@ -0,0 +1,33 @@ + + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_interfaces/ipv4_autoconf/Readme.adoc b/test/case/ietf_interfaces/ipv4_autoconf/Readme.adoc index b88281ed..2f6e8d0c 100644 --- a/test/case/ietf_interfaces/ipv4_autoconf/Readme.adoc +++ b/test/case/ietf_interfaces/ipv4_autoconf/Readme.adoc @@ -6,14 +6,14 @@ address removal on autoconf disable. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/ipv4_autoconf/topology.png[IPv4 link-local topology] +image::../../test/case/ietf_interfaces/ipv4_autoconf/topology.svg[IPv4 link-local topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::ipv4_autoconf/topology.png[IPv4 link-local topology] +image::ipv4_autoconf/topology.svg[IPv4 link-local topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[IPv4 link-local topology] +image::topology.svg[IPv4 link-local topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/ipv4_autoconf/topology.png b/test/case/ietf_interfaces/ipv4_autoconf/topology.png deleted file mode 100644 index 5444e060..00000000 Binary files a/test/case/ietf_interfaces/ipv4_autoconf/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/ipv4_autoconf/topology.svg b/test/case/ietf_interfaces/ipv4_autoconf/topology.svg new file mode 100644 index 00000000..ff3d246b --- /dev/null +++ b/test/case/ietf_interfaces/ipv4_autoconf/topology.svg @@ -0,0 +1,42 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + + + + diff --git a/test/case/ietf_interfaces/ipv6_address/Readme.adoc b/test/case/ietf_interfaces/ipv6_address/Readme.adoc index 6c134513..93f5da93 100644 --- a/test/case/ietf_interfaces/ipv6_address/Readme.adoc +++ b/test/case/ietf_interfaces/ipv6_address/Readme.adoc @@ -5,14 +5,14 @@ See issue #473 for details. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/ipv6_address/topology.png[Interface IPv6 autoconf for bridges topology] +image::../../test/case/ietf_interfaces/ipv6_address/topology.svg[Interface IPv6 autoconf for bridges topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::ipv6_address/topology.png[Interface IPv6 autoconf for bridges topology] +image::ipv6_address/topology.svg[Interface IPv6 autoconf for bridges topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Interface IPv6 autoconf for bridges topology] +image::topology.svg[Interface IPv6 autoconf for bridges topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/ipv6_address/topology.png b/test/case/ietf_interfaces/ipv6_address/topology.png deleted file mode 100644 index 5444e060..00000000 Binary files a/test/case/ietf_interfaces/ipv6_address/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/ipv6_address/topology.svg b/test/case/ietf_interfaces/ipv6_address/topology.svg new file mode 100644 index 00000000..ff3d246b --- /dev/null +++ b/test/case/ietf_interfaces/ipv6_address/topology.svg @@ -0,0 +1,42 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + + + + diff --git a/test/case/ietf_interfaces/routing_basic/Readme.adoc b/test/case/ietf_interfaces/routing_basic/Readme.adoc index 5699d9c9..5c5b681e 100644 --- a/test/case/ietf_interfaces/routing_basic/Readme.adoc +++ b/test/case/ietf_interfaces/routing_basic/Readme.adoc @@ -5,14 +5,14 @@ in configuration has the expected result. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/routing_basic/topology.png[Routing basic topology] +image::../../test/case/ietf_interfaces/routing_basic/topology.svg[Routing basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::routing_basic/topology.png[Routing basic topology] +image::routing_basic/topology.svg[Routing basic topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Routing basic topology] +image::topology.svg[Routing basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/routing_basic/topology.dot b/test/case/ietf_interfaces/routing_basic/topology.dot index a4ba84da..cfe40656 100644 --- a/test/case/ietf_interfaces/routing_basic/topology.dot +++ b/test/case/ietf_interfaces/routing_basic/topology.dot @@ -1,10 +1,9 @@ -graph "1x3" { +graph "routing_basic" { layout="neato"; overlap="false"; esep="+80"; - - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data1 | data2 }", @@ -20,6 +19,6 @@ graph "1x3" { ]; host:mgmt -- target:mgmt [kind=mgmt, color="lightgray"] - host:data1 -- target:data1 [color=black, fontcolor=black, fontsize=12, taillabel=".10", label="192.168.0.0/24" headlabel=".1"] - host:data2 -- target:data2 [color=black, fontcolor=black, fontsize=12, taillabel=".10", label="10.0.0.0/24" headlabel=".1"] + host:data1 -- target:data1 [color=black, fontcolor=black, fontsize=12, taillabel=".10", label="192.168.0.0/24", headlabel=".1"] + host:data2 -- target:data2 [color=black, fontcolor=black, fontsize=12, taillabel=".10", label="10.0.0.0/24", headlabel=".1"] } \ No newline at end of file diff --git a/test/case/ietf_interfaces/routing_basic/topology.png b/test/case/ietf_interfaces/routing_basic/topology.png deleted file mode 100644 index d8a5433f..00000000 Binary files a/test/case/ietf_interfaces/routing_basic/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/routing_basic/topology.svg b/test/case/ietf_interfaces/routing_basic/topology.svg new file mode 100644 index 00000000..3c706e87 --- /dev/null +++ b/test/case/ietf_interfaces/routing_basic/topology.svg @@ -0,0 +1,57 @@ + + + + + + +routing_basic + + + +host + +host + +mgmt + +data1 + +data2 + + + +target + +mgmt + +data1 + +data2 + +target + + + +host:mgmt--target:mgmt + + + + +host:data1--target:data1 + +192.168.0.0/24 +.1 +.10 + + + +host:data2--target:data2 + +10.0.0.0/24 +.1 +.10 + + + diff --git a/test/case/ietf_interfaces/static_multicast_filters/Readme.adoc b/test/case/ietf_interfaces/static_multicast_filters/Readme.adoc index 8a9f0085..33bcccf9 100644 --- a/test/case/ietf_interfaces/static_multicast_filters/Readme.adoc +++ b/test/case/ietf_interfaces/static_multicast_filters/Readme.adoc @@ -20,14 +20,14 @@ enabled when using static multicast filters) ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/static_multicast_filters/topology.png[Static multicast filters topology] +image::../../test/case/ietf_interfaces/static_multicast_filters/topology.svg[Static multicast filters topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::static_multicast_filters/topology.png[Static multicast filters topology] +image::static_multicast_filters/topology.svg[Static multicast filters topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Static multicast filters topology] +image::topology.svg[Static multicast filters topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/static_multicast_filters/topology.png b/test/case/ietf_interfaces/static_multicast_filters/topology.png deleted file mode 100644 index 1c448527..00000000 Binary files a/test/case/ietf_interfaces/static_multicast_filters/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/static_multicast_filters/topology.svg b/test/case/ietf_interfaces/static_multicast_filters/topology.svg new file mode 100644 index 00000000..ca4fff80 --- /dev/null +++ b/test/case/ietf_interfaces/static_multicast_filters/topology.svg @@ -0,0 +1,65 @@ + + + + + + +1x4 + + + +host + +host + +mgmt + +data1 + +data2 + +data3 + + + +target + +mgmt + +data1 + +data2 + +data3 + +target +(br0) +10.0.0.1/24 + + + +host:mgmt--target:mgmt + + + + +host:data1--target:data1 + +10.0.0.2/24 + + + +host:data2--target:data2 + +10.0.0.3/24 + + + +host:data3--target:data3 + +10.0.0.4/24 + + + diff --git a/test/case/ietf_interfaces/verify_all_interface_types/Readme.adoc b/test/case/ietf_interfaces/verify_all_interface_types/Readme.adoc index 20d26831..90257126 100644 --- a/test/case/ietf_interfaces/verify_all_interface_types/Readme.adoc +++ b/test/case/ietf_interfaces/verify_all_interface_types/Readme.adoc @@ -16,14 +16,14 @@ slightly longer than sending the entire configuration at once. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/verify_all_interface_types/topology.png[Verify that all interface types can be created topology] +image::../../test/case/ietf_interfaces/verify_all_interface_types/topology.svg[Verify that all interface types can be created topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::verify_all_interface_types/topology.png[Verify that all interface types can be created topology] +image::verify_all_interface_types/topology.svg[Verify that all interface types can be created topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Verify that all interface types can be created topology] +image::topology.svg[Verify that all interface types can be created topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/verify_all_interface_types/topology.dot b/test/case/ietf_interfaces/verify_all_interface_types/topology.dot index fd14ce15..80f83749 100644 --- a/test/case/ietf_interfaces/verify_all_interface_types/topology.dot +++ b/test/case/ietf_interfaces/verify_all_interface_types/topology.dot @@ -3,8 +3,8 @@ graph "1x3" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data1 | data2 }", diff --git a/test/case/ietf_interfaces/verify_all_interface_types/topology.png b/test/case/ietf_interfaces/verify_all_interface_types/topology.png deleted file mode 100644 index 27564429..00000000 Binary files a/test/case/ietf_interfaces/verify_all_interface_types/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/verify_all_interface_types/topology.svg b/test/case/ietf_interfaces/verify_all_interface_types/topology.svg new file mode 100644 index 00000000..3ed2c845 --- /dev/null +++ b/test/case/ietf_interfaces/verify_all_interface_types/topology.svg @@ -0,0 +1,51 @@ + + + + + + +1x3 + + + +host + +host + +mgmt + +data1 + +data2 + + + +target + +mgmt + +ethX + +ethQ + +target + + + +host:mgmt--target:mgmt + + + + +host:data1--target:ethX + + + + +host:data2--target:ethQ + + + + diff --git a/test/case/ietf_interfaces/veth_delete/Readme.adoc b/test/case/ietf_interfaces/veth_delete/Readme.adoc index 125aef7d..18fb860f 100644 --- a/test/case/ietf_interfaces/veth_delete/Readme.adoc +++ b/test/case/ietf_interfaces/veth_delete/Readme.adoc @@ -10,14 +10,14 @@ from any other step. This to trigger a new configuration "generation". ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/veth_delete/topology.png[Verify that VETH pairs can be deleted topology] +image::../../test/case/ietf_interfaces/veth_delete/topology.svg[Verify that VETH pairs can be deleted topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::veth_delete/topology.png[Verify that VETH pairs can be deleted topology] +image::veth_delete/topology.svg[Verify that VETH pairs can be deleted topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Verify that VETH pairs can be deleted topology] +image::topology.svg[Verify that VETH pairs can be deleted topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/veth_delete/topology.dot b/test/case/ietf_interfaces/veth_delete/topology.dot index 256c2739..5ba58dbf 100644 --- a/test/case/ietf_interfaces/veth_delete/topology.dot +++ b/test/case/ietf_interfaces/veth_delete/topology.dot @@ -3,8 +3,8 @@ graph "1x3" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data1 | data2 }", diff --git a/test/case/ietf_interfaces/veth_delete/topology.png b/test/case/ietf_interfaces/veth_delete/topology.png deleted file mode 100644 index d89fbd9e..00000000 Binary files a/test/case/ietf_interfaces/veth_delete/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/veth_delete/topology.svg b/test/case/ietf_interfaces/veth_delete/topology.svg new file mode 100644 index 00000000..e7d561fa --- /dev/null +++ b/test/case/ietf_interfaces/veth_delete/topology.svg @@ -0,0 +1,51 @@ + + + + + + +1x3 + + + +host + +host + +mgmt + +data1 + +data2 + + + +target + +mgmt + +data1 + +data2 + +target + + + +host:mgmt--target:mgmt + + + + +host:data1--target:data1 + + + + +host:data2--target:data2 + + + + diff --git a/test/case/ietf_interfaces/vlan_ping/Readme.adoc b/test/case/ietf_interfaces/vlan_ping/Readme.adoc index 0e610f7f..75cdde9d 100644 --- a/test/case/ietf_interfaces/vlan_ping/Readme.adoc +++ b/test/case/ietf_interfaces/vlan_ping/Readme.adoc @@ -4,14 +4,14 @@ Very basic test if the VLAN interface configuration works. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/vlan_ping/topology.png[VLAN ping connectivity topology] +image::../../test/case/ietf_interfaces/vlan_ping/topology.svg[VLAN ping connectivity topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::vlan_ping/topology.png[VLAN ping connectivity topology] +image::vlan_ping/topology.svg[VLAN ping connectivity topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[VLAN ping connectivity topology] +image::topology.svg[VLAN ping connectivity topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/vlan_ping/topology.dot b/test/case/ietf_interfaces/vlan_ping/topology.dot index a8f87f8b..f5b0fae3 100644 --- a/test/case/ietf_interfaces/vlan_ping/topology.dot +++ b/test/case/ietf_interfaces/vlan_ping/topology.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data\n(vlan10) }", diff --git a/test/case/ietf_interfaces/vlan_ping/topology.png b/test/case/ietf_interfaces/vlan_ping/topology.png deleted file mode 100644 index 48f192d9..00000000 Binary files a/test/case/ietf_interfaces/vlan_ping/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/vlan_ping/topology.svg b/test/case/ietf_interfaces/vlan_ping/topology.svg new file mode 100644 index 00000000..0aaa9e2b --- /dev/null +++ b/test/case/ietf_interfaces/vlan_ping/topology.svg @@ -0,0 +1,46 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data +(vlan10) + + + +target + +mgmt + +data +(vlan10) + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + +10.0.0.2/24 +10.0.0.1/24 + + + diff --git a/test/case/ietf_interfaces/vlan_qos/Readme.adoc b/test/case/ietf_interfaces/vlan_qos/Readme.adoc index 48336897..d54f5de1 100644 --- a/test/case/ietf_interfaces/vlan_qos/Readme.adoc +++ b/test/case/ietf_interfaces/vlan_qos/Readme.adoc @@ -16,14 +16,14 @@ correctly to PCP on egress ('from internal priority' or static '0..7'). ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_interfaces/vlan_qos/topology.png[VLAN Interface Ingress/Egress QoS topology] +image::../../test/case/ietf_interfaces/vlan_qos/topology.svg[VLAN Interface Ingress/Egress QoS topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::vlan_qos/topology.png[VLAN Interface Ingress/Egress QoS topology] +image::vlan_qos/topology.svg[VLAN Interface Ingress/Egress QoS topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[VLAN Interface Ingress/Egress QoS topology] +image::topology.svg[VLAN Interface Ingress/Egress QoS topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_interfaces/vlan_qos/topology.dot b/test/case/ietf_interfaces/vlan_qos/topology.dot index 5874d342..7d923d09 100644 --- a/test/case/ietf_interfaces/vlan_qos/topology.dot +++ b/test/case/ietf_interfaces/vlan_qos/topology.dot @@ -3,8 +3,8 @@ graph "1x3" { overlap="false"; esep="+150"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data0 | data1 }", diff --git a/test/case/ietf_interfaces/vlan_qos/topology.png b/test/case/ietf_interfaces/vlan_qos/topology.png deleted file mode 100644 index cab51133..00000000 Binary files a/test/case/ietf_interfaces/vlan_qos/topology.png and /dev/null differ diff --git a/test/case/ietf_interfaces/vlan_qos/topology.svg b/test/case/ietf_interfaces/vlan_qos/topology.svg new file mode 100644 index 00000000..fa5b5df0 --- /dev/null +++ b/test/case/ietf_interfaces/vlan_qos/topology.svg @@ -0,0 +1,55 @@ + + + + + + +1x3 + + + +host + +host + +mgmt + +data0 + +data1 + + + +target + +mgmt + +data0 + +data1 + +target + + + +host:mgmt--target:mgmt + + + + +host:data0--target:data0 + +192.168.10.1/24 (vlan10) +(vlan10) 192.168.10.2/24 + + + +host:data1--target:data1 + +192.168.11.1/24 (vlan11) +(vlan11) 192.168.11.2/24 + + + diff --git a/test/case/ietf_routing/ospf_basic/Readme.adoc b/test/case/ietf_routing/ospf_basic/Readme.adoc index 732fce2d..eb85294e 100644 --- a/test/case/ietf_routing/ospf_basic/Readme.adoc +++ b/test/case/ietf_routing/ospf_basic/Readme.adoc @@ -5,14 +5,14 @@ and that they exchange routes, ending with a simple connectivity check. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_routing/ospf_basic/topology.png[OSPF Basic topology] +image::../../test/case/ietf_routing/ospf_basic/topology.svg[OSPF Basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::ospf_basic/topology.png[OSPF Basic topology] +image::ospf_basic/topology.svg[OSPF Basic topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[OSPF Basic topology] +image::topology.svg[OSPF Basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_routing/ospf_basic/topology.dot b/test/case/ietf_routing/ospf_basic/topology.dot index 1f27fd5c..e8838240 100644 --- a/test/case/ietf_routing/ospf_basic/topology.dot +++ b/test/case/ietf_routing/ospf_basic/topology.dot @@ -4,8 +4,8 @@ graph "2x2" { esep="+20"; size=10 - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; PC [ label="PC | { mgmt1 | data | mgmt2 }", diff --git a/test/case/ietf_routing/ospf_basic/topology.png b/test/case/ietf_routing/ospf_basic/topology.png deleted file mode 100644 index 038674a6..00000000 Binary files a/test/case/ietf_routing/ospf_basic/topology.png and /dev/null differ diff --git a/test/case/ietf_routing/ospf_basic/topology.svg b/test/case/ietf_routing/ospf_basic/topology.svg new file mode 100644 index 00000000..955a4362 --- /dev/null +++ b/test/case/ietf_routing/ospf_basic/topology.svg @@ -0,0 +1,76 @@ + + + + + + +2x2 + + + +PC + +PC + +mgmt1 + +data + +mgmt2 + + + +R1 + +mgmt + +data + +link + +R1 + 192.168.100.1/32 +(lo) + + + +PC:mgmt1--R1:mgmt + + + + +PC:data--R1:data + +192.168.10.1/24 +192.168.10.2/24 + + + +R2 + +link + +mgmt + +data + +R2 + 192.168.200.1/32 +(lo) + + + +PC:mgmt2--R2:mgmt + + + + +R1:link--R2:link + +192.168.50.2/24 +192.168.50.1/24 + + + diff --git a/test/case/ietf_routing/ospf_multiarea/Readme.adoc b/test/case/ietf_routing/ospf_multiarea/Readme.adoc index 08fdb64a..33698a4f 100644 --- a/test/case/ietf_routing/ospf_multiarea/Readme.adoc +++ b/test/case/ietf_routing/ospf_multiarea/Readme.adoc @@ -24,14 +24,14 @@ explicit router-id. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_routing/ospf_multiarea/topology.png[OSPF with multiple areas topology] +image::../../test/case/ietf_routing/ospf_multiarea/topology.svg[OSPF with multiple areas topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::ospf_multiarea/topology.png[OSPF with multiple areas topology] +image::ospf_multiarea/topology.svg[OSPF with multiple areas topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[OSPF with multiple areas topology] +image::topology.svg[OSPF with multiple areas topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_routing/ospf_multiarea/topology.dot b/test/case/ietf_routing/ospf_multiarea/topology.dot index 46aae2d2..b2a3edaf 100644 --- a/test/case/ietf_routing/ospf_multiarea/topology.dot +++ b/test/case/ietf_routing/ospf_multiarea/topology.dot @@ -5,8 +5,8 @@ graph "ring-4-duts" { splines=true; size=10; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; PC [ label=" { PC | { mgmt4 | data4 | mgmt1 |                                                                       | mgmt2 | data3 | mgmt3 } }", diff --git a/test/case/ietf_routing/ospf_multiarea/topology.png b/test/case/ietf_routing/ospf_multiarea/topology.png deleted file mode 100644 index f6ed6bbb..00000000 Binary files a/test/case/ietf_routing/ospf_multiarea/topology.png and /dev/null differ diff --git a/test/case/ietf_routing/ospf_multiarea/topology.svg b/test/case/ietf_routing/ospf_multiarea/topology.svg new file mode 100644 index 00000000..a90ee388 --- /dev/null +++ b/test/case/ietf_routing/ospf_multiarea/topology.svg @@ -0,0 +1,182 @@ + + + + + + +ring-4-duts + + + +PC + +PC + +mgmt4 + +data4 + +mgmt1 + +                                                                      + +mgmt2 + +data3 + +mgmt3 + + + +R1 + +mgmt + +R1 + 10.0.0.1/32 +(lo) + +ring1 + +cross + +ring2 + + + +PC:mgmt1--R1:mgmt + + + + +R4 + +mgmt + +data + +R4 + 10.0.0.4/32 +(lo) + +ring1 + +cross + +ring2 + + + +PC:mgmt4--R4:mgmt + + + + +PC:data4--R4:data + +192.168.4.0/24  +.1 +.2 + + + +R2 + +ring2 + +cross + +ring1 + +mgmt + +R2 +10.0.0.2/32 +(lo) + + + +PC:mgmt2--R2:mgmt + + + + +R3 + +ring2 + +cross + +ring1 + +data + +mgmt + +R3 +10.0.0.3/32 +(lo) + + + +PC:mgmt3--R3:mgmt + + + + +PC:data3--R3:data + +192.168.3.0/24 +(Area 1) +.1 +.2 + + + +R1:ring1--R2:ring2 + +(Area 0) +10.0.12.0/30 +.2 +.1 + + + +R1:cross--R3:cross + +10.0.13.0/30 +(Area 1) +.2 +.1 + + + +R4:ring1--R1:ring2 + +10.0.41.0/30 +(Area 2) +.2 +.1 + + + +R2:cross--R4:cross + +10.0.24.0/30 +(Area 2) +.2 +.1 + + + +R2:ring1--R3:ring2 + +10.0.23.0/30 +(Area 1) +.2 +.1 + + + diff --git a/test/case/ietf_routing/ospf_unnumbered_interface/Readme.adoc b/test/case/ietf_routing/ospf_unnumbered_interface/Readme.adoc index 75b744fa..1067706e 100644 --- a/test/case/ietf_routing/ospf_unnumbered_interface/Readme.adoc +++ b/test/case/ietf_routing/ospf_unnumbered_interface/Readme.adoc @@ -9,14 +9,14 @@ configuration and passive to function ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_routing/ospf_unnumbered_interface/topology.png[OSPF unnumbered interfaces topology] +image::../../test/case/ietf_routing/ospf_unnumbered_interface/topology.svg[OSPF unnumbered interfaces topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::ospf_unnumbered_interface/topology.png[OSPF unnumbered interfaces topology] +image::ospf_unnumbered_interface/topology.svg[OSPF unnumbered interfaces topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[OSPF unnumbered interfaces topology] +image::topology.svg[OSPF unnumbered interfaces topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_routing/ospf_unnumbered_interface/topology.dot b/test/case/ietf_routing/ospf_unnumbered_interface/topology.dot index 8d4be9bf..edf7d453 100644 --- a/test/case/ietf_routing/ospf_unnumbered_interface/topology.dot +++ b/test/case/ietf_routing/ospf_unnumbered_interface/topology.dot @@ -4,8 +4,8 @@ graph "2x2" { esep="+20"; size=10 - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; PC [ label="PC | { mgmt1 | data | mgmt2 }", diff --git a/test/case/ietf_routing/ospf_unnumbered_interface/topology.png b/test/case/ietf_routing/ospf_unnumbered_interface/topology.png deleted file mode 100644 index 29bc7806..00000000 Binary files a/test/case/ietf_routing/ospf_unnumbered_interface/topology.png and /dev/null differ diff --git a/test/case/ietf_routing/ospf_unnumbered_interface/topology.svg b/test/case/ietf_routing/ospf_unnumbered_interface/topology.svg new file mode 100644 index 00000000..ab1e3377 --- /dev/null +++ b/test/case/ietf_routing/ospf_unnumbered_interface/topology.svg @@ -0,0 +1,76 @@ + + + + + + +2x2 + + + +PC + +PC + +mgmt1 + +data + +mgmt2 + + + +R1 + +mgmt + +data + +link + +R1 + 192.168.100.1/32 +(lo) + + + +PC:mgmt1--R1:mgmt + + + + +PC:data--R1:data + +192.168.10.1/24 +192.168.10.2/24 + + + +R2 + +link + +mgmt + +data + +R2 + 192.168.200.1/32 +(lo) + + + +PC:mgmt2--R2:mgmt + + + + +R1:link--R2:link + +10.0.0.2/32 +10.0.0.1/32 + + + diff --git a/test/case/ietf_routing/static_routing/Readme.adoc b/test/case/ietf_routing/static_routing/Readme.adoc index 9f61574c..05d5ad68 100644 --- a/test/case/ietf_routing/static_routing/Readme.adoc +++ b/test/case/ietf_routing/static_routing/Readme.adoc @@ -5,14 +5,14 @@ that data forwarding works as expected via an intermediate device. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_routing/static_routing/topology.png[Static routing topology] +image::../../test/case/ietf_routing/static_routing/topology.svg[Static routing topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::static_routing/topology.png[Static routing topology] +image::static_routing/topology.svg[Static routing topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Static routing topology] +image::topology.svg[Static routing topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_routing/static_routing/topology.dot b/test/case/ietf_routing/static_routing/topology.dot index 0da68982..b226c02c 100644 --- a/test/case/ietf_routing/static_routing/topology.dot +++ b/test/case/ietf_routing/static_routing/topology.dot @@ -4,8 +4,8 @@ graph "2x2" { esep="+20"; size=10 - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; PC [ label="PC | { mgmt1 | data | mgmt2 }", diff --git a/test/case/ietf_routing/static_routing/topology.png b/test/case/ietf_routing/static_routing/topology.png deleted file mode 100644 index 68b00742..00000000 Binary files a/test/case/ietf_routing/static_routing/topology.png and /dev/null differ diff --git a/test/case/ietf_routing/static_routing/topology.svg b/test/case/ietf_routing/static_routing/topology.svg new file mode 100644 index 00000000..6201cc4d --- /dev/null +++ b/test/case/ietf_routing/static_routing/topology.svg @@ -0,0 +1,76 @@ + + + + + + +2x2 + + + +PC + +PC + +mgmt1 + +data + +mgmt2 + + + +R1 + +mgmt + +data + +link + +R1 + 192.168.100.1/32 +(lo) + + + +PC:mgmt1--R1:mgmt + + + + +PC:data--R1:data + +192.168.10.0/24 +.1 +.2 + + + +R2 + +link + +mgmt + +R2 + 192.168.200.1/32 +(lo) + + + +PC:mgmt2--R2:mgmt + + + + +R1:link--R2:link + +192.168.50.0/24 +.2 +.1 + + + diff --git a/test/case/ietf_syslog/basic/Readme.adoc b/test/case/ietf_syslog/basic/Readme.adoc index b194bc1b..b1f56953 100644 --- a/test/case/ietf_syslog/basic/Readme.adoc +++ b/test/case/ietf_syslog/basic/Readme.adoc @@ -4,14 +4,14 @@ Add syslog actions to log to local files, then verify new log files have been cr ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_syslog/basic/topology.png[Syslog Basic topology] +image::../../test/case/ietf_syslog/basic/topology.svg[Syslog Basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::basic/topology.png[Syslog Basic topology] +image::basic/topology.svg[Syslog Basic topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Syslog Basic topology] +image::topology.svg[Syslog Basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_syslog/basic/topology.png b/test/case/ietf_syslog/basic/topology.png deleted file mode 100644 index a9abc191..00000000 Binary files a/test/case/ietf_syslog/basic/topology.png and /dev/null differ diff --git a/test/case/ietf_syslog/basic/topology.svg b/test/case/ietf_syslog/basic/topology.svg new file mode 100644 index 00000000..6fc6f47a --- /dev/null +++ b/test/case/ietf_syslog/basic/topology.svg @@ -0,0 +1,33 @@ + + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_syslog/remote/Readme.adoc b/test/case/ietf_syslog/remote/Readme.adoc index 59fb03b5..2cb6b80d 100644 --- a/test/case/ietf_syslog/remote/Readme.adoc +++ b/test/case/ietf_syslog/remote/Readme.adoc @@ -4,14 +4,14 @@ Verify logging to remote, acting as a remote, and RFC5424 log format. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_syslog/remote/topology.png[Remote syslog topology] +image::../../test/case/ietf_syslog/remote/topology.svg[Remote syslog topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::remote/topology.png[Remote syslog topology] +image::remote/topology.svg[Remote syslog topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Remote syslog topology] +image::topology.svg[Remote syslog topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_syslog/remote/topology.dot b/test/case/ietf_syslog/remote/topology.dot index 0e61e731..c879ac08 100644 --- a/test/case/ietf_syslog/remote/topology.dot +++ b/test/case/ietf_syslog/remote/topology.dot @@ -3,8 +3,8 @@ graph "2x2" { overlap="false"; esep="+60"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt1 | mgmt2 }", diff --git a/test/case/ietf_syslog/remote/topology.png b/test/case/ietf_syslog/remote/topology.png deleted file mode 100644 index 7ec808ac..00000000 Binary files a/test/case/ietf_syslog/remote/topology.png and /dev/null differ diff --git a/test/case/ietf_syslog/remote/topology.svg b/test/case/ietf_syslog/remote/topology.svg new file mode 100644 index 00000000..b07f7f68 --- /dev/null +++ b/test/case/ietf_syslog/remote/topology.svg @@ -0,0 +1,59 @@ + + + + + + +2x2 + + + +host + +host + +mgmt1 + +mgmt2 + + + +client + +mgmt + +link + +client + + + +host:mgmt1--client:mgmt + + + + +server + +link + +mgmt + +server + + + +host:mgmt2--server:mgmt + + + + +client:link--server:link + +10.0.0.1/24 +10.0.0.2/24 + + + diff --git a/test/case/ietf_system/add_delete_user/Readme.adoc b/test/case/ietf_system/add_delete_user/Readme.adoc index 74795fd0..40b2e37f 100644 --- a/test/case/ietf_system/add_delete_user/Readme.adoc +++ b/test/case/ietf_system/add_delete_user/Readme.adoc @@ -5,14 +5,14 @@ with yescrypt. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_system/add_delete_user/topology.png[Add/delete user topology] +image::../../test/case/ietf_system/add_delete_user/topology.svg[Add/delete user topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::add_delete_user/topology.png[Add/delete user topology] +image::add_delete_user/topology.svg[Add/delete user topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Add/delete user topology] +image::topology.svg[Add/delete user topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_system/add_delete_user/topology.png b/test/case/ietf_system/add_delete_user/topology.png deleted file mode 100644 index a9abc191..00000000 Binary files a/test/case/ietf_system/add_delete_user/topology.png and /dev/null differ diff --git a/test/case/ietf_system/add_delete_user/topology.svg b/test/case/ietf_system/add_delete_user/topology.svg new file mode 100644 index 00000000..6fc6f47a --- /dev/null +++ b/test/case/ietf_system/add_delete_user/topology.svg @@ -0,0 +1,33 @@ + + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_system/hostname/Readme.adoc b/test/case/ietf_system/hostname/Readme.adoc index 606367c3..ec9e8452 100644 --- a/test/case/ietf_system/hostname/Readme.adoc +++ b/test/case/ietf_system/hostname/Readme.adoc @@ -10,14 +10,14 @@ e.g. ix-01-01-01. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_system/hostname/topology.png[Set hostname topology] +image::../../test/case/ietf_system/hostname/topology.svg[Set hostname topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::hostname/topology.png[Set hostname topology] +image::hostname/topology.svg[Set hostname topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Set hostname topology] +image::topology.svg[Set hostname topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_system/hostname/topology.png b/test/case/ietf_system/hostname/topology.png deleted file mode 100644 index a9abc191..00000000 Binary files a/test/case/ietf_system/hostname/topology.png and /dev/null differ diff --git a/test/case/ietf_system/hostname/topology.svg b/test/case/ietf_system/hostname/topology.svg new file mode 100644 index 00000000..6fc6f47a --- /dev/null +++ b/test/case/ietf_system/hostname/topology.svg @@ -0,0 +1,33 @@ + + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_system/ssh_key_authentication/Readme.adoc b/test/case/ietf_system/ssh_key_authentication/Readme.adoc index 5139ed73..2e9f7f8e 100644 --- a/test/case/ietf_system/ssh_key_authentication/Readme.adoc +++ b/test/case/ietf_system/ssh_key_authentication/Readme.adoc @@ -4,14 +4,14 @@ Verify that 'guest' user can fetch data using only the 'public' key ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_system/ssh_key_authentication/topology.png[Generate ssh key pair topology] +image::../../test/case/ietf_system/ssh_key_authentication/topology.svg[Generate ssh key pair topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::ssh_key_authentication/topology.png[Generate ssh key pair topology] +image::ssh_key_authentication/topology.svg[Generate ssh key pair topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Generate ssh key pair topology] +image::topology.svg[Generate ssh key pair topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_system/ssh_key_authentication/topology.png b/test/case/ietf_system/ssh_key_authentication/topology.png deleted file mode 100644 index a9abc191..00000000 Binary files a/test/case/ietf_system/ssh_key_authentication/topology.png and /dev/null differ diff --git a/test/case/ietf_system/ssh_key_authentication/topology.svg b/test/case/ietf_system/ssh_key_authentication/topology.svg new file mode 100644 index 00000000..6fc6f47a --- /dev/null +++ b/test/case/ietf_system/ssh_key_authentication/topology.svg @@ -0,0 +1,33 @@ + + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_system/timezone/Readme.adoc b/test/case/ietf_system/timezone/Readme.adoc index fa81106f..59d1d27c 100644 --- a/test/case/ietf_system/timezone/Readme.adoc +++ b/test/case/ietf_system/timezone/Readme.adoc @@ -4,14 +4,14 @@ Verify that it is possible to set timezone using timezone names. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_system/timezone/topology.png[Set timezone using timezone name topology] +image::../../test/case/ietf_system/timezone/topology.svg[Set timezone using timezone name topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::timezone/topology.png[Set timezone using timezone name topology] +image::timezone/topology.svg[Set timezone using timezone name topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Set timezone using timezone name topology] +image::topology.svg[Set timezone using timezone name topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_system/timezone/topology.png b/test/case/ietf_system/timezone/topology.png deleted file mode 100644 index a9abc191..00000000 Binary files a/test/case/ietf_system/timezone/topology.png and /dev/null differ diff --git a/test/case/ietf_system/timezone/topology.svg b/test/case/ietf_system/timezone/topology.svg new file mode 100644 index 00000000..6fc6f47a --- /dev/null +++ b/test/case/ietf_system/timezone/topology.svg @@ -0,0 +1,33 @@ + + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_system/timezone_utc_offset/Readme.adoc b/test/case/ietf_system/timezone_utc_offset/Readme.adoc index 16bc8eef..937bdcb6 100644 --- a/test/case/ietf_system/timezone_utc_offset/Readme.adoc +++ b/test/case/ietf_system/timezone_utc_offset/Readme.adoc @@ -4,14 +4,14 @@ Verify that it is possible to set timezone using UTC offset ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_system/timezone_utc_offset/topology.png[Set timezone with UTC offset topology] +image::../../test/case/ietf_system/timezone_utc_offset/topology.svg[Set timezone with UTC offset topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::timezone_utc_offset/topology.png[Set timezone with UTC offset topology] +image::timezone_utc_offset/topology.svg[Set timezone with UTC offset topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Set timezone with UTC offset topology] +image::topology.svg[Set timezone with UTC offset topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_system/timezone_utc_offset/topology.png b/test/case/ietf_system/timezone_utc_offset/topology.png deleted file mode 100644 index a9abc191..00000000 Binary files a/test/case/ietf_system/timezone_utc_offset/topology.png and /dev/null differ diff --git a/test/case/ietf_system/timezone_utc_offset/topology.svg b/test/case/ietf_system/timezone_utc_offset/topology.svg new file mode 100644 index 00000000..6fc6f47a --- /dev/null +++ b/test/case/ietf_system/timezone_utc_offset/topology.svg @@ -0,0 +1,33 @@ + + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_system/upgrade/Readme.adoc b/test/case/ietf_system/upgrade/Readme.adoc index 4d760512..032efc36 100644 --- a/test/case/ietf_system/upgrade/Readme.adoc +++ b/test/case/ietf_system/upgrade/Readme.adoc @@ -4,14 +4,14 @@ Verify it is possible to upgrade. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_system/upgrade/topology.png[Upgrade topology] +image::../../test/case/ietf_system/upgrade/topology.svg[Upgrade topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::upgrade/topology.png[Upgrade topology] +image::upgrade/topology.svg[Upgrade topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Upgrade topology] +image::topology.svg[Upgrade topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_system/upgrade/topology.dot b/test/case/ietf_system/upgrade/topology.dot index 26307027..583b76b2 100644 --- a/test/case/ietf_system/upgrade/topology.dot +++ b/test/case/ietf_system/upgrade/topology.dot @@ -3,8 +3,8 @@ graph "1x1" { overlap="false"; esep="+20"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt }", diff --git a/test/case/ietf_system/upgrade/topology.png b/test/case/ietf_system/upgrade/topology.png deleted file mode 100644 index 8956d675..00000000 Binary files a/test/case/ietf_system/upgrade/topology.png and /dev/null differ diff --git a/test/case/ietf_system/upgrade/topology.svg b/test/case/ietf_system/upgrade/topology.svg new file mode 100644 index 00000000..cc6ebcb4 --- /dev/null +++ b/test/case/ietf_system/upgrade/topology.svg @@ -0,0 +1,33 @@ + + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/ietf_system/user_admin/Readme.adoc b/test/case/ietf_system/user_admin/Readme.adoc index 6f5b1e5f..8fb28b23 100644 --- a/test/case/ietf_system/user_admin/Readme.adoc +++ b/test/case/ietf_system/user_admin/Readme.adoc @@ -5,14 +5,14 @@ check that it when added as admin it is also the case in Linux. ==== Topology ifdef::topdoc[] -image::../../test/case/ietf_system/user_admin/topology.png[Add admin user topology] +image::../../test/case/ietf_system/user_admin/topology.svg[Add admin user topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::user_admin/topology.png[Add admin user topology] +image::user_admin/topology.svg[Add admin user topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Add admin user topology] +image::topology.svg[Add admin user topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/ietf_system/user_admin/topology.png b/test/case/ietf_system/user_admin/topology.png deleted file mode 100644 index a9abc191..00000000 Binary files a/test/case/ietf_system/user_admin/topology.png and /dev/null differ diff --git a/test/case/ietf_system/user_admin/topology.svg b/test/case/ietf_system/user_admin/topology.svg new file mode 100644 index 00000000..6fc6f47a --- /dev/null +++ b/test/case/ietf_system/user_admin/topology.svg @@ -0,0 +1,33 @@ + + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/infix_containers/container_basic/Readme.adoc b/test/case/infix_containers/container_basic/Readme.adoc index f8d56c73..1967c887 100644 --- a/test/case/infix_containers/container_basic/Readme.adoc +++ b/test/case/infix_containers/container_basic/Readme.adoc @@ -8,14 +8,14 @@ The RPC actions: stop + start, and restart are also verified. ==== Topology ifdef::topdoc[] -image::../../test/case/infix_containers/container_basic/topology.png[Container basic topology] +image::../../test/case/infix_containers/container_basic/topology.svg[Container basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::container_basic/topology.png[Container basic topology] +image::container_basic/topology.svg[Container basic topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Container basic topology] +image::topology.svg[Container basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_containers/container_basic/topology.png b/test/case/infix_containers/container_basic/topology.png deleted file mode 100644 index 5444e060..00000000 Binary files a/test/case/infix_containers/container_basic/topology.png and /dev/null differ diff --git a/test/case/infix_containers/container_basic/topology.svg b/test/case/infix_containers/container_basic/topology.svg new file mode 100644 index 00000000..ff3d246b --- /dev/null +++ b/test/case/infix_containers/container_basic/topology.svg @@ -0,0 +1,42 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + + + + diff --git a/test/case/infix_containers/container_bridge/Readme.adoc b/test/case/infix_containers/container_bridge/Readme.adoc index d521040d..1c3e6f69 100644 --- a/test/case/infix_containers/container_bridge/Readme.adoc +++ b/test/case/infix_containers/container_bridge/Readme.adoc @@ -9,14 +9,14 @@ port accessed from the host. ==== Topology ifdef::topdoc[] -image::../../test/case/infix_containers/container_bridge/topology.png[Container with bridge network topology] +image::../../test/case/infix_containers/container_bridge/topology.svg[Container with bridge network topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::container_bridge/topology.png[Container with bridge network topology] +image::container_bridge/topology.svg[Container with bridge network topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Container with bridge network topology] +image::topology.svg[Container with bridge network topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_containers/container_bridge/topology.dot b/test/case/infix_containers/container_bridge/topology.dot index 6964b75b..3b5d8be7 100644 --- a/test/case/infix_containers/container_bridge/topology.dot +++ b/test/case/infix_containers/container_bridge/topology.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data }", @@ -21,4 +21,4 @@ graph "1x2" { host:mgmt -- target:mgmt [kind=mgmt, color=lightgrey] host:data -- target:data [color=black, fontcolor=black, fontsize=12, taillabel="10.0.0.1/24", headlabel="10.0.0.2/24"] -} \ No newline at end of file +} \ No newline at end of file diff --git a/test/case/infix_containers/container_bridge/topology.png b/test/case/infix_containers/container_bridge/topology.png deleted file mode 100644 index cfb1862d..00000000 Binary files a/test/case/infix_containers/container_bridge/topology.png and /dev/null differ diff --git a/test/case/infix_containers/container_bridge/topology.svg b/test/case/infix_containers/container_bridge/topology.svg new file mode 100644 index 00000000..0d0d7683 --- /dev/null +++ b/test/case/infix_containers/container_bridge/topology.svg @@ -0,0 +1,44 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + +10.0.0.2/24 +10.0.0.1/24 + + + diff --git a/test/case/infix_containers/container_firewall_basic/Readme.adoc b/test/case/infix_containers/container_firewall_basic/Readme.adoc index 296d0309..a26af115 100644 --- a/test/case/infix_containers/container_firewall_basic/Readme.adoc +++ b/test/case/infix_containers/container_firewall_basic/Readme.adoc @@ -27,14 +27,14 @@ phrase, is only reachable from the public interface `ext0`, on ==== Topology ifdef::topdoc[] -image::../../test/case/infix_containers/container_firewall_basic/topology.png[Basic Firewall Container topology] +image::../../test/case/infix_containers/container_firewall_basic/topology.svg[Basic Firewall Container topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::container_firewall_basic/topology.png[Basic Firewall Container topology] +image::container_firewall_basic/topology.svg[Basic Firewall Container topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Basic Firewall Container topology] +image::topology.svg[Basic Firewall Container topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_containers/container_firewall_basic/topology.png b/test/case/infix_containers/container_firewall_basic/topology.png deleted file mode 100644 index 31229f67..00000000 Binary files a/test/case/infix_containers/container_firewall_basic/topology.png and /dev/null differ diff --git a/test/case/infix_containers/container_firewall_basic/topology.svg b/test/case/infix_containers/container_firewall_basic/topology.svg new file mode 100644 index 00000000..61e485fc --- /dev/null +++ b/test/case/infix_containers/container_firewall_basic/topology.svg @@ -0,0 +1,45 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +ext0 + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:ext0 + +     192.168.0.1/24      +.1 + .2 + + + diff --git a/test/case/infix_containers/container_phys/Readme.adoc b/test/case/infix_containers/container_phys/Readme.adoc index 107dabee..d05489dd 100644 --- a/test/case/infix_containers/container_phys/Readme.adoc +++ b/test/case/infix_containers/container_phys/Readme.adoc @@ -5,14 +5,14 @@ given a physical interface instead of an end of a VETH pair. ==== Topology ifdef::topdoc[] -image::../../test/case/infix_containers/container_phys/topology.png[Container with physical interface topology] +image::../../test/case/infix_containers/container_phys/topology.svg[Container with physical interface topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::container_phys/topology.png[Container with physical interface topology] +image::container_phys/topology.svg[Container with physical interface topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Container with physical interface topology] +image::topology.svg[Container with physical interface topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_containers/container_phys/topology.png b/test/case/infix_containers/container_phys/topology.png deleted file mode 100644 index cfb1862d..00000000 Binary files a/test/case/infix_containers/container_phys/topology.png and /dev/null differ diff --git a/test/case/infix_containers/container_phys/topology.svg b/test/case/infix_containers/container_phys/topology.svg new file mode 100644 index 00000000..0d0d7683 --- /dev/null +++ b/test/case/infix_containers/container_phys/topology.svg @@ -0,0 +1,44 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + +10.0.0.2/24 +10.0.0.1/24 + + + diff --git a/test/case/infix_containers/container_veth/Readme.adoc b/test/case/infix_containers/container_veth/Readme.adoc index 57aea0e5..d50ac7f7 100644 --- a/test/case/infix_containers/container_veth/Readme.adoc +++ b/test/case/infix_containers/container_veth/Readme.adoc @@ -15,14 +15,14 @@ regular bridge, a VETH pair connects the container to the bridge. ==== Topology ifdef::topdoc[] -image::../../test/case/infix_containers/container_veth/topology.png[Container with VETH pair topology] +image::../../test/case/infix_containers/container_veth/topology.svg[Container with VETH pair topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::container_veth/topology.png[Container with VETH pair topology] +image::container_veth/topology.svg[Container with VETH pair topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Container with VETH pair topology] +image::topology.svg[Container with VETH pair topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_containers/container_veth/network_diagram.svg b/test/case/infix_containers/container_veth/network_diagram.svg new file mode 100644 index 00000000..ffe912d0 --- /dev/null +++ b/test/case/infix_containers/container_veth/network_diagram.svg @@ -0,0 +1 @@ +. . . . . . tgtdatamgmtdatawebserverhosttarget' ' ' ' ' ' / br0` / veth0' \ No newline at end of file diff --git a/test/case/infix_containers/container_veth/topology.png b/test/case/infix_containers/container_veth/topology.png deleted file mode 100644 index cfb1862d..00000000 Binary files a/test/case/infix_containers/container_veth/topology.png and /dev/null differ diff --git a/test/case/infix_containers/container_veth/topology.svg b/test/case/infix_containers/container_veth/topology.svg new file mode 100644 index 00000000..0d0d7683 --- /dev/null +++ b/test/case/infix_containers/container_veth/topology.svg @@ -0,0 +1,44 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + +10.0.0.2/24 +10.0.0.1/24 + + + diff --git a/test/case/infix_dhcp/dhcp_basic/Readme.adoc b/test/case/infix_dhcp/dhcp_basic/Readme.adoc index 49f0a4f1..5c902303 100644 --- a/test/case/infix_dhcp/dhcp_basic/Readme.adoc +++ b/test/case/infix_dhcp/dhcp_basic/Readme.adoc @@ -6,14 +6,14 @@ from a DHCP server and checks that the lease is set on the ==== Topology ifdef::topdoc[] -image::../../test/case/infix_dhcp/dhcp_basic/topology.png[DHCP Basic topology] +image::../../test/case/infix_dhcp/dhcp_basic/topology.svg[DHCP Basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::dhcp_basic/topology.png[DHCP Basic topology] +image::dhcp_basic/topology.svg[DHCP Basic topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[DHCP Basic topology] +image::topology.svg[DHCP Basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_dhcp/dhcp_basic/topology.dot b/test/case/infix_dhcp/dhcp_basic/topology.dot index 5b31e599..605206a3 100644 --- a/test/case/infix_dhcp/dhcp_basic/topology.dot +++ b/test/case/infix_dhcp/dhcp_basic/topology.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host \n(10.0.0.1) | { tgt | data }", diff --git a/test/case/infix_dhcp/dhcp_basic/topology.png b/test/case/infix_dhcp/dhcp_basic/topology.png deleted file mode 100644 index 23cd9b41..00000000 Binary files a/test/case/infix_dhcp/dhcp_basic/topology.png and /dev/null differ diff --git a/test/case/infix_dhcp/dhcp_basic/topology.svg b/test/case/infix_dhcp/dhcp_basic/topology.svg new file mode 100644 index 00000000..7b8a978b --- /dev/null +++ b/test/case/infix_dhcp/dhcp_basic/topology.svg @@ -0,0 +1,44 @@ + + + + + + +1x2 + + + +host + +host +(10.0.0.1) + +tgt + +data + + + +client + +mgmt + +data + +client + + + +host:tgt--client:mgmt + +10.0.0.42/24 + + + +host:data--client:data + + + + diff --git a/test/case/infix_dhcp/dhcp_router/Readme.adoc b/test/case/infix_dhcp/dhcp_router/Readme.adoc index 8beebd7f..c6f59f9d 100644 --- a/test/case/infix_dhcp/dhcp_router/Readme.adoc +++ b/test/case/infix_dhcp/dhcp_router/Readme.adoc @@ -5,14 +5,14 @@ and that route exists in operational datastore. ==== Topology ifdef::topdoc[] -image::../../test/case/infix_dhcp/dhcp_router/topology.png[DHCP router topology] +image::../../test/case/infix_dhcp/dhcp_router/topology.svg[DHCP router topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::dhcp_router/topology.png[DHCP router topology] +image::dhcp_router/topology.svg[DHCP router topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[DHCP router topology] +image::topology.svg[DHCP router topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_dhcp/dhcp_router/topology.dot b/test/case/infix_dhcp/dhcp_router/topology.dot index 97c610cf..16ff458d 100644 --- a/test/case/infix_dhcp/dhcp_router/topology.dot +++ b/test/case/infix_dhcp/dhcp_router/topology.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host \n(192.168.0.1) | { tgt | data }", diff --git a/test/case/infix_dhcp/dhcp_router/topology.png b/test/case/infix_dhcp/dhcp_router/topology.png deleted file mode 100644 index 27108b32..00000000 Binary files a/test/case/infix_dhcp/dhcp_router/topology.png and /dev/null differ diff --git a/test/case/infix_dhcp/dhcp_router/topology.svg b/test/case/infix_dhcp/dhcp_router/topology.svg new file mode 100644 index 00000000..7ce78c1d --- /dev/null +++ b/test/case/infix_dhcp/dhcp_router/topology.svg @@ -0,0 +1,44 @@ + + + + + + +1x2 + + + +host + +host +(192.168.0.1) + +tgt + +data + + + +client + +mgmt + +data + +client + + + +host:tgt--client:mgmt + +192.168.0.254/24 + + + +host:data--client:data + + + + diff --git a/test/case/infix_dhcp/dhcp_routes/Readme.adoc b/test/case/infix_dhcp/dhcp_routes/Readme.adoc index 4d4f8088..41d35d39 100644 --- a/test/case/infix_dhcp/dhcp_routes/Readme.adoc +++ b/test/case/infix_dhcp/dhcp_routes/Readme.adoc @@ -10,14 +10,14 @@ before a DHCP lease has been acquired. ==== Topology ifdef::topdoc[] -image::../../test/case/infix_dhcp/dhcp_routes/topology.png[DHCP option 121 vs option 3 topology] +image::../../test/case/infix_dhcp/dhcp_routes/topology.svg[DHCP option 121 vs option 3 topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::dhcp_routes/topology.png[DHCP option 121 vs option 3 topology] +image::dhcp_routes/topology.svg[DHCP option 121 vs option 3 topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[DHCP option 121 vs option 3 topology] +image::topology.svg[DHCP option 121 vs option 3 topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_dhcp/dhcp_routes/topology.dot b/test/case/infix_dhcp/dhcp_routes/topology.dot index 5090ad16..78c2737d 100644 --- a/test/case/infix_dhcp/dhcp_routes/topology.dot +++ b/test/case/infix_dhcp/dhcp_routes/topology.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+100"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host \n(10.0.0.0/24) | { tgt | data }", diff --git a/test/case/infix_dhcp/dhcp_routes/topology.png b/test/case/infix_dhcp/dhcp_routes/topology.png deleted file mode 100644 index 84847fd3..00000000 Binary files a/test/case/infix_dhcp/dhcp_routes/topology.png and /dev/null differ diff --git a/test/case/infix_dhcp/dhcp_routes/topology.svg b/test/case/infix_dhcp/dhcp_routes/topology.svg new file mode 100644 index 00000000..eb6dc218 --- /dev/null +++ b/test/case/infix_dhcp/dhcp_routes/topology.svg @@ -0,0 +1,44 @@ + + + + + + +1x2 + + + +host + +host +(10.0.0.0/24) + +tgt + +data + + + +client + +mgmt + +data + +client + + + +host:tgt--client:mgmt + +192.168.0.254/24 + + + +host:data--client:data + + + + diff --git a/test/case/infix_services/services_basic/Readme.adoc b/test/case/infix_services/services_basic/Readme.adoc index 16673042..4c6063a9 100644 --- a/test/case/infix_services/services_basic/Readme.adoc +++ b/test/case/infix_services/services_basic/Readme.adoc @@ -5,14 +5,14 @@ disabled. Operation and non-operation are confirmed using tcpdump. ==== Topology ifdef::topdoc[] -image::../../test/case/infix_services/services_basic/topology.png[Services basic topology] +image::../../test/case/infix_services/services_basic/topology.svg[Services basic topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::services_basic/topology.png[Services basic topology] +image::services_basic/topology.svg[Services basic topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Services basic topology] +image::topology.svg[Services basic topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/infix_services/services_basic/topology.dot b/test/case/infix_services/services_basic/topology.dot index 2884294d..eba5b382 100644 --- a/test/case/infix_services/services_basic/topology.dot +++ b/test/case/infix_services/services_basic/topology.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data }", @@ -22,4 +22,3 @@ graph "1x2" { host:mgmt -- target:mgmt [kind=mgmt, color=lightgrey] host:data -- target:data [color=black, fontcolor=black, fontsize=12, taillabel="10.0.0.1/24", headlabel="10.0.0.10/24"] } - diff --git a/test/case/infix_services/services_basic/topology.png b/test/case/infix_services/services_basic/topology.png deleted file mode 100644 index cf77bcb0..00000000 Binary files a/test/case/infix_services/services_basic/topology.png and /dev/null differ diff --git a/test/case/infix_services/services_basic/topology.svg b/test/case/infix_services/services_basic/topology.svg new file mode 100644 index 00000000..5b805b37 --- /dev/null +++ b/test/case/infix_services/services_basic/topology.svg @@ -0,0 +1,44 @@ + + + + + + +1x2 + + + +host + +host + +mgmt + +data + + + +target + +mgmt + +data + +target + + + +host:mgmt--target:mgmt + + + + +host:data--target:data + +10.0.0.10/24 +10.0.0.1/24 + + + diff --git a/test/case/misc/operational_all/Readme.adoc b/test/case/misc/operational_all/Readme.adoc index efb5cd54..8f1b05e0 100644 --- a/test/case/misc/operational_all/Readme.adoc +++ b/test/case/misc/operational_all/Readme.adoc @@ -4,14 +4,14 @@ Basic test just to get operational from test-config without errors. ==== Topology ifdef::topdoc[] -image::../../test/case/misc/operational_all/topology.png[Get operational topology] +image::../../test/case/misc/operational_all/topology.svg[Get operational topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::operational_all/topology.png[Get operational topology] +image::operational_all/topology.svg[Get operational topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Get operational topology] +image::topology.svg[Get operational topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/misc/operational_all/topology.png b/test/case/misc/operational_all/topology.png deleted file mode 100644 index a9abc191..00000000 Binary files a/test/case/misc/operational_all/topology.png and /dev/null differ diff --git a/test/case/misc/operational_all/topology.svg b/test/case/misc/operational_all/topology.svg new file mode 100644 index 00000000..6fc6f47a --- /dev/null +++ b/test/case/misc/operational_all/topology.svg @@ -0,0 +1,33 @@ + + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/case/misc/start_from_startup/Readme.adoc b/test/case/misc/start_from_startup/Readme.adoc index fc8d5294..5669c681 100644 --- a/test/case/misc/start_from_startup/Readme.adoc +++ b/test/case/misc/start_from_startup/Readme.adoc @@ -4,14 +4,14 @@ Undefined ==== Topology ifdef::topdoc[] -image::../../test/case/misc/start_from_startup/topology.png[Undefined topology] +image::../../test/case/misc/start_from_startup/topology.svg[Undefined topology] endif::topdoc[] ifndef::topdoc[] ifdef::testgroup[] -image::start_from_startup/topology.png[Undefined topology] +image::start_from_startup/topology.svg[Undefined topology] endif::testgroup[] ifndef::testgroup[] -image::topology.png[Undefined topology] +image::topology.svg[Undefined topology] endif::testgroup[] endif::topdoc[] ==== Test sequence diff --git a/test/case/misc/start_from_startup/topology.png b/test/case/misc/start_from_startup/topology.png deleted file mode 100644 index a9abc191..00000000 Binary files a/test/case/misc/start_from_startup/topology.png and /dev/null differ diff --git a/test/case/misc/start_from_startup/topology.svg b/test/case/misc/start_from_startup/topology.svg new file mode 100644 index 00000000..6fc6f47a --- /dev/null +++ b/test/case/misc/start_from_startup/topology.svg @@ -0,0 +1,33 @@ + + + + + + +1x1 + + + +host + +host + +mgmt + + + +target + +mgmt + +target + + + +host:mgmt--target:mgmt + + + + diff --git a/test/infamy/topologies/1x1.dot b/test/infamy/topologies/1x1.dot index 5a9bbf64..27381d87 100644 --- a/test/infamy/topologies/1x1.dot +++ b/test/infamy/topologies/1x1.dot @@ -3,8 +3,8 @@ graph "1x1" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt }", diff --git a/test/infamy/topologies/1x2.dot b/test/infamy/topologies/1x2.dot index 8891e6a2..73cae852 100644 --- a/test/infamy/topologies/1x2.dot +++ b/test/infamy/topologies/1x2.dot @@ -3,8 +3,8 @@ graph "1x2" { overlap="false"; esep="+80"; - node [shape=record, fontname="monospace"]; - edge [color="cornflowerblue", penwidth="2"]; + node [shape=record, fontname="DejaVu Sans Mono, Book"]; + edge [color="cornflowerblue", penwidth="2", fontname="DejaVu Serif, Book"]; host [ label="host | { mgmt | data }", diff --git a/test/spec/Readme.adoc b/test/spec/Readme.adoc deleted file mode 100644 index 17a74744..00000000 --- a/test/spec/Readme.adoc +++ /dev/null @@ -1,44 +0,0 @@ -:topdoc: - -= Test specification -This is the test specification for Infix. -:title-page: -:toc: -:toclevels: 2 -:sectnums: -:sectnumlevels: 2 - -<<< -include::../case/misc/Readme.adoc[] - -<<< - -include::../case/ietf_system/Readme.adoc[] - -<<< - -include::../case/ietf_syslog/Readme.adoc[] - -<<< - -include::../case/ietf_interfaces/Readme.adoc[] - -<<< - -include::../case/ietf_routing/Readme.adoc[] - -<<< - -include::../case/infix_containers/Readme.adoc[] - -<<< - -include::../case/infix_dhcp/Readme.adoc[] - -<<< - -include::../case/ietf_hardware/Readme.adoc[] - -<<< - -include::../case/infix_services/Readme.adoc[] diff --git a/test/spec/Readme.adoc.in b/test/spec/Readme.adoc.in index 1c0e62cc..0b26bd01 100644 --- a/test/spec/Readme.adoc.in +++ b/test/spec/Readme.adoc.in @@ -1,7 +1,7 @@ :topdoc: = Test specification -This is the test specification for {REPLACE}. +{REPLACE} :title-page: :toc: :toclevels: 2 diff --git a/test/spec/generate_spec.py b/test/spec/generate_spec.py index 2b0b4d9b..b1ed0173 100755 --- a/test/spec/generate_spec.py +++ b/test/spec/generate_spec.py @@ -5,6 +5,7 @@ import graphviz import argparse import io import sys +import re from pathlib import Path @@ -65,7 +66,14 @@ class TestCase: with open(self.topology_dot, 'r') as dot_file: dot_graph = dot_file.read() graph = graphviz.Source(dot_graph) - graph.render(self.topology_image, format='png', cleanup=True) + graph.render(self.topology_image, format='svg', cleanup=True) + pattern = r'' + content="" + with open(f"{self.topology_image}.svg", "r") as f: + content = f.read() + mod_content = re.sub(pattern, '',content, flags=re.DOTALL) + with open(f"{self.topology_image}.svg", 'w') as f: + f.write(mod_content) def generate_specification(self): self.generate_topology() @@ -75,14 +83,14 @@ class TestCase: spec.write(self.description + "\n\n") spec.write("==== Topology\n") spec.write("ifdef::topdoc[]\n") - spec.write(f"image::../../{self.test_dir}/topology.png[{self.name} topology]\n") + spec.write(f"image::../../{self.test_dir}/topology.svg[{self.name} topology]\n") spec.write("endif::topdoc[]\n") spec.write("ifndef::topdoc[]\n") spec.write("ifdef::testgroup[]\n") - spec.write(f"image::{Path(*self.test_dir.parts[3:])}/topology.png[{self.name} topology]\n") + spec.write(f"image::{Path(*self.test_dir.parts[3:])}/topology.svg[{self.name} topology]\n") spec.write("endif::testgroup[]\n") spec.write("ifndef::testgroup[]\n") - spec.write(f"image::topology.png[{self.name} topology]\n") + spec.write(f"image::topology.svg[{self.name} topology]\n") spec.write("endif::testgroup[]\n") spec.write("endif::topdoc[]\n") spec.write("==== Test sequence\n") diff --git a/test/test.mk b/test/test.mk index 9f9b8a40..4631c46e 100644 --- a/test/test.mk +++ b/test/test.mk @@ -4,8 +4,14 @@ ninepm := $(BR2_EXTERNAL_INFIX_PATH)/test/9pm/9pm.py spec-dir := $(test-dir)/spec test-specification := $(O)/images/test-specification.pdf -UNIT_TESTS ?= $(test-dir)/case/all-repo.yaml $(test-dir)/case/all-unit.yaml -TESTS ?= $(test-dir)/case/all.yaml +UNIT_TESTS ?= $(test-dir)/case/all-repo.yaml $(test-dir)/case/all-unit.yaml +TESTS ?= $(test-dir)/case/all.yaml +ifeq ($INFIX_OEM_PATH), "") +GIT_PATH = $(INFIX_OEM_PATH) +else +GIT_PATH = $(BR2_EXTERNAL_INFIX_PATH) +endif +GIT_VERSION = $(shell git -C $(GIT_PATH) describe --dirty --always --tags) IMAGE ?= infix TOPOLOGY-DIR ?= $(test-dir)/virt/quad @@ -34,7 +40,7 @@ test-sh: $(test-dir)/env $(base) $(mode) $(binaries) -i /bin/sh test-spec: - @sed 's/{REPLACE}/$(subst ",,$(INFIX_NAME))/' $(spec-dir)/Readme.adoc.in > $(spec-dir)/Readme.adoc + @sed 's/{REPLACE}/$(subst ",,$(INFIX_NAME)) $(GIT_VERSION)/' $(spec-dir)/Readme.adoc.in > $(spec-dir)/Readme.adoc @$(spec-dir)/generate_spec.py -d $(test-dir)/case -r $(BR2_EXTERNAL_INFIX_PATH) @asciidoctor-pdf --failure-level INFO --theme $(spec-dir)/theme.yml -a pdf-fontsdir=$(spec-dir)/fonts -o $(test-specification) $(spec-dir)/Readme.adoc