IperfFlowMeasurement.py: Add mptcp options to iperf

Added code to support setting the `--multipath` flag in iperf3 on both client and server

Note: This requires a special build of iperf:
esnet/iperf#1166

lnst/RecipeCommon/Perf/Measurements/IperfFlowMeasurement.py

@@ -121,6 +121,9 @@ def _prepare_server(self, flow):
 
         self._set_cpupin_params(server_params, flow.cpupin)
 
+        if flow.type == "mptcp_stream":
+            server_params["mptcp"] = True
+
         if flow.receiver_port is not None:
             server_params["port"] = flow.receiver_port
 
@@ -139,6 +142,8 @@ def _prepare_client(self, flow):
             client_params["udp"] = True
         elif flow.type == "sctp_stream":
             client_params["sctp"] = True
+        elif flow.type == "mptcp_stream":
+            client_params["mptcp"] = True
         else:
             raise RecipeError("Unsupported flow type '{}'".format(flow.type))
 

lnst/Tests/Iperf.py

@@ -8,6 +8,8 @@
 from lnst.Tests.BaseTestModule import BaseTestModule, TestModuleError
 
 class IperfBase(BaseTestModule):
+    mptcp = BoolParam(default=False)
+
     def run(self):
         self._res_data = {}
         if not is_installed("iperf3"):
@@ -105,8 +107,10 @@ def _compose_cmd(self):
         if "oneoff" in self.params and self.params.oneoff:
             oneoff = "-1"
 
-        cmd = "iperf3 -s {bind} -J {port} {cpu} {oneoff} {opts}".format(
-                bind=bind, port=port, cpu=cpu, oneoff=oneoff,
+        mptcp = "--multipath" if self.params.mptcp else ""
+
+        cmd = "iperf3 -s {bind} -J {port} {cpu} {oneoff} {mptcp} {opts}".format(
+                bind=bind, port=port, cpu=cpu, oneoff=oneoff, mptcp=mptcp,
                 opts=self.params.opts if "opts" in self.params else "")
 
         return cmd
@@ -166,6 +170,8 @@ def _compose_cmd(self):
             test = "--udp"
         elif self.params.sctp:
             test = "--sctp"
+        elif self.params.mptcp:
+            test = "--multipath"
         else:
             test = ""