LNST-developers July 2016

lnst-developers@lists.fedorahosted.org

5 participants
22 discussions

[PATCH v4 00/18] PyRecipes draft - changelog
by Jiri Prochazka 15 Aug '16

15 Aug '16

Changes v2 -> v3 Task.py: fixed raw_input message in breakpoint() Task: add HostAPI methods: added commit message merged multi_match related patches rebased and reordered the commits so they are bisectable and logically ordered Changes v3 -> v4 Task.py: added missing params to host machine requirements dict Jiri Prochazka (18): NetTestController: add multi_match argument to __init__ NetTestController: store defined aliases in attribute NetTestController: add run_mode attribute Task: add new InterfaceAPI method init_iface Task: add HostAPI methods Task: add new ControllerAPI methods NetTestController: add set_machine_requirements method NetTestController: add prepare_test_env and init_taskapi methods Task: add set_machine_requirements and prepare_test_env methods Task: add global level TaskAPI methods used in PyRecipes __init__: export module level API methods PyRecipes: add PyRecipes support pyrecipes: add example recipes lnst-ctl: remove overriden aliases NetTestController: remove obsolete code Task: remove deprecated methods Task: improve breakpoint feature lnst-ctl: remove config_only option lnst-ctl | 37 +-- lnst/Controller/Machine.py | 15 +- lnst/Controller/NetTestController.py | 466 ++++++----------------------------- lnst/Controller/Task.py | 246 +++++++++--------- lnst/__init__.py | 1 + pyrecipes/3_vlans.py | 34 +++ pyrecipes/example.py | 33 +++ pyrecipes/ping_flood.py | 48 ++++ 8 files changed, 344 insertions(+), 536 deletions(-) create mode 100644 pyrecipes/3_vlans.py create mode 100644 pyrecipes/example.py create mode 100644 pyrecipes/ping_flood.py -- 2.4.11

3 21

[PATCH v3] regression_tests: add udp_size to netperf tests
by Kamil Jerabek 11 Aug '16

11 Aug '16

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 }) 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..62fc800 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) @@ -171,6 +172,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}) + # configure mtu h1.get_interface("nic").set_mtu(mtu) h1.get_interface("tap").set_mtu(mtu) @@ -240,6 +245,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 +310,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..ec43321 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) @@ -170,6 +171,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}) + # configure mtu h1.get_interface("nic").set_mtu(mtu) h1.get_interface("tap").set_mtu(mtu) @@ -240,6 +245,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 +310,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..a157c45 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) @@ -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/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index 1aa0d0f..fc6ed08 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) @@ -175,6 +176,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: @@ -223,6 +228,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) @@ -280,6 +289,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) @@ -382,6 +395,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', "testmachine2") result_udp.set_parameter('netperf_client', "testmachine1") result_udp.add_tag(product_name) @@ -439,6 +456,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', "testmachine2") result_udp.set_parameter('netperf_client', "testmachine1") 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..affc6f5 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) @@ -187,6 +188,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}) + ping_mod_bad = ctl.get_module("IcmpPing", options={ "addr" : g4_guestnic.get_ip(0), @@ -283,6 +288,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 +356,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..5b7ca94 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) @@ -168,6 +169,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: @@ -228,6 +233,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 +298,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..6acb1b1 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) @@ -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}) + ctl.wait(15) for setting in offload_settings: @@ -227,6 +232,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 +298,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") -- 2.5.5

2 2

[PATCH v2] Netperf: add option udp_size
by Kamil Jerabek 26 Jul '16

26 Jul '16

This option set UDP datagram size for netperf test on client. If this option is not explicitly specified, default value from netperf is used. The option accepts integer value describing datagram size, it should be also concatenated with G/M/K/g/m/k. In this commit I also added this option to regression_test: simple_netperf test. --- recipes/regression_tests/phase1/simple_netperf.py | 10 ++++++++-- test_modules/Netperf.py | 11 +++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/recipes/regression_tests/phase1/simple_netperf.py b/recipes/regression_tests/phase1/simple_netperf.py index fe9d96b..d68d10c 100644 --- a/recipes/regression_tests/phase1/simple_netperf.py +++ b/recipes/regression_tests/phase1/simple_netperf.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) @@ -107,7 +108,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_udp6 = ctl.get_module("Netperf", @@ -121,7 +123,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 }) netperf_srv = ctl.get_module("Netperf", @@ -198,6 +201,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/test_modules/Netperf.py b/test_modules/Netperf.py index d09bdfc..e6c68ad 100644 --- a/test_modules/Netperf.py +++ b/test_modules/Netperf.py @@ -39,6 +39,7 @@ class Netperf(TestGeneric): self._cpu_util = self.get_opt("cpu_util") self._num_parallel = int(self.get_opt("num_parallel", default=1)) self._runs = self.get_opt("runs", default=1) + self._udp_size = self.get_opt("udp_size") self._debug = int_it(self.get_opt("debug", default=0)) self._threshold = self._parse_threshold(self.get_opt("threshold")) @@ -141,6 +142,16 @@ class Netperf(TestGeneric): else: cmd += " -- %s" % self._testoptions + if self._udp_size is not None: + """ + udp packets will have this size + """ + if self._is_omni() or self._testoptions: + cmd += " -m %s" % self._udp_size + else: + cms += " -- -m %s" % self._udp_size + + elif self._role == "server": cmd = "netserver -D" if self._bind is not None: -- 2.5.5

4 4

[PATCH v2] regression_tests: add udp_size to netperf tests
by Kamil Jerabek 26 Jul '16

26 Jul '16

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") -- 2.5.5

2 1

[PATCH] regression_tests: add udp_size to netperf tests
by Kamil Jerabek 26 Jul '16

26 Jul '16

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 +++++++++-- .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 15 +++++++++++++-- .../phase2/virtual_ovs_bridge_vlan_in_host.py | 15 +++++++++++++-- 11 files changed, 130 insertions(+), 20 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_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") -- 2.5.5

2 1

[PATCH v2 0/4] fixes for Release 12 milestone
by Ondrej Lichtner 26 Jul '16

26 Jul '16

From: Ondrej Lichtner <olichtne(a)redhat.com> Changes in v2: * added 4th patch that fixes #175 * Fixed float and int conversion in patch 3/4 in the Netperf module, thanks to jtluka for noticing Ondrej Lichtner (4): NmConfigDevice: don't crash when deactivating an inactive connection NetTest{Slave, Controller}: add is_installed tcpdump check Netperf: fix confidence parsing when result is 0 NetConfigDevice: skip undefined ovs internal port options lnst/Controller/NetTestController.py | 11 +++++++++-- lnst/Slave/NetConfigDevice.py | 9 +++++---- lnst/Slave/NetTestSlave.py | 4 ++++ lnst/Slave/NmConfigDevice.py | 10 +++++++++- test_modules/Netperf.py | 13 +++++++++---- 5 files changed, 36 insertions(+), 11 deletions(-) -- 2.9.0

2 5

[PATCH 1/3] NmConfigDevice: don't crash when deactivating an inactive connection
by Ondrej Lichtner 26 Jul '16

26 Jul '16

From: Ondrej Lichtner <olichtne(a)redhat.com> If the NM connection was deactivated during test execution and never reactivated, the deconfiguration of the Slave failed due to an unhandled exception. This left the slave in an inconsistent state and failed the recipe execution. This commit fixes that catching the related exception and ignoring it. Fixes #145. Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com> --- lnst/Slave/NmConfigDevice.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lnst/Slave/NmConfigDevice.py b/lnst/Slave/NmConfigDevice.py index cbd3420..a9e0c1f 100644 --- a/lnst/Slave/NmConfigDevice.py +++ b/lnst/Slave/NmConfigDevice.py @@ -17,6 +17,7 @@ import dbus import uuid import socket, struct import time +from dbus.exceptions import DBusException from lnst.Common.ExecCmd import exec_cmd from lnst.Slave.NetConfigCommon import get_slaves, get_option, get_slave_option, parse_netem from lnst.Common.NetUtils import scan_netdevs @@ -291,7 +292,14 @@ class NmConfigDeviceGeneric(object): % config["name"]) logging.debug("Active connection object path: %s" % self._acon_obj_path) - self._nm_if.DeactivateConnection(self._acon_obj_path) + try: + self._nm_if.DeactivateConnection(self._acon_obj_path) + except DBusException as e: + if e.get_dbus_name() == "org.freedesktop.NetworkManager."\ + "ConnectionNotActive": + pass + else: + raise e self._acon_obj_path = None def nm_enslave(self, slave_type, master_uuid, slave_conf): -- 2.9.0

2 5

[PATCH v3 01/18] NetTestController: add multi_match argument to __init__
by Jiri Prochazka 25 Jul '16

25 Jul '16

Info about multi_match is now passed to NetTestController's init function where it's stored as attribute of the class. This will be used in PyRecipes implementation as flag indicating whether multi_match is toggled on or off. Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> --- lnst-ctl | 3 ++- lnst/Controller/NetTestController.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lnst-ctl b/lnst-ctl index d61353d..b75b8a0 100755 --- a/lnst-ctl +++ b/lnst-ctl @@ -163,7 +163,8 @@ def get_recipe_result(action, file_path, log_ctl, res_serializer, defined_aliases=defined_aliases, overriden_aliases=overriden_aliases, reduce_sync=reduce_sync, - restrict_pools=pools) + restrict_pools=pools, + multi_match=multi_match) except XmlProcessingError as err: log_exc_traceback() logging.error(err) diff --git a/lnst/Controller/NetTestController.py b/lnst/Controller/NetTestController.py index 889dfa7..d3b4798 100644 --- a/lnst/Controller/NetTestController.py +++ b/lnst/Controller/NetTestController.py @@ -56,7 +56,8 @@ class NetTestController: res_serializer=None, pool_checks=True, packet_capture=False, defined_aliases=None, overriden_aliases=None, - reduce_sync=False, restrict_pools=[]): + reduce_sync=False, restrict_pools=[], + multi_match=False): self._res_serializer = res_serializer self._remote_capture_files = {} self._log_ctl = log_ctl @@ -65,6 +66,7 @@ class NetTestController: self._packet_capture = packet_capture self._reduce_sync = reduce_sync self._parser = RecipeParser(recipe_path) + self._multi_match = multi_match self.remove_saved_machine_config() -- 2.4.11

3 20

[PATCH 00/15] PyRecipes draft v2
by Jiri Prochazka 21 Jul '16

21 Jul '16

I did resolve the issues everyone pointed out on first version of the draft. Patchset is changed to work with git bisect as team requested. Please, review the patchset again and let me know if you run into any issues. After the patches will be stable enough, next steps will be pushing it to a new branch and start with transforming the tests to PyRecipes. When all the tests and LNST will be stable enough, we can merge it to upstream. Jiri Prochazka (15): NetTestController: add multi_match argument to __init__ lnst-ctl: add multi_match option to NetTestController init NetTestController: store defined aliases in attribute NetTestController: add run_mode attribute NetTestController: add set_machine_requirements method NetTestController: add prepare_test_env and init_taskapi methods Task: add global level TaskAPI methods used in PyRecipes Task: add new ControllerAPI methods pyrecipes: add example recipes __init__: export module level API methods Task: add HostAPI methods PyRecipes: add PyRecipes support lnst-ctl: remove overriden aliases NetTestController: remove obsolete code Task: remove deprecated methods lnst-ctl | 21 +- lnst/Controller/NetTestController.py | 372 +++++++---------------------------- lnst/Controller/Task.py | 244 ++++++++++++----------- lnst/__init__.py | 1 + pyrecipes/3_vlans.py | 34 ++++ pyrecipes/example.py | 33 ++++ pyrecipes/ping_flood.py | 48 +++++ 7 files changed, 329 insertions(+), 424 deletions(-) create mode 100644 pyrecipes/3_vlans.py create mode 100644 pyrecipes/example.py create mode 100644 pyrecipes/ping_flood.py -- 2.4.11

3 31

[PATCH v3] Config: replace subprocess.check_output with python2.6 compatible equivalent
by Jiri Prochazka 20 Jul '16

20 Jul '16

Method check_output used for getting hash of HEAD in git repo was introduced in Python2.7 and it does not work for Python2.6 which is default Python version for RHEL6.x. This patch replaces method check_output with Popen which is available in both 2.6 and 2.7. Fixes #174 --- changes in v2: prettier code changes in v3: process handling inserted in try-except block -> if user does not have git installed, it will throw OSError exception --- Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com> --- lnst/Common/Config.py | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/lnst/Common/Config.py b/lnst/Common/Config.py index 5362da1..d47f3e2 100644 --- a/lnst/Common/Config.py +++ b/lnst/Common/Config.py @@ -34,19 +34,26 @@ class Config(): def _get_version(self): # Check if I'm in git - try: - cwd = os.getcwd() - abspath = os.path.abspath(__file__) - dname = os.path.dirname(abspath) - os.chdir(dname) - with open(os.devnull, 'w') as null: - head = subprocess.check_output(['git', 'rev-parse', 'HEAD'], - stderr=null).strip() - return head - except subprocess.CalledProcessError: - return LNSTMajorVersion - finally: - os.chdir(cwd) + cwd = os.getcwd() + abspath = os.path.abspath(__file__) + dname = os.path.dirname(abspath) + os.chdir(dname) + with open(os.devnull, 'w') as null: + cmd = ['git', 'rev-parse', 'HEAD'] + try: + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=null) + data = proc.communicate() + except: + os.chdir(cwd) + return LNSTMajorVersion + # git command passed + if data[0] != '': + version = data[0].strip() + # git command failed + else: + version = LNSTMajorVersion + os.chdir(cwd) + return version def controller_init(self): self._options['environment'] = dict() -- 2.4.11

3 3

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

LNST-developers July 2016