From: Ondrej Lichtner olichtne@redhat.com
When the official_result parameter is set to True it indicates that the result will be filtered by a hash tag. So the save_result method calculates and adds this tag before submitting the object.
If set to False the hash calculation and the tag is skipped.
Signed-off-by: Ondrej Lichtner olichtne@redhat.com --- lnst/Controller/Task.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/lnst/Controller/Task.py b/lnst/Controller/Task.py index a5fb0d3..b5080d2 100644 --- a/lnst/Controller/Task.py +++ b/lnst/Controller/Task.py @@ -921,7 +921,7 @@ class PerfRepoAPI(object): result = PerfRepoResult(test, name, hash_ignore) return result
- def save_result(self, result): + def save_result(self, result, official_result=False): if isinstance(result, Noop): return elif not self.connected(): @@ -931,9 +931,13 @@ class PerfRepoAPI(object): logging.debug("PerfRepoResult with no result data, skipping "\ "send to PerfRepo.") return + h = result.generate_hash() - logging.debug("Adding hash '%s' as tag to result." % h) - result.add_tag(h) + if official_result: + logging.debug("Adding hash '%s' as tag to result." % h) + result.add_tag(h) + else: + logging.debug("Unofficial results - skipping hash tag.") logging.info("Sending TestExecution to PerfRepo.") try: self._rest_api.testExecution_create(result.get_testExecution())
From: Ondrej Lichtner olichtne@redhat.com
Setting this alias to "yes" or "true" indicates that netperf results calculated by the recipe should be shown in the official perfrepo reports (they need to have a hash tag added).
The default value of the alias is "no".
Signed-off-by: Ondrej Lichtner olichtne@redhat.com --- recipes/regression_tests/phase1/3_vlans.py | 14 +++++++----- recipes/regression_tests/phase1/3_vlans.xml | 1 + .../phase1/3_vlans_over_active_backup_bond.xml | 1 + .../regression_tests/phase1/3_vlans_over_bond.py | 14 +++++++----- .../phase1/3_vlans_over_round_robin_bond.xml | 1 + .../regression_tests/phase1/active_backup_bond.xml | 1 + .../phase1/active_backup_double_bond.xml | 1 + recipes/regression_tests/phase1/bonding_test.py | 14 +++++++----- .../regression_tests/phase1/round_robin_bond.xml | 1 + .../phase1/round_robin_double_bond.xml | 1 + recipes/regression_tests/phase1/simple_netperf.py | 14 +++++++----- recipes/regression_tests/phase1/simple_netperf.xml | 1 + ...tual_bridge_2_vlans_over_active_backup_bond.xml | 1 + .../phase1/virtual_bridge_2_vlans_over_bond.py | 14 +++++++----- .../phase1/virtual_bridge_vlan_in_guest.py | 14 +++++++----- .../phase1/virtual_bridge_vlan_in_guest.xml | 1 + .../virtual_bridge_vlan_in_guest_mirrored.py | 14 +++++++----- .../virtual_bridge_vlan_in_guest_mirrored.xml | 1 + .../phase1/virtual_bridge_vlan_in_host.py | 14 +++++++----- .../phase1/virtual_bridge_vlan_in_host.xml | 1 + .../phase1/virtual_bridge_vlan_in_host_mirrored.py | 14 +++++++----- .../virtual_bridge_vlan_in_host_mirrored.xml | 1 + .../phase2/3_vlans_over_active_backup_team.xml | 1 + .../phase2/3_vlans_over_round_robin_team.xml | 1 + .../regression_tests/phase2/3_vlans_over_team.py | 14 +++++++----- .../phase2/active_backup_double_team.xml | 1 + .../regression_tests/phase2/active_backup_team.xml | 1 + .../active_backup_team_vs_active_backup_bond.xml | 1 + .../active_backup_team_vs_round_robin_bond.xml | 1 + .../phase2/round_robin_double_team.xml | 1 + .../regression_tests/phase2/round_robin_team.xml | 1 + .../round_robin_team_vs_active_backup_bond.xml | 1 + .../round_robin_team_vs_round_robin_bond.xml | 1 + recipes/regression_tests/phase2/team_test.py | 26 ++++++++++++---------- ...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 14 +++++++----- ..._ovs_bridge_2_vlans_over_active_backup_bond.xml | 1 + .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 14 +++++++----- .../phase2/virtual_ovs_bridge_vlan_in_guest.xml | 1 + .../virtual_ovs_bridge_vlan_in_guest_mirrored.py | 14 +++++++----- .../virtual_ovs_bridge_vlan_in_guest_mirrored.xml | 1 + .../phase2/virtual_ovs_bridge_vlan_in_host.py | 14 +++++++----- .../phase2/virtual_ovs_bridge_vlan_in_host.xml | 1 + .../virtual_ovs_bridge_vlan_in_host_mirrored.py | 14 +++++++----- .../virtual_ovs_bridge_vlan_in_host_mirrored.xml | 1 + .../regression_tests/phase3/2_virt_ovs_vxlan.py | 10 +++++---- .../regression_tests/phase3/2_virt_ovs_vxlan.xml | 1 + .../regression_tests/phase3/ipsec_esp_ah_comp.py | 10 +++++---- .../regression_tests/phase3/ipsec_esp_ah_comp.xml | 1 + .../regression_tests/phase3/novirt_ovs_vxlan.py | 10 +++++---- .../regression_tests/phase3/novirt_ovs_vxlan.xml | 1 + recipes/regression_tests/phase3/simple_macsec.py | 10 +++++---- recipes/regression_tests/phase3/simple_macsec.xml | 1 + recipes/regression_tests/phase3/vxlan_multicast.py | 10 +++++---- .../regression_tests/phase3/vxlan_multicast.xml | 1 + recipes/regression_tests/phase3/vxlan_remote.py | 10 +++++---- recipes/regression_tests/phase3/vxlan_remote.xml | 1 + 56 files changed, 204 insertions(+), 126 deletions(-)
diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index 1d2cee8..a8e7c23 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -43,6 +44,7 @@ nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") offloads_alias = ctl.get_alias("offloads") nperf_protocols = ctl.get_alias("nperf_protocols") +official_result = bool_it(ctl.get_alias("official_result"))
sctp_default_msg_size = "16K"
@@ -296,7 +298,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -326,7 +328,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -354,7 +356,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
srv_proc.intr()
@@ -390,7 +392,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp ipv6 @@ -420,7 +422,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -448,7 +450,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
srv_proc.intr()
diff --git a/recipes/regression_tests/phase1/3_vlans.xml b/recipes/regression_tests/phase1/3_vlans.xml index fdc681f..d021c1c 100644 --- a/recipes/regression_tests/phase1/3_vlans.xml +++ b/recipes/regression_tests/phase1/3_vlans.xml @@ -19,6 +19,7 @@ <alias name="vlan30_net" value="192.168.30"/> <alias name="vlan30_tag" value="30"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml b/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml index 50a984e..140be99 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml +++ b/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml @@ -19,6 +19,7 @@ <alias name="vlan30_net" value="192.168.30"/> <alias name="vlan30_tag" value="30"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index 49f35a9..81c4c5c 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -43,6 +44,7 @@ nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") offloads_alias = ctl.get_alias("offloads") nperf_protocols = ctl.get_alias("nperf_protocols") +official_result = bool_it(ctl.get_alias("official_result"))
sctp_default_msg_size = "16K"
@@ -296,7 +298,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -326,7 +328,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -354,7 +356,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
srv_proc.intr()
@@ -390,7 +392,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp ipv6 @@ -420,7 +422,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -448,7 +450,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
srv_proc.intr()
diff --git a/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml b/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml index d22fa7b..1b5f9e6 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml +++ b/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml @@ -10,6 +10,7 @@ <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="3_vlans_over_round_robin_bond.mapping" /> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase1/active_backup_bond.xml b/recipes/regression_tests/phase1/active_backup_bond.xml index ca65f54..47b8ff5 100644 --- a/recipes/regression_tests/phase1/active_backup_bond.xml +++ b/recipes/regression_tests/phase1/active_backup_bond.xml @@ -14,6 +14,7 @@ <alias name="mapping_file" value="active_backup_bond.mapping" /> <alias name="net" value="192.168.0"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase1/active_backup_double_bond.xml b/recipes/regression_tests/phase1/active_backup_double_bond.xml index e769ffb..6b2e618 100644 --- a/recipes/regression_tests/phase1/active_backup_double_bond.xml +++ b/recipes/regression_tests/phase1/active_backup_double_bond.xml @@ -14,6 +14,7 @@ <alias name="mapping_file" value="active_backup_double_bond.mapping" /> <alias name="net" value="192.168.0"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index e293a79..5bcbec0 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -42,6 +43,7 @@ nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") offloads_alias = ctl.get_alias("offloads") nperf_protocols = ctl.get_alias("nperf_protocols") +official_result = bool_it(ctl.get_alias("official_result"))
sctp_default_msg_size = "16K"
@@ -283,7 +285,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -311,7 +313,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -337,7 +339,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
@@ -373,7 +375,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp ipv6 @@ -401,7 +403,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -427,7 +429,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
diff --git a/recipes/regression_tests/phase1/round_robin_bond.xml b/recipes/regression_tests/phase1/round_robin_bond.xml index 9b28cbc..a547a35 100644 --- a/recipes/regression_tests/phase1/round_robin_bond.xml +++ b/recipes/regression_tests/phase1/round_robin_bond.xml @@ -10,6 +10,7 @@ <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="round_robin_bond.mapping" /> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase1/round_robin_double_bond.xml b/recipes/regression_tests/phase1/round_robin_double_bond.xml index 15798f1..7217673 100644 --- a/recipes/regression_tests/phase1/round_robin_double_bond.xml +++ b/recipes/regression_tests/phase1/round_robin_double_bond.xml @@ -10,6 +10,7 @@ <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="round_robin_double_bond.mapping" /> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase1/simple_netperf.py b/recipes/regression_tests/phase1/simple_netperf.py index 7e30955..48d0b3b 100644 --- a/recipes/regression_tests/phase1/simple_netperf.py +++ b/recipes/regression_tests/phase1/simple_netperf.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -41,6 +42,7 @@ nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") offloads_alias = ctl.get_alias("offloads") nperf_protocols = ctl.get_alias("nperf_protocols") +official_result = bool_it(ctl.get_alias("official_result"))
sctp_default_msg_size = "16K"
@@ -246,7 +248,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -273,7 +275,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -299,7 +301,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
srv_proc.intr()
@@ -332,7 +334,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp ipv6 @@ -359,7 +361,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -385,7 +387,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
srv_proc.intr()
diff --git a/recipes/regression_tests/phase1/simple_netperf.xml b/recipes/regression_tests/phase1/simple_netperf.xml index cd90233..c23a70f 100644 --- a/recipes/regression_tests/phase1/simple_netperf.xml +++ b/recipes/regression_tests/phase1/simple_netperf.xml @@ -14,6 +14,7 @@ <alias name="mapping_file" value="simple_netperf.mapping" /> <alias name="net" value="192.168.101" /> <alias name="driver" value="ixgbe" /> + <alias name="official_result" value="no" /> </define> <network> <host id="machine1"> diff --git a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml index a0d96e6..8dee39c 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml @@ -17,6 +17,7 @@ <alias name="vlan20_net" value="192.168.20"/> <alias name="vlan20_tag" value="20"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="host1"> 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 265d038..d01d2cc 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 @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -47,6 +48,7 @@ nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") offloads_alias = ctl.get_alias("offloads") nperf_protocols = ctl.get_alias("nperf_protocols") +official_result = bool_it(ctl.get_alias("official_result"))
sctp_default_msg_size = "16K"
@@ -355,7 +357,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -386,7 +388,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -412,7 +414,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
@@ -454,7 +456,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp ipv6 @@ -485,7 +487,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -511,7 +513,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
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 81e2cb9..e3455b9 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -42,6 +43,7 @@ nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") offloads_alias = ctl.get_alias("offloads") nperf_protocols = ctl.get_alias("nperf_protocols") +official_result = bool_it(ctl.get_alias("official_result"))
sctp_default_msg_size = "16K"
@@ -287,7 +289,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -318,7 +320,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -344,7 +346,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
@@ -383,7 +385,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp ipv6 @@ -414,7 +416,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -440,7 +442,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml index 22aedf4..dfa2ec3 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml @@ -15,6 +15,7 @@ <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="host1"> diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest_mirrored.py b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest_mirrored.py index 3d7dc1e..15285ac 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest_mirrored.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest_mirrored.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -42,6 +43,7 @@ nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") offloads_alias = ctl.get_alias("offloads") nperf_protocols = ctl.get_alias("nperf_protocols") +official_result = bool_it(ctl.get_alias("official_result"))
sctp_default_msg_size = "16K"
@@ -288,7 +290,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -319,7 +321,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -349,7 +351,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
@@ -388,7 +390,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp ipv6 @@ -419,7 +421,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -449,7 +451,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest_mirrored.xml b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest_mirrored.xml index 9d91555..22f8f7c 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest_mirrored.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest_mirrored.xml @@ -15,6 +15,7 @@ <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="host1"> 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 c7cb984..190b50b 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -42,6 +43,7 @@ nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") offloads_alias = ctl.get_alias("offloads") nperf_protocols = ctl.get_alias("nperf_protocols") +official_result = bool_it(ctl.get_alias("official_result"))
sctp_default_msg_size = "16K"
@@ -287,7 +289,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -318,7 +320,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -344,7 +346,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
@@ -383,7 +385,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp ipv6 @@ -414,7 +416,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -440,7 +442,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml index 5a71d40..7277016 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml @@ -15,6 +15,7 @@ <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="host1"> diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host_mirrored.py b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host_mirrored.py index 5a06fcd..7ed9ccb 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host_mirrored.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host_mirrored.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -42,6 +43,7 @@ nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") offloads_alias = ctl.get_alias("offloads") nperf_protocols = ctl.get_alias("nperf_protocols") +official_result = bool_it(ctl.get_alias("official_result"))
sctp_default_msg_size = "16K"
@@ -286,7 +288,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -317,7 +319,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -347,7 +349,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
@@ -386,7 +388,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp ipv6 @@ -417,7 +419,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -447,7 +449,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
diff --git a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host_mirrored.xml b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host_mirrored.xml index a756478..40407b4 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host_mirrored.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host_mirrored.xml @@ -15,6 +15,7 @@ <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="host1"> diff --git a/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml b/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml index 8e778f2..ab9206f 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml +++ b/recipes/regression_tests/phase2/3_vlans_over_active_backup_team.xml @@ -19,6 +19,7 @@ <alias name="vlan30_net" value="192.168.30"/> <alias name="vlan30_tag" value="30"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/3_vlans_over_round_robin_team.xml b/recipes/regression_tests/phase2/3_vlans_over_round_robin_team.xml index 7576ec0..4ec16b3 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_round_robin_team.xml +++ b/recipes/regression_tests/phase2/3_vlans_over_round_robin_team.xml @@ -10,6 +10,7 @@ <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="3_vlans_over_round_robin_team.mapping" /> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index 89af6a0..ed92bca 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -43,6 +44,7 @@ nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") offloads_alias = ctl.get_alias("offloads") nperf_protocols = ctl.get_alias("nperf_protocols") +official_result = bool_it(ctl.get_alias("official_result"))
sctp_default_msg_size = "16K"
@@ -296,7 +298,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -326,7 +328,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -354,7 +356,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
srv_proc.intr()
@@ -390,7 +392,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp ipv6 @@ -420,7 +422,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -448,7 +450,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
srv_proc.intr()
diff --git a/recipes/regression_tests/phase2/active_backup_double_team.xml b/recipes/regression_tests/phase2/active_backup_double_team.xml index b4be042..05f9e0e 100644 --- a/recipes/regression_tests/phase2/active_backup_double_team.xml +++ b/recipes/regression_tests/phase2/active_backup_double_team.xml @@ -14,6 +14,7 @@ <alias name="mapping_file" value="active_backup_double_team.mapping" /> <alias name="net" value="192.168.0"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/active_backup_team.xml b/recipes/regression_tests/phase2/active_backup_team.xml index 7b332a0..1adc215 100644 --- a/recipes/regression_tests/phase2/active_backup_team.xml +++ b/recipes/regression_tests/phase2/active_backup_team.xml @@ -14,6 +14,7 @@ <alias name="mapping_file" value="active_backup_team.mapping" /> <alias name="net" value="192.168.0"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml b/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml index fca487f..65b005d 100644 --- a/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml +++ b/recipes/regression_tests/phase2/active_backup_team_vs_active_backup_bond.xml @@ -14,6 +14,7 @@ <alias name="mapping_file" value="active_backup_team_vs_active_backup_bond.mapping" /> <alias name="net" value="192.168.0"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/active_backup_team_vs_round_robin_bond.xml b/recipes/regression_tests/phase2/active_backup_team_vs_round_robin_bond.xml index 983a512..6ddb46b 100644 --- a/recipes/regression_tests/phase2/active_backup_team_vs_round_robin_bond.xml +++ b/recipes/regression_tests/phase2/active_backup_team_vs_round_robin_bond.xml @@ -10,6 +10,7 @@ <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="active_backup_team_vs_round_robin_bond.mapping" /> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/round_robin_double_team.xml b/recipes/regression_tests/phase2/round_robin_double_team.xml index a4cb9cb..ef52815 100644 --- a/recipes/regression_tests/phase2/round_robin_double_team.xml +++ b/recipes/regression_tests/phase2/round_robin_double_team.xml @@ -10,6 +10,7 @@ <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="round_robin_double_team.mapping" /> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/round_robin_team.xml b/recipes/regression_tests/phase2/round_robin_team.xml index 9ff89eb..e4fa6ae 100644 --- a/recipes/regression_tests/phase2/round_robin_team.xml +++ b/recipes/regression_tests/phase2/round_robin_team.xml @@ -10,6 +10,7 @@ <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="round_robin_team.mapping" /> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/round_robin_team_vs_active_backup_bond.xml b/recipes/regression_tests/phase2/round_robin_team_vs_active_backup_bond.xml index 0d15dda..f16a6d7 100644 --- a/recipes/regression_tests/phase2/round_robin_team_vs_active_backup_bond.xml +++ b/recipes/regression_tests/phase2/round_robin_team_vs_active_backup_bond.xml @@ -10,6 +10,7 @@ <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="round_robin_team_vs_active_backup_bond.mapping" /> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/round_robin_team_vs_round_robin_bond.xml b/recipes/regression_tests/phase2/round_robin_team_vs_round_robin_bond.xml index 4b31194..506206e 100644 --- a/recipes/regression_tests/phase2/round_robin_team_vs_round_robin_bond.xml +++ b/recipes/regression_tests/phase2/round_robin_team_vs_round_robin_bond.xml @@ -10,6 +10,7 @@ <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="round_robin_team_vs_round_robin_bond.mapping" /> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index c61f721..8363890 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -41,6 +42,7 @@ nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") offloads_alias = ctl.get_alias("offloads") nperf_protocols = ctl.get_alias("nperf_protocols") +official_result = bool_it(ctl.get_alias("official_result"))
sctp_default_msg_size = "16K"
@@ -284,7 +286,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -314,7 +316,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# prepare PerfRepo result for sctp # for SCTP only gso offload on/off @@ -343,7 +345,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr() if ipv in [ 'ipv6', 'both' ]: @@ -380,7 +382,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -410,7 +412,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# prepare PerfRepo result for sctp # for SCTP only gso offload on/off @@ -439,7 +441,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
@@ -527,7 +529,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -557,7 +559,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# prepare PerfRepo result for sctp # for SCTP only gso offload on/off @@ -586,7 +588,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr() if ipv in [ 'ipv6', 'both' ]: @@ -623,7 +625,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -653,7 +655,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# prepare PerfRepo result for sctp # for SCTP only gso offload on/off @@ -682,7 +684,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
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 3c1fd39..1d9c1c4 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 @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -48,6 +49,7 @@ nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") offloads_alias = ctl.get_alias("offloads") nperf_protocols = ctl.get_alias("nperf_protocols") +official_result = bool_it(ctl.get_alias("official_result"))
sctp_default_msg_size = "16K"
@@ -355,7 +357,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -387,7 +389,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -413,7 +415,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
@@ -456,7 +458,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp ipv6 @@ -488,7 +490,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -514,7 +516,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml index 8991be0..ee41fbb 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml @@ -17,6 +17,7 @@ <alias name="vlan20_net" value="192.168.20"/> <alias name="vlan20_tag" value="20"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="host1"> 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 36f48a8..6e922f2 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 @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -43,6 +44,7 @@ nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") offloads_alias = ctl.get_alias("offloads") nperf_protocols = ctl.get_alias("nperf_protocols") +official_result = bool_it(ctl.get_alias("official_result"))
sctp_default_msg_size = "16K"
@@ -288,7 +290,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -320,7 +322,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -346,7 +348,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
@@ -386,7 +388,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp ipv6 @@ -418,7 +420,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -444,7 +446,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml index 739450e..c4e39c9 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.xml @@ -15,6 +15,7 @@ <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="host1"> diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest_mirrored.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest_mirrored.py index 2203cdc..29a8b6f 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest_mirrored.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest_mirrored.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -43,6 +44,7 @@ nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") offloads_alias = ctl.get_alias("offloads") nperf_protocols = ctl.get_alias("nperf_protocols") +official_result = bool_it(ctl.get_alias("official_result"))
sctp_default_msg_size = "16K"
@@ -288,7 +290,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -320,7 +322,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -350,7 +352,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
@@ -390,7 +392,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp ipv6 @@ -422,7 +424,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -452,7 +454,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest_mirrored.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest_mirrored.xml index 45e1808..3f07665 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest_mirrored.xml +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest_mirrored.xml @@ -15,6 +15,7 @@ <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="host1"> 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 1d473c7..a213ea6 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 @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -43,6 +44,7 @@ nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") offloads_alias = ctl.get_alias("offloads") nperf_protocols = ctl.get_alias("nperf_protocols") +official_result = bool_it(ctl.get_alias("official_result"))
sctp_default_msg_size = "16K"
@@ -286,7 +288,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -318,7 +320,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -344,7 +346,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
@@ -384,7 +386,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp ipv6 @@ -416,7 +418,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -442,7 +444,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml index 8c1de53..420cf53 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.xml @@ -15,6 +15,7 @@ <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="host1"> diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host_mirrored.py b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host_mirrored.py index 407ddb6..dd91849 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host_mirrored.py +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host_mirrored.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import netperf_baseline_template from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -43,6 +44,7 @@ nperf_msg_size = ctl.get_alias("nperf_msg_size") pr_user_comment = ctl.get_alias("perfrepo_comment") offloads_alias = ctl.get_alias("offloads") nperf_protocols = ctl.get_alias("nperf_protocols") +official_result = bool_it(ctl.get_alias("official_result"))
sctp_default_msg_size = "16K"
@@ -283,7 +285,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp @@ -315,7 +317,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -345,7 +347,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
@@ -385,7 +387,7 @@ for setting in offload_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1 and ("gro", "off") not in setting: # prepare PerfRepo result for udp ipv6 @@ -417,7 +419,7 @@ for setting in offload_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
# for SCTP only gso offload on/off if (nperf_protocols.find("sctp") > -1 and @@ -447,7 +449,7 @@ for setting in offload_settings:
netperf_result_template(result_sctp, sctp_res_data) result_sctp.set_comment(pr_comment) - perf_api.save_result(result_sctp) + perf_api.save_result(result_sctp, official_result)
server_proc.intr()
diff --git a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host_mirrored.xml b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host_mirrored.xml index 9e22de8..34f088b 100644 --- a/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host_mirrored.xml +++ b/recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host_mirrored.xml @@ -15,6 +15,7 @@ <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> <alias name="driver" value="ixgbe"/> + <alias name="official_result" value="no" /> </define> <network> <host id="host1"> diff --git a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py index 36a3df4..1899711 100644 --- a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py +++ b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import perfrepo_baseline_to_dict from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -46,6 +47,7 @@ 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") +official_result = bool_it(ctl.get_alias("official_result"))
pr_comment = generate_perfrepo_comment([guest1, guest2, guest3, guest4], pr_user_comment) @@ -173,7 +175,7 @@ if ipv in [ 'ipv4', 'both' ]:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1: # prepare PerfRepo result for udp @@ -207,7 +209,7 @@ if ipv in [ 'ipv4', 'both' ]:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result) if ipv in [ 'ipv6', 'both' ]: # prepare PerfRepo result for tcp ipv6 if nperf_protocols.find("tcp") > -1: @@ -241,7 +243,7 @@ if ipv in [ 'ipv6', 'both' ]:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1: #prepare PerfRepo result for udp ipv6 @@ -275,7 +277,7 @@ if ipv in [ 'ipv6', 'both' ]:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
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 3d131b8..763d9e7 100644 --- a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml +++ b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml @@ -15,6 +15,7 @@ <alias name="vxlan_net" value="192.168.100"/> <alias name="vxlan_net6" value="fc00:0:0:0"/> <alias name="driver" value=""/> + <alias name="official_result" value="no" /> </define> <network> <host id="h1"> diff --git a/recipes/regression_tests/phase3/ipsec_esp_ah_comp.py b/recipes/regression_tests/phase3/ipsec_esp_ah_comp.py index fada91e..575ce97 100644 --- a/recipes/regression_tests/phase3/ipsec_esp_ah_comp.py +++ b/recipes/regression_tests/phase3/ipsec_esp_ah_comp.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import perfrepo_baseline_to_dict from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -60,6 +61,7 @@ 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") ipsec_mode = ctl.get_alias("ipsec_mode") +official_result = bool_it(ctl.get_alias("official_result"))
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
@@ -352,7 +354,7 @@ for ciph_alg, ciph_len in ciphers:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
# prepare PerfRepo result for udp result_udp = perf_api.new_result("udp_ipv4_id", @@ -391,7 +393,7 @@ for ciph_alg, ciph_len in ciphers:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
if ipv in [ 'ipv6', 'both']: configure_ipsec(ciph_alg, @@ -502,7 +504,7 @@ for ciph_alg, ciph_len in ciphers:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
# prepare PerfRepo result for udp result_udp = perf_api.new_result("udp_ipv6_id", @@ -541,7 +543,7 @@ for ciph_alg, ciph_len in ciphers:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
m1.run("ip xfrm policy flush") m1.run("ip xfrm state flush") diff --git a/recipes/regression_tests/phase3/ipsec_esp_ah_comp.xml b/recipes/regression_tests/phase3/ipsec_esp_ah_comp.xml index 8ed30d6..6fec4be 100644 --- a/recipes/regression_tests/phase3/ipsec_esp_ah_comp.xml +++ b/recipes/regression_tests/phase3/ipsec_esp_ah_comp.xml @@ -15,6 +15,7 @@ <alias name="net_2" value="192.168.100"/> <alias name="net6_2" value="fc00:2::"/> <alias name="driver" value=""/> + <alias name="official_result" value="no" /> </define> <network> <host id="machine1"> diff --git a/recipes/regression_tests/phase3/novirt_ovs_vxlan.py b/recipes/regression_tests/phase3/novirt_ovs_vxlan.py index 02e5dcc..669e9e9 100644 --- a/recipes/regression_tests/phase3/novirt_ovs_vxlan.py +++ b/recipes/regression_tests/phase3/novirt_ovs_vxlan.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import perfrepo_baseline_to_dict from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -40,6 +41,7 @@ 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") +official_result = bool_it(ctl.get_alias("official_result"))
pr_comment = generate_perfrepo_comment([h1, h2], pr_user_comment)
@@ -124,7 +126,7 @@ if ipv in [ 'ipv4', 'both' ]:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1: # prepare PerfRepo result for udp @@ -155,7 +157,7 @@ if ipv in [ 'ipv4', 'both' ]:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result) if ipv in [ 'ipv6', 'both' ]: ctl.wait(2)
@@ -188,7 +190,7 @@ if ipv in [ 'ipv6', 'both' ]:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1: # prepare PerfRepo result for udp ipv6 @@ -219,7 +221,7 @@ if ipv in [ 'ipv6', 'both' ]:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
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 9764d50..3d84963 100644 --- a/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml +++ b/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml @@ -15,6 +15,7 @@ <alias name="vxlan_net" value="192.168.100"/> <alias name="vxlan_net6" value="fc00:0:0:0"/> <alias name="driver" value=""/> + <alias name="official_result" value="no" /> </define> <network> <host id="test_host1"> diff --git a/recipes/regression_tests/phase3/simple_macsec.py b/recipes/regression_tests/phase3/simple_macsec.py index ffd4487..0601c0e 100644 --- a/recipes/regression_tests/phase3/simple_macsec.py +++ b/recipes/regression_tests/phase3/simple_macsec.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import perfrepo_baseline_to_dict from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -39,6 +40,7 @@ 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") +official_result = bool_it(ctl.get_alias("official_result"))
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
@@ -177,7 +179,7 @@ for setting in encryption_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1: # prepare PerfRepo result for udp @@ -209,7 +211,7 @@ for setting in encryption_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
if ipv in [ 'ipv6', 'both' ]: @@ -249,7 +251,7 @@ for setting in encryption_settings:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1: # prepare PerfRepo result for udp ipv6 @@ -281,7 +283,7 @@ for setting in encryption_settings:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
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 0ef80a5..b0141e1 100644 --- a/recipes/regression_tests/phase3/simple_macsec.xml +++ b/recipes/regression_tests/phase3/simple_macsec.xml @@ -13,6 +13,7 @@ <alias name="mapping_file" value="simple_macsec.mapping" /> <alias name="net" value="192.168.0" /> <alias name="driver" value=""/> + <alias name="official_result" value="no" /> </define> <network> <host id="machine1"> diff --git a/recipes/regression_tests/phase3/vxlan_multicast.py b/recipes/regression_tests/phase3/vxlan_multicast.py index e31bd6b..31596fc 100644 --- a/recipes/regression_tests/phase3/vxlan_multicast.py +++ b/recipes/regression_tests/phase3/vxlan_multicast.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import perfrepo_baseline_to_dict from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -41,6 +42,7 @@ 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") +official_result = bool_it(ctl.get_alias("official_result"))
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
@@ -144,7 +146,7 @@ if ipv in [ 'ipv4', 'both' ]:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1: # prepare PerfRepo result for udp @@ -178,7 +180,7 @@ if ipv in [ 'ipv4', 'both' ]:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
if ipv in [ 'ipv6', 'both' ]: if nperf_protocols.find("tcp") > -1: @@ -213,7 +215,7 @@ if ipv in [ 'ipv6', 'both' ]:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1: # prepare PerfRepo result for udp ipv6 @@ -247,7 +249,7 @@ if ipv in [ 'ipv6', 'both' ]:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
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 715a19c..af1df40 100644 --- a/recipes/regression_tests/phase3/vxlan_multicast.xml +++ b/recipes/regression_tests/phase3/vxlan_multicast.xml @@ -15,6 +15,7 @@ <alias name="vxlan_net" value="192.168.100"/> <alias name="vxlan_net6" value="fc00:0:0:0"/> <alias name="driver" value=""/> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1"> diff --git a/recipes/regression_tests/phase3/vxlan_remote.py b/recipes/regression_tests/phase3/vxlan_remote.py index cc4b16e..61d9532 100644 --- a/recipes/regression_tests/phase3/vxlan_remote.py +++ b/recipes/regression_tests/phase3/vxlan_remote.py @@ -1,3 +1,4 @@ +from lnst.Common.Utils import bool_it from lnst.Controller.Task import ctl from lnst.Controller.PerfRepoUtils import perfrepo_baseline_to_dict from lnst.Controller.PerfRepoUtils import netperf_result_template @@ -40,6 +41,7 @@ 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") +official_result = bool_it(ctl.get_alias("official_result"))
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
@@ -117,7 +119,7 @@ if ipv in [ 'ipv4', 'both' ]:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1: # prepare PerfRepo result for udp @@ -148,7 +150,7 @@ if ipv in [ 'ipv4', 'both' ]:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
if ipv in [ 'ipv6', 'both' ]: ping6((m1, test_if1, 1, {"scope": 0}), @@ -184,7 +186,7 @@ if ipv in [ 'ipv6', 'both' ]:
netperf_result_template(result_tcp, tcp_res_data) result_tcp.set_comment(pr_comment) - perf_api.save_result(result_tcp) + perf_api.save_result(result_tcp, official_result)
if nperf_protocols.find("udp") > -1: # prepare PerfRepo result for udp ipv6 @@ -215,7 +217,7 @@ if ipv in [ 'ipv6', 'both' ]:
netperf_result_template(result_udp, udp_res_data) result_udp.set_comment(pr_comment) - perf_api.save_result(result_udp) + perf_api.save_result(result_udp, official_result)
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 3d290f0..1c1b042 100644 --- a/recipes/regression_tests/phase3/vxlan_remote.xml +++ b/recipes/regression_tests/phase3/vxlan_remote.xml @@ -15,6 +15,7 @@ <alias name="vxlan_net" value="192.168.100"/> <alias name="vxlan_net6" value="fc00:0:0:0"/> <alias name="driver" value=""/> + <alias name="official_result" value="no" /> </define> <network> <host id="testmachine1">
On Wed, Jun 07, 2017 at 04:10:39PM +0200, olichtne@redhat.com wrote:
From: Ondrej Lichtner olichtne@redhat.com
When the official_result parameter is set to True it indicates that the result will be filtered by a hash tag. So the save_result method calculates and adds this tag before submitting the object.
If set to False the hash calculation and the tag is skipped.
Signed-off-by: Ondrej Lichtner olichtne@redhat.com
lnst/Controller/Task.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
We've already tested this in beaker so I sent these just for archival purposes and am pushing them without waiting for acks...
-Ondrej
lnst-developers@lists.fedorahosted.org