All phase3 tests now take optional alias nperf_protocols that can be used to limit which netperf tests to run.
For example, if set to 'udp', only UDP_STREAM. The default value is all protocol tests for phase3, i.e. TCP and UDP.
Changes in v4: * Move nperf_msg_size in 2_virt_ovs_vxlan to correct commit
Signed-off-by: Jiri Prochazka jprochaz@redhat.com --- .../regression_tests/phase3/2_virt_ovs_vxlan.py | 279 ++++++++++---------- .../regression_tests/phase3/2_virt_ovs_vxlan.xml | 1 + .../regression_tests/phase3/novirt_ovs_vxlan.py | 265 ++++++++++--------- .../regression_tests/phase3/novirt_ovs_vxlan.xml | 1 + recipes/regression_tests/phase3/simple_macsec.py | 273 +++++++++---------- recipes/regression_tests/phase3/simple_macsec.xml | 1 + recipes/regression_tests/phase3/vxlan_multicast.py | 289 +++++++++++---------- .../regression_tests/phase3/vxlan_multicast.xml | 1 + recipes/regression_tests/phase3/vxlan_remote.py | 263 ++++++++++--------- recipes/regression_tests/phase3/vxlan_remote.xml | 1 + 10 files changed, 699 insertions(+), 675 deletions(-)
diff --git a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py index 5ebaacc..026a666 100644 --- a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py +++ b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py @@ -44,6 +44,7 @@ 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") pr_user_comment = ctl.get_alias("perfrepo_comment") +nperf_protocols = ctl.get_alias("nperf_protocols")
pr_comment = generate_perfrepo_comment([guest1, guest2, guest3, guest4], pr_user_comment) @@ -127,148 +128,146 @@ if ipv in ['ipv6', 'both']:
if ipv in [ 'ipv4', 'both' ]: # prepare PerfRepo result for tcp - result_tcp = perf_api.new_result("tcp_ipv4_id", - "tcp_ipv4_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release', - r'test_host\d+.hostname', - r'test_host\d+..*hwaddr', - r'machine_h\d+..*ovs\d*.hwaddr', - r'machine_h\d+..*tap\d*.hwaddr', - r'machine_h\d+..*tap\d*.devname']) - result_tcp.add_tag(product_name) - if nperf_num_parallel > 1: - result_tcp.add_tag("multithreaded") - result_tcp.set_parameter('num_parallel', nperf_num_parallel) - - baseline = perf_api.get_baseline_of_result(result_tcp) - baseline = perfrepo_baseline_to_dict(baseline) - - 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, - timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) - - netperf_result_template(result_tcp, tcp_res_data) - result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) - - # prepare PerfRepo result for udp - result_udp = perf_api.new_result("udp_ipv4_id", - "udp_ipv4_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release', - r'test_host\d+.hostname', - r'test_host\d+..*hwaddr', - r'machine_h\d+..*ovs\d*.hwaddr', - r'machine_h\d+..*tap\d*.hwaddr', - r'machine_h\d+..*tap\d*.devname']) - result_udp.add_tag(product_name) - if nperf_num_parallel > 1: - result_udp.add_tag("multithreaded") - result_udp.set_parameter('num_parallel', nperf_num_parallel) - - baseline = perf_api.get_baseline_of_result(result_udp) - baseline = perfrepo_baseline_to_dict(baseline) - - udp_res_data = netperf((guest1, g1_nic, 0), (guest3, g3_nic, 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, - "netperf_opts": nperf_opts, - "debug": nperf_debug, - "max_deviation": nperf_max_dev}, - 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 nperf_protocols.find("tcp") > -1: + result_tcp = perf_api.new_result("tcp_ipv4_id", + "tcp_ipv4_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release', + r'test_host\d+.hostname', + r'test_host\d+..*hwaddr', + r'machine_h\d+..*ovs\d*.hwaddr', + r'machine_h\d+..*tap\d*.hwaddr', + r'machine_h\d+..*tap\d*.devname']) + result_tcp.add_tag(product_name) + if nperf_num_parallel > 1: + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel) + + baseline = perf_api.get_baseline_of_result(result_tcp) + baseline = perfrepo_baseline_to_dict(baseline) + + 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, + timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) + + netperf_result_template(result_tcp, tcp_res_data) + result_tcp.set_comment(pr_comment) + perf_api.save_result(result_tcp) + + if nperf_protocols.find("udp") > -1: + # prepare PerfRepo result for udp + result_udp = perf_api.new_result("udp_ipv4_id", + "udp_ipv4_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release', + r'test_host\d+.hostname', + r'test_host\d+..*hwaddr', + r'machine_h\d+..*ovs\d*.hwaddr', + r'machine_h\d+..*tap\d*.hwaddr', + r'machine_h\d+..*tap\d*.devname']) + result_udp.add_tag(product_name) + if nperf_num_parallel > 1: + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel) + + 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((guest1, g1_nic, 0), (guest3, g3_nic, 0), + 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' ]: # prepare PerfRepo result for tcp ipv6 - result_tcp = perf_api.new_result("tcp_ipv6_id", - "tcp_ipv6_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release', - r'test_host\d+.hostname', - r'test_host\d+..*hwaddr', - r'machine_h\d+..*ovs\d*.hwaddr', - r'machine_h\d+..*tap\d*.hwaddr', - r'machine_h\d+..*tap\d*.devname']) - result_tcp.add_tag(product_name) - if nperf_num_parallel > 1: - result_tcp.add_tag("multithreaded") - result_tcp.set_parameter('num_parallel', nperf_num_parallel) - - baseline = perf_api.get_baseline_of_result(result_tcp) - baseline = perfrepo_baseline_to_dict(baseline) - - 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) - - netperf_result_template(result_tcp, tcp_res_data) - result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) - - #prepare PerfRepo result for udp ipv6 - result_udp = perf_api.new_result("udp_ipv6_id", - "udp_ipv6_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release', - r'test_host\d+.hostname', - r'test_host\d+..*hwaddr', - r'machine_h\d+..*ovs\d*.hwaddr', - r'machine_h\d+..*tap\d*.hwaddr', - r'machine_h\d+..*tap\d*.devname']) - result_udp.add_tag(product_name) - if nperf_num_parallel > 1: - result_udp.add_tag("multithreaded") - result_udp.set_parameter('num_parallel', nperf_num_parallel) - - baseline = perf_api.get_baseline_of_result(result_udp) - baseline = perfrepo_baseline_to_dict(baseline) - - 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) - - netperf_result_template(result_udp, udp_res_data) - result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + if nperf_protocols.find("tcp") > -1: + result_tcp = perf_api.new_result("tcp_ipv6_id", + "tcp_ipv6_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release', + r'test_host\d+.hostname', + r'test_host\d+..*hwaddr', + r'machine_h\d+..*ovs\d*.hwaddr', + r'machine_h\d+..*tap\d*.hwaddr', + r'machine_h\d+..*tap\d*.devname']) + result_tcp.add_tag(product_name) + if nperf_num_parallel > 1: + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel) + + baseline = perf_api.get_baseline_of_result(result_tcp) + baseline = perfrepo_baseline_to_dict(baseline) + + 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) + + netperf_result_template(result_tcp, tcp_res_data) + result_tcp.set_comment(pr_comment) + perf_api.save_result(result_tcp) + + if nperf_protocols.find("udp") > -1: + #prepare PerfRepo result for udp ipv6 + result_udp = perf_api.new_result("udp_ipv6_id", + "udp_ipv6_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release', + r'test_host\d+.hostname', + r'test_host\d+..*hwaddr', + r'machine_h\d+..*ovs\d*.hwaddr', + r'machine_h\d+..*tap\d*.hwaddr', + r'machine_h\d+..*tap\d*.devname']) + result_udp.add_tag(product_name) + if nperf_num_parallel > 1: + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel) + + baseline = perf_api.get_baseline_of_result(result_udp) + baseline = perfrepo_baseline_to_dict(baseline) + + 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) + + netperf_result_template(result_udp, udp_res_data) + result_udp.set_comment(pr_comment) + perf_api.save_result(result_udp)
if nperf_cpupin: host1.run("service irqbalance start") diff --git a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml index 2861acb..3d131b8 100644 --- a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml +++ b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml @@ -9,6 +9,7 @@ <alias name="nperf_num_parallel" value="1"/> <alias name="nperf_debug" value="0"/> <alias name="nperf_max_dev" value="20%"/> + <alias name="nperf_protocols" value="tcp udp"/> <alias name="mapping_file" value="2_virt_ovs_vxlan.mapping" /> <alias name="net" value="192.168.2"/> <alias name="vxlan_net" value="192.168.100"/> diff --git a/recipes/regression_tests/phase3/novirt_ovs_vxlan.py b/recipes/regression_tests/phase3/novirt_ovs_vxlan.py index 5419ad9..e2998e2 100644 --- a/recipes/regression_tests/phase3/novirt_ovs_vxlan.py +++ b/recipes/regression_tests/phase3/novirt_ovs_vxlan.py @@ -38,6 +38,7 @@ 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") pr_user_comment = ctl.get_alias("perfrepo_comment") +nperf_protocols = ctl.get_alias("nperf_protocols")
pr_comment = generate_perfrepo_comment([h1, h2], pr_user_comment)
@@ -77,139 +78,143 @@ if ipv in [ 'ipv6', 'both' ]: if ipv in [ 'ipv4', 'both' ]: ctl.wait(2)
- # prepare PerfRepo result for tcp - result_tcp = perf_api.new_result("tcp_ipv4_id", - "tcp_ipv4_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release', - r'interface_ovs\d+.hwaddr']) - result_tcp.add_tag(product_name) - if nperf_num_parallel > 1: - result_tcp.add_tag("multithreaded") - result_tcp.set_parameter('num_parallel', nperf_num_parallel) - - baseline = perf_api.get_baseline_of_result(result_tcp) - baseline = perfrepo_baseline_to_dict(baseline) - - 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, - timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) - - netperf_result_template(result_tcp, tcp_res_data) - result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) - - # prepare PerfRepo result for udp - result_udp = perf_api.new_result("udp_ipv4_id", - "udp_ipv4_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release', - r'interface_ovs\d+.hwaddr']) - result_udp.add_tag(product_name) - if nperf_num_parallel > 1: - result_udp.add_tag("multithreaded") - result_udp.set_parameter('num_parallel', nperf_num_parallel) - - baseline = perf_api.get_baseline_of_result(result_udp) - baseline = perfrepo_baseline_to_dict(baseline) - - 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, - 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 nperf_protocols.find("tcp") > -1: + # prepare PerfRepo result for tcp + result_tcp = perf_api.new_result("tcp_ipv4_id", + "tcp_ipv4_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release', + r'interface_ovs\d+.hwaddr']) + result_tcp.add_tag(product_name) + if nperf_num_parallel > 1: + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel) + + baseline = perf_api.get_baseline_of_result(result_tcp) + baseline = perfrepo_baseline_to_dict(baseline) + + 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, + timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) + + netperf_result_template(result_tcp, tcp_res_data) + result_tcp.set_comment(pr_comment) + perf_api.save_result(result_tcp) + + if nperf_protocols.find("udp") > -1: + # prepare PerfRepo result for udp + result_udp = perf_api.new_result("udp_ipv4_id", + "udp_ipv4_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release', + r'interface_ovs\d+.hwaddr']) + result_udp.add_tag(product_name) + if nperf_num_parallel > 1: + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel) + + baseline = perf_api.get_baseline_of_result(result_udp) + baseline = perfrepo_baseline_to_dict(baseline) + + 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, + 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' ]: ctl.wait(2)
- # prepare PerfRepo result for tcp ipv6 - result_tcp = perf_api.new_result("tcp_ipv6_id", - "tcp_ipv6_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release', - r'interface_ovs\d+.hwaddr']) - result_tcp.add_tag(product_name) - if nperf_num_parallel > 1: - result_tcp.add_tag("multithreaded") - result_tcp.set_parameter('num_parallel', nperf_num_parallel) - - baseline = perf_api.get_baseline_of_result(result_tcp) - baseline = perfrepo_baseline_to_dict(baseline) - - 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, - timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) - - netperf_result_template(result_tcp, tcp_res_data) - result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) - - # prepare PerfRepo result for udp ipv6 - result_udp = perf_api.new_result("udp_ipv6_id", - "udp_ipv6_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release', - r'interface_ovs\d+.hwaddr']) - result_udp.add_tag(product_name) - if nperf_num_parallel > 1: - result_udp.add_tag("multithreaded") - result_udp.set_parameter('num_parallel', nperf_num_parallel) - - baseline = perf_api.get_baseline_of_result(result_udp) - baseline = perfrepo_baseline_to_dict(baseline) - - 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, - 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 nperf_protocols.find("tcp") > -1: + # prepare PerfRepo result for tcp ipv6 + result_tcp = perf_api.new_result("tcp_ipv6_id", + "tcp_ipv6_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release', + r'interface_ovs\d+.hwaddr']) + result_tcp.add_tag(product_name) + if nperf_num_parallel > 1: + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel) + + baseline = perf_api.get_baseline_of_result(result_tcp) + baseline = perfrepo_baseline_to_dict(baseline) + + 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, + timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) + + netperf_result_template(result_tcp, tcp_res_data) + result_tcp.set_comment(pr_comment) + perf_api.save_result(result_tcp) + + if nperf_protocols.find("udp") > -1: + # prepare PerfRepo result for udp ipv6 + result_udp = perf_api.new_result("udp_ipv6_id", + "udp_ipv6_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release', + r'interface_ovs\d+.hwaddr']) + result_udp.add_tag(product_name) + if nperf_num_parallel > 1: + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel) + + baseline = perf_api.get_baseline_of_result(result_udp) + baseline = perfrepo_baseline_to_dict(baseline) + + 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, + 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 nperf_cpupin: h1.run("service irqbalance start") diff --git a/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml b/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml index bf2d387..9764d50 100644 --- a/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml +++ b/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml @@ -9,6 +9,7 @@ <alias name="nperf_num_parallel" value="1"/> <alias name="nperf_debug" value="0"/> <alias name="nperf_max_dev" value="20%"/> + <alias name="nperf_protocols" value="tcp udp"/> <alias name="mapping_file" value="novirt_ovs_vxlan.mapping" /> <alias name="net" value="192.168.2"/> <alias name="vxlan_net" value="192.168.100"/> diff --git a/recipes/regression_tests/phase3/simple_macsec.py b/recipes/regression_tests/phase3/simple_macsec.py index b16214b..013e852 100644 --- a/recipes/regression_tests/phase3/simple_macsec.py +++ b/recipes/regression_tests/phase3/simple_macsec.py @@ -37,6 +37,7 @@ 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") pr_user_comment = ctl.get_alias("perfrepo_comment") +nperf_protocols = ctl.get_alias("nperf_protocols")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
@@ -132,73 +133,75 @@ for setting in encryption_settings: ctl.wait(2)
- # prepare PerfRepo result for tcp - result_tcp = perf_api.new_result("tcp_ipv4_id", - "tcp_ipv4_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release']) - result_tcp.add_tag(product_name) - if nperf_num_parallel > 1: - result_tcp.add_tag("multithreaded") - result_tcp.set_parameter('num_parallel', nperf_num_parallel) - - result_tcp.set_parameter('encryption', setting) - - baseline = perf_api.get_baseline_of_result(result_tcp) - baseline = perfrepo_baseline_to_dict(baseline) - - 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, - timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) - - netperf_result_template(result_tcp, tcp_res_data) - result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) - - # prepare PerfRepo result for udp - result_udp = perf_api.new_result("udp_ipv4_id", - "udp_ipv4_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release']) - result_udp.add_tag(product_name) - if nperf_num_parallel > 1: - result_udp.add_tag("multithreaded") - result_udp.set_parameter('num_parallel', nperf_num_parallel) - - result_udp.set_parameter('encryption', setting) - - baseline = perf_api.get_baseline_of_result(result_udp) - baseline = perfrepo_baseline_to_dict(baseline) - - 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, - 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 nperf_protocols.find("tcp") > -1: + # prepare PerfRepo result for tcp + result_tcp = perf_api.new_result("tcp_ipv4_id", + "tcp_ipv4_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release']) + result_tcp.add_tag(product_name) + if nperf_num_parallel > 1: + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel) + + result_tcp.set_parameter('encryption', setting) + + baseline = perf_api.get_baseline_of_result(result_tcp) + baseline = perfrepo_baseline_to_dict(baseline) + + 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, + timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) + + netperf_result_template(result_tcp, tcp_res_data) + result_tcp.set_comment(pr_comment) + perf_api.save_result(result_tcp) + + if nperf_protocols.find("udp") > -1: + # prepare PerfRepo result for udp + result_udp = perf_api.new_result("udp_ipv4_id", + "udp_ipv4_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release']) + result_udp.add_tag(product_name) + if nperf_num_parallel > 1: + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel) + + result_udp.set_parameter('encryption', setting) + + baseline = perf_api.get_baseline_of_result(result_udp) + baseline = perfrepo_baseline_to_dict(baseline) + + 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, + 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' ]: @@ -208,73 +211,75 @@ for setting in encryption_settings:
ctl.wait(2)
- # prepare PerfRepo result for tcp ipv6 - result_tcp = perf_api.new_result("tcp_ipv6_id", - "tcp_ipv6_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release']) - result_tcp.add_tag(product_name) - if nperf_num_parallel > 1: - result_tcp.add_tag("multithreaded") - result_tcp.set_parameter('num_parallel', nperf_num_parallel) - - result_tcp.set_parameter('encryption', setting) - - baseline = perf_api.get_baseline_of_result(result_tcp) - baseline = perfrepo_baseline_to_dict(baseline) - - 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, - timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) - - netperf_result_template(result_tcp, tcp_res_data) - result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) - - # prepare PerfRepo result for udp ipv6 - result_udp = perf_api.new_result("udp_ipv6_id", - "udp_ipv6_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release']) - result_udp.add_tag(product_name) - if nperf_num_parallel > 1: - result_udp.add_tag("multithreaded") - result_udp.set_parameter('num_parallel', nperf_num_parallel) - - result_udp.set_parameter('encryption', setting) - - baseline = perf_api.get_baseline_of_result(result_udp) - baseline = perfrepo_baseline_to_dict(baseline) - - 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, - 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 nperf_protocols.find("tcp") > -1: + # prepare PerfRepo result for tcp ipv6 + result_tcp = perf_api.new_result("tcp_ipv6_id", + "tcp_ipv6_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release']) + result_tcp.add_tag(product_name) + if nperf_num_parallel > 1: + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel) + + result_tcp.set_parameter('encryption', setting) + + baseline = perf_api.get_baseline_of_result(result_tcp) + baseline = perfrepo_baseline_to_dict(baseline) + + 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, + timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) + + netperf_result_template(result_tcp, tcp_res_data) + result_tcp.set_comment(pr_comment) + perf_api.save_result(result_tcp) + + if nperf_protocols.find("udp") > -1: + # prepare PerfRepo result for udp ipv6 + result_udp = perf_api.new_result("udp_ipv6_id", + "udp_ipv6_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release']) + result_udp.add_tag(product_name) + if nperf_num_parallel > 1: + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel) + + result_udp.set_parameter('encryption', setting) + + baseline = perf_api.get_baseline_of_result(result_udp) + baseline = perfrepo_baseline_to_dict(baseline) + + 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, + 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) diff --git a/recipes/regression_tests/phase3/simple_macsec.xml b/recipes/regression_tests/phase3/simple_macsec.xml index 2209af6..0ef80a5 100644 --- a/recipes/regression_tests/phase3/simple_macsec.xml +++ b/recipes/regression_tests/phase3/simple_macsec.xml @@ -9,6 +9,7 @@ <alias name="nperf_num_parallel" value="1" /> <alias name="nperf_debug" value="0"/> <alias name="nperf_max_dev" value="20%"/> + <alias name="nperf_protocols" value="tcp udp"/> <alias name="mapping_file" value="simple_macsec.mapping" /> <alias name="net" value="192.168.0" /> <alias name="driver" value=""/> diff --git a/recipes/regression_tests/phase3/vxlan_multicast.py b/recipes/regression_tests/phase3/vxlan_multicast.py index 0c29977..02050ce 100644 --- a/recipes/regression_tests/phase3/vxlan_multicast.py +++ b/recipes/regression_tests/phase3/vxlan_multicast.py @@ -39,6 +39,7 @@ 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") pr_user_comment = ctl.get_alias("perfrepo_comment") +nperf_protocols = ctl.get_alias("nperf_protocols")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
@@ -99,150 +100,154 @@ for i in ipv6_pings:
ctl.wait(2) if ipv in [ 'ipv4', 'both' ]: - # prepare PerfRepo result for tcp - result_tcp = perf_api.new_result("tcp_ipv4_id", - "tcp_ipv4_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release', - r'testmachine\d+.interface_tap\d+.hwaddr', - r'guest\d+.hostname', - r'guest\d+.interface_eth\d+.hwaddr', - r'test_if.hwaddr']) - result_tcp.add_tag(product_name) - if nperf_num_parallel > 1: - result_tcp.add_tag("multithreaded") - result_tcp.set_parameter('num_parallel', nperf_num_parallel) - - 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, - timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) - - netperf_result_template(result_tcp, tcp_res_data) - result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) - - # prepare PerfRepo result for udp - result_udp = perf_api.new_result("udp_ipv4_id", - "udp_ipv4_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release', - r'testmachine\d+.interface_tap\d+.hwaddr', - r'guest\d+.hostname', - r'guest\d+.interface_eth\d+.hwaddr', - r'test_if.hwaddr']) - result_udp.add_tag(product_name) - if nperf_num_parallel > 1: - result_udp.add_tag("multithreaded") - result_udp.set_parameter('num_parallel', nperf_num_parallel) - - 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, - 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 nperf_protocols.find("tcp") > -1: + # prepare PerfRepo result for tcp + result_tcp = perf_api.new_result("tcp_ipv4_id", + "tcp_ipv4_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release', + r'testmachine\d+.interface_tap\d+.hwaddr', + r'guest\d+.hostname', + r'guest\d+.interface_eth\d+.hwaddr', + r'test_if.hwaddr']) + result_tcp.add_tag(product_name) + if nperf_num_parallel > 1: + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel) + + 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, + timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) + + netperf_result_template(result_tcp, tcp_res_data) + result_tcp.set_comment(pr_comment) + perf_api.save_result(result_tcp) + + if nperf_protocols.find("udp") > -1: + # prepare PerfRepo result for udp + result_udp = perf_api.new_result("udp_ipv4_id", + "udp_ipv4_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release', + r'testmachine\d+.interface_tap\d+.hwaddr', + r'guest\d+.hostname', + r'guest\d+.interface_eth\d+.hwaddr', + r'test_if.hwaddr']) + result_udp.add_tag(product_name) + if nperf_num_parallel > 1: + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel) + + 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, + 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' ]: - # prepare PerfRepo result for tcp ipv6 - result_tcp = perf_api.new_result("tcp_ipv6_id", - "tcp_ipv6_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release', - r'testmachine\d+.interface_tap\d+.hwaddr', - r'guest\d+.hostname', - r'guest\d+.interface_eth\d+.hwaddr', - r'test_if.hwaddr']) - result_tcp.add_tag(product_name) - if nperf_num_parallel > 1: - result_tcp.add_tag("multithreaded") - result_tcp.set_parameter('num_parallel', nperf_num_parallel) - - 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, - timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) - - netperf_result_template(result_tcp, tcp_res_data) - result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) - - # prepare PerfRepo result for udp ipv6 - result_udp = perf_api.new_result("udp_ipv6_id", - "udp_ipv6_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release', - r'testmachine\d+.interface_tap\d+.hwaddr', - r'guest\d+.hostname', - r'guest\d+.interface_eth\d+.hwaddr', - r'test_if.hwaddr']) - result_udp.add_tag(product_name) - if nperf_num_parallel > 1: - result_udp.add_tag("multithreaded") - result_udp.set_parameter('num_parallel', nperf_num_parallel) - - 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, - 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 nperf_protocols.find("tcp") > -1: + # prepare PerfRepo result for tcp ipv6 + result_tcp = perf_api.new_result("tcp_ipv6_id", + "tcp_ipv6_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release', + r'testmachine\d+.interface_tap\d+.hwaddr', + r'guest\d+.hostname', + r'guest\d+.interface_eth\d+.hwaddr', + r'test_if.hwaddr']) + result_tcp.add_tag(product_name) + if nperf_num_parallel > 1: + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel) + + 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, + timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) + + netperf_result_template(result_tcp, tcp_res_data) + result_tcp.set_comment(pr_comment) + perf_api.save_result(result_tcp) + + if nperf_protocols.find("udp") > -1: + # prepare PerfRepo result for udp ipv6 + result_udp = perf_api.new_result("udp_ipv6_id", + "udp_ipv6_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release', + r'testmachine\d+.interface_tap\d+.hwaddr', + r'guest\d+.hostname', + r'guest\d+.interface_eth\d+.hwaddr', + r'test_if.hwaddr']) + result_udp.add_tag(product_name) + if nperf_num_parallel > 1: + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel) + + 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, + 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 nperf_cpupin: m1.run("service irqbalance start") diff --git a/recipes/regression_tests/phase3/vxlan_multicast.xml b/recipes/regression_tests/phase3/vxlan_multicast.xml index 5021652..715a19c 100644 --- a/recipes/regression_tests/phase3/vxlan_multicast.xml +++ b/recipes/regression_tests/phase3/vxlan_multicast.xml @@ -9,6 +9,7 @@ <alias name="nperf_num_parallel" value="1"/> <alias name="nperf_debug" value="0"/> <alias name="nperf_max_dev" value="20%"/> + <alias name="nperf_protocols" value="tcp udp"/> <alias name="mapping_file" value="vxlan_multicast.mapping" /> <alias name="net" value="192.168.0"/> <alias name="vxlan_net" value="192.168.100"/> diff --git a/recipes/regression_tests/phase3/vxlan_remote.py b/recipes/regression_tests/phase3/vxlan_remote.py index 12050d9..0ec0e86 100644 --- a/recipes/regression_tests/phase3/vxlan_remote.py +++ b/recipes/regression_tests/phase3/vxlan_remote.py @@ -38,6 +38,7 @@ 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") pr_user_comment = ctl.get_alias("perfrepo_comment") +nperf_protocols = ctl.get_alias("nperf_protocols")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
@@ -74,141 +75,145 @@ if ipv in [ 'ipv4', 'both' ]: ctl.wait(2)
# prepare PerfRepo result for tcp - result_tcp = perf_api.new_result("tcp_ipv4_id", - "tcp_ipv4_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release', - r'test_if.hwaddr']) - result_tcp.add_tag(product_name) - if nperf_num_parallel > 1: - result_tcp.add_tag("multithreaded") - result_tcp.set_parameter('num_parallel', nperf_num_parallel) - - 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, - timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) - - netperf_result_template(result_tcp, tcp_res_data) - result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) - - # prepare PerfRepo result for udp - result_udp = perf_api.new_result("udp_ipv4_id", - "udp_ipv4_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release', - r'test_if.hwaddr']) - result_udp.add_tag(product_name) - if nperf_num_parallel > 1: - result_udp.add_tag("multithreaded") - result_udp.set_parameter('num_parallel', nperf_num_parallel) - - 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, - 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 nperf_protocols.find("tcp") > -1: + result_tcp = perf_api.new_result("tcp_ipv4_id", + "tcp_ipv4_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release', + r'test_if.hwaddr']) + result_tcp.add_tag(product_name) + if nperf_num_parallel > 1: + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel) + + 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, + timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) + + netperf_result_template(result_tcp, tcp_res_data) + result_tcp.set_comment(pr_comment) + perf_api.save_result(result_tcp) + + if nperf_protocols.find("udp") > -1: + # prepare PerfRepo result for udp + result_udp = perf_api.new_result("udp_ipv4_id", + "udp_ipv4_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release', + r'test_if.hwaddr']) + result_udp.add_tag(product_name) + if nperf_num_parallel > 1: + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel) + + 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, + 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, test_if1, 1, {"scope": 0}), (m2, test_if2, 1, {"scope": 0}), options=ping_opts)
- # prepare PerfRepo result for tcp ipv6 - result_tcp = perf_api.new_result("tcp_ipv6_id", - "tcp_ipv6_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release', - r'test_if.hwaddr']) - result_tcp.add_tag(product_name) - if nperf_num_parallel > 1: - result_tcp.add_tag("multithreaded") - result_tcp.set_parameter('num_parallel', nperf_num_parallel) - - 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, - timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) - - netperf_result_template(result_tcp, tcp_res_data) - result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) - - # prepare PerfRepo result for udp ipv6 - result_udp = perf_api.new_result("udp_ipv6_id", - "udp_ipv6_result", - hash_ignore=[ - r'kernel_release', - r'redhat_release', - r'test_if.hwaddr']) - result_udp.add_tag(product_name) - if nperf_num_parallel > 1: - result_udp.add_tag("multithreaded") - result_udp.set_parameter('num_parallel', nperf_num_parallel) - - 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, - 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 nperf_protocols.find("tcp") > -1: + # prepare PerfRepo result for tcp ipv6 + result_tcp = perf_api.new_result("tcp_ipv6_id", + "tcp_ipv6_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release', + r'test_if.hwaddr']) + result_tcp.add_tag(product_name) + if nperf_num_parallel > 1: + result_tcp.add_tag("multithreaded") + result_tcp.set_parameter('num_parallel', nperf_num_parallel) + + 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, + timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) + + netperf_result_template(result_tcp, tcp_res_data) + result_tcp.set_comment(pr_comment) + perf_api.save_result(result_tcp) + + if nperf_protocols.find("udp") > -1: + # prepare PerfRepo result for udp ipv6 + result_udp = perf_api.new_result("udp_ipv6_id", + "udp_ipv6_result", + hash_ignore=[ + r'kernel_release', + r'redhat_release', + r'test_if.hwaddr']) + result_udp.add_tag(product_name) + if nperf_num_parallel > 1: + result_udp.add_tag("multithreaded") + result_udp.set_parameter('num_parallel', nperf_num_parallel) + + 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, + 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 nperf_cpupin: m1.run("service irqbalance start") diff --git a/recipes/regression_tests/phase3/vxlan_remote.xml b/recipes/regression_tests/phase3/vxlan_remote.xml index 824c839..3d290f0 100644 --- a/recipes/regression_tests/phase3/vxlan_remote.xml +++ b/recipes/regression_tests/phase3/vxlan_remote.xml @@ -9,6 +9,7 @@ <alias name="nperf_num_parallel" value="1"/> <alias name="nperf_debug" value="0"/> <alias name="nperf_max_dev" value="20%"/> + <alias name="nperf_protocols" value="tcp udp"/> <alias name="mapping_file" value="vxlan_remote.mapping" /> <alias name="net" value="192.168.0"/> <alias name="vxlan_net" value="192.168.100"/>
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@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)
This patch adds nperf_msg_size alias to all phase3 tests.
Changes in v2: * Fix typos and copy-pasting error
Changes in v3: * Fix copy-pasting error
Changes in v4: * Move nperf_opts code to separate commit
Signed-off-by: Jiri Prochazka jprochaz@redhat.com --- recipes/regression_tests/phase3/2_virt_ovs_vxlan.py | 16 ++++++++++++++++ recipes/regression_tests/phase3/novirt_ovs_vxlan.py | 16 ++++++++++++++++ recipes/regression_tests/phase3/simple_macsec.py | 16 ++++++++++++++++ recipes/regression_tests/phase3/vxlan_multicast.py | 16 ++++++++++++++++ recipes/regression_tests/phase3/vxlan_remote.py | 16 ++++++++++++++++ 5 files changed, 80 insertions(+)
diff --git a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py index 8784516..36a3df4 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")
@@ -135,6 +136,9 @@ client_opts = {"duration" : netperf_duration, "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 @@ -154,6 +158,9 @@ 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)
@@ -185,6 +192,9 @@ 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)
@@ -216,6 +226,9 @@ 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)
@@ -247,6 +260,9 @@ 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)
diff --git a/recipes/regression_tests/phase3/novirt_ovs_vxlan.py b/recipes/regression_tests/phase3/novirt_ovs_vxlan.py index ac57473..7b4d1ec 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")
@@ -84,6 +85,9 @@ client_opts = {"duration" : netperf_duration, "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) @@ -101,6 +105,9 @@ 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)
@@ -129,6 +136,9 @@ 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)
@@ -159,6 +169,9 @@ 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)
@@ -187,6 +200,9 @@ 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)
diff --git a/recipes/regression_tests/phase3/simple_macsec.py b/recipes/regression_tests/phase3/simple_macsec.py index a186797..ffd4487 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")
@@ -129,6 +130,9 @@ client_opts = {"duration" : netperf_duration, "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) @@ -157,6 +161,9 @@ 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)
@@ -186,6 +193,9 @@ 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)
@@ -223,6 +233,9 @@ 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)
@@ -252,6 +265,9 @@ 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)
diff --git a/recipes/regression_tests/phase3/vxlan_multicast.py b/recipes/regression_tests/phase3/vxlan_multicast.py index 7b64890..d4c18ee 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")
@@ -108,6 +109,9 @@ client_opts = {"duration" : netperf_duration, "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: @@ -126,6 +130,9 @@ 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)
@@ -157,6 +164,9 @@ 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)
@@ -189,6 +199,9 @@ 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)
@@ -220,6 +233,9 @@ 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)
diff --git a/recipes/regression_tests/phase3/vxlan_remote.py b/recipes/regression_tests/phase3/vxlan_remote.py index 2de4eb7..cc4b16e 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")
@@ -77,6 +78,9 @@ client_opts = {"duration" : netperf_duration, "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}), @@ -97,6 +101,9 @@ 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)
@@ -125,6 +132,9 @@ 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)
@@ -158,6 +168,9 @@ 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)
@@ -186,6 +199,9 @@ 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)
Thu, Jan 12, 2017 at 04:11:16PM CET, jprochaz@redhat.com wrote:
All phase3 tests now take optional alias nperf_protocols that can be used to limit which netperf tests to run.
For example, if set to 'udp', only UDP_STREAM. The default value is all protocol tests for phase3, i.e. TCP and UDP.
Changes in v4:
- Move nperf_msg_size in 2_virt_ovs_vxlan to correct commit
Signed-off-by: Jiri Prochazka jprochaz@redhat.com
Ack to series.
-Jan
Thu, Jan 12, 2017 at 04:11:16PM CET, jprochaz@redhat.com wrote:
All phase3 tests now take optional alias nperf_protocols that can be used to limit which netperf tests to run.
For example, if set to 'udp', only UDP_STREAM. The default value is all protocol tests for phase3, i.e. TCP and UDP.
Changes in v4:
- Move nperf_msg_size in 2_virt_ovs_vxlan to correct commit
Signed-off-by: Jiri Prochazka jprochaz@redhat.com
Pushed, thanks!
-Jan
lnst-developers@lists.fedorahosted.org