[PATCH v2 3/3] regression_tests: add set msg_size to tcp netperf tests

This commit adds set msg_size to tcp netperf tests in our phase1-2 regression_tests. --- recipes/regression_tests/phase1/3_vlans.py | 10 ++++++++++ recipes/regression_tests/phase1/3_vlans_over_bond.py | 10 ++++++++++ recipes/regression_tests/phase1/bonding_test.py | 10 ++++++++++ recipes/regression_tests/phase1/simple_netperf.py | 8 ++++++++ .../phase1/virtual_bridge_2_vlans_over_bond.py | 10 ++++++++++ .../phase1/virtual_bridge_vlan_in_guest.py | 10 ++++++++++ .../phase1/virtual_bridge_vlan_in_host.py | 10 ++++++++++ recipes/regression_tests/phase2/3_vlans_over_team.py | 10 ++++++++++ recipes/regression_tests/phase2/team_test.py | 18 ++++++++++++++++++ ...rtual_ovs_bridge_2_vlans_over_active_backup_bond.py | 10 ++++++++++ .../phase2/virtual_ovs_bridge_vlan_in_guest.py | 10 ++++++++++ .../phase2/virtual_ovs_bridge_vlan_in_host.py | 10 ++++++++++ 12 files changed, 126 insertions(+) diff --git a/recipes/regression_tests/phase1/3_vlans.py b/recipes/regression_tests/phase1/3_vlans.py index e34072b..e4f1067 100644 --- a/recipes/regression_tests/phase1/3_vlans.py +++ b/recipes/regression_tests/phase1/3_vlans.py @@ -174,7 +174,9 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) if nperf_msg_size is not None: + netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) + netperf_cli_tcp6.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size}) for setting in offload_settings: @@ -231,6 +233,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.set_parameter('netperf_server_on_vlan', vlans[0]) result_tcp.set_parameter('netperf_client_on_vlan', vlans[0]) result_tcp.add_tag(product_name) @@ -292,6 +298,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.set_parameter('netperf_server_on_vlan', vlans[0]) result_tcp.set_parameter('netperf_client_on_vlan', vlans[0]) result_tcp.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 3759905..342e105 100644 --- a/recipes/regression_tests/phase1/3_vlans_over_bond.py +++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py @@ -175,7 +175,9 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) if nperf_msg_size is not None: + netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) + netperf_cli_tcp6.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size}) for setting in offload_settings: @@ -230,6 +232,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.set_parameter('netperf_server_on_vlan', vlans[0]) result_tcp.set_parameter('netperf_client_on_vlan', vlans[0]) result_tcp.add_tag(product_name) @@ -291,6 +297,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.set_parameter('netperf_server_on_vlan', vlans[0]) result_tcp.set_parameter('netperf_client_on_vlan', vlans[0]) result_tcp.add_tag(product_name) diff --git a/recipes/regression_tests/phase1/bonding_test.py b/recipes/regression_tests/phase1/bonding_test.py index 3fe31a9..222613e 100644 --- a/recipes/regression_tests/phase1/bonding_test.py +++ b/recipes/regression_tests/phase1/bonding_test.py @@ -183,7 +183,9 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) if nperf_msg_size is not None: + netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) + netperf_cli_tcp6.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size}) ctl.wait(15) @@ -209,6 +211,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.add_tag(product_name) if nperf_mode == "multi": result_tcp.add_tag("multithreaded") @@ -268,6 +274,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.add_tag(product_name) if nperf_mode == "multi": result_tcp.add_tag("multithreaded") diff --git a/recipes/regression_tests/phase1/simple_netperf.py b/recipes/regression_tests/phase1/simple_netperf.py index 8856fb6..13996ca 100644 --- a/recipes/regression_tests/phase1/simple_netperf.py +++ b/recipes/regression_tests/phase1/simple_netperf.py @@ -154,7 +154,9 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel" : nperf_num_parallel}) if nperf_msg_size is not None: + netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) + netperf_cli_tcp6.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size}) ctl.wait(15) @@ -185,6 +187,9 @@ for setting in offload_settings: for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.add_tag(product_name) if nperf_mode == "multi": result_tcp.add_tag("multithreaded") @@ -240,6 +245,9 @@ for setting in offload_settings: for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.add_tag(product_name) if nperf_mode == "multi": result_tcp.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 aeb6bb9..48142d7 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 @@ -195,7 +195,9 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) if nperf_msg_size is not None: + netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) + netperf_cli_tcp6.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size}) ping_mod_bad = ctl.get_module("IcmpPing", @@ -287,6 +289,10 @@ for setting in offload_settings: r'host\d+\..*tap\d*\.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.add_tag(product_name) if nperf_mode == "multi": result_tcp.add_tag("multithreaded") @@ -355,6 +361,10 @@ for setting in offload_settings: r'host\d+\..*tap\d*\.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.add_tag(product_name) if nperf_mode == "multi": result_tcp.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 3b267fe..eb23990 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py @@ -178,7 +178,9 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) if nperf_msg_size is not None: + netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) + netperf_cli_tcp6.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size}) # configure mtu @@ -223,6 +225,10 @@ for setting in offload_settings: r'host\d+\..*tap\d*\.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.add_tag(product_name) if nperf_mode == "multi": result_tcp.add_tag("multithreaded") @@ -288,6 +294,10 @@ for setting in offload_settings: r'host\d+\..*tap\d*\.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.add_tag(product_name) if nperf_mode == "multi": result_tcp.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 1dcb5d0..695d322 100644 --- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py +++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py @@ -177,7 +177,9 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) if nperf_msg_size is not None: + netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) + netperf_cli_tcp6.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size}) # configure mtu @@ -223,6 +225,10 @@ for setting in offload_settings: r'host\d+\..*tap\d*\.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.add_tag(product_name) if nperf_mode == "multi": result_tcp.add_tag("multithreaded") @@ -288,6 +294,10 @@ for setting in offload_settings: r'host\d+\..*tap\d*\.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.add_tag(product_name) if nperf_mode == "multi": result_tcp.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 8dfd146..fd16fe4 100644 --- a/recipes/regression_tests/phase2/3_vlans_over_team.py +++ b/recipes/regression_tests/phase2/3_vlans_over_team.py @@ -175,7 +175,9 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) if nperf_msg_size is not None: + netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) + netperf_cli_tcp6.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size}) for setting in offload_settings: @@ -230,6 +232,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.set_parameter('netperf_server_on_vlan', vlans[0]) result_tcp.set_parameter('netperf_client_on_vlan', vlans[0]) result_tcp.add_tag(product_name) @@ -291,6 +297,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.set_parameter('netperf_server_on_vlan', vlans[0]) result_tcp.set_parameter('netperf_client_on_vlan', vlans[0]) result_tcp.add_tag(product_name) diff --git a/recipes/regression_tests/phase2/team_test.py b/recipes/regression_tests/phase2/team_test.py index e7dc7bb..92a6169 100644 --- a/recipes/regression_tests/phase2/team_test.py +++ b/recipes/regression_tests/phase2/team_test.py @@ -182,7 +182,9 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) if nperf_msg_size is not None: + netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) + netperf_cli_tcp6.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size}) ctl.wait(15) @@ -208,6 +210,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.set_parameter('netperf_server', "testmachine1") result_tcp.set_parameter('netperf_client', "testmachine2") result_tcp.add_tag(product_name) @@ -270,6 +276,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.set_parameter('netperf_server', "testmachine1") result_tcp.set_parameter('netperf_client', "testmachine2") result_tcp.add_tag(product_name) @@ -377,6 +387,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.set_parameter('netperf_server', "testmachine2") result_tcp.set_parameter('netperf_client', "testmachine1") result_tcp.add_tag(product_name) @@ -439,6 +453,10 @@ for setting in offload_settings: 'redhat_release']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.set_parameter('netperf_server', "testmachine2") result_tcp.set_parameter('netperf_client', "testmachine1") result_tcp.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 2059c24..cb8fa99 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 @@ -195,7 +195,9 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) if nperf_msg_size is not None: + netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) + netperf_cli_tcp6.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size}) ping_mod_bad = ctl.get_module("IcmpPing", @@ -286,6 +288,10 @@ for setting in offload_settings: r'host\d+\..*tap\d*\.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.add_tag(product_name) if nperf_mode == "multi": result_tcp.add_tag("multithreaded") @@ -355,6 +361,10 @@ for setting in offload_settings: r'host\d+\..*tap\d*\.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.add_tag(product_name) if nperf_mode == "multi": result_tcp.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 91efb80..07dbf4b 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 @@ -176,7 +176,9 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) if nperf_msg_size is not None: + netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) + netperf_cli_tcp6.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size}) #set mtu @@ -223,6 +225,10 @@ for setting in offload_settings: r'host\d+\..*tap\d*\.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.add_tag(product_name) if nperf_mode == "multi": result_tcp.add_tag("multithreaded") @@ -289,6 +295,10 @@ for setting in offload_settings: r'host\d+\..*tap\d*\.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.add_tag(product_name) if nperf_mode == "multi": result_tcp.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 ebcb654..07864a0 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 @@ -175,6 +175,8 @@ if nperf_mode == "multi": netperf_cli_udp6.update_options({"num_parallel": nperf_num_parallel}) if nperf_msg_size is not None: + netperf_cli_tcp.update_options({"msg_size" : nperf_msg_size}) + netperf_cli_tcp6.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp.update_options({"msg_size" : nperf_msg_size}) netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size}) @@ -221,6 +223,10 @@ for setting in offload_settings: r'host\d+\..*tap\d*\.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.add_tag(product_name) if nperf_mode == "multi": result_tcp.add_tag("multithreaded") @@ -288,6 +294,10 @@ for setting in offload_settings: r'host\d+\..*tap\d*\.devname']) for offload in setting: result_tcp.set_parameter(offload[0], offload[1]) + + if nperf_msg_size is not None: + result_tcp.set_parameter("nperf_msg_size", nperf_msg_size) + result_tcp.add_tag(product_name) if nperf_mode == "multi": result_tcp.add_tag("multithreaded") -- 2.5.5