8:31 p.m.
The phase1 and phase2 regression tests now take an optional alias
nperf_confidence with default value 99,5.
This patch also enhances how the timeout for netperf test is calculated.
The value is now (netperf_duration + nperf_reserve)*nperf_max_runs. The
value of nperf_max_runs is taken from nperf_confidence alias.
v3 changes:
- added alias definition in almost all recipe xmls
- team_test.py: added netperf confidence level stuff into the reversed test
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
recipes/regression_tests/phase1/3_vlans.py | 26 ++++++++-------
recipes/regression_tests/phase1/3_vlans.xml | 1 +
.../phase1/3_vlans_over_active_backup_bond.xml | 1 +
.../regression_tests/phase1/3_vlans_over_bond.py | 26 ++++++++-------
.../phase1/3_vlans_over_round_robin_bond.xml | 1 +
.../regression_tests/phase1/active_backup_bond.xml | 1 +
.../phase1/active_backup_double_bond.xml | 1 +
recipes/regression_tests/phase1/bonding_test.py | 26 ++++++++-------
.../regression_tests/phase1/round_robin_bond.xml | 1 +
.../phase1/round_robin_double_bond.xml | 1 +
...tual_bridge_2_vlans_over_active_backup_bond.xml | 1 +
.../phase1/virtual_bridge_2_vlans_over_bond.py | 30 +++++++++--------
.../phase1/virtual_bridge_vlan_in_guest.py | 30 +++++++++--------
.../phase1/virtual_bridge_vlan_in_guest.xml | 1 +
.../phase1/virtual_bridge_vlan_in_host.py | 31 ++++++++++--------
.../phase1/virtual_bridge_vlan_in_host.xml | 1 +
.../phase2/3_vlans_over_active_backup_team.xml | 1 +
.../phase2/3_vlans_over_round_robin_team.xml | 1 +
.../regression_tests/phase2/3_vlans_over_team.py | 27 +++++++--------
.../phase2/active_backup_double_team.xml | 1 +
.../regression_tests/phase2/active_backup_team.xml | 1 +
.../active_backup_team_vs_active_backup_bond.xml | 1 +
.../active_backup_team_vs_round_robin_bond.xml | 1 +
.../phase2/round_robin_double_team.xml | 1 +
.../regression_tests/phase2/round_robin_team.xml | 1 +
.../round_robin_team_vs_active_backup_bond.xml | 1 +
.../round_robin_team_vs_round_robin_bond.xml | 1 +
recipes/regression_tests/phase2/team_test.py | 38 ++++++++++++----------
...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 30 +++++++++--------
..._ovs_bridge_2_vlans_over_active_backup_bond.xml | 1 +
.../phase2/virtual_ovs_bridge_vlan_in_guest.py | 30 +++++++++--------
.../phase2/virtual_ovs_bridge_vlan_in_guest.xml | 1 +
.../phase2/virtual_ovs_bridge_vlan_in_host.py | 30 +++++++++--------
.../phase2/virtual_ovs_bridge_vlan_in_host.xml | 1 +
34 files changed, 196 insertions(+), 151 deletions(-)
diff --git a/recipes/regression_tests/phase1/3_vlans.py
b/recipes/regression_tests/phase1/3_vlans.py
index 2be04e7..6e04f67 100644
--- a/recipes/regression_tests/phase1/3_vlans.py
+++ b/recipes/regression_tests/phase1/3_vlans.py
@@ -43,6 +43,8 @@ ipv = ctl.get_alias("ipv")
mtu = ctl.get_alias("mtu")
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(nperf_confidence.split(",")[1])
m1_phy1 = m1.get_interface("eth1")
m1_phy1.set_mtu(mtu)
@@ -81,28 +83,28 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"role" : "client",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5"
+ "confidence" : nperf_confidence
})
netperf_cli_udp = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5"
+ "confidence" : nperf_confidence
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5"
+ "confidence" : nperf_confidence
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5"
+ "confidence" : nperf_confidence
})
for vlan1 in vlans:
@@ -118,16 +120,16 @@ for vlan1 in vlans:
netperf_srv6.update_options({"bind": m1.get_ip(vlan1, 1)})
netperf_cli_tcp.update_options({"netperf_server": m1.get_ip(vlan1, 0),
- "netperf_opts": "-i 5 -L %s"
% m2.get_ip(vlan1, 0)})
+ "netperf_opts": "-i %s -L %s"
% (nperf_max_runs, m2.get_ip(vlan1, 0))})
netperf_cli_udp.update_options({"netperf_server": m1.get_ip(vlan1, 0),
- "netperf_opts": "-i 5 -L %s"
% m2.get_ip(vlan1, 0)})
+ "netperf_opts": "-i %s -L %s"
% (nperf_max_runs, m2.get_ip(vlan1, 0))})
netperf_cli_tcp6.update_options({"netperf_server": m1.get_ip(vlan1,
1),
- "netperf_opts": "-i 5 -L %s
-6" % m2.get_ip(vlan1, 1)})
+ "netperf_opts": "-i %s -L %s
-6" % (nperf_max_runs, m2.get_ip(vlan1, 1))})
netperf_cli_udp6.update_options({"netperf_server": m1.get_ip(vlan1,
1),
- "netperf_opts": "-i 5 -L %s
-6" % m2.get_ip(vlan1, 1)})
+ "netperf_opts": "-i %s -L %s
-6" % (nperf_max_runs, m2.get_ip(vlan1, 1))})
if vlan1 == vlan2:
# These tests should pass
@@ -196,9 +198,9 @@ for vlan1 in vlans:
srv_proc = m1.run(netperf_srv, bg=True)
ctl.wait(2)
tcp_res_data = m2.run(netperf_cli_tcp,
- timeout = (netperf_duration +
nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
udp_res_data = m2.run(netperf_cli_udp,
- timeout = (netperf_duration +
nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
srv_proc.intr()
if result_tcp is not None and\
@@ -280,9 +282,9 @@ for vlan1 in vlans:
srv_proc = m1.run(netperf_srv6, bg=True)
ctl.wait(2)
tcp_res_data = m2.run(netperf_cli_tcp6,
- timeout = (netperf_duration +
nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
udp_res_data = m2.run(netperf_cli_udp6,
- timeout = (netperf_duration +
nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
srv_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not
None and\
diff --git a/recipes/regression_tests/phase1/3_vlans.xml
b/recipes/regression_tests/phase1/3_vlans.xml
index ee4eab5..86b82b6 100644
--- a/recipes/regression_tests/phase1/3_vlans.xml
+++ b/recipes/regression_tests/phase1/3_vlans.xml
@@ -4,6 +4,7 @@
<alias name="mtu" value="1500" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<alias name="mapping_file" value="3_vlans.mapping" />
</define>
<network>
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 6101f4c..aabf2c6 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
@@ -4,6 +4,7 @@
<alias name="mtu" value="1500" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<alias name="mapping_file"
value="3_vlans_over_active_backup_bond.mapping" />
</define>
<network>
diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py
b/recipes/regression_tests/phase1/3_vlans_over_bond.py
index feb9302..95936d1 100644
--- a/recipes/regression_tests/phase1/3_vlans_over_bond.py
+++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py
@@ -43,6 +43,8 @@ ipv = ctl.get_alias("ipv")
mtu = ctl.get_alias("mtu")
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(nperf_confidence.split(",")[1])
m1_bond = m1.get_interface("test_bond")
m1_bond.set_mtu(mtu)
@@ -81,28 +83,28 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"role" : "client",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5"
+ "confidence" : nperf_confidence
})
netperf_cli_udp = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5"
+ "confidence" : nperf_confidence
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5"
+ "confidence" : nperf_confidence
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5"
+ "confidence" : nperf_confidence
})
for vlan1 in vlans:
@@ -118,16 +120,16 @@ for vlan1 in vlans:
netperf_srv6.update_options({"bind": m1.get_ip(vlan1, 1)})
netperf_cli_tcp.update_options({"netperf_server": m1.get_ip(vlan1, 0),
- "netperf_opts": "-i 5 -L %s"
% m2.get_ip(vlan1, 0)})
+ "netperf_opts": "-i %s -L %s"
% (nperf_max_runs, m2.get_ip(vlan1, 0))})
netperf_cli_udp.update_options({"netperf_server": m1.get_ip(vlan1, 0),
- "netperf_opts": "-i 5 -L %s"
% m2.get_ip(vlan1, 0)})
+ "netperf_opts": "-i %s -L %s"
% (nperf_max_runs, m2.get_ip(vlan1, 0))})
netperf_cli_tcp6.update_options({"netperf_server": m1.get_ip(vlan1,
1),
- "netperf_opts": "-i 5 -L %s
-6" % m2.get_ip(vlan1, 1)})
+ "netperf_opts": "-i %s -L %s
-6" % (nperf_max_runs, m2.get_ip(vlan1, 1))})
netperf_cli_udp6.update_options({"netperf_server": m1.get_ip(vlan1,
1),
- "netperf_opts": "-i 5 -L %s
-6" % m2.get_ip(vlan1, 1)})
+ "netperf_opts": "-i %s -L %s
-6" % (nperf_max_runs, m2.get_ip(vlan1, 1))})
if vlan1 == vlan2:
# These tests should pass
@@ -198,9 +200,9 @@ for vlan1 in vlans:
srv_proc = m1.run(netperf_srv, bg=True)
ctl.wait(2)
tcp_res_data = m2.run(netperf_cli_tcp,
- timeout = (netperf_duration +
nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
udp_res_data = m2.run(netperf_cli_udp,
- timeout = (netperf_duration +
nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
srv_proc.intr()
if result_tcp is not None and\
@@ -282,9 +284,9 @@ for vlan1 in vlans:
srv_proc = m1.run(netperf_srv6, bg=True)
ctl.wait(2)
tcp_res_data = m2.run(netperf_cli_tcp6,
- timeout = (netperf_duration +
nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
udp_res_data = m2.run(netperf_cli_udp6,
- timeout = (netperf_duration +
nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
srv_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not
None and\
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 da729c2..fda2f1b 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
@@ -4,6 +4,7 @@
<alias name="mtu" value="1500" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<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 db2772e..08f8718 100644
--- a/recipes/regression_tests/phase1/active_backup_bond.xml
+++ b/recipes/regression_tests/phase1/active_backup_bond.xml
@@ -4,6 +4,7 @@
<alias name="mtu" value="1500" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<alias name="mapping_file"
value="active_backup_bond.mapping" />
</define>
<network>
diff --git a/recipes/regression_tests/phase1/active_backup_double_bond.xml
b/recipes/regression_tests/phase1/active_backup_double_bond.xml
index b9f3006..256ebfc 100644
--- a/recipes/regression_tests/phase1/active_backup_double_bond.xml
+++ b/recipes/regression_tests/phase1/active_backup_double_bond.xml
@@ -4,6 +4,7 @@
<alias name="mtu" value="1500" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<alias name="mapping_file"
value="active_backup_double_bond.mapping" />
</define>
<network>
diff --git a/recipes/regression_tests/phase1/bonding_test.py
b/recipes/regression_tests/phase1/bonding_test.py
index cefea0d..a343b9e 100644
--- a/recipes/regression_tests/phase1/bonding_test.py
+++ b/recipes/regression_tests/phase1/bonding_test.py
@@ -42,6 +42,8 @@ ipv = ctl.get_alias("ipv")
mtu = ctl.get_alias("mtu")
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(nperf_confidence.split(",")[1])
test_if1 = m1.get_interface("test_if")
test_if1.set_mtu(mtu)
@@ -83,8 +85,8 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"netperf_server" :
m1.get_ip("test_if", 0),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s" %
m2.get_ip("test_if", 0)
+ "confidence" : nperf_confidence,
+ "netperf_opts" : "-i %s -L %s"
% (nperf_max_runs, m2.get_ip("test_if", 0))
})
netperf_cli_udp = ctl.get_module("Netperf",
@@ -93,8 +95,8 @@ netperf_cli_udp = ctl.get_module("Netperf",
"netperf_server" :
m1.get_ip("test_if", 0),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s" %
m2.get_ip("test_if", 0)
+ "confidence" : nperf_confidence,
+ "netperf_opts" : "-i %s -L %s"
% (nperf_max_runs, m2.get_ip("test_if", 0))
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
@@ -104,9 +106,9 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
m1.get_ip("test_if", 1),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5",
+ "confidence" : nperf_confidence,
"netperf_opts" :
- "-i 5 -L %s -6" %
m2.get_ip("test_if", 1)
+ "-i %s -L %s -6" % (nperf_max_runs,
m2.get_ip("test_if", 1))
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
@@ -115,9 +117,9 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
m1.get_ip("test_if", 1),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5",
+ "confidence" : nperf_confidence,
"netperf_opts" :
- "-i 5 -L %s -6" %
m2.get_ip("test_if", 1)
+ "-i %s -L %s -6" % (nperf_max_runs,
m2.get_ip("test_if", 1))
})
ctl.wait(15)
@@ -177,9 +179,9 @@ for offload in offloads:
server_proc = m1.run(netperf_srv, bg=True)
ctl.wait(2)
tcp_res_data = m2.run(netperf_cli_tcp,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
udp_res_data = m2.run(netperf_cli_udp,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
server_proc.intr()
if result_tcp is not None and\
@@ -255,9 +257,9 @@ for offload in offloads:
server_proc = m1.run(netperf_srv6, bg=True)
ctl.wait(2)
tcp_res_data = m2.run(netperf_cli_tcp6,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
udp_res_data = m2.run(netperf_cli_udp6,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
server_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not None and\
diff --git a/recipes/regression_tests/phase1/round_robin_bond.xml
b/recipes/regression_tests/phase1/round_robin_bond.xml
index 66e010c..cc055ec 100644
--- a/recipes/regression_tests/phase1/round_robin_bond.xml
+++ b/recipes/regression_tests/phase1/round_robin_bond.xml
@@ -4,6 +4,7 @@
<alias name="mtu" value="1500" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<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 e9003d3..0f5a98b 100644
--- a/recipes/regression_tests/phase1/round_robin_double_bond.xml
+++ b/recipes/regression_tests/phase1/round_robin_double_bond.xml
@@ -4,6 +4,7 @@
<alias name="mtu" value="1500" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<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 e5d9d1d..a9646d8 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
@@ -3,6 +3,7 @@
<alias name="ipv" value="both" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<alias name="mtu" value="1500" />
<alias name="mapping_file"
value="virtual_bridge_2_vlans_over_active_backup_bond.mapping" />
</define>
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 dd55166..8226fc4 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
@@ -48,6 +48,8 @@ offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
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(nperf_confidence.split(",")[1])
mtu = ctl.get_alias("mtu")
enable_udp_perf = ctl.get_alias("enable_udp_perf")
@@ -102,9 +104,9 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"netperf_server" :
g1.get_ip("guestnic"),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s"
%
-
g3.get_ip("guestnic")
+ "confidence" : nperf_confidence,
+ "netperf_opts" : "-i %s -L %s"
%
+ (nperf_max_runs,
g3.get_ip("guestnic"))
})
netperf_cli_udp = ctl.get_module("Netperf",
@@ -113,9 +115,9 @@ netperf_cli_udp = ctl.get_module("Netperf",
"netperf_server" :
g1.get_ip("guestnic"),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s"
%
-
g3.get_ip("guestnic")
+ "confidence" : nperf_confidence,
+ "netperf_opts" : "-i %s -L %s"
%
+ (nperf_max_runs,
g3.get_ip("guestnic"))
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
@@ -125,9 +127,9 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
g1.get_ip("guestnic", 1),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5",
+ "confidence" : nperf_confidence,
"netperf_opts" :
- "-i 5 -L %s -6" %
g3.get_ip("guestnic", 1)
+ "-i %s -L %s -6" % (nperf_max_runs,
g3.get_ip("guestnic", 1))
})
netperf_cli_udp6 = ctl.get_module("Netperf",
@@ -137,9 +139,9 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
g1.get_ip("guestnic", 1),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5",
+ "confidence" : nperf_confidence,
"netperf_opts" :
- "-i 5 -L %s -6" %
g3.get_ip("guestnic", 1)
+ "-i %s -L %s -6" % (nperf_max_runs,
g3.get_ip("guestnic", 1))
})
ping_mod_bad = ctl.get_module("IcmpPing",
@@ -272,10 +274,10 @@ for offload in offloads:
server_proc = g1.run(netperf_srv, bg=True)
ctl.wait(2)
tcp_res_data = g3.run(netperf_cli_tcp,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
if enable_udp_perf is not None:
udp_res_data = g3.run(netperf_cli_udp,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
server_proc.intr()
if result_tcp is not None and\
@@ -359,10 +361,10 @@ for offload in offloads:
server_proc = g1.run(netperf_srv6, bg=True)
ctl.wait(2)
tcp_res_data = g3.run(netperf_cli_tcp6,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
if enable_udp_perf is not None:
udp_res_data = g3.run(netperf_cli_udp6,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
server_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not None and\
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 af66655..0c7ffa4 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
@@ -42,6 +42,8 @@ offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
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(nperf_confidence.split(",")[1])
mtu = ctl.get_alias("mtu")
enable_udp_perf = ctl.get_alias("enable_udp_perf")
@@ -81,9 +83,9 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"netperf_server" :
g1.get_ip("vlan10"),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s"
%
-
h2.get_ip("vlan10")
+ "confidence" : nperf_confidence,
+ "netperf_opts" : "-i %s -L %s"
%
+ (nperf_max_runs,
h2.get_ip("vlan10"))
})
netperf_cli_udp = ctl.get_module("Netperf",
@@ -92,9 +94,9 @@ netperf_cli_udp = ctl.get_module("Netperf",
"netperf_server" :
g1.get_ip("vlan10"),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s"
%
-
h2.get_ip("vlan10")
+ "confidence" : nperf_confidence,
+ "netperf_opts" : "-i %s -L %s"
%
+ (nperf_max_runs,
h2.get_ip("vlan10"))
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
@@ -104,9 +106,9 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
g1.get_ip("vlan10", 1),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5",
+ "confidence" : nperf_confidence,
"netperf_opts" :
- "-i 5 -L %s -6" %
h2.get_ip("vlan10", 1)
+ "-i %s -L %s -6" % (nperf_max_runs,
h2.get_ip("vlan10", 1))
})
netperf_cli_udp6 = ctl.get_module("Netperf",
@@ -116,9 +118,9 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
g1.get_ip("vlan10", 1),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5",
+ "confidence" : nperf_confidence,
"netperf_opts" :
- "-i 5 -L %s -6" %
h2.get_ip("vlan10", 1)
+ "-i %s -L %s -6" % (nperf_max_runs,
h2.get_ip("vlan10", 1))
})
# configure mtu
@@ -195,10 +197,10 @@ for offload in offloads:
server_proc = g1.run(netperf_srv, bg=True)
ctl.wait(2)
tcp_res_data = h2.run(netperf_cli_tcp,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
if enable_udp_perf is not None:
udp_res_data = h2.run(netperf_cli_udp,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
server_proc.intr()
@@ -280,9 +282,9 @@ for offload in offloads:
server_proc = g1.run(netperf_srv6, bg=True)
ctl.wait(2)
tcp_res_data = h2.run(netperf_cli_tcp6,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
udp_res_data = h2.run(netperf_cli_udp6,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
server_proc.intr()
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 a3bfb9f..63e23fe 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml
@@ -3,6 +3,7 @@
<alias name="ipv" value="both" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<alias name="mtu" value="1500" />
<alias name="mapping_file"
value="virtual_bridge_vlan_in_guest.mapping" />
</define>
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 30979cb..509ea57 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
@@ -42,6 +42,8 @@ offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
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(nperf_confidence.split(",")[1])
mtu = ctl.get_alias("mtu")
enable_udp_perf = ctl.get_alias("enable_udp_perf")
@@ -81,9 +83,9 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"netperf_server" :
g1.get_ip("guestnic"),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s"
%
-
h2.get_ip("vlan10")
+ "confidence" : nperf_confidence,
+ "netperf_opts" : "-i %s -L %s"
%
+ (nperf_max_runs,
h2.get_ip("vlan10"))
})
netperf_cli_udp = ctl.get_module("Netperf",
@@ -92,9 +94,9 @@ netperf_cli_udp = ctl.get_module("Netperf",
"netperf_server" :
g1.get_ip("guestnic"),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s"
%
-
h2.get_ip("vlan10")
+ "confidence" : nperf_confidence,
+ "netperf_opts" : "-i %s -L %s"
%
+ (nperf_max_runs,
h2.get_ip("vlan10"))
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
@@ -104,9 +106,9 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
g1.get_ip("guestnic", 1),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5",
+ "confidence" : nperf_confidence,
"netperf_opts" :
- "-i 5 -L %s -6" %
h2.get_ip("vlan10", 1)
+ "-i %s -L %s -6" % (nperf_max_runs,
h2.get_ip("vlan10", 1))
})
netperf_cli_udp6 = ctl.get_module("Netperf",
@@ -116,9 +118,9 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
g1.get_ip("guestnic", 1),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5",
+ "confidence" : nperf_confidence,
"netperf_opts" :
- "-i 5 -L %s -6" %
h2.get_ip("vlan10", 1)
+ "-i %s -L %s -6" % (nperf_max_runs,
h2.get_ip("vlan10", 1))
})
# configure mtu
@@ -195,10 +197,10 @@ for offload in offloads:
server_proc = g1.run(netperf_srv, bg=True)
ctl.wait(2)
tcp_res_data = h2.run(netperf_cli_tcp,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
if enable_udp_perf is not None:
udp_res_data = h2.run(netperf_cli_udp,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
server_proc.intr()
@@ -280,9 +282,10 @@ for offload in offloads:
server_proc = g1.run(netperf_srv6, bg=True)
ctl.wait(2)
tcp_res_data = h2.run(netperf_cli_tcp6,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
udp_res_data = h2.run(netperf_cli_udp6,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
+
server_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not None and\
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 2d8b862..4f8f1e2 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml
@@ -3,6 +3,7 @@
<alias name="ipv" value="both" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<alias name="mtu" value="1500" />
<alias name="mapping_file"
value="virtual_bridge_vlan_in_host.mapping" />
</define>
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 c2eb6f8..8937bef 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
@@ -4,6 +4,7 @@
<alias name="mtu" value="1500" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<alias name="mapping_file"
value="3_vlans_over_active_backup_team.mapping" />
</define>
<network>
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 daec70b..cab3d7a 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
@@ -4,6 +4,7 @@
<alias name="mtu" value="1500" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<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 7f9a767..157da14 100644
--- a/recipes/regression_tests/phase2/3_vlans_over_team.py
+++ b/recipes/regression_tests/phase2/3_vlans_over_team.py
@@ -42,6 +42,8 @@ ipv = ctl.get_alias("ipv")
mtu = ctl.get_alias("mtu")
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(nperf_confidence.split(",")[1])
m1_team = m1.get_interface("test_if")
m1_team.set_mtu(mtu)
@@ -81,28 +83,28 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"role" : "client",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5"
+ "confidence" : nperf_confidence
})
netperf_cli_udp = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5"
+ "confidence" : nperf_confidence
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5"
+ "confidence" : nperf_confidence
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
"role" : "client",
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5"
+ "confidence" : nperf_confidence
})
for vlan1 in vlans:
@@ -118,17 +120,16 @@ for vlan1 in vlans:
netperf_srv6.update_options({"bind": m1.get_ip(vlan1, 1)})
netperf_cli_tcp.update_options({"netperf_server": m1.get_ip(vlan1, 0),
- "netperf_opts": "-i 5 -L %s"
% m2.get_ip(vlan1, 0)})
+ "netperf_opts": "-i %s -L %s"
% (nperf_max_runs, m2.get_ip(vlan1, 0))})
netperf_cli_udp.update_options({"netperf_server": m1.get_ip(vlan1, 0),
- "netperf_opts": "-i 5 -L %s"
% m2.get_ip(vlan1, 0)})
+ "netperf_opts": "-i %s -L %s"
% (nperf_max_runs, m2.get_ip(vlan1, 0))})
netperf_cli_tcp6.update_options({"netperf_server": m1.get_ip(vlan1,
1),
- "netperf_opts": "-i 5 -L %s
-6" % m2.get_ip(vlan1, 1)})
+ "netperf_opts": "-i %s -L %s
-6" % (nperf_max_runs, m2.get_ip(vlan1, 1))})
netperf_cli_udp6.update_options({"netperf_server": m1.get_ip(vlan1,
1),
- "netperf_opts": "-i 5 -L %s
-6" % m2.get_ip(vlan1, 1)})
-
+ "netperf_opts": "-i %s -L %s
-6" % (nperf_max_runs, m2.get_ip(vlan1, 1))})
if vlan1 == vlan2:
# These tests should pass
@@ -199,9 +200,9 @@ for vlan1 in vlans:
srv_proc = m1.run(netperf_srv, bg=True)
ctl.wait(2)
tcp_res_data = m2.run(netperf_cli_tcp,
- timeout = (netperf_duration +
nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
udp_res_data = m2.run(netperf_cli_udp,
- timeout = (netperf_duration +
nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
srv_proc.intr()
if result_tcp is not None and\
@@ -282,9 +283,9 @@ for vlan1 in vlans:
srv_proc = m1.run(netperf_srv6, bg=True)
ctl.wait(2)
tcp_res_data = m2.run(netperf_cli_tcp6,
- timeout = (netperf_duration +
nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
udp_res_data = m2.run(netperf_cli_udp6,
- timeout = (netperf_duration +
nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
srv_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not
None and\
diff --git a/recipes/regression_tests/phase2/active_backup_double_team.xml
b/recipes/regression_tests/phase2/active_backup_double_team.xml
index 2cc911a..a3f0549 100644
--- a/recipes/regression_tests/phase2/active_backup_double_team.xml
+++ b/recipes/regression_tests/phase2/active_backup_double_team.xml
@@ -4,6 +4,7 @@
<alias name="mtu" value="1500" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<alias name="mapping_file"
value="active_backup_double_team.mapping" />
</define>
<network>
diff --git a/recipes/regression_tests/phase2/active_backup_team.xml
b/recipes/regression_tests/phase2/active_backup_team.xml
index 8e5a6ad..30fe553 100644
--- a/recipes/regression_tests/phase2/active_backup_team.xml
+++ b/recipes/regression_tests/phase2/active_backup_team.xml
@@ -4,6 +4,7 @@
<alias name="mtu" value="1500" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<alias name="mapping_file"
value="active_backup_team.mapping" />
</define>
<network>
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 c373bd1..1badb1f 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
@@ -4,6 +4,7 @@
<alias name="mtu" value="1500" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<alias name="mapping_file"
value="active_backup_team_vs_active_backup_bond.mapping" />
</define>
<network>
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 fcfa46a..c921037 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
@@ -4,6 +4,7 @@
<alias name="mtu" value="1500" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<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 2a680f5..585e446 100644
--- a/recipes/regression_tests/phase2/round_robin_double_team.xml
+++ b/recipes/regression_tests/phase2/round_robin_double_team.xml
@@ -4,6 +4,7 @@
<alias name="mtu" value="1500" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<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 cc3702c..c257851 100644
--- a/recipes/regression_tests/phase2/round_robin_team.xml
+++ b/recipes/regression_tests/phase2/round_robin_team.xml
@@ -4,6 +4,7 @@
<alias name="mtu" value="1500" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<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 1f18459..b59188a 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
@@ -4,6 +4,7 @@
<alias name="mtu" value="1500" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<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 bcdd111..88c2617 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
@@ -4,6 +4,7 @@
<alias name="mtu" value="1500" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<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 259505b..4e7aed6 100644
--- a/recipes/regression_tests/phase2/team_test.py
+++ b/recipes/regression_tests/phase2/team_test.py
@@ -42,6 +42,8 @@ ipv = ctl.get_alias("ipv")
mtu = ctl.get_alias("mtu")
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(nperf_confidence.split(",")[1])
test_if1 = m1.get_interface("test_if")
test_if1.set_mtu(mtu)
@@ -84,8 +86,8 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"netperf_server" :
m1.get_ip("test_if", 0),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s" %
m2.get_ip("test_if", 0)
+ "confidence" : nperf_confidence,
+ "netperf_opts" : "-i %s -L %s"
% (nperf_max_runs, m2.get_ip("test_if", 0))
})
netperf_cli_udp = ctl.get_module("Netperf",
@@ -94,8 +96,8 @@ netperf_cli_udp = ctl.get_module("Netperf",
"netperf_server" :
m1.get_ip("test_if", 0),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s" %
m2.get_ip("test_if", 0)
+ "confidence" : nperf_confidence,
+ "netperf_opts" : "-i %s -L %s"
% (nperf_max_runs, m2.get_ip("test_if", 0))
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
@@ -105,9 +107,9 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
m1.get_ip("test_if", 1),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5",
+ "confidence" : nperf_confidence,
"netperf_opts" :
- "-i 5 -L %s -6" %
m2.get_ip("test_if", 1)
+ "-i %s -L %s -6" % (nperf_max_runs,
m2.get_ip("test_if", 1))
})
netperf_cli_udp6 = ctl.get_module("Netperf",
options={
@@ -116,9 +118,9 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
m1.get_ip("test_if", 1),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5",
+ "confidence" : nperf_confidence,
"netperf_opts" :
- "-i 5 -L %s -6" %
m2.get_ip("test_if", 1)
+ "-i %s -L %s -6" % (nperf_max_runs,
m2.get_ip("test_if", 1))
})
ctl.wait(15)
@@ -183,9 +185,9 @@ for offload in offloads:
server_proc = m1.run(netperf_srv, bg=True)
ctl.wait(2)
tcp_res_data = m2.run(netperf_cli_tcp,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
udp_res_data = m2.run(netperf_cli_udp,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
server_proc.intr()
if result_tcp is not None and\
@@ -305,16 +307,16 @@ netperf_srv.update_options({"bind" :
m2.get_ip("test_if", 0)})
netperf_srv6.update_options({"bind" : m2.get_ip("test_if", 1)})
netperf_cli_tcp.update_options({"netperf_server" :
m2.get_ip("test_if", 0),
- "netperf_opts" : "-i 5 -L %s" %
m1.get_ip("test_if", 0)})
+ "netperf_opts" : "-i %s -L %s" %
(nperf_max_runs, m1.get_ip("test_if", 0))})
netperf_cli_udp.update_options({"netperf_server" :
m2.get_ip("test_if", 0),
- "netperf_opts" : "-i 5 -L %s" %
m1.get_ip("test_if", 0)})
+ "netperf_opts" : "-i %s -L %s" %
(nperf_max_runs, m1.get_ip("test_if", 0))})
netperf_cli_tcp6.update_options({"netperf_server" :
m2.get_ip("test_if", 1),
- "netperf_opts" : "-i 5 -L %s -6" %
m1.get_ip("test_if", 1)})
+ "netperf_opts" : "-i %s -L %s -6" %
(nperf_max_runs, m1.get_ip("test_if", 1))})
netperf_cli_udp6.update_options({"netperf_server" :
m2.get_ip("test_if", 1),
- "netperf_opts" : "-i 5 -L %s -6" %
m1.get_ip("test_if", 1)})
+ "netperf_opts" : "-i %s -L %s -6" %
(nperf_max_runs, m1.get_ip("test_if", 1))})
for offload in offloads:
for state in ["off", "on"]:
@@ -375,8 +377,8 @@ for offload in offloads:
server_proc = m2.run(netperf_srv, bg=True)
ctl.wait(2)
- tcp_res_data = m1.run(netperf_cli_tcp, timeout = (netperf_duration +
nperf_reserve)*5)
- udp_res_data = m1.run(netperf_cli_udp, timeout = (netperf_duration +
nperf_reserve)*5)
+ tcp_res_data = m1.run(netperf_cli_tcp, timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
+ udp_res_data = m1.run(netperf_cli_udp, timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
server_proc.intr()
if result_tcp is not None and\
@@ -455,8 +457,8 @@ for offload in offloads:
server_proc = m2.run(netperf_srv6, bg=True)
ctl.wait(2)
- tcp_res_data = m1.run(netperf_cli_tcp6, timeout = (netperf_duration +
nperf_reserve)*5)
- udp_res_data = m1.run(netperf_cli_udp6, timeout = (netperf_duration +
nperf_reserve)*5)
+ tcp_res_data = m1.run(netperf_cli_tcp6, timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
+ udp_res_data = m1.run(netperf_cli_udp6, timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
server_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not None and\
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 3d0a828..6e6aa10 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
@@ -48,6 +48,8 @@ offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
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(nperf_confidence.split(",")[1])
ping_mod = ctl.get_module("IcmpPing",
options={
@@ -100,9 +102,9 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"netperf_server" :
g1.get_ip("guestnic"),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s"
%
-
g3.get_ip("guestnic")
+ "confidence" : nperf_confidence,
+ "netperf_opts" : "-i %s -L %s"
%
+ (nperf_max_runs,
g3.get_ip("guestnic"))
})
netperf_cli_udp = ctl.get_module("Netperf",
@@ -111,9 +113,9 @@ netperf_cli_udp = ctl.get_module("Netperf",
"netperf_server" :
g1.get_ip("guestnic"),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s"
%
-
g3.get_ip("guestnic")
+ "confidence" : nperf_confidence,
+ "netperf_opts" : "-i %s -L %s"
%
+ (nperf_max_runs,
g3.get_ip("guestnic"))
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
@@ -123,9 +125,9 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
g1.get_ip("guestnic", 1),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5",
+ "confidence" : nperf_confidence,
"netperf_opts" :
- "-i 5 -L %s -6" %
g3.get_ip("guestnic", 1)
+ "-i %s -L %s -6" % (nperf_max_runs,
g3.get_ip("guestnic", 1))
})
netperf_cli_udp6 = ctl.get_module("Netperf",
@@ -135,9 +137,9 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
g1.get_ip("guestnic", 1),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5",
+ "confidence" : nperf_confidence,
"netperf_opts" :
- "-i 5 -L %s -6" %
g3.get_ip("guestnic", 1)
+ "-i %s -L %s -6" % (nperf_max_runs,
g3.get_ip("guestnic", 1))
})
ping_mod_bad = ctl.get_module("IcmpPing",
@@ -245,9 +247,9 @@ for offload in offloads:
server_proc = g1.run(netperf_srv, bg=True)
ctl.wait(2)
tcp_res_data = g3.run(netperf_cli_tcp,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
udp_res_data = g3.run(netperf_cli_udp,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
server_proc.intr()
if result_tcp is not None and\
@@ -326,9 +328,9 @@ for offload in offloads:
server_proc = g1.run(netperf_srv6, bg=True)
ctl.wait(2)
tcp_res_data = g3.run(netperf_cli_tcp6,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
udp_res_data = g3.run(netperf_cli_udp6,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
server_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not None and\
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 07e0d14..71f4778 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
@@ -3,6 +3,7 @@
<alias name="ipv" value="both" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<alias name="mapping_file"
value="virtual_ovs_bridge_2_vlans_over_active_backup_bond.mapping" />
</define>
<network>
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 7a5b710..1ce8b36 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
@@ -42,6 +42,8 @@ offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
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(nperf_confidence.split(",")[1])
ping_mod = ctl.get_module("IcmpPing",
options={
@@ -78,9 +80,9 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"netperf_server" :
g1.get_ip("vlan10"),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s"
%
-
h2.get_ip("vlan10")
+ "confidence" : nperf_confidence,
+ "netperf_opts" : "-i %s -L %s"
%
+ (nperf_max_runs,
h2.get_ip("vlan10"))
})
netperf_cli_udp = ctl.get_module("Netperf",
@@ -89,9 +91,9 @@ netperf_cli_udp = ctl.get_module("Netperf",
"netperf_server" :
g1.get_ip("vlan10"),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s"
%
-
h2.get_ip("vlan10")
+ "confidence" : nperf_confidence,
+ "netperf_opts" : "-i %s -L %s"
%
+ (nperf_max_runs,
h2.get_ip("vlan10"))
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
@@ -101,9 +103,9 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
g1.get_ip("vlan10", 1),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5",
+ "confidence" : nperf_confidence,
"netperf_opts" :
- "-i 5 -L %s -6" %
h2.get_ip("vlan10", 1)
+ "-i %s -L %s -6" % (nperf_max_runs,
h2.get_ip("vlan10", 1))
})
netperf_cli_udp6 = ctl.get_module("Netperf",
@@ -113,9 +115,9 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
g1.get_ip("vlan10", 1),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5",
+ "confidence" : nperf_confidence,
"netperf_opts" :
- "-i 5 -L %s -6" %
h2.get_ip("vlan10", 1)
+ "-i %s -L %s -6" % (nperf_max_runs,
h2.get_ip("vlan10", 1))
})
ctl.wait(15)
@@ -177,9 +179,9 @@ for offload in offloads:
server_proc = g1.run(netperf_srv, bg=True)
ctl.wait(2)
tcp_res_data = h2.run(netperf_cli_tcp,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
udp_res_data = h2.run(netperf_cli_udp,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
server_proc.intr()
@@ -256,9 +258,9 @@ for offload in offloads:
server_proc = g1.run(netperf_srv6, bg=True)
ctl.wait(2)
tcp_res_data = h2.run(netperf_cli_tcp6,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
udp_res_data = h2.run(netperf_cli_udp6,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
server_proc.intr()
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 eead7a9..bbd0902 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
@@ -3,6 +3,7 @@
<alias name="ipv" value="both" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<alias name="mapping_file"
value="virtual_ovs_bridge_vlan_in_guest.mapping" />
</define>
<network>
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 6ba1c7f..43381da 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
@@ -42,6 +42,8 @@ offloads = ["gso", "gro", "tso"]
ipv = ctl.get_alias("ipv")
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(nperf_confidence.split(",")[1])
ping_mod = ctl.get_module("IcmpPing",
options={
@@ -78,9 +80,9 @@ netperf_cli_tcp = ctl.get_module("Netperf",
"netperf_server" :
g1.get_ip("guestnic"),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s"
%
-
h2.get_ip("vlan10")
+ "confidence" : nperf_confidence,
+ "netperf_opts" : "-i %s -L %s"
%
+ (nperf_max_runs,
h2.get_ip("vlan10"))
})
netperf_cli_udp = ctl.get_module("Netperf",
@@ -89,9 +91,9 @@ netperf_cli_udp = ctl.get_module("Netperf",
"netperf_server" :
g1.get_ip("guestnic"),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5",
- "netperf_opts" : "-i 5 -L %s"
%
-
h2.get_ip("vlan10")
+ "confidence" : nperf_confidence,
+ "netperf_opts" : "-i %s -L %s"
%
+ (nperf_max_runs,
h2.get_ip("vlan10"))
})
netperf_cli_tcp6 = ctl.get_module("Netperf",
@@ -101,9 +103,9 @@ netperf_cli_tcp6 = ctl.get_module("Netperf",
g1.get_ip("guestnic", 1),
"duration" : netperf_duration,
"testname" : "TCP_STREAM",
- "confidence" : "99,5",
+ "confidence" : nperf_confidence,
"netperf_opts" :
- "-i 5 -L %s -6" %
h2.get_ip("vlan10", 1)
+ "-i %s -L %s -6" % (nperf_max_runs,
h2.get_ip("vlan10", 1))
})
netperf_cli_udp6 = ctl.get_module("Netperf",
@@ -113,9 +115,9 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
g1.get_ip("guestnic", 1),
"duration" : netperf_duration,
"testname" : "UDP_STREAM",
- "confidence" : "99,5",
+ "confidence" : nperf_confidence,
"netperf_opts" :
- "-i 5 -L %s -6" %
h2.get_ip("vlan10", 1)
+ "-i %s -L %s -6" % (nperf_max_runs,
h2.get_ip("vlan10", 1))
})
ctl.wait(15)
@@ -176,9 +178,9 @@ for offload in offloads:
server_proc = g1.run(netperf_srv, bg=True)
ctl.wait(2)
tcp_res_data = h2.run(netperf_cli_tcp,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
udp_res_data = h2.run(netperf_cli_udp,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
server_proc.intr()
if result_tcp is not None and\
@@ -254,9 +256,9 @@ for offload in offloads:
server_proc = g1.run(netperf_srv6, bg=True)
ctl.wait(2)
tcp_res_data = h2.run(netperf_cli_tcp6,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
udp_res_data = h2.run(netperf_cli_udp6,
- timeout = (netperf_duration + nperf_reserve)*5)
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
server_proc.intr()
if result_tcp is not None and tcp_res_data.get_result() is not None and\
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 b31f8e1..e41aa26 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
@@ -3,6 +3,7 @@
<alias name="ipv" value="both" />
<alias name="netperf_duration" value="60" />
<alias name="nperf_reserve" value="20" />
+ <alias name="nperf_confidence" value="99,5" />
<alias name="mapping_file"
value="virtual_ovs_bridge_vlan_in_host.mapping" />
</define>
<network>
--
2.1.0