This patch adds alias nperf_cpu_util, which is used in netperf test module for
enabling local/remote/both CPU utilization measure. When the value is different
from these three, no CPU utilization measure will be enabled.
Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com>
---
recipes/regression_tests/phase1/3_vlans.py | 13 +++++++++----
recipes/regression_tests/phase1/3_vlans_over_bond.py | 13 +++++++++----
recipes/regression_tests/phase1/bonding_test.py | 5 +++++
.../phase1/virtual_bridge_2_vlans_over_bond.py | 5 +++++
.../regression_tests/phase1/virtual_bridge_vlan_in_guest.py | 5 +++++
.../regression_tests/phase1/virtual_bridge_vlan_in_host.py | 5 +++++
recipes/regression_tests/phase2/3_vlans_over_team.py | 13 +++++++++----
recipes/regression_tests/phase2/team_test.py | 5 +++++
.../virtual_ovs_bridge_2_vlans_over_active_backup_bond.py | 5 +++++
.../phase2/virtual_ovs_bridge_vlan_in_guest.py | 5 +++++
.../phase2/virtual_ovs_bridge_vlan_in_host.py | 5 +++++
11 files changed, 67 insertions(+), 12 deletions(-)
diff --git a/recipes/regression_tests/phase1/3_vlans.py
b/recipes/regression_tests/phase1/3_vlans.py
index c4d229b..69b958e 100644
--- a/recipes/regression_tests/phase1/3_vlans.py
+++ b/recipes/regression_tests/phase1/3_vlans.py
@@ -37,6 +37,7 @@ 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_cpupin = ctl.get_alias("nperf_cpupin")
+nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
m1_phy1 = m1.get_interface("eth1")
m1_phy1.set_mtu(mtu)
@@ -75,28 +76,32 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"role" : "client",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : nperf_confidence
+ "confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util
})
netperf_cli_udp = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : nperf_confidence
+ "confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : nperf_confidence
+ "confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : nperf_confidence
+ "confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util
})
for vlan1 in vlans:
diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py
b/recipes/regression_tests/phase1/3_vlans_over_bond.py
index e998480..adaf426 100644
--- a/recipes/regression_tests/phase1/3_vlans_over_bond.py
+++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py
@@ -36,6 +36,7 @@ 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_cpupin = ctl.get_alias("nperf_cpupin")
+nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
m1_bond = m1.get_interface("test_bond")
m1_bond.set_mtu(mtu)
@@ -76,28 +77,32 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"role" : "client",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : nperf_confidence
+ "confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util
})
netperf_cli_udp = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : nperf_confidence
+ "confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : nperf_confidence
+ "confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : nperf_confidence
+ "confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util
})
for vlan1 in vlans:
diff --git a/recipes/regression_tests/phase1/bonding_test.py
b/recipes/regression_tests/phase1/bonding_test.py
index 8909ca0..b73f0dc 100644
--- a/recipes/regression_tests/phase1/bonding_test.py
+++ b/recipes/regression_tests/phase1/bonding_test.py
@@ -36,6 +36,7 @@ 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_cpupin = ctl.get_alias("nperf_cpupin")
+nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
test_if1 = m1.get_interface("test_if")
test_if1.set_mtu(mtu)
@@ -82,6 +83,7 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" : p_opts
})
@@ -92,6 +94,7 @@ netperf_cli_udp = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" : p_opts
})
@@ -103,6 +106,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs,
test_if2.get_ip(1))
})
@@ -114,6 +118,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs,
test_if2.get_ip(1))
})
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 8b580a9..4ad0dc9 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
@@ -41,6 +41,7 @@ netperf_duration = int(ctl.get_alias("netperf_duration"))
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")
mtu = ctl.get_alias("mtu")
enable_udp_perf = ctl.get_alias("enable_udp_perf")
@@ -105,6 +106,7 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" : "-i %s -L %s"
%
(nperf_max_runs,
g3_guestnic.get_ip(0))
})
@@ -116,6 +118,7 @@ netperf_cli_udp = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" : "-i %s -L %s"
%
(nperf_max_runs,
g3_guestnic.get_ip(0))
})
@@ -128,6 +131,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs,
g3_guestnic.get_ip(1))
})
@@ -140,6 +144,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs,
g3_guestnic.get_ip(1))
})
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 de46b51..ec2400b 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
@@ -37,6 +37,7 @@ 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_cpupin = ctl.get_alias("nperf_cpupin")
+nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
mtu = ctl.get_alias("mtu")
enable_udp_perf = ctl.get_alias("enable_udp_perf")
@@ -87,6 +88,7 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" : p_opts
})
@@ -97,6 +99,7 @@ netperf_cli_udp = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" : p_opts
})
@@ -108,6 +111,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs,
h2_vlan10.get_ip(1))
})
@@ -120,6 +124,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs,
h2_vlan10.get_ip(1))
})
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 1ea1d46..8b235f8 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
@@ -37,6 +37,7 @@ 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_cpupin = ctl.get_alias("nperf_cpupin")
+nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
mtu = ctl.get_alias("mtu")
enable_udp_perf = ctl.get_alias("enable_udp_perf")
@@ -86,6 +87,7 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" : p_opts
})
@@ -96,6 +98,7 @@ netperf_cli_udp = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" : p_opts
})
@@ -107,6 +110,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs,
h2_vlan10.get_ip(1))
})
@@ -119,6 +123,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs,
h2_vlan10.get_ip(1))
})
diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py
b/recipes/regression_tests/phase2/3_vlans_over_team.py
index de7f955..5855915 100644
--- a/recipes/regression_tests/phase2/3_vlans_over_team.py
+++ b/recipes/regression_tests/phase2/3_vlans_over_team.py
@@ -36,6 +36,7 @@ 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_cpupin = ctl.get_alias("nperf_cpupin")
+nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
m1_team = m1.get_interface("test_if")
m1_team.set_mtu(mtu)
@@ -77,28 +78,32 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"role" : "client",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : nperf_confidence
+ "confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util
})
netperf_cli_udp = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : nperf_confidence
+ "confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : nperf_confidence
+ "confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : nperf_confidence
+ "confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util
})
for vlan1 in vlans:
diff --git a/recipes/regression_tests/phase2/team_test.py
b/recipes/regression_tests/phase2/team_test.py
index 50e8364..4897d8d 100644
--- a/recipes/regression_tests/phase2/team_test.py
+++ b/recipes/regression_tests/phase2/team_test.py
@@ -35,6 +35,7 @@ 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_cpupin = ctl.get_alias("nperf_cpupin")
+nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
test_if1 = m1.get_interface("test_if")
test_if1.set_mtu(mtu)
@@ -82,6 +83,7 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" : p_opts
})
@@ -92,6 +94,7 @@ netperf_cli_udp = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" : p_opts
})
@@ -103,6 +106,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs,
test_if2.get_ip(1))
})
@@ -114,6 +118,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs,
test_if2.get_ip(1))
})
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 6f02921..521b268 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
@@ -41,6 +41,7 @@ netperf_duration = int(ctl.get_alias("netperf_duration"))
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")
h1_nic1 = h1.get_interface("nic1")
h1_nic2 = h1.get_interface("nic2")
@@ -103,6 +104,7 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" : "-i %s -L %s"
%
(nperf_max_runs,
g3_guestnic.get_ip(0))
})
@@ -114,6 +116,7 @@ netperf_cli_udp = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" : "-i %s -L %s"
%
(nperf_max_runs,
g3_guestnic.get_ip(0))
})
@@ -126,6 +129,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs,
g3_guestnic.get_ip(1))
})
@@ -138,6 +142,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs,
g3_guestnic.get_ip(1))
})
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 32c1335..27bc63b 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
@@ -37,6 +37,7 @@ 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_cpupin = ctl.get_alias("nperf_cpupin")
+nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
h2_vlan10 = h2.get_interface("vlan10")
g1_vlan10 = g1.get_interface("vlan10")
@@ -84,6 +85,7 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" : p_opts
})
@@ -94,6 +96,7 @@ netperf_cli_udp = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" : p_opts
})
@@ -105,6 +108,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs,
h2_vlan10.get_ip(1))
})
@@ -117,6 +121,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs,
h2_vlan10.get_ip(1))
})
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 209b85a..3284851 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
@@ -37,6 +37,7 @@ 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_cpupin = ctl.get_alias("nperf_cpupin")
+nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
h2_vlan10 = h2.get_interface("vlan10")
g1_guestnic = g1.get_interface("guestnic")
@@ -83,6 +84,7 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" : p_opts
})
@@ -93,6 +95,7 @@ netperf_cli_udp = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" : p_opts
})
@@ -104,6 +107,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs,
h2_vlan10.get_ip(1))
})
@@ -116,6 +120,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
"confidence" : nperf_confidence,
+ "cpu_util" : nperf_cpu_util,
"netperf_opts" :
"-i %s -L %s -6" % (nperf_max_runs,
h2_vlan10.get_ip(1))
})
--
2.4.3