All phase1/phase2 tests will now include comment in perfrepo test executions. The comment will include kernels of both baremetal and guest test machines. User can also specify alias 'perfrepo_comment' that will be appended to automatically generated comment. Signed-off-by: Jan Tluka <jtluka(a)redhat.com&gt; --- recipes/regression_tests/phase1/3_vlans.py | 8 ++++++++ recipes/regression_tests/phase1/3_vlans_over_bond.py | 8 ++++++++ recipes/regression_tests/phase1/bonding_test.py | 8 ++++++++ recipes/regression_tests/phase1/simple_netperf.py | 8 ++++++++ .../phase1/virtual_bridge_2_vlans_over_bond.py | 8 ++++++++ .../regression_tests/phase1/virtual_bridge_vlan_in_guest.py | 8 ++++++++ .../regression_tests/phase1/virtual_bridge_vlan_in_host.py | 8 ++++++++ recipes/regression_tests/phase2/3_vlans_over_team.py | 8 ++++++++ recipes/regression_tests/phase2/team_test.py | 12 ++++++++++++ .../virtual_ovs_bridge_2_vlans_over_active_backup_bond.py | 8 ++++++++ .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 8 ++++++++ .../phase2/virtual_ovs_bridge_vlan_in_host.py | 8 ++++++++ 12 files changed, 100 insertions(+) diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index 78eedcf..b9420b6 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -3,6 +3,7 @@ from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template from lnst.RecipeCommon.IRQ import pin_dev_irqs +from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment # ------ # SETUP @@ -41,6 +42,9 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +pr_user_comment = ctl.get_alias("perfrepo_comment") + +pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) m1_phy1 = m1.get_interface("eth1") m1_phy1.set_mtu(mtu) @@ -220,6 +224,7 @@ for setting in offload_settings: 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 @@ -244,6 +249,7 @@ for setting in offload_settings: 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) srv_proc.intr() @@ -274,6 +280,7 @@ for setting in offload_settings: 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 @@ -298,6 +305,7 @@ for setting in offload_settings: 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) srv_proc.intr() diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index ff83121..07d5f5c 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -3,6 +3,7 @@ from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template from lnst.RecipeCommon.IRQ import pin_dev_irqs +from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment # ------ # SETUP @@ -40,6 +41,9 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +pr_user_comment = ctl.get_alias("perfrepo_comment") + +pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) m1_bond = m1.get_interface("test_bond") m1_bond.set_mtu(mtu) @@ -219,6 +223,7 @@ for setting in offload_settings: 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 @@ -243,6 +248,7 @@ for setting in offload_settings: 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) srv_proc.intr() @@ -273,6 +279,7 @@ for setting in offload_settings: 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 @@ -297,6 +304,7 @@ for setting in offload_settings: 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) srv_proc.intr() diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index e125fb9..d56955d 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -3,6 +3,7 @@ from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template from lnst.RecipeCommon.IRQ import pin_dev_irqs +from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment # ------ # SETUP @@ -40,6 +41,9 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +pr_user_comment = ctl.get_alias("perfrepo_comment") + +pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) test_if1 = m1.get_interface("test_if") test_if1.set_mtu(mtu) @@ -197,6 +201,7 @@ for setting in offload_settings: 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 @@ -219,6 +224,7 @@ for setting in offload_settings: 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) server_proc.intr() @@ -249,6 +255,7 @@ for setting in offload_settings: 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 @@ -271,6 +278,7 @@ for setting in offload_settings: 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) server_proc.intr() diff --git a/recipes/regression_tests/phase1/simple_netperf.py b/recipes/regression_tests/phase1/simple_netperf.py index 407ee5d..baf3c3c 100644 --- a/recipes/regression_tests/phase1/simple_netperf.py +++ b/recipes/regression_tests/phase1/simple_netperf.py @@ -3,6 +3,7 @@ from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template from lnst.RecipeCommon.IRQ import pin_dev_irqs +from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment # ------ # SETUP @@ -39,6 +40,9 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +pr_user_comment = ctl.get_alias("perfrepo_comment") + +pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) m1_testiface = m1.get_interface("testiface") m2_testiface = m2.get_interface("testiface") @@ -165,6 +169,7 @@ for setting in offload_settings: 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 @@ -187,6 +192,7 @@ for setting in offload_settings: 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) srv_proc.intr() @@ -213,6 +219,7 @@ for setting in offload_settings: 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 @@ -235,6 +242,7 @@ for setting in offload_settings: 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) srv_proc.intr() diff --git a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py index 598ee7b..6b79dff 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py @@ -3,6 +3,7 @@ from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template from lnst.RecipeCommon.IRQ import pin_dev_irqs +from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment # ------ # SETUP @@ -45,6 +46,9 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs")) nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +pr_user_comment = ctl.get_alias("perfrepo_comment") + +pr_comment = generate_perfrepo_comment([h1, g1, g2, h2, g3, g4], pr_user_comment) mtu = ctl.get_alias("mtu") enable_udp_perf = ctl.get_alias("enable_udp_perf") @@ -275,6 +279,7 @@ for setting in offload_settings: 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 enable_udp_perf is not None: @@ -301,6 +306,7 @@ for setting in offload_settings: 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) server_proc.intr() @@ -337,6 +343,7 @@ for setting in offload_settings: 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 @@ -363,6 +370,7 @@ for setting in offload_settings: 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) server_proc.intr() diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py index d3e4790..cf83070 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -3,6 +3,7 @@ from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template from lnst.RecipeCommon.IRQ import pin_dev_irqs +from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment # ------ # SETUP @@ -41,6 +42,9 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +pr_user_comment = ctl.get_alias("perfrepo_comment") + +pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment) mtu = ctl.get_alias("mtu") enable_udp_perf = ctl.get_alias("enable_udp_perf") @@ -211,6 +215,7 @@ for setting in offload_settings: 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 @@ -237,6 +242,7 @@ for setting in offload_settings: 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) server_proc.intr() @@ -270,6 +276,7 @@ for setting in offload_settings: 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 @@ -296,6 +303,7 @@ for setting in offload_settings: 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) server_proc.intr() diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py index 6070beb..2ee4c60 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -3,6 +3,7 @@ from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template from lnst.RecipeCommon.IRQ import pin_dev_irqs +from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment # ------ # SETUP @@ -41,6 +42,9 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +pr_user_comment = ctl.get_alias("perfrepo_comment") + +pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment) mtu = ctl.get_alias("mtu") enable_udp_perf = ctl.get_alias("enable_udp_perf") @@ -211,6 +215,7 @@ for setting in offload_settings: 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 @@ -237,6 +242,7 @@ for setting in offload_settings: 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) server_proc.intr() @@ -270,6 +276,7 @@ for setting in offload_settings: 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 @@ -296,6 +303,7 @@ for setting in offload_settings: 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) server_proc.intr() diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index 972f94f..f66a38d 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -3,6 +3,7 @@ from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template from lnst.RecipeCommon.IRQ import pin_dev_irqs +from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment # ------ # SETUP @@ -40,6 +41,9 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +pr_user_comment = ctl.get_alias("perfrepo_comment") + +pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) m1_team = m1.get_interface("test_if") m1_team.set_mtu(mtu) @@ -219,6 +223,7 @@ for setting in offload_settings: 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 @@ -243,6 +248,7 @@ for setting in offload_settings: 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) srv_proc.intr() @@ -273,6 +279,7 @@ for setting in offload_settings: 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 @@ -297,6 +304,7 @@ for setting in offload_settings: 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) srv_proc.intr() diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 7cc66dd..6327528 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -3,6 +3,7 @@ from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template from lnst.RecipeCommon.IRQ import pin_dev_irqs +from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment # ------ # SETUP @@ -39,6 +40,9 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +pr_user_comment = ctl.get_alias("perfrepo_comment") + +pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) test_if1 = m1.get_interface("test_if") test_if1.set_mtu(mtu) @@ -198,6 +202,7 @@ for setting in offload_settings: 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 @@ -222,6 +227,7 @@ for setting in offload_settings: 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) server_proc.intr() @@ -253,6 +259,7 @@ for setting in offload_settings: timeout = (netperf_duration + nperf_reserve)*5) 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 @@ -277,6 +284,7 @@ for setting in offload_settings: timeout = (netperf_duration + nperf_reserve)*5) netperf_result_template(result_udp, udp_res_data) + result_udp.set_comment(pr_comment) perf_api.save_result(result_udp) server_proc.intr() @@ -353,6 +361,7 @@ for setting in offload_settings: 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 @@ -377,6 +386,7 @@ for setting in offload_settings: 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) server_proc.intr() @@ -408,6 +418,7 @@ for setting in offload_settings: 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 @@ -432,6 +443,7 @@ for setting in offload_settings: 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) server_proc.intr() diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py index 5620d8a..a65c4ba 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py @@ -3,6 +3,7 @@ from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template from lnst.RecipeCommon.IRQ import pin_dev_irqs +from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment # ------ # SETUP @@ -45,6 +46,9 @@ nperf_max_runs = int(ctl.get_alias("nperf_max_runs")) nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +pr_user_comment = ctl.get_alias("perfrepo_comment") + +pr_comment = generate_perfrepo_comment([h1, g1, g2, h2, g3, g4], pr_user_comment) h1_nic1 = h1.get_interface("nic1") h1_nic2 = h1.get_interface("nic2") @@ -254,6 +258,7 @@ for setting in offload_settings: 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 @@ -280,6 +285,7 @@ for setting in offload_settings: 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) server_proc.intr() @@ -316,6 +322,7 @@ for setting in offload_settings: 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 @@ -342,6 +349,7 @@ for setting in offload_settings: 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) server_proc.intr() diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py index 1e1020e..dfc54e3 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py @@ -3,6 +3,7 @@ from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template from lnst.RecipeCommon.IRQ import pin_dev_irqs +from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment # ------ # SETUP @@ -41,6 +42,9 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +pr_user_comment = ctl.get_alias("perfrepo_comment") + +pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment) h2_vlan10 = h2.get_interface("vlan10") g1_vlan10 = g1.get_interface("vlan10") @@ -199,6 +203,7 @@ for setting in offload_settings: 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 @@ -225,6 +230,7 @@ for setting in offload_settings: 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) server_proc.intr() @@ -258,6 +264,7 @@ for setting in offload_settings: 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 @@ -284,6 +291,7 @@ for setting in offload_settings: 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) server_proc.intr() diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py index 92549e2..154f0b9 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py @@ -3,6 +3,7 @@ from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template from lnst.RecipeCommon.IRQ import pin_dev_irqs +from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment # ------ # SETUP @@ -41,6 +42,9 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_mode = ctl.get_alias("nperf_mode") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) +pr_user_comment = ctl.get_alias("perfrepo_comment") + +pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment) h2_vlan10 = h2.get_interface("vlan10") g1_guestnic = g1.get_interface("guestnic") @@ -198,6 +202,7 @@ for setting in offload_settings: 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 @@ -224,6 +229,7 @@ for setting in offload_settings: 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) server_proc.intr() @@ -258,6 +264,7 @@ for setting in offload_settings: 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 @@ -284,6 +291,7 @@ for setting in offload_settings: 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) server_proc.intr() -- 2.4.3