This patch adds CPU pinning to IPv6 tests as we do for IPv4 tests.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
recipes/regression_tests/phase1/3_vlans.py | 8 ++++++--
recipes/regression_tests/phase1/3_vlans_over_bond.py | 8 ++++++--
recipes/regression_tests/phase1/bonding_test.py | 12 +++++++-----
recipes/regression_tests/phase1/simple_netperf.py | 10 ++++++----
.../phase1/virtual_bridge_vlan_in_guest.py | 10 ++++++----
.../phase1/virtual_bridge_vlan_in_host.py | 10 ++++++----
recipes/regression_tests/phase2/3_vlans_over_team.py | 8 ++++++--
recipes/regression_tests/phase2/team_test.py | 18 ++++++++++++------
.../phase2/virtual_ovs_bridge_vlan_in_guest.py | 12 +++++++-----
.../phase2/virtual_ovs_bridge_vlan_in_host.py | 10 ++++++----
10 files changed, 68 insertions(+), 38 deletions(-)
diff --git a/recipes/regression_tests/phase1/3_vlans.py
b/recipes/regression_tests/phase1/3_vlans.py
index 65c6d49..78eedcf 100644
--- a/recipes/regression_tests/phase1/3_vlans.py
+++ b/recipes/regression_tests/phase1/3_vlans.py
@@ -81,6 +81,10 @@ p_opts = "-L %s" % (m2_vlan1.get_ip(0))
if nperf_cpupin and nperf_mode != "multi":
p_opts += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
+p_opts6 = "-L %s -6" % (m2_vlan1.get_ip(1))
+if nperf_cpupin and nperf_mode != "multi":
+ p_opts6 += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
+
netperf_srv = ctl.get_module("Netperf",
options={
"role" : "server",
@@ -123,7 +127,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts": "-L %s -6" %
(m2_vlan1.get_ip(1))
+ "netperf_opts": p_opts6
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
@@ -134,7 +138,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts": "-L %s -6" %
(m2_vlan1.get_ip(1))
+ "netperf_opts": p_opts6
})
if nperf_mode == "multi":
diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py
b/recipes/regression_tests/phase1/3_vlans_over_bond.py
index d942e9b..ff83121 100644
--- a/recipes/regression_tests/phase1/3_vlans_over_bond.py
+++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py
@@ -82,6 +82,10 @@ p_opts = "-L %s" % (m2_vlan1.get_ip(0))
if nperf_cpupin and nperf_mode != "multi":
p_opts += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
+p_opts6 = "-L %s -6" % (m2_vlan1.get_ip(1))
+if nperf_cpupin and nperf_mode != "multi":
+ p_opts6 += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
+
netperf_srv = ctl.get_module("Netperf",
options={
"role" : "server",
@@ -124,7 +128,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts": "-L %s -6" %
(m2_vlan1.get_ip(1))
+ "netperf_opts": p_opts6
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
@@ -135,7 +139,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts": "-L %s -6" %
(m2_vlan1.get_ip(1))
+ "netperf_opts": p_opts6
})
if nperf_mode == "multi":
diff --git a/recipes/regression_tests/phase1/bonding_test.py
b/recipes/regression_tests/phase1/bonding_test.py
index c285b7c..e125fb9 100644
--- a/recipes/regression_tests/phase1/bonding_test.py
+++ b/recipes/regression_tests/phase1/bonding_test.py
@@ -91,13 +91,17 @@ netperf_srv6 = ctl.get_module("Netperf",
options={
"role" : "server",
"bind" : test_if1.get_ip(1),
- "netperf_opts" : " -6",
+ "netperf_opts" : " -6"
})
p_opts = "-L %s" % (test_if2.get_ip(0))
if nperf_cpupin and nperf_mode != "multi":
p_opts += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
+p_opts6 = "-L %s -6" % (test_if2.get_ip(1))
+if nperf_cpupin and nperf_mode != "multi":
+ p_opts6 += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
+
netperf_cli_tcp = ctl.get_module("Netperf",
options = {
"role" : "client",
@@ -132,8 +136,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts" :
- "-L %s -6" % (test_if2.get_ip(1))
+ "netperf_opts" : p_opts6
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
@@ -145,8 +148,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts" :
- "-L %s -6" % (test_if2.get_ip(1))
+ "netperf_opts" : p_opts6
})
if nperf_mode == "multi":
diff --git a/recipes/regression_tests/phase1/simple_netperf.py
b/recipes/regression_tests/phase1/simple_netperf.py
index 659befd..6762a60 100644
--- a/recipes/regression_tests/phase1/simple_netperf.py
+++ b/recipes/regression_tests/phase1/simple_netperf.py
@@ -59,6 +59,10 @@ p_opts = "-L %s" % (m2_testiface.get_ip(0))
if nperf_cpupin and nperf_mode != "multi":
p_opts += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
+p_opts6 = "-L %s -6" % (m2_testiface.get_ip(1))
+if nperf_cpupin and nperf_mode != "multi":
+ p_opts6 += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
+
netperf_cli_tcp = ctl.get_module("Netperf",
options={
"role" : "client",
@@ -80,8 +84,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs" : nperf_max_runs,
- "netperf_opts" :
- "-L %s -6" %
(m2_testiface.get_ip(1))
+ "netperf_opts" : p_opts6
})
netperf_cli_udp = ctl.get_module("Netperf",
@@ -105,8 +108,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs" : nperf_max_runs,
- "netperf_opts" :
- "-L %s -6" %
(m2_testiface.get_ip(1))
+ "netperf_opts" : p_opts6
})
netperf_srv = ctl.get_module("Netperf",
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 92422e7..d3e4790 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
@@ -92,6 +92,10 @@ p_opts = "-L %s" % (h2_vlan10.get_ip(0))
if nperf_cpupin and nperf_mode != "multi":
p_opts += " -T%s" % nperf_cpupin
+p_opts6 = "-L %s -6" % (h2_vlan10.get_ip(1))
+if nperf_cpupin and nperf_mode != "multi":
+ p_opts6 += " -T%s" % nperf_cpupin
+
netperf_cli_tcp = ctl.get_module("Netperf",
options={
"role" : "client",
@@ -126,8 +130,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts" :
- "-L %s -6" % (h2_vlan10.get_ip(1))
+ "netperf_opts" : p_opts6
})
netperf_cli_udp6 = ctl.get_module("Netperf",
@@ -140,8 +143,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts" :
- "-L %s -6" % (h2_vlan10.get_ip(1))
+ "netperf_opts" : p_opts6
})
if nperf_mode == "multi":
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 dabc6c9..6070beb 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
@@ -91,6 +91,10 @@ p_opts = "-L %s" % (h2_vlan10.get_ip(0))
if nperf_cpupin and nperf_mode != "multi":
p_opts += " -T%s" % nperf_cpupin
+p_opts6 = "-L %s -6" % (h2_vlan10.get_ip(1))
+if nperf_cpupin and nperf_mode != "multi":
+ p_opts6 += " -T%s" % nperf_cpupin
+
netperf_cli_tcp = ctl.get_module("Netperf",
options={
"role" : "client",
@@ -125,8 +129,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts" :
- "-L %s -6" % (h2_vlan10.get_ip(1))
+ "netperf_opts" : p_opts6
})
netperf_cli_udp6 = ctl.get_module("Netperf",
@@ -139,8 +142,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts" :
- "-L %s -6" % (h2_vlan10.get_ip(1))
+ "netperf_opts" : p_opts6
})
if nperf_mode == "multi":
diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py
b/recipes/regression_tests/phase2/3_vlans_over_team.py
index 60ff335..972f94f 100644
--- a/recipes/regression_tests/phase2/3_vlans_over_team.py
+++ b/recipes/regression_tests/phase2/3_vlans_over_team.py
@@ -82,6 +82,10 @@ p_opts = "-L %s" % (m2_vlan1.get_ip(0))
if nperf_cpupin and nperf_mode != "multi":
p_opts += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
+p_opts6 = "-L %s -6" % (m2_vlan1.get_ip(1))
+if nperf_cpupin and nperf_mode != "multi":
+ p_opts6 += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
+
netperf_srv = ctl.get_module("Netperf",
options={
"role" : "server",
@@ -124,7 +128,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts": "-L %s -6" %
(m2_vlan1.get_ip(1))
+ "netperf_opts": p_opts6
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
@@ -135,7 +139,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts": "-L %s -6" %
(m2_vlan1.get_ip(1))
+ "netperf_opts": p_opts6
})
if nperf_mode == "multi":
diff --git a/recipes/regression_tests/phase2/team_test.py
b/recipes/regression_tests/phase2/team_test.py
index d5d9a30..7cc66dd 100644
--- a/recipes/regression_tests/phase2/team_test.py
+++ b/recipes/regression_tests/phase2/team_test.py
@@ -97,6 +97,10 @@ p_opts = "-L %s" % (test_if2.get_ip(0))
if nperf_cpupin and nperf_mode != "multi":
p_opts += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
+p_opts6 = "-L %s -6" % (test_if2.get_ip(1))
+if nperf_cpupin and nperf_mode != "multi":
+ p_opts6 += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
+
netperf_cli_tcp = ctl.get_module("Netperf",
options = {
"role" : "client",
@@ -131,8 +135,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts" :
- "-L %s -6" % (test_if2.get_ip(1))
+ "netperf_opts" : p_opts6
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
@@ -144,8 +147,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts" :
- "-L %s -6" % (test_if2.get_ip(1))
+ "netperf_opts" : p_opts6
})
if nperf_mode == "multi":
@@ -300,6 +302,10 @@ p_opts = "-L %s" % (test_if1.get_ip(0))
if nperf_cpupin and nperf_mode != "multi":
p_opts += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
+p_opts6 = "-L %s -6" % (test_if1.get_ip(1))
+if nperf_cpupin and nperf_mode != "multi":
+ p_opts6 += " -T%s,%s" % (nperf_cpupin, nperf_cpupin)
+
netperf_cli_tcp.update_options({"netperf_server" : test_if2.get_ip(0),
"netperf_opts" : p_opts})
@@ -307,10 +313,10 @@ netperf_cli_udp.update_options({"netperf_server" :
test_if2.get_ip(0),
"netperf_opts" : p_opts})
netperf_cli_tcp6.update_options({"netperf_server" : test_if2.get_ip(1),
- "netperf_opts" : "-L %s -6" %
(test_if1.get_ip(1))})
+ "netperf_opts" : p_opts6 })
netperf_cli_udp6.update_options({"netperf_server" : test_if2.get_ip(1),
- "netperf_opts" : "-L %s -6" %
(test_if1.get_ip(1))})
+ "netperf_opts" : p_opts6 })
for setting in offload_settings:
dev_features = ""
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 3c0faf9..1e1020e 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
@@ -89,6 +89,10 @@ p_opts = "-L %s" % (h2_vlan10.get_ip(0))
if nperf_cpupin and nperf_mode != "multi":
p_opts += " -T%s" % nperf_cpupin
+p_opts6 = "-L %s -6" % (h2_vlan10.get_ip(1))
+if nperf_cpupin and nperf_mode != "multi":
+ p_opts6 += " -T%s" % nperf_cpupin
+
netperf_cli_tcp = ctl.get_module("Netperf",
options={
"role" : "client",
@@ -123,8 +127,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts" :
- "-L %s -6" % (h2_vlan10.get_ip(1))
+ "netperf_opts" : p_opts6
})
netperf_cli_udp6 = ctl.get_module("Netperf",
@@ -137,9 +140,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts" :
- "-L %s -6" % (h2_vlan10.get_ip(1))
- })
+ "netperf_opts" : p_opts6
+ })
if nperf_mode == "multi":
netperf_cli_tcp.unset_option("confidence")
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 9a4d18c..92549e2 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
@@ -88,6 +88,10 @@ p_opts = "-L %s" % (h2_vlan10.get_ip(0))
if nperf_cpupin and nperf_mode != "multi":
p_opts += " -T%s" % nperf_cpupin
+p_opts6 = "-L %s -6" % (h2_vlan10.get_ip(1))
+if nperf_cpupin and nperf_mode != "multi":
+ p_opts6 += " -T%s" % nperf_cpupin
+
netperf_cli_tcp = ctl.get_module("Netperf",
options={
"role" : "client",
@@ -122,8 +126,7 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts" :
- "-L %s -6" % (h2_vlan10.get_ip(1))
+ "netperf_opts" : p_opts6
})
netperf_cli_udp6 = ctl.get_module("Netperf",
@@ -136,8 +139,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
"confidence" : nperf_confidence,
"cpu_util" : nperf_cpu_util,
"runs": nperf_max_runs,
- "netperf_opts" :
- "-L %s -6" % (h2_vlan10.get_ip(1))
+ "netperf_opts" : p_opts6
})
if nperf_mode == "multi":
--
2.4.3