This commit adds a udp_size parameter to all udp Netperf clients in our
regression_tests/phase1-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 | 10 ++++++++++
.../phase1/virtual_bridge_2_vlans_over_bond.py | 13 +++++++++++++
.../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, 161 insertions(+)
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 fe9d96b..15f4f6f 100644
--- a/recipes/regression_tests/phase1/simple_netperf.py
+++ b/recipes/regression_tests/phase1/simple_netperf.py
@@ -147,6 +147,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:
@@ -198,6 +202,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")
@@ -249,6 +256,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..fd421ef 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)
@@ -188,6 +189,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),
@@ -304,6 +309,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 +377,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