[PATCH 2/2] regression_tests: add netperf multithreading support

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

This patch extends the ENRT tests to allow for the use of the new
Netperf multithreading support. To do this I added two new aliases:
nperf_mode = default|multi
nperf_num_parallel = 2 (default value)

The nperf_mode alias chooses if Netperf is supposed to run in
multithreading mode or in single thread mode. Multithreading is only
enabled if the value "multi" is supplied, otherwise the default mode is
used. Enabling multithreading will automatically disable any Netperf
confidence settings supplied as these don't make sense when running
multiple netperf clients.

the nperf_num_parallel parameter changes how many Netperf clients should
be run in parallel.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 recipes/regression_tests/phase1/3_vlans.py                 | 13 +++++++++++++
 recipes/regression_tests/phase1/3_vlans.xml                |  2 ++
 .../phase1/3_vlans_over_active_backup_bond.xml             |  2 ++
 recipes/regression_tests/phase1/3_vlans_over_bond.py       | 13 +++++++++++++
 .../phase1/3_vlans_over_round_robin_bond.xml               |  2 ++
 recipes/regression_tests/phase1/active_backup_bond.xml     |  2 ++
 .../regression_tests/phase1/active_backup_double_bond.xml  |  2 ++
 recipes/regression_tests/phase1/bonding_test.py            | 13 +++++++++++++
 recipes/regression_tests/phase1/round_robin_bond.xml       |  2 ++
 .../regression_tests/phase1/round_robin_double_bond.xml    |  2 ++
 .../virtual_bridge_2_vlans_over_active_backup_bond.xml     |  2 ++
 .../phase1/virtual_bridge_2_vlans_over_bond.py             | 13 +++++++++++++
 .../phase1/virtual_bridge_vlan_in_guest.py                 | 13 +++++++++++++
 .../phase1/virtual_bridge_vlan_in_guest.xml                |  2 ++
 .../regression_tests/phase1/virtual_bridge_vlan_in_host.py | 13 +++++++++++++
 .../phase1/virtual_bridge_vlan_in_host.xml                 |  2 ++
 .../phase2/3_vlans_over_active_backup_team.xml             |  2 ++
 .../phase2/3_vlans_over_round_robin_team.xml               |  2 ++
 recipes/regression_tests/phase2/3_vlans_over_team.py       | 13 +++++++++++++
 .../regression_tests/phase2/active_backup_double_team.xml  |  2 ++
 recipes/regression_tests/phase2/active_backup_team.xml     |  2 ++
 .../phase2/active_backup_team_vs_active_backup_bond.xml    |  2 ++
 .../phase2/active_backup_team_vs_round_robin_bond.xml      |  2 ++
 .../regression_tests/phase2/round_robin_double_team.xml    |  2 ++
 recipes/regression_tests/phase2/round_robin_team.xml       |  2 ++
 .../phase2/round_robin_team_vs_active_backup_bond.xml      |  2 ++
 .../phase2/round_robin_team_vs_round_robin_bond.xml        |  2 ++
 recipes/regression_tests/phase2/team_test.py               | 13 +++++++++++++
 .../virtual_ovs_bridge_2_vlans_over_active_backup_bond.py  | 13 +++++++++++++
 .../virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml |  2 ++
 .../phase2/virtual_ovs_bridge_vlan_in_guest.py             | 13 +++++++++++++
 .../phase2/virtual_ovs_bridge_vlan_in_guest.xml            |  2 ++
 .../phase2/virtual_ovs_bridge_vlan_in_host.py              | 14 ++++++++++++++
 .../phase2/virtual_ovs_bridge_vlan_in_host.xml             |  2 ++
 34 files changed, 190 insertions(+)

diff --git a/recipes/regression_tests/phase1/3_vlans.py
b/recipes/regression_tests/phase1/3_vlans.py
index 19c897e..163daa9 100644
--- a/recipes/regression_tests/phase1/3_vlans.py
+++ b/recipes/regression_tests/phase1/3_vlans.py
@@ -38,6 +38,8 @@ nperf_confidence = ctl.get_alias("nperf_confidence")
 nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
 nperf_cpupin = ctl.get_alias("nperf_cpupin")
 nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
+nperf_mode = ctl.get_alias("nperf_mode")
+nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
 
 m1_phy1 = m1.get_interface("eth1")
 m1_phy1.set_mtu(mtu)
@@ -108,6 +110,17 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
                                       "runs": nperf_max_runs
                                   })
 
+if nperf_mode == "multi":
+    netperf_cli_tcp.unset_option("confidence")
+    netperf_cli_udp.unset_option("confidence")
+    netperf_cli_tcp6.unset_option("confidence")
+    netperf_cli_udp6.unset_option("confidence")
+
+    netperf_cli_tcp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_tcp6.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel})
+
 for vlan1 in vlans:
     m1_vlan1 = m1.get_interface(vlan1)
     for vlan2 in vlans:
diff --git a/recipes/regression_tests/phase1/3_vlans.xml
b/recipes/regression_tests/phase1/3_vlans.xml
index 318508d..064475e 100644
--- a/recipes/regression_tests/phase1/3_vlans.xml
+++ b/recipes/regression_tests/phase1/3_vlans.xml
@@ -6,6 +6,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5"/>
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file" value="3_vlans.mapping" />
         <alias name="vlan10_net" value="192.168.10"/>
         <alias name="vlan10_tag" value="10"/>
diff --git a/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml
b/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml
index 36a3659..ca63ddb 100644
--- a/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml
+++ b/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml
@@ -6,6 +6,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5"/>
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="3_vlans_over_active_backup_bond.mapping" />
         <alias name="vlan10_net" value="192.168.10"/>
         <alias name="vlan10_tag" value="10"/>
diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py
b/recipes/regression_tests/phase1/3_vlans_over_bond.py
index 06c6b98..2c4131b 100644
--- a/recipes/regression_tests/phase1/3_vlans_over_bond.py
+++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py
@@ -37,6 +37,8 @@ nperf_confidence = ctl.get_alias("nperf_confidence")
 nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
 nperf_cpupin = ctl.get_alias("nperf_cpupin")
 nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
+nperf_mode = ctl.get_alias("nperf_mode")
+nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
 
 m1_bond = m1.get_interface("test_bond")
 m1_bond.set_mtu(mtu)
@@ -109,6 +111,17 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
                                       "runs": nperf_max_runs
                                   })
 
+if nperf_mode == "multi":
+    netperf_cli_tcp.unset_option("confidence")
+    netperf_cli_udp.unset_option("confidence")
+    netperf_cli_tcp6.unset_option("confidence")
+    netperf_cli_udp6.unset_option("confidence")
+
+    netperf_cli_tcp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_tcp6.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel})
+
 for vlan1 in vlans:
     m1_vlan1 = m1.get_interface(vlan1)
     for vlan2 in vlans:
diff --git a/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml
b/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml
index 35786fb..1f77a46 100644
--- a/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml
+++ b/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml
@@ -6,6 +6,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5"/>
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="3_vlans_over_round_robin_bond.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase1/active_backup_bond.xml
b/recipes/regression_tests/phase1/active_backup_bond.xml
index 26e338d..6eb686f 100644
--- a/recipes/regression_tests/phase1/active_backup_bond.xml
+++ b/recipes/regression_tests/phase1/active_backup_bond.xml
@@ -6,6 +6,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5"/>
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="active_backup_bond.mapping" />
         <alias name="net" value="192.168.0"/>
     </define>
diff --git a/recipes/regression_tests/phase1/active_backup_double_bond.xml
b/recipes/regression_tests/phase1/active_backup_double_bond.xml
index 044510a..3fba12e 100644
--- a/recipes/regression_tests/phase1/active_backup_double_bond.xml
+++ b/recipes/regression_tests/phase1/active_backup_double_bond.xml
@@ -6,6 +6,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5"/>
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="active_backup_double_bond.mapping" />
         <alias name="net" value="192.168.0"/>
     </define>
diff --git a/recipes/regression_tests/phase1/bonding_test.py
b/recipes/regression_tests/phase1/bonding_test.py
index 70827a2..2ee8ee5 100644
--- a/recipes/regression_tests/phase1/bonding_test.py
+++ b/recipes/regression_tests/phase1/bonding_test.py
@@ -37,6 +37,8 @@ nperf_confidence = ctl.get_alias("nperf_confidence")
 nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
 nperf_cpupin = ctl.get_alias("nperf_cpupin")
 nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
+nperf_mode = ctl.get_alias("nperf_mode")
+nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
 
 test_if1 = m1.get_interface("test_if")
 test_if1.set_mtu(mtu)
@@ -127,6 +129,17 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
                                           "-L %s -6" % (test_if2.get_ip(1))
                                   })
 
+if nperf_mode == "multi":
+    netperf_cli_tcp.unset_option("confidence")
+    netperf_cli_udp.unset_option("confidence")
+    netperf_cli_tcp6.unset_option("confidence")
+    netperf_cli_udp6.unset_option("confidence")
+
+    netperf_cli_tcp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_tcp6.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel})
+
 ctl.wait(15)
 
 for setting in offload_settings:
diff --git a/recipes/regression_tests/phase1/round_robin_bond.xml
b/recipes/regression_tests/phase1/round_robin_bond.xml
index 9c2b716..861e47c 100644
--- a/recipes/regression_tests/phase1/round_robin_bond.xml
+++ b/recipes/regression_tests/phase1/round_robin_bond.xml
@@ -6,6 +6,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5"/>
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="round_robin_bond.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase1/round_robin_double_bond.xml
b/recipes/regression_tests/phase1/round_robin_double_bond.xml
index 896404c..0083b4b 100644
--- a/recipes/regression_tests/phase1/round_robin_double_bond.xml
+++ b/recipes/regression_tests/phase1/round_robin_double_bond.xml
@@ -6,6 +6,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5"/>
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="round_robin_double_bond.mapping" />
     </define>
     <network>
diff --git
a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml
b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml
index e4c648e..7af6b2b 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml
+++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml
@@ -5,6 +5,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5"/>
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mtu" value="1500" />
         <alias name="mapping_file"
value="virtual_bridge_2_vlans_over_active_backup_bond.mapping" />
         <alias name="vlan10_net" value="192.168.10"/>
diff --git a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
index e241f1a..dd427e0 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py
@@ -42,6 +42,8 @@ nperf_reserve = int(ctl.get_alias("nperf_reserve"))
 nperf_confidence = ctl.get_alias("nperf_confidence")
 nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
 nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
+nperf_mode = ctl.get_alias("nperf_mode")
+nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
 
 mtu = ctl.get_alias("mtu")
 enable_udp_perf = ctl.get_alias("enable_udp_perf")
@@ -153,6 +155,17 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
                                           "-L %s -6" % (g3_guestnic.get_ip(1))
                                   })
 
+if nperf_mode == "multi":
+    netperf_cli_tcp.unset_option("confidence")
+    netperf_cli_udp.unset_option("confidence")
+    netperf_cli_tcp6.unset_option("confidence")
+    netperf_cli_udp6.unset_option("confidence")
+
+    netperf_cli_tcp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_tcp6.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel})
+
 ping_mod_bad = ctl.get_module("IcmpPing",
                                options={
                                    "addr" : g4_guestnic.get_ip(0),
diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
index 1830051..1f7595b 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
@@ -38,6 +38,8 @@ nperf_confidence = ctl.get_alias("nperf_confidence")
 nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
 nperf_cpupin = ctl.get_alias("nperf_cpupin")
 nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
+nperf_mode = ctl.get_alias("nperf_mode")
+nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
 
 mtu = ctl.get_alias("mtu")
 enable_udp_perf = ctl.get_alias("enable_udp_perf")
@@ -133,6 +135,17 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
                                           "-L %s -6" % (h2_vlan10.get_ip(1))
                                   })
 
+if nperf_mode == "multi":
+    netperf_cli_tcp.unset_option("confidence")
+    netperf_cli_udp.unset_option("confidence")
+    netperf_cli_tcp6.unset_option("confidence")
+    netperf_cli_udp6.unset_option("confidence")
+
+    netperf_cli_tcp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_tcp6.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel})
+
 # configure mtu
 h1.get_interface("nic").set_mtu(mtu)
 h1.get_interface("tap").set_mtu(mtu)
diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml
b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml
index b8ec826..f710d0a 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml
@@ -5,6 +5,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5"/>
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mtu" value="1500" />
         <alias name="mapping_file"
value="virtual_bridge_vlan_in_guest.mapping" />
         <alias name="vlan10_net" value="192.168.10"/>
diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
index 8337687..e192bba 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
@@ -38,6 +38,8 @@ nperf_confidence = ctl.get_alias("nperf_confidence")
 nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
 nperf_cpupin = ctl.get_alias("nperf_cpupin")
 nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
+nperf_mode = ctl.get_alias("nperf_mode")
+nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
 
 mtu = ctl.get_alias("mtu")
 enable_udp_perf = ctl.get_alias("enable_udp_perf")
@@ -132,6 +134,17 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
                                           "-L %s -6" % (h2_vlan10.get_ip(1))
                                   })
 
+if nperf_mode == "multi":
+    netperf_cli_tcp.unset_option("confidence")
+    netperf_cli_udp.unset_option("confidence")
+    netperf_cli_tcp6.unset_option("confidence")
+    netperf_cli_udp6.unset_option("confidence")
+
+    netperf_cli_tcp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_tcp6.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel})
+
 # configure mtu
 h1.get_interface("nic").set_mtu(mtu)
 h1.get_interface("tap").set_mtu(mtu)
diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml
b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml
index 9c867a9..5d403b2 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml
@@ -5,6 +5,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5"/>
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mtu" value="1500" />
         <alias name="mapping_file"
value="virtual_bridge_vlan_in_host.mapping" />
         <alias name="vlan10_net" value="192.168.10"/>
diff --git a/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml
b/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml
index 1eb5a3a..9adac61 100644
--- a/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml
+++ b/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml
@@ -6,6 +6,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5" />
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="3_vlans_over_active_backup_team.mapping" />
         <alias name="vlan10_net" value="192.168.10"/>
         <alias name="vlan10_tag" value="10"/>
diff --git a/recipes/regression_tests/phase2/3_vlans_over_round_robin_team.xml
b/recipes/regression_tests/phase2/3_vlans_over_round_robin_team.xml
index 7bbf9a2..1a374bd 100644
--- a/recipes/regression_tests/phase2/3_vlans_over_round_robin_team.xml
+++ b/recipes/regression_tests/phase2/3_vlans_over_round_robin_team.xml
@@ -6,6 +6,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5" />
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="3_vlans_over_round_robin_team.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py
b/recipes/regression_tests/phase2/3_vlans_over_team.py
index 25f42d1..7f5cf8f 100644
--- a/recipes/regression_tests/phase2/3_vlans_over_team.py
+++ b/recipes/regression_tests/phase2/3_vlans_over_team.py
@@ -37,6 +37,8 @@ nperf_confidence = ctl.get_alias("nperf_confidence")
 nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
 nperf_cpupin = ctl.get_alias("nperf_cpupin")
 nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
+nperf_mode = ctl.get_alias("nperf_mode")
+nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
 
 m1_team = m1.get_interface("test_if")
 m1_team.set_mtu(mtu)
@@ -110,6 +112,17 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
                                       "runs": nperf_max_runs
                                   })
 
+if nperf_mode == "multi":
+    netperf_cli_tcp.unset_option("confidence")
+    netperf_cli_udp.unset_option("confidence")
+    netperf_cli_tcp6.unset_option("confidence")
+    netperf_cli_udp6.unset_option("confidence")
+
+    netperf_cli_tcp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_tcp6.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel})
+
 for vlan1 in vlans:
     m1_vlan1 = m1.get_interface(vlan1)
     for vlan2 in vlans:
diff --git a/recipes/regression_tests/phase2/active_backup_double_team.xml
b/recipes/regression_tests/phase2/active_backup_double_team.xml
index 8c2d5b7..22a2795 100644
--- a/recipes/regression_tests/phase2/active_backup_double_team.xml
+++ b/recipes/regression_tests/phase2/active_backup_double_team.xml
@@ -6,6 +6,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5" />
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="active_backup_double_team.mapping" />
         <alias name="net" value="192.168.0"/>
     </define>
diff --git a/recipes/regression_tests/phase2/active_backup_team.xml
b/recipes/regression_tests/phase2/active_backup_team.xml
index 4e7d419..dacf0c7 100644
--- a/recipes/regression_tests/phase2/active_backup_team.xml
+++ b/recipes/regression_tests/phase2/active_backup_team.xml
@@ -6,6 +6,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5" />
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="active_backup_team.mapping" />
         <alias name="net" value="192.168.0"/>
     </define>
diff --git a/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml
b/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml
index e421d2c..6ddb930 100644
--- a/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml
+++ b/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml
@@ -6,6 +6,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5" />
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="active_backup_team_vs_active_backup_bond.mapping" />
         <alias name="net" value="192.168.0"/>
     </define>
diff --git a/recipes/regression_tests/phase2/active_backup_team_vs_round_robin_bond.xml
b/recipes/regression_tests/phase2/active_backup_team_vs_round_robin_bond.xml
index 08a2d1e..3d40c72 100644
--- a/recipes/regression_tests/phase2/active_backup_team_vs_round_robin_bond.xml
+++ b/recipes/regression_tests/phase2/active_backup_team_vs_round_robin_bond.xml
@@ -6,6 +6,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5" />
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="active_backup_team_vs_round_robin_bond.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase2/round_robin_double_team.xml
b/recipes/regression_tests/phase2/round_robin_double_team.xml
index 0d6cb6f..4acc6c6 100644
--- a/recipes/regression_tests/phase2/round_robin_double_team.xml
+++ b/recipes/regression_tests/phase2/round_robin_double_team.xml
@@ -6,6 +6,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5" />
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="round_robin_double_team.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase2/round_robin_team.xml
b/recipes/regression_tests/phase2/round_robin_team.xml
index 4d6a3c7..95ecac2 100644
--- a/recipes/regression_tests/phase2/round_robin_team.xml
+++ b/recipes/regression_tests/phase2/round_robin_team.xml
@@ -6,6 +6,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5" />
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="round_robin_team.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase2/round_robin_team_vs_active_backup_bond.xml
b/recipes/regression_tests/phase2/round_robin_team_vs_active_backup_bond.xml
index 6b5f065..99f1767 100644
--- a/recipes/regression_tests/phase2/round_robin_team_vs_active_backup_bond.xml
+++ b/recipes/regression_tests/phase2/round_robin_team_vs_active_backup_bond.xml
@@ -6,6 +6,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5" />
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="round_robin_team_vs_active_backup_bond.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase2/round_robin_team_vs_round_robin_bond.xml
b/recipes/regression_tests/phase2/round_robin_team_vs_round_robin_bond.xml
index aeb6e7e..e03c64d 100644
--- a/recipes/regression_tests/phase2/round_robin_team_vs_round_robin_bond.xml
+++ b/recipes/regression_tests/phase2/round_robin_team_vs_round_robin_bond.xml
@@ -6,6 +6,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5" />
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="round_robin_team_vs_round_robin_bond.mapping" />
     </define>
     <network>
diff --git a/recipes/regression_tests/phase2/team_test.py
b/recipes/regression_tests/phase2/team_test.py
index e670d2c..5fa9b4e 100644
--- a/recipes/regression_tests/phase2/team_test.py
+++ b/recipes/regression_tests/phase2/team_test.py
@@ -36,6 +36,8 @@ nperf_confidence = ctl.get_alias("nperf_confidence")
 nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
 nperf_cpupin = ctl.get_alias("nperf_cpupin")
 nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
+nperf_mode = ctl.get_alias("nperf_mode")
+nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
 
 test_if1 = m1.get_interface("test_if")
 test_if1.set_mtu(mtu)
@@ -127,6 +129,17 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
                                           "-L %s -6" % (test_if2.get_ip(1))
                                   })
 
+if nperf_mode == "multi":
+    netperf_cli_tcp.unset_option("confidence")
+    netperf_cli_udp.unset_option("confidence")
+    netperf_cli_tcp6.unset_option("confidence")
+    netperf_cli_udp6.unset_option("confidence")
+
+    netperf_cli_tcp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_tcp6.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel})
+
 ctl.wait(15)
 
 for setting in offload_settings:
diff --git
a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py
b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py
index 742bc1a..5c16355 100644
---
a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py
+++
b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py
@@ -42,6 +42,8 @@ nperf_reserve = int(ctl.get_alias("nperf_reserve"))
 nperf_confidence = ctl.get_alias("nperf_confidence")
 nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
 nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
+nperf_mode = ctl.get_alias("nperf_mode")
+nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
 
 h1_nic1 = h1.get_interface("nic1")
 h1_nic2 = h1.get_interface("nic2")
@@ -151,6 +153,17 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
                                           "-L %s -6" % (g3_guestnic.get_ip(1))
                                   })
 
+if nperf_mode == "multi":
+    netperf_cli_tcp.unset_option("confidence")
+    netperf_cli_udp.unset_option("confidence")
+    netperf_cli_tcp6.unset_option("confidence")
+    netperf_cli_udp6.unset_option("confidence")
+
+    netperf_cli_tcp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_tcp6.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel})
+
 ping_mod_bad = ctl.get_module("IcmpPing",
                                options={
                                    "addr" : g4_guestnic.get_ip(0),
diff --git
a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml
b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml
index 0d5fcf1..58f0a9f 100644
---
a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml
+++
b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml
@@ -5,6 +5,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5" />
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="virtual_ovs_bridge_2_vlans_over_active_backup_bond.mapping" />
         <alias name="vlan10_net" value="192.168.10"/>
         <alias name="vlan10_tag" value="10"/>
diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py
b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py
index bf67b77..a94b70c 100644
--- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py
+++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py
@@ -38,6 +38,8 @@ nperf_confidence = ctl.get_alias("nperf_confidence")
 nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
 nperf_cpupin = ctl.get_alias("nperf_cpupin")
 nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
+nperf_mode = ctl.get_alias("nperf_mode")
+nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
 
 h2_vlan10 = h2.get_interface("vlan10")
 g1_vlan10 = g1.get_interface("vlan10")
@@ -130,6 +132,17 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
                                           "-L %s -6" % (h2_vlan10.get_ip(1))
                               })
 
+if nperf_mode == "multi":
+    netperf_cli_tcp.unset_option("confidence")
+    netperf_cli_udp.unset_option("confidence")
+    netperf_cli_tcp6.unset_option("confidence")
+    netperf_cli_udp6.unset_option("confidence")
+
+    netperf_cli_tcp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_tcp6.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel})
+
 ctl.wait(15)
 
 for setting in offload_settings:
diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml
b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml
index 890e808..30bac5f 100644
--- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml
+++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml
@@ -5,6 +5,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5" />
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="virtual_ovs_bridge_vlan_in_guest.mapping" />
         <alias name="vlan10_net" value="192.168.10"/>
         <alias name="vlan10_tag" value="10"/>
diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py
b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py
index 1050871..9697f28 100644
--- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py
+++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py
@@ -38,6 +38,8 @@ nperf_confidence = ctl.get_alias("nperf_confidence")
 nperf_max_runs = int(ctl.get_alias("nperf_max_runs"))
 nperf_cpupin = ctl.get_alias("nperf_cpupin")
 nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
+nperf_mode = ctl.get_alias("nperf_mode")
+nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
 
 h2_vlan10 = h2.get_interface("vlan10")
 g1_guestnic = g1.get_interface("guestnic")
@@ -128,6 +130,18 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
                                       "netperf_opts" :
                                           "-L %s -6" % (h2_vlan10.get_ip(1))
                                   })
+
+if nperf_mode == "multi":
+    netperf_cli_tcp.unset_option("confidence")
+    netperf_cli_udp.unset_option("confidence")
+    netperf_cli_tcp6.unset_option("confidence")
+    netperf_cli_udp6.unset_option("confidence")
+
+    netperf_cli_tcp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_tcp6.update_options({"num_parallel": nperf_num_parallel})
+    netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel})
+
 ctl.wait(15)
 
 for setting in offload_settings:
diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml
b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml
index f6c5b28..02f5c6d 100644
--- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml
+++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml
@@ -5,6 +5,8 @@
         <alias name="nperf_reserve" value="20" />
         <alias name="nperf_confidence" value="99,5" />
         <alias name="nperf_max_runs" value="5" />
+        <alias name="nperf_mode" value="default"/>
+        <alias name="nperf_num_parallel" value="2"/>
         <alias name="mapping_file"
value="virtual_ovs_bridge_vlan_in_host.mapping" />
         <alias name="vlan10_net" value="192.168.10"/>
         <alias name="vlan10_tag" value="10"/>
-- 
2.6.2