This patch removes repeated code.
Netperf opts (dict), used in Netperf module are created once before and
are only updated before each netperf run with valid testname and
nperf_opts.
Changes in v4:
* Split this in separate commit
Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com>
---
.../regression_tests/phase3/2_virt_ovs_vxlan.py | 56 ++++++++----------
.../regression_tests/phase3/novirt_ovs_vxlan.py | 66 +++++++++-------------
recipes/regression_tests/phase3/simple_macsec.py | 66 +++++++++-------------
recipes/regression_tests/phase3/vxlan_multicast.py | 66 +++++++++-------------
recipes/regression_tests/phase3/vxlan_remote.py | 66 +++++++++-------------
5 files changed, 128 insertions(+), 192 deletions(-)
diff --git a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py
b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py
index 026a666..8784516 100644
--- a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py
+++ b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py
@@ -125,6 +125,16 @@ if ipv in ['ipv6', 'both']:
(guest4, g4_nic, 1, {"scope": 0}),
options=ping_opts, expect="fail")
+client_opts = {"duration" : netperf_duration,
+ "testname" : "TCP_STREAM",
+ "confidence" : nperf_confidence,
+ "num_parallel" : nperf_num_parallel,
+ "cpu_util" : nperf_cpu_util,
+ "runs": nperf_max_runs,
+ "netperf_opts": nperf_opts,
+ "debug": nperf_debug,
+ "max_deviation": nperf_max_dev}
+
if ipv in [ 'ipv4', 'both' ]:
# prepare PerfRepo result for tcp
@@ -147,17 +157,11 @@ if ipv in [ 'ipv4', 'both' ]:
baseline = perf_api.get_baseline_of_result(result_tcp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "TCP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts
+
tcp_res_data = netperf((guest1, g1_nic, 0), (guest3, g3_nic, 0),
- client_opts={"duration" : netperf_duration,
- "testname" :
"TCP_STREAM",
- "confidence" : nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "netperf_opts": nperf_opts,
- "debug": nperf_debug,
- "max_deviation": nperf_max_dev},
- baseline = baseline,
+ client_opts = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_tcp, tcp_res_data)
@@ -215,18 +219,12 @@ if ipv in [ 'ipv6', 'both' ]:
baseline = perf_api.get_baseline_of_result(result_tcp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "TCP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts + " -6"
+
tcp_res_data = netperf((guest1, g1_nic, 1), (guest3, g3_nic, 1),
- client_opts={"duration" : netperf_duration,
- "testname" :
"TCP_STREAM",
- "confidence" : nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "netperf_opts" : nperf_opts +
"-6",
- "debug": nperf_debug,
- "max_deviation": nperf_max_dev},
- baseline = baseline,
- timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
+ client_opts = client_opts, baseline = baseline,
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_tcp, tcp_res_data)
result_tcp.set_comment(pr_comment)
@@ -252,18 +250,12 @@ if ipv in [ 'ipv6', 'both' ]:
baseline = perf_api.get_baseline_of_result(result_udp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "UDP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts + " -6"
+
udp_res_data = netperf((guest1, g1_nic, 1), (guest3, g3_nic, 1),
- client_opts={"duration" : netperf_duration,
- "testname" :
"UDP_STREAM",
- "confidence" : nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "netperf_opts" : nperf_opts +
"-6",
- "debug": nperf_debug,
- "max_deviation": nperf_max_dev},
- baseline = baseline,
- timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
+ client_opts = client_opts, baseline = baseline,
+ timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_udp, udp_res_data)
result_udp.set_comment(pr_comment)
diff --git a/recipes/regression_tests/phase3/novirt_ovs_vxlan.py
b/recipes/regression_tests/phase3/novirt_ovs_vxlan.py
index e2998e2..ac57473 100644
--- a/recipes/regression_tests/phase3/novirt_ovs_vxlan.py
+++ b/recipes/regression_tests/phase3/novirt_ovs_vxlan.py
@@ -74,6 +74,16 @@ if ipv in [ 'ipv6', 'both' ]:
(h2, h2_nic, 1, {"scope": 0}),
options=ping_opts)
+client_opts = {"duration" : netperf_duration,
+ "testname" : "TCP_STREAM",
+ "confidence" : nperf_confidence,
+ "num_parallel" : nperf_num_parallel,
+ "cpu_util" : nperf_cpu_util,
+ "runs": nperf_max_runs,
+ "netperf_opts": nperf_opts,
+ "debug": nperf_debug,
+ "max_deviation": nperf_max_dev}
+
#netperfs
if ipv in [ 'ipv4', 'both' ]:
ctl.wait(2)
@@ -94,18 +104,12 @@ if ipv in [ 'ipv4', 'both' ]:
baseline = perf_api.get_baseline_of_result(result_tcp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "TCP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts
+
tcp_res_data = netperf((h1, h1_nic, 0, {"scope": 0}),
(h2, h2_nic, 0, {"scope": 0}),
- client_opts={"duration" : netperf_duration,
- "testname" :
"TCP_STREAM",
- "confidence" : nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "debug": nperf_debug,
- "max_deviation": nperf_max_dev,
- "netperf_opts": nperf_opts},
- baseline = baseline,
+ client_opts = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_tcp, tcp_res_data)
@@ -128,18 +132,12 @@ if ipv in [ 'ipv4', 'both' ]:
baseline = perf_api.get_baseline_of_result(result_udp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "UDP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts
+
udp_res_data = netperf((h1, h1_nic, 0, {"scope": 0}),
(h2, h2_nic, 0, {"scope": 0}),
- client_opts={"duration" : netperf_duration,
- "testname" :
"UDP_STREAM",
- "confidence" : nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "debug": nperf_debug,
- "max_deviation": nperf_max_dev,
- "netperf_opts": nperf_opts},
- baseline = baseline,
+ client_opts = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_udp, udp_res_data)
@@ -164,18 +162,12 @@ if ipv in [ 'ipv6', 'both' ]:
baseline = perf_api.get_baseline_of_result(result_tcp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "TCP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts + " -6"
+
tcp_res_data = netperf((h1, h1_nic, 1, {"scope": 0}),
(h2, h2_nic, 1, {"scope": 0}),
- client_opts={"duration" : netperf_duration,
- "testname" :
"TCP_STREAM",
- "confidence" : nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "debug": nperf_debug,
- "max_deviation": nperf_max_dev,
- "netperf_opts" : nperf_opts +
"-6"},
- baseline = baseline,
+ client_opts = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_tcp, tcp_res_data)
@@ -198,18 +190,12 @@ if ipv in [ 'ipv6', 'both' ]:
baseline = perf_api.get_baseline_of_result(result_udp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "UDP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts + " -6"
+
udp_res_data = netperf((h1, h1_nic, 1, {"scope": 0}),
(h2, h2_nic, 1, {"scope": 0}),
- client_opts={"duration" : netperf_duration,
- "testname" :
"UDP_STREAM",
- "confidence" : nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "debug": nperf_debug,
- "max_deviation": nperf_max_dev,
- "netperf_opts" : nperf_opts +
"-6"},
- baseline = baseline,
+ client_opts = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_udp, udp_res_data)
diff --git a/recipes/regression_tests/phase3/simple_macsec.py
b/recipes/regression_tests/phase3/simple_macsec.py
index 013e852..a186797 100644
--- a/recipes/regression_tests/phase3/simple_macsec.py
+++ b/recipes/regression_tests/phase3/simple_macsec.py
@@ -119,6 +119,16 @@ ping((m1, m1_phy, 0, {"scope": 0}),
ctl.wait(2)
+client_opts = {"duration" : netperf_duration,
+ "testname" : "TCP_STREAM",
+ "confidence" : nperf_confidence,
+ "num_parallel" : nperf_num_parallel,
+ "cpu_util" : nperf_cpu_util,
+ "runs": nperf_max_runs,
+ "netperf_opts": nperf_opts,
+ "debug": nperf_debug,
+ "max_deviation": nperf_max_dev}
+
for setting in encryption_settings:
#macsec setup
macsecSetup(setting)
@@ -150,18 +160,12 @@ for setting in encryption_settings:
baseline = perf_api.get_baseline_of_result(result_tcp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "TCP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts
+
tcp_res_data = netperf((m1, m1_tif, 0, {"scope": 0}),
(m2, m2_tif, 0, {"scope": 0}),
- client_opts={"duration" : netperf_duration,
- "testname" :
"TCP_STREAM",
- "confidence" :
nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "debug": nperf_debug,
- "max_deviation":
nperf_max_dev,
- "netperf_opts": nperf_opts},
- baseline = baseline,
+ client_opts = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_tcp, tcp_res_data)
@@ -185,18 +189,12 @@ for setting in encryption_settings:
baseline = perf_api.get_baseline_of_result(result_udp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "UDP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts
+
udp_res_data = netperf((m1, m1_tif, 0, {"scope": 0}),
(m2, m2_tif, 0, {"scope": 0}),
- client_opts={"duration" : netperf_duration,
- "testname" :
"UDP_STREAM",
- "confidence" :
nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "debug": nperf_debug,
- "max_deviation":
nperf_max_dev,
- "netperf_opts": nperf_opts},
- baseline = baseline,
+ client_opts = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_udp, udp_res_data)
@@ -228,18 +226,12 @@ for setting in encryption_settings:
baseline = perf_api.get_baseline_of_result(result_tcp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "TCP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts + " -6"
+
tcp_res_data = netperf((m1, m1_tif, 1, {"scope": 0}),
(m2, m2_tif, 1, {"scope": 0}),
- client_opts={"duration" : netperf_duration,
- "testname" :
"TCP_STREAM",
- "confidence" :
nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "debug": nperf_debug,
- "max_deviation":
nperf_max_dev,
- "netperf_opts" : nperf_opts +
" -6"},
- baseline = baseline,
+ client_opts = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_tcp, tcp_res_data)
@@ -263,18 +255,12 @@ for setting in encryption_settings:
baseline = perf_api.get_baseline_of_result(result_udp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "UDP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts + " -6"
+
udp_res_data = netperf((m1, m1_tif, 1, {"scope": 0}),
(m2, m2_tif, 1, {"scope": 0}),
- client_opts={"duration" : netperf_duration,
- "testname" :
"UDP_STREAM",
- "confidence" :
nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "debug": nperf_debug,
- "max_deviation":
nperf_max_dev,
- "netperf_opts" : nperf_opts +
"-6"},
- baseline = baseline,
+ client_opts = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_udp, udp_res_data)
diff --git a/recipes/regression_tests/phase3/vxlan_multicast.py
b/recipes/regression_tests/phase3/vxlan_multicast.py
index 02050ce..7b64890 100644
--- a/recipes/regression_tests/phase3/vxlan_multicast.py
+++ b/recipes/regression_tests/phase3/vxlan_multicast.py
@@ -98,6 +98,16 @@ for x in ipv6_endpoints:
for i in ipv6_pings:
i.wait()
+client_opts = {"duration" : netperf_duration,
+ "testname" : "TCP_STREAM",
+ "confidence" : nperf_confidence,
+ "num_parallel" : nperf_num_parallel,
+ "cpu_util" : nperf_cpu_util,
+ "runs": nperf_max_runs,
+ "netperf_opts": nperf_opts,
+ "debug": nperf_debug,
+ "max_deviation": nperf_max_dev}
+
ctl.wait(2)
if ipv in [ 'ipv4', 'both' ]:
if nperf_protocols.find("tcp") > -1:
@@ -119,18 +129,12 @@ if ipv in [ 'ipv4', 'both' ]:
baseline = perf_api.get_baseline_of_result(result_tcp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "TCP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts
+
tcp_res_data = netperf((m1, test_if1, 0, {"scope": 0}),
(m2, test_if2, 0, {"scope": 0}),
- client_opts={"duration" : netperf_duration,
- "testname" :
"TCP_STREAM",
- "confidence" : nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "debug": nperf_debug,
- "max_deviation": nperf_max_dev,
- "netperf_opts": nperf_opts},
- baseline = baseline,
+ client_opts = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_tcp, tcp_res_data)
@@ -156,18 +160,12 @@ if ipv in [ 'ipv4', 'both' ]:
baseline = perf_api.get_baseline_of_result(result_udp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "UDP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts
+
udp_res_data = netperf((m1, test_if1, 0, {"scope": 0}),
(m2, test_if2, 0, {"scope": 0}),
- client_opts={"duration" : netperf_duration,
- "testname" :
"UDP_STREAM",
- "confidence" : nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "debug": nperf_debug,
- "max_deviation": nperf_max_dev,
- "netperf_opts": nperf_opts},
- baseline = baseline,
+ client_opts = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_udp, udp_res_data)
@@ -194,18 +192,12 @@ if ipv in [ 'ipv6', 'both' ]:
baseline = perf_api.get_baseline_of_result(result_tcp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "TCP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts + " -6"
+
tcp_res_data = netperf((m1, test_if1, 1, {"scope": 0}),
(m2, test_if2, 1, {"scope": 0}),
- client_opts={"duration" : netperf_duration,
- "testname" :
"TCP_STREAM",
- "confidence" : nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "debug": nperf_debug,
- "max_deviation": nperf_max_dev,
- "netperf_opts" : nperf_opts +
" -6"},
- baseline = baseline,
+ client_opts = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_tcp, tcp_res_data)
@@ -231,18 +223,12 @@ if ipv in [ 'ipv6', 'both' ]:
baseline = perf_api.get_baseline_of_result(result_udp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "UDP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts + " -6"
+
udp_res_data = netperf((m1, test_if1, 1, {"scope": 0}),
(m2, test_if2, 1, {"scope": 0}),
- client_opts={"duration" : netperf_duration,
- "testname" :
"UDP_STREAM",
- "confidence" : nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "debug": nperf_debug,
- "max_deviation": nperf_max_dev,
- "netperf_opts" : nperf_opts +
"-6"},
- baseline = baseline,
+ client_opts = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_udp, udp_res_data)
diff --git a/recipes/regression_tests/phase3/vxlan_remote.py
b/recipes/regression_tests/phase3/vxlan_remote.py
index 0ec0e86..2de4eb7 100644
--- a/recipes/regression_tests/phase3/vxlan_remote.py
+++ b/recipes/regression_tests/phase3/vxlan_remote.py
@@ -67,6 +67,16 @@ ctl.wait(15)
ping_opts = {"count": 100, "interval": 0.1}
+client_opts = {"duration" : netperf_duration,
+ "testname" : "TCP_STREAM",
+ "confidence" : nperf_confidence,
+ "num_parallel" : nperf_num_parallel,
+ "cpu_util" : nperf_cpu_util,
+ "runs": nperf_max_runs,
+ "netperf_opts": nperf_opts,
+ "debug": nperf_debug,
+ "max_deviation": nperf_max_dev}
+
if ipv in [ 'ipv4', 'both' ]:
ping((m1, test_if1, 0, {"scope": 0}),
(m2, test_if2, 0, {"scope": 0}),
@@ -90,18 +100,12 @@ if ipv in [ 'ipv4', 'both' ]:
baseline = perf_api.get_baseline_of_result(result_tcp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "TCP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts
+
tcp_res_data = netperf((m1, test_if1, 0, {"scope": 0}),
(m2, test_if2, 0, {"scope": 0}),
- client_opts={"duration" : netperf_duration,
- "testname" :
"TCP_STREAM",
- "confidence" : nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "debug": nperf_debug,
- "max_deviation": nperf_max_dev,
- "netperf_opts": nperf_opts},
- baseline = baseline,
+ client_opts = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_tcp, tcp_res_data)
@@ -124,18 +128,12 @@ if ipv in [ 'ipv4', 'both' ]:
baseline = perf_api.get_baseline_of_result(result_udp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "UDP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts
+
udp_res_data = netperf((m1, test_if1, 0, {"scope": 0}),
(m2, test_if2, 0, {"scope": 0}),
- client_opts={"duration" : netperf_duration,
- "testname" :
"UDP_STREAM",
- "confidence" : nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "debug": nperf_debug,
- "max_deviation": nperf_max_dev,
- "netperf_opts": nperf_opts},
- baseline = baseline,
+ client_opts = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_udp, udp_res_data)
@@ -163,18 +161,12 @@ if ipv in [ 'ipv6', 'both' ]:
baseline = perf_api.get_baseline_of_result(result_tcp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "TCP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts + " -6"
+
tcp_res_data = netperf((m1, test_if1, 1, {"scope": 0}),
(m2, test_if2, 1, {"scope": 0}),
- client_opts={"duration" : netperf_duration,
- "testname" :
"TCP_STREAM",
- "confidence" : nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "debug": nperf_debug,
- "max_deviation": nperf_max_dev,
- "netperf_opts" : nperf_opts +
" -6"},
- baseline = baseline,
+ client_opts = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_tcp, tcp_res_data)
@@ -197,18 +189,12 @@ if ipv in [ 'ipv6', 'both' ]:
baseline = perf_api.get_baseline_of_result(result_udp)
baseline = perfrepo_baseline_to_dict(baseline)
+ client_opts["testname"] = "UDP_STREAM"
+ client_opts["netperf_opts"] = nperf_opts + " -6"
+
udp_res_data = netperf((m1, test_if1, 1, {"scope": 0}),
(m2, test_if2, 1, {"scope": 0}),
- client_opts={"duration" : netperf_duration,
- "testname" :
"UDP_STREAM",
- "confidence" : nperf_confidence,
- "num_parallel" :
nperf_num_parallel,
- "cpu_util" : nperf_cpu_util,
- "runs": nperf_max_runs,
- "debug": nperf_debug,
- "max_deviation": nperf_max_dev,
- "netperf_opts" : nperf_opts +
"-6"},
- baseline = baseline,
+ client_opts = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_udp, udp_res_data)
--
2.9.3