On Wed, Jul 27, 2016 at 02:23:07PM +0200, Kamil Jerabek wrote:
> 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.
>
> Signed-off-by: Kamil Jerabek <kjerabek(a)redhat.com>
> ---
> recipes/regression_tests/phase1/3_vlans.py | 13 +++++++++++++
> .../regression_tests/phase1/3_vlans_over_bond.py | 13 +++++++++++++
> recipes/regression_tests/phase1/bonding_test.py | 13 +++++++++++++
> recipes/regression_tests/phase1/simple_netperf.py | 13 +++++++++----
> .../phase1/virtual_bridge_2_vlans_over_bond.py | 15 +++++++++++++--
> .../phase1/virtual_bridge_vlan_in_guest.py | 13 +++++++++++++
> .../phase1/virtual_bridge_vlan_in_host.py | 13 +++++++++++++
> .../regression_tests/phase2/3_vlans_over_team.py | 13 +++++++++++++
> recipes/regression_tests/phase2/team_test.py | 21 +++++++++++++++++++++
> ...al_ovs_bridge_2_vlans_over_active_backup_bond.py | 13 +++++++++++++
> .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 13 +++++++++++++
> .../phase2/virtual_ovs_bridge_vlan_in_host.py | 13 +++++++++++++
> 12 files changed, 160 insertions(+), 6 deletions(-)
>
> diff --git a/recipes/regression_tests/phase1/3_vlans.py
b/recipes/regression_tests/phase1/3_vlans.py
> index 8144815..a508697 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)
> @@ -166,6 +167,10 @@ if nperf_mode == "multi":
> netperf_cli_tcp6.update_options({"num_parallel":
nperf_num_parallel})
> netperf_cli_udp6.update_options({"num_parallel":
nperf_num_parallel})
>
> +if nperf_udp_size is not None:
> + netperf_cli_udp.update_options({"udp_size" : nperf_udp_size})
> + netperf_cli_udp6.update_options({"udp_size" : nperf_udp_size})
> +
> for setting in offload_settings:
> #apply offload setting
> dev_features = ""
> @@ -245,6 +250,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 +310,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..6c036f2 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)
> @@ -167,6 +168,10 @@ if nperf_mode == "multi":
> netperf_cli_tcp6.update_options({"num_parallel":
nperf_num_parallel})
> netperf_cli_udp6.update_options({"num_parallel":
nperf_num_parallel})
>
> +if nperf_udp_size is not None:
> + netperf_cli_udp.update_options({"udp_size" : nperf_udp_size})
> + netperf_cli_udp6.update_options({"udp_size" : nperf_udp_size})
> +
> for setting in offload_settings:
> #apply offload setting
> dev_features = ""
> @@ -244,6 +249,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 +309,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..4bbf573 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)
> @@ -176,6 +177,10 @@ if nperf_mode == "multi":
> netperf_cli_tcp6.update_options({"num_parallel":
nperf_num_parallel})
> netperf_cli_udp6.update_options({"num_parallel":
nperf_num_parallel})
>
> +if nperf_udp_size is not None:
> + netperf_cli_udp.update_options({"udp_size" : nperf_udp_size})
> + netperf_cli_udp6.update_options({"udp_size" : nperf_udp_size})
> +
> ctl.wait(15)
>
> for setting in offload_settings:
> @@ -222,6 +227,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 +285,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..8d9fb1d 100644
> --- a/recipes/regression_tests/phase1/simple_netperf.py
> +++ b/recipes/regression_tests/phase1/simple_netperf.py
> @@ -108,8 +108,7 @@ netperf_cli_udp = ctl.get_module("Netperf",
> "runs" : nperf_max_runs,
> "netperf_opts" : p_opts,
> "debug" : nperf_debug,
> - "max_deviation" : nperf_max_dev,
> - "udp_size" : nperf_udp_size
> + "max_deviation" : nperf_max_dev
> })
>
> netperf_cli_udp6 = ctl.get_module("Netperf",
> @@ -123,8 +122,7 @@ netperf_cli_udp6 = ctl.get_module("Netperf",
> "runs" : nperf_max_runs,
> "netperf_opts" : p_opts6,
> "debug" : nperf_debug,
> - "max_deviation" : nperf_max_dev,
> - "udp_size" : nperf_udp_size
> + "max_deviation" : nperf_max_dev
> })
>
> netperf_srv = ctl.get_module("Netperf",
> @@ -150,6 +148,10 @@ if nperf_mode == "multi":
> netperf_cli_tcp6.update_options({"num_parallel" :
nperf_num_parallel})
> netperf_cli_udp6.update_options({"num_parallel" :
nperf_num_parallel})
>
> +if nperf_udp_size is not None:
> + netperf_cli_udp.update_options({"udp_size" : nperf_udp_size})
> + netperf_cli_udp6.update_options({"udp_size" : nperf_udp_size})
> +
> ctl.wait(15)
>
> for setting in offload_settings:
> @@ -255,6 +257,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
> })
This should be done with the update_options() call as in the other
recipes.
_______________________________________________
LNST-developers mailing list
lnst-developers(a)lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/lnst-developers@lists.fedoraho...
I noticed you've fixed my comments to the "Netperf: add option udp_size"
commit in this commit instead... so while you're fixing this, can you
cleanup the "udp_size" changes and send them in a single patchset?
I'm thinking something like:
"Netperf: add option udp_size" : modifies just the Netperf.py module
"regression_tests: add udp_size to netperf tests" : modifies all the recipes
(simple_netperf included)
"regression_tests: skip unnecessary offload..." : resent this patch since it
depends on the previous 2 ones
-Ondrej