timing changes

implementation/topologies/4r4h_topo.py

@@ -144,6 +144,35 @@ class FourRoutersFourHosts(CustomTopo):
                     }
                 ]
             },
+            "udp_bandwidth_intermediate": {
+                "pre_execution": {
+                    "use_pre_defined_function": False,
+                    "command": lambda net: net.iperf((net['h1'], net['h4'])),
+                },
+                "source": "h1",
+                "destination": "h4",
+                "destination_ip": "10.4.0.101",
+                "execute": {
+                    "use_pre_defined_function": True,
+                    "separate_definitions": True,
+                    "command_pre": ("measure_bandwidth", (
+                    ['h1', 'h4'], '10.4.0.101', 30, 0.5, "tcp_pre_failure", "UDP Bandwidth before failure", "tcp", 100,
+                    [0, self.limit + self.limit * 0.1])),
+                    "command_post": ("measure_bandwidth", (
+                    ['h1', 'h4'], '10.4.0.101', 30, 0.5, "tcp_post_failure", "UDP Bandwidth after failure", "tcp", 100,
+                    [0, self.limit + self.limit * 0.1]))
+                },
+                "failures": [
+                    {
+                        "type": "intermediate",
+                        "execute": {
+                            "use_pre_defined_function": True,
+                            "command": (
+                                "connection_shutdown", (['r2', 'r4'], ['Router 2', 'Router 4'], ['r2-eth2', 'r4-eth1']))
+                        }
+                    }
+                ]
+            },
             "bandwidth_link_usage_intermediate": {
                 "pre_execution": {
                     "use_pre_defined_function": False,
@@ -358,7 +387,7 @@ class FourRoutersFourHosts(CustomTopo):
                 "failures": [
                     {
                         "type": "timer",
-                        "timing": 14.5,
+                        "timing": 17.1,
                         "execute": {
                             "use_pre_defined_function": True,
                             "command": (
@@ -384,7 +413,7 @@ class FourRoutersFourHosts(CustomTopo):
                 "failures": [
                     {
                         "type": "timer",
-                        "timing": 16.1,
+                        "timing": 17.1,
                         "execute": {
                             "use_pre_defined_function": True,
                             "command": (

implementation/topologies/6r4h_topo.py

@@ -384,7 +384,7 @@ class SixRoutersFourHosts(CustomTopo):
                 "failures": [
                     {
                         "type": "timer",
-                        "timing": 14.5,
+                        "timing": 17.1,
                         "execute": {
                             "use_pre_defined_function": True,
                             "command": (
@@ -441,7 +441,7 @@ class SixRoutersFourHosts(CustomTopo):
                 "failures": [
                     {
                         "type": "timer",
-                        "timing": 16.1,
+                        "timing": 17.1,
                         "execute": {
                             "use_pre_defined_function": True,
                             "command": (

implementation/topologies/8r4h_topo.py

@@ -531,7 +531,7 @@ class EightRoutersFourHosts(CustomTopo):
                 "failures": [
                     {
                         "type": "timer",
-                        "timing": 16.1,
+                        "timing": 17.1,
                         "execute": {
                             "use_pre_defined_function": True,
                             "command": (
@@ -585,7 +585,7 @@ class EightRoutersFourHosts(CustomTopo):
                 "failures": [
                     {
                         "type": "timer",
-                        "timing": 14.5,
+                        "timing": 17.1,
                         "execute": {
                             "use_pre_defined_function": True,
                             "command": (

thesis/content/evaluation/minimal_network.tex

@@ -84,6 +84,7 @@ In our further tests we observed that the bandwidth alone does not change heavil
 As can be seen in \cref{fig:evaluation_minimal_bandwidth_sc} and \cref{fig:evaluation_minimal_bandwidth_concurrent_sc}, using ShortCut had no further influence on the achieved throughput. This is to be expected, as longer or shorter paths will only influence throughput if e.g. a link with a lower bandwidth is contained in an additional path.
 
 \subsection{UDP Bandwidth}
+When using UDP for bandwidth measurements
 
 \subsection{Two concurrent data transfers}
 In this test we evaluated the bandwidth between H1 and H4 with a concurrent data transfer on H2 to H1. Both transfers were run with a limitation of \SI{100}{Mbps}, which constitutes the maximum allowed bandwidth in this test. 
@@ -277,14 +278,14 @@ Reconfiguration of routers in Mininet does not reset the \textit{nftables} count
 	\centering
 	\begin{subfigure}[b]{0.49\textwidth}
 		\centering
-		\includegraphics[width=\textwidth]{tests/minimal_packet_flow/before_failure_sc_graph}
+		\includegraphics[width=\textwidth]{tests/minimal_packet_flow/packet_flow_before_sc}
 		\label{fig:evaluation_minimal_packet_flow_sc_a}
 		\caption{TCP Packets on routers before a failure}
 	\end{subfigure}
 	\hfill
 	\begin{subfigure}[b]{0.49\textwidth}
 		\centering
-		\includegraphics[width=\textwidth]{tests/minimal_packet_flow/before_failure_sc_graph}
+		\includegraphics[width=\textwidth]{tests/minimal_packet_flow/packet_flow_after_sc}
 		\label{fig:evaluation_minimal_packet_flow_sc_b}
 		\caption{TCP Packets on routers after a failure}
 	\end{subfigure}
@@ -330,7 +331,7 @@ We repeated the packet flow test in \cref{tcp_packet_flow} using UDP to inspect
   	\label{fig:evaluation_minimal_packet_flow_udp_concurrent_wo_sc}
 \end{figure}
 
-When running the packet flow test measuring UDP packets the amount of packets changed drastically when compared to TCP packets. This is caused by the different window sizes \textit{iperf} uses
+When running the packet flow test measuring UDP packets the amount of packets changed drastically when compared to TCP packets. This is caused by the different window sizes \textit{iperf} uses for TCP and UDP 
 \subsubsection{With FRR and ShortCut}
 \begin{figure}
 	\centering

thesis/settings/packages.tex

@@ -110,11 +110,12 @@
 
 %% Useful package for SI units
 \usepackage[exponent-product = \cdot,
-			output-complex-root = j, 
-			separate-uncertainty = true,
-			output-product = \cdot,
-			arc-separator = \,,
-			product-units = brackets-power]{siunitx}[=v2]
+            output-complex-root = j,
+            separate-uncertainty = true,
+            %output-product =  \cdot,
+            arc-separator = \,
+            %product-units = bracket-power,
+            ]{siunitx}
 \sisetup{detect-all} % detect font faces, sizes etc.
 			
 \iftoggle{lang_eng}