This commit adds a udp_size parameter to all udp Netperf clients in our regression_tests/hase1-2 directories. The value of the parameter can be controlled via alias "nperf_udp_size" that I've added to all recipes. The default value is set by Netperf to size of out buffer otherwise to value specified in this alias. --- recipes/regression_tests/phase1/3_vlans.py | 15 +++++++++++++-- recipes/regression_tests/phase1/3_vlans_over_bond.py | 15 +++++++++++++-- recipes/regression_tests/phase1/bonding_test.py | 16 ++++++++++++++-- recipes/regression_tests/phase1/simple_netperf.py | 3 +++ .../phase1/virtual_bridge_2_vlans_over_bond.py | 15 +++++++++++++-- .../phase1/virtual_bridge_vlan_in_guest.py | 15 +++++++++++++-- .../phase1/virtual_bridge_vlan_in_host.py | 15 +++++++++++++-- recipes/regression_tests/phase2/3_vlans_over_team.py | 15 +++++++++++++-- recipes/regression_tests/phase2/team_test.py | 11 +++++++++-- ...virtual_ovs_bridge_2_vlans_over_active_backup_bond.py | 15 +++++++++++++-- .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 15 +++++++++++++-- .../phase2/virtual_ovs_bridge_vlan_in_host.py | 15 +++++++++++++-- 12 files changed, 143 insertions(+), 22 deletions(-)
diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index 8144815..4cccbf5 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -44,6 +44,7 @@ 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") +nperf_udp_size = ctl.get_alias("nperf_udp_size") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -126,7 +127,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts": p_opts, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size }) netperf_cli_tcp6 = ctl.get_module("Netperf", options={ @@ -152,7 +154,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts": p_opts6, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
if nperf_mode == "multi": @@ -245,6 +248,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.set_parameter('netperf_server_on_vlan', vlans[0]) result_udp.set_parameter('netperf_client_on_vlan', vlans[0]) result_udp.add_tag(product_name) @@ -301,6 +308,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.set_parameter('netperf_server_on_vlan', vlans[0]) result_udp.set_parameter('netperf_client_on_vlan', vlans[0]) result_udp.set_tag(product_name) diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py b/recipes/regression_tests/phase1/3_vlans_over_bond.py index 41f2b95..2d3420f 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -43,6 +43,7 @@ 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") +nperf_udp_size = ctl.get_alias("nperf_udp_size") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -127,7 +128,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts": p_opts, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size }) netperf_cli_tcp6 = ctl.get_module("Netperf", options={ @@ -153,7 +155,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts": p_opts6, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
if nperf_mode == "multi": @@ -244,6 +247,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.set_parameter('netperf_server_on_vlan', vlans[0]) result_udp.set_parameter('netperf_client_on_vlan', vlans[0]) result_udp.add_tag(product_name) @@ -300,6 +307,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.set_parameter('netperf_server_on_vlan', vlans[0]) result_udp.set_parameter('netperf_client_on_vlan', vlans[0]) result_udp.add_tag(product_name) diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index 39e7df8..a831e0b 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -43,6 +43,7 @@ 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") +nperf_udp_size = ctl.get_alias("nperf_udp_size") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -133,7 +134,9 @@ netperf_cli_udp = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : p_opts, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size + })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -162,7 +165,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : p_opts6, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
if nperf_mode == "multi": @@ -222,6 +226,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.add_tag(product_name) if nperf_mode == "multi": result_udp.add_tag("multithreaded") @@ -276,6 +284,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.add_tag(product_name) if nperf_mode == "multi": result_udp.add_tag("multithreaded") diff --git a/recipes/regression_tests/phase1/simple_netperf.py b/recipes/regression_tests/phase1/simple_netperf.py index d68d10c..36f89df 100644 --- a/recipes/regression_tests/phase1/simple_netperf.py +++ b/recipes/regression_tests/phase1/simple_netperf.py @@ -255,6 +255,9 @@ for setting in offload_settings: for offload in setting: result_udp.set_parameter(offload[0], offload[1])
+ if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.add_tag(product_name) if nperf_mode == "multi": result_udp.add_tag("multithreaded") 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 37f703f..5841fad 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 @@ -48,6 +48,7 @@ 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") +nperf_udp_size = ctl.get_alias("nperf_udp_size") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, g2, h2, g3, g4], pr_user_comment) @@ -142,7 +143,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "netperf_opts" : "-L %s" % (g3_guestnic.get_ip(0)), "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -174,7 +176,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "netperf_opts" : "-L %s -6" % (g3_guestnic.get_ip(1)), "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
if nperf_mode == "multi": @@ -304,6 +307,10 @@ for setting in offload_settings: r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.add_tag(product_name) if nperf_mode == "multi": result_udp.add_tag("multithreaded") @@ -368,6 +375,10 @@ for setting in offload_settings: r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.add_tag(product_name) if nperf_mode == "multi": result_udp.add_tag("multithreaded") 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 b4b5c6c..0a02e2d 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -44,6 +44,7 @@ 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") +nperf_udp_size = ctl.get_alias("nperf_udp_size") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment) @@ -127,7 +128,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : p_opts, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -157,7 +159,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : p_opts6, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
if nperf_mode == "multi": @@ -240,6 +243,10 @@ for setting in offload_settings: r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.add_tag(product_name) if nperf_mode == "multi": result_udp.add_tag("multithreaded") @@ -301,6 +308,10 @@ for setting in offload_settings: r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.add_tag(product_name) if nperf_mode == "multi": result_udp.add_tag("multithreaded") 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 1ebdd91..b048e90 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -44,6 +44,7 @@ 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") +nperf_udp_size = ctl.get_alias("nperf_udp_size") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment) @@ -126,7 +127,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : p_opts, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -156,7 +158,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : p_opts6, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
if nperf_mode == "multi": @@ -240,6 +243,10 @@ for setting in offload_settings: r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.add_tag(product_name) if nperf_mode == "multi": result_udp.add_tag("multithreaded") @@ -301,6 +308,10 @@ for setting in offload_settings: r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.add_tag(product_name) if nperf_mode == "multi": result_udp.add_tag("multithreaded") diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py b/recipes/regression_tests/phase2/3_vlans_over_team.py index e9cae83..d95a040 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -43,6 +43,7 @@ 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") +nperf_udp_size = ctl.get_alias("nperf_udp_size") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -127,7 +128,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts": p_opts, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size }) netperf_cli_tcp6 = ctl.get_module("Netperf", options={ @@ -153,7 +155,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts": p_opts6, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
if nperf_mode == "multi": @@ -244,6 +247,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.set_parameter('netperf_server_on_vlan', vlans[0]) result_udp.set_parameter('netperf_client_on_vlan', vlans[0]) result_udp.add_tag(product_name) @@ -300,6 +307,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.set_parameter('netperf_server_on_vlan', vlans[0]) result_udp.set_parameter('netperf_client_on_vlan', vlans[0]) result_udp.add_tag(product_name) diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 1aa0d0f..4d16f3a 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -42,6 +42,7 @@ 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") +nperf_udp_size = ctl.get_alias("nperf_udp_size") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -132,7 +133,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : p_opts, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -161,7 +163,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : p_opts6, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
if nperf_mode == "multi": @@ -223,6 +226,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.set_parameter('netperf_server', "testmachine1") result_udp.set_parameter('netperf_client', "testmachine2") result_udp.add_tag(product_name) 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 d795714..998cb1f 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 @@ -48,6 +48,7 @@ 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") +nperf_udp_size = ctl.get_alias("nperf_udp_size") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, g2, h2, g3, g4], pr_user_comment) @@ -141,7 +142,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "netperf_opts" : "-L %s" % (g3_guestnic.get_ip(0)), "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -173,7 +175,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "netperf_opts" : "-L %s -6" % (g3_guestnic.get_ip(1)), "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
if nperf_mode == "multi": @@ -283,6 +286,10 @@ for setting in offload_settings: r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.add_tag(product_name) if nperf_mode == "multi": result_udp.add_tag("multithreaded") @@ -347,6 +354,10 @@ for setting in offload_settings: r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.add_tag(product_name) if nperf_mode == "multi": result_udp.add_tag("multithreaded") 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 c96e2a6..22e4706 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 @@ -44,6 +44,7 @@ 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") +nperf_udp_size = ctl.get_alias("nperf_udp_size") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment) @@ -124,7 +125,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : p_opts, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -154,7 +156,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : p_opts6, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
if nperf_mode == "multi": @@ -228,6 +231,10 @@ for setting in offload_settings: r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.add_tag(product_name) if nperf_mode == "multi": result_udp.add_tag("multithreaded") @@ -289,6 +296,10 @@ for setting in offload_settings: r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.add_tag(product_name) if nperf_mode == "multi": result_udp.add_tag("multithreaded") 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 eaa1cab..a2457fe 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 @@ -44,6 +44,7 @@ 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") +nperf_udp_size = ctl.get_alias("nperf_udp_size") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment) @@ -123,7 +124,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : p_opts, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -153,7 +155,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : p_opts6, "debug" : nperf_debug, - "max_deviation" : nperf_max_dev + "max_deviation" : nperf_max_dev, + "udp_size" : nperf_udp_size })
if nperf_mode == "multi": @@ -227,6 +230,10 @@ for setting in offload_settings: r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.add_tag(product_name) if nperf_mode == "multi": result_udp.add_tag("multithreaded") @@ -289,6 +296,10 @@ for setting in offload_settings: r'host\d+..*tap\d*.devname']) for offload in setting: result_udp.set_parameter(offload[0], offload[1]) + + if nperf_udp_size is not None: + result_udp.set_parameter("nperf_udp_size", nperf_udp_size) + result_udp.add_tag(product_name) if nperf_mode == "multi": result_udp.add_tag("multithreaded")
<snip>
diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 1aa0d0f..4d16f3a 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -42,6 +42,7 @@ 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") +nperf_udp_size = ctl.get_alias("nperf_udp_size") pr_user_comment = ctl.get_alias("perfrepo_comment")
pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment) @@ -132,7 +133,8 @@ netperf_cli_udp = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : p_opts, "debug" : nperf_debug,
"max_deviation" : nperf_max_dev
"max_deviation" : nperf_max_dev,"udp_size" : nperf_udp_size })netperf_cli_tcp6 = ctl.get_module("Netperf", @@ -161,7 +163,8 @@ netperf_cli_udp6 = ctl.get_module("Netperf", "runs": nperf_max_runs, "netperf_opts" : p_opts6, "debug" : nperf_debug,
"max_deviation" : nperf_max_dev
"max_deviation" : nperf_max_dev,"udp_size" : nperf_udp_size })if nperf_mode == "multi": @@ -223,6 +226,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_udp.set_parameter(offload[0], offload[1])
if nperf_udp_size is not None:result_udp.set_parameter("nperf_udp_size", nperf_udp_size)result_udp.set_parameter('netperf_server', "testmachine1") result_udp.set_parameter('netperf_client', "testmachine2") result_udp.add_tag(product_name)
You skipped ipv6 UDP_STREAM in phase2/team_test.py
-Ondrej
lnst-developers@lists.fedorahosted.org
-
Kamil Jerabek -
Ondrej Lichtner