This patch adds nperf_msg_size alias to all phase3 tests.
Changes in v2:
* Rebased patch which adds nperf_protocols alias to phase3 recipes
* Fixed bug which caused to run only IPv4 TCP_STREAM all the time
* Fixed bugs where result_tcp was used instead of result_udp
Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com>
---
.../regression_tests/phase3/2_virt_ovs_vxlan.py | 69 ++++++++-------
.../regression_tests/phase3/novirt_ovs_vxlan.py | 82 +++++++++---------
recipes/regression_tests/phase3/simple_macsec.py | 85 ++++++++++---------
recipes/regression_tests/phase3/vxlan_multicast.py | 98 +++++++++++-----------
recipes/regression_tests/phase3/vxlan_remote.py | 98 +++++++++++-----------
5 files changed, 221 insertions(+), 211 deletions(-)
diff --git a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py
b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py
index 17cc0ce..9c583ff 100644
--- a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py
+++ b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py
@@ -43,6 +43,7 @@ nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
nperf_debug = ctl.get_alias("nperf_debug")
nperf_max_dev = ctl.get_alias("nperf_max_dev")
+nperf_msg_size = ctl.get_alias("nperf_msg_size")
pr_user_comment = ctl.get_alias("perfrepo_comment")
nperf_protocols = ctl.get_alias("nperf_protocols")
@@ -125,6 +126,19 @@ 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 nperf_msg_size is not None:
+ client_opts["msg_size"] = nperf_msg_size
+
if ipv in [ 'ipv4', 'both' ]:
# prepare PerfRepo result for tcp
@@ -144,20 +158,17 @@ if ipv in [ 'ipv4', 'both' ]:
result_tcp.add_tag("multithreaded")
result_tcp.set_parameter('num_parallel', nperf_num_parallel)
+ if nperf_msg_size is not None:
+ result_tcp.set_parameter("nperf_msg_size", nperf_msg_size)
+
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,21 +226,18 @@ if ipv in [ 'ipv6', 'both' ]:
result_tcp.add_tag("multithreaded")
result_tcp.set_parameter('num_parallel', nperf_num_parallel)
+ if nperf_msg_size is not None:
+ result_tcp.set_parameter("nperf_msg_size", nperf_msg_size)
+
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,21 +260,18 @@ if ipv in [ 'ipv6', 'both' ]:
result_udp.add_tag("multithreaded")
result_udp.set_parameter('num_parallel', nperf_num_parallel)
+ if nperf_msg_size is not None:
+ result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
+
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..e8d12e4 100644
--- a/recipes/regression_tests/phase3/novirt_ovs_vxlan.py
+++ b/recipes/regression_tests/phase3/novirt_ovs_vxlan.py
@@ -37,6 +37,7 @@ nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
nperf_debug = ctl.get_alias("nperf_debug")
nperf_max_dev = ctl.get_alias("nperf_max_dev")
+nperf_msg_size = ctl.get_alias("nperf_msg_size")
pr_user_comment = ctl.get_alias("perfrepo_comment")
nperf_protocols = ctl.get_alias("nperf_protocols")
@@ -74,6 +75,19 @@ 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}
+
+if nperf_msg_size is not None:
+ client_opts["msg_size"] = nperf_msg_size
+
#netperfs
if ipv in [ 'ipv4', 'both' ]:
ctl.wait(2)
@@ -91,21 +105,18 @@ if ipv in [ 'ipv4', 'both' ]:
result_tcp.add_tag("multithreaded")
result_tcp.set_parameter('num_parallel', nperf_num_parallel)
+ if nperf_msg_size is not None:
+ result_tcp.set_parameter("nperf_msg_size", nperf_msg_size)
+
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)
@@ -125,21 +136,18 @@ if ipv in [ 'ipv4', 'both' ]:
result_udp.add_tag("multithreaded")
result_udp.set_parameter('num_parallel', nperf_num_parallel)
+ if nperf_msg_size is not None:
+ result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
+
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)
@@ -161,21 +169,18 @@ if ipv in [ 'ipv6', 'both' ]:
result_tcp.add_tag("multithreaded")
result_tcp.set_parameter('num_parallel', nperf_num_parallel)
+ if nperf_msg_size is not None:
+ result_tcp.set_parameter("nperf_msg_size", nperf_msg_size)
+
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)
@@ -195,21 +200,18 @@ if ipv in [ 'ipv6', 'both' ]:
result_udp.add_tag("multithreaded")
result_udp.set_parameter('num_parallel', nperf_num_parallel)
+ if nperf_msg_size is not None:
+ result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
+
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..668dae2 100644
--- a/recipes/regression_tests/phase3/simple_macsec.py
+++ b/recipes/regression_tests/phase3/simple_macsec.py
@@ -36,6 +36,7 @@ nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
nperf_debug = ctl.get_alias("nperf_debug")
nperf_max_dev = ctl.get_alias("nperf_max_dev")
+nperf_msg_size = ctl.get_alias("nperf_msg_size")
pr_user_comment = ctl.get_alias("perfrepo_comment")
nperf_protocols = ctl.get_alias("nperf_protocols")
@@ -119,6 +120,19 @@ 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}
+
+if nperf_msg_size is not None:
+ client_opts["msg_size"] = nperf_msg_size
+
for setting in encryption_settings:
#macsec setup
macsecSetup(setting)
@@ -132,7 +146,6 @@ for setting in encryption_settings:
ctl.wait(2)
-
if nperf_protocols.find("tcp") > -1:
# prepare PerfRepo result for tcp
result_tcp = perf_api.new_result("tcp_ipv4_id",
@@ -147,21 +160,18 @@ for setting in encryption_settings:
result_tcp.set_parameter('encryption', setting)
+ if nperf_msg_size is not None:
+ result_tcp.set_parameter("nperf_msg_size", nperf_msg_size)
+
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)
@@ -182,28 +192,24 @@ for setting in encryption_settings:
result_udp.set_parameter('encryption', setting)
+ if nperf_msg_size is not None:
+ result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
+
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)
result_udp.set_comment(pr_comment)
perf_api.save_result(result_udp)
-
if ipv in [ 'ipv6', 'both' ]:
ping6((m1, m1_tif, 1, {"scope": 0}),
(m2, m2_tif, 1, {"scope": 0}),
@@ -225,21 +231,18 @@ for setting in encryption_settings:
result_tcp.set_parameter('encryption', setting)
+ if nperf_msg_size is not None:
+ result_tcp.set_parameter("nperf_msg_size", nperf_msg_size)
+
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)
@@ -260,28 +263,24 @@ for setting in encryption_settings:
result_udp.set_parameter('encryption', setting)
+ if nperf_msg_size is not None:
+ result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
+
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)
result_udp.set_comment(pr_comment)
perf_api.save_result(result_udp)
-
m1.run("ip link delete %s" % msec_tif_name)
m2.run("ip link delete %s" % msec_tif_name)
diff --git a/recipes/regression_tests/phase3/vxlan_multicast.py
b/recipes/regression_tests/phase3/vxlan_multicast.py
index 02050ce..714439a 100644
--- a/recipes/regression_tests/phase3/vxlan_multicast.py
+++ b/recipes/regression_tests/phase3/vxlan_multicast.py
@@ -38,6 +38,7 @@ nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
nperf_debug = ctl.get_alias("nperf_debug")
nperf_max_dev = ctl.get_alias("nperf_max_dev")
+nperf_msg_size = ctl.get_alias("nperf_msg_size")
pr_user_comment = ctl.get_alias("perfrepo_comment")
nperf_protocols = ctl.get_alias("nperf_protocols")
@@ -98,6 +99,19 @@ 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}
+
+if nperf_msg_size is not None:
+ client_opts["msg_size"] = nperf_msg_size
+
ctl.wait(2)
if ipv in [ 'ipv4', 'both' ]:
if nperf_protocols.find("tcp") > -1:
@@ -116,21 +130,18 @@ if ipv in [ 'ipv4', 'both' ]:
result_tcp.add_tag("multithreaded")
result_tcp.set_parameter('num_parallel', nperf_num_parallel)
+ if nperf_msg_size is not None:
+ result_tcp.set_parameter("nperf_msg_size", nperf_msg_size)
+
baseline = perf_api.get_baseline_of_result(result_tcp)
baseline = perfrepo_baseline_to_dict(baseline)
- 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["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 = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_tcp, tcp_res_data)
@@ -153,21 +164,18 @@ if ipv in [ 'ipv4', 'both' ]:
result_udp.add_tag("multithreaded")
result_udp.set_parameter('num_parallel', nperf_num_parallel)
+ if nperf_msg_size is not None:
+ result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
+
baseline = perf_api.get_baseline_of_result(result_udp)
baseline = perfrepo_baseline_to_dict(baseline)
- 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["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 = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_udp, udp_res_data)
@@ -191,21 +199,18 @@ if ipv in [ 'ipv6', 'both' ]:
result_tcp.add_tag("multithreaded")
result_tcp.set_parameter('num_parallel', nperf_num_parallel)
+ if nperf_msg_size is not None:
+ result_tcp.set_parameter("nperf_msg_size", nperf_msg_size)
+
baseline = perf_api.get_baseline_of_result(result_tcp)
baseline = perfrepo_baseline_to_dict(baseline)
- 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["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 = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_tcp, tcp_res_data)
@@ -228,21 +233,18 @@ if ipv in [ 'ipv6', 'both' ]:
result_udp.add_tag("multithreaded")
result_udp.set_parameter('num_parallel', nperf_num_parallel)
+ if nperf_msg_size is not None:
+ result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
+
baseline = perf_api.get_baseline_of_result(result_udp)
baseline = perfrepo_baseline_to_dict(baseline)
- 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["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 = 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..7606814 100644
--- a/recipes/regression_tests/phase3/vxlan_remote.py
+++ b/recipes/regression_tests/phase3/vxlan_remote.py
@@ -37,6 +37,7 @@ nperf_cpu_util = ctl.get_alias("nperf_cpu_util")
nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel"))
nperf_debug = ctl.get_alias("nperf_debug")
nperf_max_dev = ctl.get_alias("nperf_max_dev")
+nperf_msg_size = ctl.get_alias("nperf_msg_size")
pr_user_comment = ctl.get_alias("perfrepo_comment")
nperf_protocols = ctl.get_alias("nperf_protocols")
@@ -67,6 +68,19 @@ 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 nperf_msg_size is not None:
+ client_opts["msg_size"] = nperf_msg_size
+
if ipv in [ 'ipv4', 'both' ]:
ping((m1, test_if1, 0, {"scope": 0}),
(m2, test_if2, 0, {"scope": 0}),
@@ -87,21 +101,18 @@ if ipv in [ 'ipv4', 'both' ]:
result_tcp.add_tag("multithreaded")
result_tcp.set_parameter('num_parallel', nperf_num_parallel)
+ if nperf_msg_size is not None:
+ result_tcp.set_parameter("nperf_msg_size", nperf_msg_size)
+
baseline = perf_api.get_baseline_of_result(result_tcp)
baseline = perfrepo_baseline_to_dict(baseline)
- 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["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 = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_tcp, tcp_res_data)
@@ -121,21 +132,18 @@ if ipv in [ 'ipv4', 'both' ]:
result_udp.add_tag("multithreaded")
result_udp.set_parameter('num_parallel', nperf_num_parallel)
+ if nperf_msg_size is not None:
+ result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
+
baseline = perf_api.get_baseline_of_result(result_udp)
baseline = perfrepo_baseline_to_dict(baseline)
- 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["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 = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_udp, udp_res_data)
@@ -160,21 +168,18 @@ if ipv in [ 'ipv6', 'both' ]:
result_tcp.add_tag("multithreaded")
result_tcp.set_parameter('num_parallel', nperf_num_parallel)
+ if nperf_msg_size is not None:
+ result_tcp.set_parameter("nperf_msg_size", nperf_msg_size)
+
baseline = perf_api.get_baseline_of_result(result_tcp)
baseline = perfrepo_baseline_to_dict(baseline)
- 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["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 = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_tcp, tcp_res_data)
@@ -194,21 +199,18 @@ if ipv in [ 'ipv6', 'both' ]:
result_udp.add_tag("multithreaded")
result_udp.set_parameter('num_parallel', nperf_num_parallel)
+ if nperf_msg_size is not None:
+ result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
+
baseline = perf_api.get_baseline_of_result(result_udp)
baseline = perfrepo_baseline_to_dict(baseline)
- 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["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 = client_opts, baseline = baseline,
timeout = (netperf_duration +
nperf_reserve)*nperf_max_runs)
netperf_result_template(result_udp, udp_res_data)
--
2.9.3