Add option to redirect guest serial console output to file

tests/framework/utils_iperf.py

@@ -65,12 +65,12 @@ def run_test(self, first_free_cpu):
 
             clients = []
             for client_idx in range(self._num_clients):
-                client_mode = self.client_mode(client_idx)
-                client_mode_flag = self.client_mode_to_iperf3_flag(client_mode)
                 client_future = executor.submit(
-                    self.spawn_iperf3_client, client_idx, client_mode_flag
+                    self.spawn_iperf3_client,
+                    client_idx,
+                    self.client_mode_to_iperf3_flag,
                 )
-                clients.append((client_mode, client_future))
+                clients.append((self._mode, client_future))
 
             data = {"cpu_load_raw": cpu_load_future.result(), "g2h": [], "h2g": []}
 
@@ -79,31 +79,12 @@ def run_test(self, first_free_cpu):
 
             return data
 
-    def client_mode(self, client_idx):
-        """Converts client index into client mode"""
-        match self._mode:
-            case "g2h":
-                client_mode = "g2h"
-            case "h2g":
-                client_mode = "h2g"
-            case "bd":
-                # in bidirectional mode we alternate
-                # modes
-                if client_idx % 2 == 0:
-                    client_mode = "g2h"
-                else:
-                    client_mode = "h2g"
-        return client_mode
-
-    @staticmethod
-    def client_mode_to_iperf3_flag(client_mode):
+    @property
+    def client_mode_to_iperf3_flag(self):
         """Converts client mode into iperf3 mode flag"""
-        match client_mode:
-            case "g2h":
-                client_mode_flag = ""
-            case "h2g":
-                client_mode_flag = "-R"
-        return client_mode_flag
+        if self._mode == "h2g":
+            return "-R"
+        return ""
 
     def spawn_iperf3_client(self, client_idx, client_mode_flag):
         """

tests/integration_tests/performance/test_network.py

@@ -91,7 +91,7 @@ def test_network_latency(network_microvm, metrics):
 @pytest.mark.timeout(120)
 @pytest.mark.parametrize("network_microvm", [1, 2], indirect=True)
 @pytest.mark.parametrize("payload_length", ["128K", "1024K"], ids=["p128K", "p1024K"])
-@pytest.mark.parametrize("mode", ["g2h", "h2g", "bd"])
+@pytest.mark.parametrize("mode", ["g2h", "h2g"])
 def test_network_tcp_throughput(
     network_microvm,
     payload_length,
@@ -109,12 +109,6 @@ def test_network_tcp_throughput(
     # Time (in seconds) for which iperf runs after warmup is done
     runtime_sec = 20
 
-    # We run bi-directional tests only on uVM with more than 2 vCPus
-    # because we need to pin one iperf3/direction per vCPU, and since we
-    # have two directions, we need at least two vCPUs.
-    if mode == "bd" and network_microvm.vcpus_count < 2:
-        pytest.skip("bidrectional test only done with at least 2 vcpus")
-
     metrics.set_dimensions(
         {
             "performance_test": "test_network_tcp_throughput",

tests/integration_tests/performance/test_vsock.py

@@ -73,7 +73,7 @@ def guest_command(self, port_offset):
 @pytest.mark.nonci
 @pytest.mark.parametrize("vcpus", [1, 2], ids=["1vcpu", "2vcpu"])
 @pytest.mark.parametrize("payload_length", ["64K", "1024K"], ids=["p64K", "p1024K"])
-@pytest.mark.parametrize("mode", ["g2h", "h2g", "bd"])
+@pytest.mark.parametrize("mode", ["g2h", "h2g"])
 def test_vsock_throughput(
     uvm_plain_acpi,
     vcpus,
@@ -85,11 +85,6 @@ def test_vsock_throughput(
     """
     Test vsock throughput for multiple vm configurations.
     """
-    # We run bi-directional tests only on uVM with more than 2 vCPus
-    # because we need to pin one iperf3/direction per vCPU, and since we
-    # have two directions, we need at least two vCPUs.
-    if mode == "bd" and vcpus < 2:
-        pytest.skip("bidrectional test only done with at least 2 vcpus")
 
     mem_size_mib = 1024
     vm = uvm_plain_acpi