From: Ondrej Lichtner olichtne@redhat.com
This commit adds a max_deviation parameter to all Netperf test_module clients in our regression_tests directory. The value of the parameter can be controlled through alias "nperf_max_dev" that I've added to all the recipes and set the default value to 20%. I chose the default value by going through the PASS values we usually see on these tests. None of these normally exceed 20% so it should be safe.
Signed-off-by: Ondrej Lichtner olichtne@redhat.com --- recipes/regression_tests/phase1/3_vlans.py | 13 +++++++++---- recipes/regression_tests/phase1/3_vlans.xml | 1 + .../phase1/3_vlans_over_active_backup_bond.xml | 1 + recipes/regression_tests/phase1/3_vlans_over_bond.py | 13 +++++++++---- .../phase1/3_vlans_over_round_robin_bond.xml | 1 + recipes/regression_tests/phase1/active_backup_bond.xml | 1 + .../regression_tests/phase1/active_backup_double_bond.xml | 1 + recipes/regression_tests/phase1/bonding_test.py | 13 +++++++++---- recipes/regression_tests/phase1/round_robin_bond.xml | 1 + recipes/regression_tests/phase1/round_robin_double_bond.xml | 1 + recipes/regression_tests/phase1/simple_netperf.py | 13 +++++++++---- recipes/regression_tests/phase1/simple_netperf.xml | 1 + .../virtual_bridge_2_vlans_over_active_backup_bond.xml | 1 + .../phase1/virtual_bridge_2_vlans_over_bond.py | 13 +++++++++---- .../regression_tests/phase1/virtual_bridge_vlan_in_guest.py | 13 +++++++++---- .../phase1/virtual_bridge_vlan_in_guest.xml | 1 + .../regression_tests/phase1/virtual_bridge_vlan_in_host.py | 13 +++++++++---- .../regression_tests/phase1/virtual_bridge_vlan_in_host.xml | 1 + .../phase2/3_vlans_over_active_backup_team.xml | 1 + .../phase2/3_vlans_over_round_robin_team.xml | 1 + recipes/regression_tests/phase2/3_vlans_over_team.py | 13 +++++++++---- .../regression_tests/phase2/active_backup_double_team.xml | 1 + recipes/regression_tests/phase2/active_backup_team.xml | 1 + .../phase2/active_backup_team_vs_active_backup_bond.xml | 1 + .../phase2/active_backup_team_vs_round_robin_bond.xml | 1 + recipes/regression_tests/phase2/round_robin_double_team.xml | 1 + recipes/regression_tests/phase2/round_robin_team.xml | 1 + .../phase2/round_robin_team_vs_active_backup_bond.xml | 1 + .../phase2/round_robin_team_vs_round_robin_bond.xml | 1 + recipes/regression_tests/phase2/team_test.py | 13 +++++++++---- .../virtual_ovs_bridge_2_vlans_over_active_backup_bond.py | 13 +++++++++---- .../virtual_ovs_bridge_2_vlans_over_active_backup_bond.xml | 1 + .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 13 +++++++++---- .../phase2/virtual_ovs_bridge_vlan_in_guest.xml | 1 + .../phase2/virtual_ovs_bridge_vlan_in_host.py | 13 +++++++++---- .../phase2/virtual_ovs_bridge_vlan_in_host.xml | 1 + recipes/regression_tests/phase3/2_virt_ovs_vxlan.py | 13 +++++++++---- recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml | 1 + recipes/regression_tests/phase3/novirt_ovs_vxlan.py | 5 +++++ recipes/regression_tests/phase3/novirt_ovs_vxlan.xml | 1 + recipes/regression_tests/phase3/vxlan_multicast.py | 5 +++++ recipes/regression_tests/phase3/vxlan_multicast.xml | 1 + recipes/regression_tests/phase3/vxlan_remote.py | 5 +++++ recipes/regression_tests/phase3/vxlan_remote.xml | 1 + 44 files changed, 160 insertions(+), 52 deletions(-)
diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index 49020db..8144815 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -43,6 +43,7 @@ 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")) nperf_debug = ctl.get_alias("nperf_debug") +nperf_max_dev = ctl.get_alias("nperf_max_dev") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -111,7 +112,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts": p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev }) netperf_cli_udp = ctl.get_module("Netperf", options={ @@ -123,7 +125,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts": p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev }) netperf_cli_tcp6 = ctl.get_module("Netperf", options={ @@ -135,7 +138,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts": p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev }) netperf_cli_udp6 = ctl.get_module("Netperf", options={ @@ -147,7 +151,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts": p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
if nperf_mode == "multi": diff --git a/recipes/regression_tests/phase1/3_vlans.xml b/recipes/regression_tests/phase1/3_vlans.xml index 03cf350..5c0f1fe 100644 --- a/recipes/regression_tests/phase1/3_vlans.xml +++ b/recipes/regression_tests/phase1/3_vlans.xml @@ -9,6 +9,7 @@ <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="3_vlans.mapping" /> <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> 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 9f4f932..f9b4922 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 @@ -9,6 +9,7 @@ <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="3_vlans_over_active_backup_bond.mapping" /> <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index a96e604..41f2b95 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -42,6 +42,7 @@ 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")) nperf_debug = ctl.get_alias("nperf_debug") +nperf_max_dev = ctl.get_alias("nperf_max_dev") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -112,7 +113,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts": p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev }) netperf_cli_udp = ctl.get_module("Netperf", options={ @@ -124,7 +126,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts": p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev }) netperf_cli_tcp6 = ctl.get_module("Netperf", options={ @@ -136,7 +139,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts": p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev }) netperf_cli_udp6 = ctl.get_module("Netperf", options={ @@ -148,7 +152,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts": p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
if nperf_mode == "multi": 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 1f77a46..d22fa7b 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 @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5"/> <alias name="nperf_mode" value="default"/> <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" /> </define> <network> diff --git a/recipes/regression_tests/phase1/active_backup_bond.xml b/recipes/regression_tests/phase1/active_backup_bond.xml index 11c5f28..0b79f4c 100644 --- a/recipes/regression_tests/phase1/active_backup_bond.xml +++ b/recipes/regression_tests/phase1/active_backup_bond.xml @@ -9,6 +9,7 @@ <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="active_backup_bond.mapping" /> <alias name="net" value="192.168.0"/> </define> diff --git a/recipes/regression_tests/phase1/active_backup_double_bond.xml b/recipes/regression_tests/phase1/active_backup_double_bond.xml index ccf1ba1..bc39db8 100644 --- a/recipes/regression_tests/phase1/active_backup_double_bond.xml +++ b/recipes/regression_tests/phase1/active_backup_double_bond.xml @@ -9,6 +9,7 @@ <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="active_backup_double_bond.mapping" /> <alias name="net" value="192.168.0"/> </define> diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index 7d8a48e..39e7df8 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -42,6 +42,7 @@ 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")) nperf_debug = ctl.get_alias("nperf_debug") +nperf_max_dev = ctl.get_alias("nperf_max_dev") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -117,7 +118,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_udp = ctl.get_module("Netperf", @@ -130,7 +132,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -144,7 +147,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev }) netperf_cli_udp6 = ctl.get_module("Netperf", options={ @@ -157,7 +161,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
if nperf_mode == "multi": diff --git a/recipes/regression_tests/phase1/round_robin_bond.xml b/recipes/regression_tests/phase1/round_robin_bond.xml index 861e47c..9b28cbc 100644 --- a/recipes/regression_tests/phase1/round_robin_bond.xml +++ b/recipes/regression_tests/phase1/round_robin_bond.xml @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5"/> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="round_robin_bond.mapping" /> </define> <network> diff --git a/recipes/regression_tests/phase1/round_robin_double_bond.xml b/recipes/regression_tests/phase1/round_robin_double_bond.xml index 0083b4b..15798f1 100644 --- a/recipes/regression_tests/phase1/round_robin_double_bond.xml +++ b/recipes/regression_tests/phase1/round_robin_double_bond.xml @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5"/> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="round_robin_double_bond.mapping" /> </define> <network> diff --git a/recipes/regression_tests/phase1/simple_netperf.py b/recipes/regression_tests/phase1/simple_netperf.py index 811dd58..fe9d96b 100644 --- a/recipes/regression_tests/phase1/simple_netperf.py +++ b/recipes/regression_tests/phase1/simple_netperf.py @@ -42,6 +42,7 @@ 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")) nperf_debug = ctl.get_alias("nperf_debug") +nperf_max_dev = ctl.get_alias("nperf_max_dev") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -77,7 +78,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs" : nperf_max_runs, "netperf_opts" : p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -90,7 +92,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs" : nperf_max_runs, "netperf_opts" : p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_udp = ctl.get_module("Netperf", @@ -103,7 +106,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs" : nperf_max_runs, "netperf_opts" : p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_udp6 = ctl.get_module("Netperf", @@ -116,7 +120,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs" : nperf_max_runs, "netperf_opts" : p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_srv = ctl.get_module("Netperf", diff --git a/recipes/regression_tests/phase1/simple_netperf.xml b/recipes/regression_tests/phase1/simple_netperf.xml index cfc2d85..0f106aa 100644 --- a/recipes/regression_tests/phase1/simple_netperf.xml +++ b/recipes/regression_tests/phase1/simple_netperf.xml @@ -9,6 +9,7 @@ <alias name="nperf_mode" value="default" /> <alias name="nperf_num_parallel" value="2" /> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="simple_netperf.mapping" /> <alias name="net" value="192.168.101" /> </define> 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 ff5d8d6..5b5223e 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 @@ -8,6 +8,7 @@ <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mtu" value="1500" /> <alias name="mapping_file" value="virtual_bridge_2_vlans_over_active_backup_bond.mapping" /> <alias name="vlan10_net" value="192.168.10"/> 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 780e85b..37f703f 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 @@ -47,6 +47,7 @@ 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")) nperf_debug = ctl.get_alias("nperf_debug") +nperf_max_dev = ctl.get_alias("nperf_max_dev") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, g2, h2, g3, g4], pr_user_comment) @@ -125,7 +126,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : "-L %s" % (g3_guestnic.get_ip(0)), - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_udp = ctl.get_module("Netperf", @@ -139,7 +141,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : "-L %s" % (g3_guestnic.get_ip(0)), - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -154,7 +157,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : "-L %s -6" % (g3_guestnic.get_ip(1)), - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_udp6 = ctl.get_module("Netperf", @@ -169,7 +173,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : "-L %s -6" % (g3_guestnic.get_ip(1)), - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
if nperf_mode == "multi": 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 416f469..b4b5c6c 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -43,6 +43,7 @@ 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")) nperf_debug = ctl.get_alias("nperf_debug") +nperf_max_dev = ctl.get_alias("nperf_max_dev") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment) @@ -111,7 +112,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_udp = ctl.get_module("Netperf", @@ -124,7 +126,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -138,7 +141,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_udp6 = ctl.get_module("Netperf", @@ -152,7 +156,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
if nperf_mode == "multi": 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 6aba6f8..7768542 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.xml @@ -8,6 +8,7 @@ <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mtu" value="1500" /> <alias name="mapping_file" value="virtual_bridge_vlan_in_guest.mapping" /> <alias name="vlan10_net" value="192.168.10"/> 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 03dd3bf..1ebdd91 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -43,6 +43,7 @@ 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")) nperf_debug = ctl.get_alias("nperf_debug") +nperf_max_dev = ctl.get_alias("nperf_max_dev") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment) @@ -110,7 +111,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_udp = ctl.get_module("Netperf", @@ -123,7 +125,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -137,7 +140,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_udp6 = ctl.get_module("Netperf", @@ -151,7 +155,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
if nperf_mode == "multi": 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 27583ac..a38848b 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.xml @@ -8,6 +8,7 @@ <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mtu" value="1500" /> <alias name="mapping_file" value="virtual_bridge_vlan_in_host.mapping" /> <alias name="vlan10_net" value="192.168.10"/> 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 2bcfc88..c2a5117 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 @@ -9,6 +9,7 @@ <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="3_vlans_over_active_backup_team.mapping" /> <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> 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 1a374bd..7576ec0 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 @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5" /> <alias name="nperf_mode" value="default"/> <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" /> </define> <network> diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index 2a33268..e9cae83 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -42,6 +42,7 @@ 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")) nperf_debug = ctl.get_alias("nperf_debug") +nperf_max_dev = ctl.get_alias("nperf_max_dev") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -112,7 +113,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts": p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev }) netperf_cli_udp = ctl.get_module("Netperf", options={ @@ -124,7 +126,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts": p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev }) netperf_cli_tcp6 = ctl.get_module("Netperf", options={ @@ -136,7 +139,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts": p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev }) netperf_cli_udp6 = ctl.get_module("Netperf", options={ @@ -148,7 +152,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts": p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
if nperf_mode == "multi": diff --git a/recipes/regression_tests/phase2/active_backup_double_team.xml b/recipes/regression_tests/phase2/active_backup_double_team.xml index 235872b..3825fb0 100644 --- a/recipes/regression_tests/phase2/active_backup_double_team.xml +++ b/recipes/regression_tests/phase2/active_backup_double_team.xml @@ -9,6 +9,7 @@ <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="active_backup_double_team.mapping" /> <alias name="net" value="192.168.0"/> </define> diff --git a/recipes/regression_tests/phase2/active_backup_team.xml b/recipes/regression_tests/phase2/active_backup_team.xml index 721edeb..abf4451 100644 --- a/recipes/regression_tests/phase2/active_backup_team.xml +++ b/recipes/regression_tests/phase2/active_backup_team.xml @@ -9,6 +9,7 @@ <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="active_backup_team.mapping" /> <alias name="net" value="192.168.0"/> </define> 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 b2fc512..e0cb9c1 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 @@ -9,6 +9,7 @@ <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="active_backup_team_vs_active_backup_bond.mapping" /> <alias name="net" value="192.168.0"/> </define> 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 3d40c72..983a512 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 @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5" /> <alias name="nperf_mode" value="default"/> <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" /> </define> <network> diff --git a/recipes/regression_tests/phase2/round_robin_double_team.xml b/recipes/regression_tests/phase2/round_robin_double_team.xml index 4acc6c6..a4cb9cb 100644 --- a/recipes/regression_tests/phase2/round_robin_double_team.xml +++ b/recipes/regression_tests/phase2/round_robin_double_team.xml @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5" /> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="round_robin_double_team.mapping" /> </define> <network> diff --git a/recipes/regression_tests/phase2/round_robin_team.xml b/recipes/regression_tests/phase2/round_robin_team.xml index 95ecac2..9ff89eb 100644 --- a/recipes/regression_tests/phase2/round_robin_team.xml +++ b/recipes/regression_tests/phase2/round_robin_team.xml @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5" /> <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="round_robin_team.mapping" /> </define> <network> 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 99f1767..0d15dda 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 @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5" /> <alias name="nperf_mode" value="default"/> <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" /> </define> <network> 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 e03c64d..4b31194 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 @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5" /> <alias name="nperf_mode" value="default"/> <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" /> </define> <network> diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 8ad9758..1aa0d0f 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -41,6 +41,7 @@ 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")) nperf_debug = ctl.get_alias("nperf_debug") +nperf_max_dev = ctl.get_alias("nperf_max_dev") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -116,7 +117,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_udp = ctl.get_module("Netperf", @@ -129,7 +131,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -143,7 +146,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev }) netperf_cli_udp6 = ctl.get_module("Netperf", options={ @@ -156,7 +160,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
if nperf_mode == "multi": 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 9ce9048..d795714 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 @@ -47,6 +47,7 @@ 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")) nperf_debug = ctl.get_alias("nperf_debug") +nperf_max_dev = ctl.get_alias("nperf_max_dev") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, g2, h2, g3, g4], pr_user_comment) @@ -124,7 +125,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : "-L %s" % (g3_guestnic.get_ip(0)), - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_udp = ctl.get_module("Netperf", @@ -138,7 +140,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : "-L %s" % (g3_guestnic.get_ip(0)), - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -153,7 +156,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : "-L %s -6" % (g3_guestnic.get_ip(1)), - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_udp6 = ctl.get_module("Netperf", @@ -168,7 +172,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : "-L %s -6" % (g3_guestnic.get_ip(1)), - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
if nperf_mode == "multi": 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 172f02f..4f34ac5 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 @@ -8,6 +8,7 @@ <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="virtual_ovs_bridge_2_vlans_over_active_backup_bond.mapping" /> <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> 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 b72b660..c96e2a6 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 @@ -43,6 +43,7 @@ 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")) nperf_debug = ctl.get_alias("nperf_debug") +nperf_max_dev = ctl.get_alias("nperf_max_dev") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment) @@ -108,7 +109,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_udp = ctl.get_module("Netperf", @@ -121,7 +123,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -135,7 +138,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_udp6 = ctl.get_module("Netperf", @@ -149,7 +153,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
if nperf_mode == "multi": 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 020b9a3..bfea7a0 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 @@ -8,6 +8,7 @@ <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="virtual_ovs_bridge_vlan_in_guest.mapping" /> <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> 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 a2382cd..eaa1cab 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 @@ -43,6 +43,7 @@ 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")) nperf_debug = ctl.get_alias("nperf_debug") +nperf_max_dev = ctl.get_alias("nperf_max_dev") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment) @@ -107,7 +108,8 @@ netperf_cli_tcp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_udp = ctl.get_module("Netperf", @@ -120,7 +122,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -134,7 +137,8 @@ netperf_cli_tcp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
netperf_cli_udp6 = ctl.get_module("Netperf", @@ -148,7 +152,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : p_opts6, - "debug" : nperf_debug + "debug" : nperf_debug, + "max_deviation" : nperf_max_dev })
if nperf_mode == "multi": 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 2715c0d..ea8f41a 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 @@ -8,6 +8,7 @@ <alias name="nperf_mode" value="default"/> <alias name="nperf_num_parallel" value="2"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="virtual_ovs_bridge_vlan_in_host.mapping" /> <alias name="vlan10_net" value="192.168.10"/> <alias name="vlan10_tag" value="10"/> diff --git a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py index 57f1373..5ebaacc 100644 --- a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py +++ b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.py @@ -42,6 +42,7 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) nperf_debug = ctl.get_alias("nperf_debug") +nperf_max_dev = ctl.get_alias("nperf_max_dev") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([guest1, guest2, guest3, guest4], @@ -152,7 +153,8 @@ if ipv in [ 'ipv4', 'both' ]: "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts": nperf_opts, - "debug": nperf_debug}, + "debug": nperf_debug, + "max_deviation": nperf_max_dev}, baseline = baseline, timeout = (netperf_duration + nperf_reserve)*nperf_max_runs)
@@ -187,7 +189,8 @@ if ipv in [ 'ipv4', 'both' ]: "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts": nperf_opts, - "debug": nperf_debug}, + "debug": nperf_debug, + "max_deviation": nperf_max_dev}, baseline = baseline, timeout = (netperf_duration + nperf_reserve)*nperf_max_runs)
@@ -222,7 +225,8 @@ if ipv in [ 'ipv6', 'both' ]: "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : nperf_opts + "-6", - "debug": nperf_debug}, + "debug": nperf_debug, + "max_deviation": nperf_max_dev}, baseline = baseline, timeout = (netperf_duration + nperf_reserve)*nperf_max_runs)
@@ -257,7 +261,8 @@ if ipv in [ 'ipv6', 'both' ]: "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "netperf_opts" : nperf_opts + "-6", - "debug": nperf_debug}, + "debug": nperf_debug, + "max_deviation": nperf_max_dev}, baseline = baseline, timeout = (netperf_duration + nperf_reserve)*nperf_max_runs)
diff --git a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml index a9c97d1..e2e7ee7 100644 --- a/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml +++ b/recipes/regression_tests/phase3/2_virt_ovs_vxlan.xml @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5"/> <alias name="nperf_num_parallel" value="1"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="2_virt_ovs_vxlan.mapping" /> <alias name="net" value="192.168.2"/> <alias name="vxlan_net" value="192.168.100"/> diff --git a/recipes/regression_tests/phase3/novirt_ovs_vxlan.py b/recipes/regression_tests/phase3/novirt_ovs_vxlan.py index d3b0ac9..5419ad9 100644 --- a/recipes/regression_tests/phase3/novirt_ovs_vxlan.py +++ b/recipes/regression_tests/phase3/novirt_ovs_vxlan.py @@ -36,6 +36,7 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) nperf_debug = ctl.get_alias("nperf_debug") +nperf_max_dev = ctl.get_alias("nperf_max_dev") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, h2], pr_user_comment) @@ -100,6 +101,7 @@ if ipv in [ 'ipv4', 'both' ]: "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "debug": nperf_debug, + "max_deviation": nperf_max_dev, "netperf_opts": nperf_opts}, baseline = baseline, timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) @@ -132,6 +134,7 @@ if ipv in [ 'ipv4', 'both' ]: "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "debug": nperf_debug, + "max_deviation": nperf_max_dev, "netperf_opts": nperf_opts}, baseline = baseline, timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) @@ -166,6 +169,7 @@ if ipv in [ 'ipv6', 'both' ]: "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "debug": nperf_debug, + "max_deviation": nperf_max_dev, "netperf_opts" : nperf_opts + "-6"}, baseline = baseline, timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) @@ -198,6 +202,7 @@ if ipv in [ 'ipv6', 'both' ]: "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "debug": nperf_debug, + "max_deviation": nperf_max_dev, "netperf_opts" : nperf_opts + "-6"}, baseline = baseline, timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) diff --git a/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml b/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml index 25404b7..98f5f1b 100644 --- a/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml +++ b/recipes/regression_tests/phase3/novirt_ovs_vxlan.xml @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5"/> <alias name="nperf_num_parallel" value="1"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="novirt_ovs_vxlan.mapping" /> <alias name="net" value="192.168.2"/> <alias name="vxlan_net" value="192.168.100"/> diff --git a/recipes/regression_tests/phase3/vxlan_multicast.py b/recipes/regression_tests/phase3/vxlan_multicast.py index da44ac0..b634606 100644 --- a/recipes/regression_tests/phase3/vxlan_multicast.py +++ b/recipes/regression_tests/phase3/vxlan_multicast.py @@ -37,6 +37,7 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) nperf_debug = ctl.get_alias("nperf_debug") +nperf_max_dev = ctl.get_alias("nperf_max_dev") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -122,6 +123,7 @@ if ipv in [ 'ipv4', 'both' ]: "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "debug": nperf_debug, + "max_deviation": nperf_max_dev, "netperf_opts": nperf_opts}, baseline = baseline, timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) @@ -154,6 +156,7 @@ if ipv in [ 'ipv4', 'both' ]: "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "debug": nperf_debug, + "max_deviation": nperf_max_dev, "netperf_opts": nperf_opts}, baseline = baseline, timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) @@ -187,6 +190,7 @@ if ipv in [ 'ipv6', 'both' ]: "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "debug": nperf_debug, + "max_deviation": nperf_max_dev, "netperf_opts" : nperf_opts + " -6"}, baseline = baseline, timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) @@ -219,6 +223,7 @@ if ipv in [ 'ipv6', 'both' ]: "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "debug": nperf_debug, + "max_deviation": nperf_max_dev, "netperf_opts" : nperf_opts + "-6"}, baseline = baseline, timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) diff --git a/recipes/regression_tests/phase3/vxlan_multicast.xml b/recipes/regression_tests/phase3/vxlan_multicast.xml index cfdb4ac..38ac7b0 100644 --- a/recipes/regression_tests/phase3/vxlan_multicast.xml +++ b/recipes/regression_tests/phase3/vxlan_multicast.xml @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5"/> <alias name="nperf_num_parallel" value="1"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="vxlan_multicast.mapping" /> <alias name="net" value="192.168.0"/> <alias name="vxlan_net" value="192.168.100"/> diff --git a/recipes/regression_tests/phase3/vxlan_remote.py b/recipes/regression_tests/phase3/vxlan_remote.py index 712c34b..12050d9 100644 --- a/recipes/regression_tests/phase3/vxlan_remote.py +++ b/recipes/regression_tests/phase3/vxlan_remote.py @@ -36,6 +36,7 @@ nperf_cpupin = ctl.get_alias("nperf_cpupin") nperf_cpu_util = ctl.get_alias("nperf_cpu_util") nperf_num_parallel = int(ctl.get_alias("nperf_num_parallel")) nperf_debug = ctl.get_alias("nperf_debug") +nperf_max_dev = ctl.get_alias("nperf_max_dev") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -96,6 +97,7 @@ if ipv in [ 'ipv4', 'both' ]: "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "debug": nperf_debug, + "max_deviation": nperf_max_dev, "netperf_opts": nperf_opts}, baseline = baseline, timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) @@ -128,6 +130,7 @@ if ipv in [ 'ipv4', 'both' ]: "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "debug": nperf_debug, + "max_deviation": nperf_max_dev, "netperf_opts": nperf_opts}, baseline = baseline, timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) @@ -165,6 +168,7 @@ if ipv in [ 'ipv6', 'both' ]: "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "debug": nperf_debug, + "max_deviation": nperf_max_dev, "netperf_opts" : nperf_opts + " -6"}, baseline = baseline, timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) @@ -197,6 +201,7 @@ if ipv in [ 'ipv6', 'both' ]: "cpu_util" : nperf_cpu_util, "runs": nperf_max_runs, "debug": nperf_debug, + "max_deviation": nperf_max_dev, "netperf_opts" : nperf_opts + "-6"}, baseline = baseline, timeout = (netperf_duration + nperf_reserve)*nperf_max_runs) diff --git a/recipes/regression_tests/phase3/vxlan_remote.xml b/recipes/regression_tests/phase3/vxlan_remote.xml index 2290458..040479e 100644 --- a/recipes/regression_tests/phase3/vxlan_remote.xml +++ b/recipes/regression_tests/phase3/vxlan_remote.xml @@ -8,6 +8,7 @@ <alias name="nperf_max_runs" value="5"/> <alias name="nperf_num_parallel" value="1"/> <alias name="nperf_debug" value="0"/> + <alias name="nperf_max_dev" value="20%"/> <alias name="mapping_file" value="vxlan_remote.mapping" /> <alias name="net" value="192.168.0"/> <alias name="vxlan_net" value="192.168.100"/>