[PATCH v2 0/3] Netperf message size

[Kamil Jerabek]

Patch 1 rename udp_size option to msg_size in Netperf module.

Patch 2 rename udp_size to msg_size in regression_tests/phase1-2.

Patch 3 adds set msg_size to tcp netperf tests in regression_tests/phase1-2.

Changes in
v2: * fixed rebase conflicts

Kamil Jerabek (3):
  Netperf: rename udp_size option to msg_size
  regression_tests: rename udp_size to msg_size in netperf tests
  regression_tests: add set msg_size to tcp netperf tests

 recipes/regression_tests/phase1/3_vlans.py         | 26 +++++++++-----
 .../regression_tests/phase1/3_vlans_over_bond.py   | 26 +++++++++-----
 recipes/regression_tests/phase1/bonding_test.py    | 26 +++++++++-----
 recipes/regression_tests/phase1/simple_netperf.py  | 24 ++++++++-----
 .../phase1/virtual_bridge_2_vlans_over_bond.py     | 26 +++++++++-----
 .../phase1/virtual_bridge_vlan_in_guest.py         | 26 +++++++++-----
 .../phase1/virtual_bridge_vlan_in_host.py          | 26 +++++++++-----
 .../regression_tests/phase2/3_vlans_over_team.py   | 26 +++++++++-----
 recipes/regression_tests/phase2/team_test.py       | 42 +++++++++++++++-------
 ...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 26 +++++++++-----
 .../phase2/virtual_ovs_bridge_vlan_in_guest.py     | 26 +++++++++-----
 .../phase2/virtual_ovs_bridge_vlan_in_host.py      | 26 +++++++++-----
 test_modules/Netperf.py                            | 10 +++---
 13 files changed, 231 insertions(+), 105 deletions(-)

-- 
2.5.5

[PATCH v2 1/3] Netperf: rename udp_size option to msg_size

[Kamil Jerabek]

This commit rename udp_size option to msg_size in Netperf module.

Signed-off-by: Kamil Jerabek <kjerabek(a)redhat.com&gt;

---
Changes in
v2: * fixed rebase conflicts
---
 test_modules/Netperf.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test_modules/Netperf.py b/test_modules/Netperf.py
index 023bd9a..b01e460 100644
--- a/test_modules/Netperf.py
+++ b/test_modules/Netperf.py
@@ -39,7 +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._msg_size = self.get_opt("msg_size")
         self._debug = int_it(self.get_opt("debug", default=0))
 
         self._threshold = self._parse_threshold(self.get_opt("threshold"))
@@ -142,14 +142,14 @@ class Netperf(TestGeneric):
                 else:
                     cmd += " -- %s" % self._testoptions
 
-            if self._udp_size is not None:
+            if self._msg_size is not None:
                 """
-                udp packets will have this size
+                packets will have this size
                 """
                 if self._is_omni() or self._testoptions:
-                    cmd += " -m %s" % self._udp_size
+                    cmd += " -m %s" % self._msg_size
                 else:
-                    cmd += " -- -m %s" % self._udp_size
+                    cmd += " -- -m %s" % self._msg_size
 
 
         elif self._role == "server":
-- 
2.5.5

[PATCH v2 2/3] regression_tests: rename udp_size to msg_size in netperf tests

[Kamil Jerabek]

This commit rename udp_size to msg_size in our regression_tests/phase1-2
directories.

Signed-off-by: Kamil Jerabek <kjerabek(a)redhat.com&gt;
---
 recipes/regression_tests/phase1/3_vlans.py         | 16 +++++++--------
 .../regression_tests/phase1/3_vlans_over_bond.py   | 16 +++++++--------
 recipes/regression_tests/phase1/bonding_test.py    | 16 +++++++--------
 recipes/regression_tests/phase1/simple_netperf.py  | 16 +++++++--------
 .../phase1/virtual_bridge_2_vlans_over_bond.py     | 16 +++++++--------
 .../phase1/virtual_bridge_vlan_in_guest.py         | 16 +++++++--------
 .../phase1/virtual_bridge_vlan_in_host.py          | 16 +++++++--------
 .../regression_tests/phase2/3_vlans_over_team.py   | 16 +++++++--------
 recipes/regression_tests/phase2/team_test.py       | 24 +++++++++++-----------
 ...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 16 +++++++--------
 .../phase2/virtual_ovs_bridge_vlan_in_guest.py     | 16 +++++++--------
 .../phase2/virtual_ovs_bridge_vlan_in_host.py      | 16 +++++++--------
 12 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/recipes/regression_tests/phase1/3_vlans.py
b/recipes/regression_tests/phase1/3_vlans.py
index 4b028f6..e34072b 100644
--- a/recipes/regression_tests/phase1/3_vlans.py
+++ b/recipes/regression_tests/phase1/3_vlans.py
@@ -39,7 +39,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")
+nperf_msg_size = ctl.get_alias("nperf_msg_size")
 pr_user_comment = ctl.get_alias("perfrepo_comment")
 offloads_alias = ctl.get_alias("offloads")
 
@@ -173,9 +173,9 @@ 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})
+if nperf_msg_size is not None:
+    netperf_cli_udp.update_options({"msg_size" : nperf_msg_size})
+    netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size})
 
 for setting in offload_settings:
     #apply offload setting
@@ -258,8 +258,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.set_parameter('netperf_server_on_vlan', vlans[0])
             result_udp.set_parameter('netperf_client_on_vlan', vlans[0])
@@ -319,8 +319,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.set_parameter('netperf_server_on_vlan', vlans[0])
             result_udp.set_parameter('netperf_client_on_vlan', vlans[0])
diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py
b/recipes/regression_tests/phase1/3_vlans_over_bond.py
index e557bda..3759905 100644
--- a/recipes/regression_tests/phase1/3_vlans_over_bond.py
+++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py
@@ -39,7 +39,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")
+nperf_msg_size = ctl.get_alias("nperf_msg_size")
 pr_user_comment = ctl.get_alias("perfrepo_comment")
 offloads_alias = ctl.get_alias("offloads")
 
@@ -174,9 +174,9 @@ 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})
+if nperf_msg_size is not None:
+    netperf_cli_udp.update_options({"msg_size" : nperf_msg_size})
+    netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size})
 
 for setting in offload_settings:
     #apply offload setting
@@ -257,8 +257,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.set_parameter('netperf_server_on_vlan', vlans[0])
             result_udp.set_parameter('netperf_client_on_vlan', vlans[0])
@@ -318,8 +318,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.set_parameter('netperf_server_on_vlan', vlans[0])
             result_udp.set_parameter('netperf_client_on_vlan', vlans[0])
diff --git a/recipes/regression_tests/phase1/bonding_test.py
b/recipes/regression_tests/phase1/bonding_test.py
index 3884b4f..3fe31a9 100644
--- a/recipes/regression_tests/phase1/bonding_test.py
+++ b/recipes/regression_tests/phase1/bonding_test.py
@@ -38,7 +38,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")
+nperf_msg_size = ctl.get_alias("nperf_msg_size")
 pr_user_comment = ctl.get_alias("perfrepo_comment")
 offloads_alias = ctl.get_alias("offloads")
 
@@ -182,9 +182,9 @@ 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})
+if nperf_msg_size is not None:
+    netperf_cli_udp.update_options({"msg_size" : nperf_msg_size})
+    netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size})
 
 ctl.wait(15)
 
@@ -234,8 +234,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.add_tag(product_name)
             if nperf_mode == "multi":
@@ -293,8 +293,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.add_tag(product_name)
             if nperf_mode == "multi":
diff --git a/recipes/regression_tests/phase1/simple_netperf.py
b/recipes/regression_tests/phase1/simple_netperf.py
index 2c8f6f6..8856fb6 100644
--- a/recipes/regression_tests/phase1/simple_netperf.py
+++ b/recipes/regression_tests/phase1/simple_netperf.py
@@ -37,7 +37,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")
+nperf_msg_size = ctl.get_alias("nperf_msg_size")
 pr_user_comment = ctl.get_alias("perfrepo_comment")
 offloads_alias = ctl.get_alias("offloads")
 
@@ -153,9 +153,9 @@ 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})
+if nperf_msg_size is not None:
+    netperf_cli_udp.update_options({"msg_size" : nperf_msg_size})
+    netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size})
 
 ctl.wait(15)
 
@@ -209,8 +209,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.add_tag(product_name)
             if nperf_mode == "multi":
@@ -264,8 +264,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.add_tag(product_name)
             if nperf_mode == "multi":
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 ce88e82..aeb6bb9 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
@@ -43,7 +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")
+nperf_msg_size = ctl.get_alias("nperf_msg_size")
 pr_user_comment = ctl.get_alias("perfrepo_comment")
 offloads_alias = ctl.get_alias("offloads")
 
@@ -194,9 +194,9 @@ 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})
+if nperf_msg_size is not None:
+    netperf_cli_udp.update_options({"msg_size" : nperf_msg_size})
+    netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size})
 
 ping_mod_bad = ctl.get_module("IcmpPing",
                                options={
@@ -315,8 +315,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.add_tag(product_name)
             if nperf_mode == "multi":
@@ -383,8 +383,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.add_tag(product_name)
             if nperf_mode == "multi":
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 9688025..3b267fe 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
@@ -38,7 +38,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")
+nperf_msg_size = ctl.get_alias("nperf_msg_size")
 pr_user_comment = ctl.get_alias("perfrepo_comment")
 offloads_alias = ctl.get_alias("offloads")
 
@@ -177,9 +177,9 @@ 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})
+if nperf_msg_size is not None:
+    netperf_cli_udp.update_options({"msg_size" : nperf_msg_size})
+    netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size})
 
 # configure mtu
 h1.get_interface("nic").set_mtu(mtu)
@@ -251,8 +251,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.add_tag(product_name)
             if nperf_mode == "multi":
@@ -316,8 +316,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.add_tag(product_name)
             if nperf_mode == "multi":
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 03f483d..1dcb5d0 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
@@ -38,7 +38,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")
+nperf_msg_size = ctl.get_alias("nperf_msg_size")
 pr_user_comment = ctl.get_alias("perfrepo_comment")
 offloads_alias = ctl.get_alias("offloads")
 
@@ -176,9 +176,9 @@ 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})
+if nperf_msg_size is not None:
+    netperf_cli_udp.update_options({"msg_size" : nperf_msg_size})
+    netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size})
 
 # configure mtu
 h1.get_interface("nic").set_mtu(mtu)
@@ -251,8 +251,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.add_tag(product_name)
             if nperf_mode == "multi":
@@ -316,8 +316,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.add_tag(product_name)
             if nperf_mode == "multi":
diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py
b/recipes/regression_tests/phase2/3_vlans_over_team.py
index 37fe0d0..8dfd146 100644
--- a/recipes/regression_tests/phase2/3_vlans_over_team.py
+++ b/recipes/regression_tests/phase2/3_vlans_over_team.py
@@ -39,7 +39,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")
+nperf_msg_size = ctl.get_alias("nperf_msg_size")
 pr_user_comment = ctl.get_alias("perfrepo_comment")
 offloads_alias = ctl.get_alias("offloads")
 
@@ -174,9 +174,9 @@ 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})
+if nperf_msg_size is not None:
+    netperf_cli_udp.update_options({"msg_size" : nperf_msg_size})
+    netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size})
 
 for setting in offload_settings:
     #apply offload setting
@@ -257,8 +257,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.set_parameter('netperf_server_on_vlan', vlans[0])
             result_udp.set_parameter('netperf_client_on_vlan', vlans[0])
@@ -318,8 +318,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.set_parameter('netperf_server_on_vlan', vlans[0])
             result_udp.set_parameter('netperf_client_on_vlan', vlans[0])
diff --git a/recipes/regression_tests/phase2/team_test.py
b/recipes/regression_tests/phase2/team_test.py
index af8ac13..e7dc7bb 100644
--- a/recipes/regression_tests/phase2/team_test.py
+++ b/recipes/regression_tests/phase2/team_test.py
@@ -37,7 +37,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")
+nperf_msg_size = ctl.get_alias("nperf_msg_size")
 pr_user_comment = ctl.get_alias("perfrepo_comment")
 offloads_alias = ctl.get_alias("offloads")
 
@@ -181,9 +181,9 @@ 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})
+if nperf_msg_size is not None:
+    netperf_cli_udp.update_options({"msg_size" : nperf_msg_size})
+    netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size})
 
 ctl.wait(15)
 
@@ -235,8 +235,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.set_parameter('netperf_server', "testmachine1")
             result_udp.set_parameter('netperf_client', "testmachine2")
@@ -297,8 +297,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.set_parameter('netperf_server', "testmachine1")
             result_udp.set_parameter('netperf_client', "testmachine2")
@@ -404,8 +404,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.set_parameter('netperf_server', "testmachine2")
             result_udp.set_parameter('netperf_client', "testmachine1")
@@ -466,8 +466,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.set_parameter('netperf_server', "testmachine2")
             result_udp.set_parameter('netperf_client', "testmachine1")
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 c2f3b78..2059c24 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
@@ -44,7 +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")
+nperf_msg_size = ctl.get_alias("nperf_msg_size")
 pr_user_comment = ctl.get_alias("perfrepo_comment")
 offloads_alias = ctl.get_alias("offloads")
 
@@ -194,9 +194,9 @@ 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})
+if nperf_msg_size is not None:
+    netperf_cli_udp.update_options({"msg_size" : nperf_msg_size})
+    netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size})
 
 ping_mod_bad = ctl.get_module("IcmpPing",
                                options={
@@ -315,8 +315,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.add_tag(product_name)
             if nperf_mode == "multi":
@@ -384,8 +384,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.add_tag(product_name)
             if nperf_mode == "multi":
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 812bc27..91efb80 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
@@ -39,7 +39,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")
+nperf_msg_size = ctl.get_alias("nperf_msg_size")
 pr_user_comment = ctl.get_alias("perfrepo_comment")
 offloads_alias = ctl.get_alias("offloads")
 
@@ -175,9 +175,9 @@ 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})
+if nperf_msg_size is not None:
+    netperf_cli_udp.update_options({"msg_size" : nperf_msg_size})
+    netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size})
 
 #set mtu
 h1.get_interface("nic").set_mtu(mtu)
@@ -252,8 +252,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.add_tag(product_name)
             if nperf_mode == "multi":
@@ -318,8 +318,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.add_tag(product_name)
             if nperf_mode == "multi":
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 69560b9..ebcb654 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
@@ -39,7 +39,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")
+nperf_msg_size = ctl.get_alias("nperf_msg_size")
 pr_user_comment = ctl.get_alias("perfrepo_comment")
 offloads_alias = ctl.get_alias("offloads")
 
@@ -174,9 +174,9 @@ 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})
+if nperf_msg_size is not None:
+    netperf_cli_udp.update_options({"msg_size" : nperf_msg_size})
+    netperf_cli_udp6.update_options({"msg_size" : nperf_msg_size})
 
 #set mtu
 h1.get_interface("nic").set_mtu(mtu)
@@ -250,8 +250,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.add_tag(product_name)
             if nperf_mode == "multi":
@@ -317,8 +317,8 @@ 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)
+            if nperf_msg_size is not None:
+                result_udp.set_parameter("nperf_msg_size", nperf_msg_size)
 
             result_udp.add_tag(product_name)
             if nperf_mode == "multi":
-- 
2.5.5

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

[Kamil Jerabek]

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

[Jan Tluka]

Mon, Oct 31, 2016 at 01:56:52PM CET, kjerabek(a)redhat.com wrote:
> Patch 1 rename udp_size option to msg_size in Netperf module.
>
> Patch 2 rename udp_size to msg_size in regression_tests/phase1-2.
>
> Patch 3 adds set msg_size to tcp netperf tests in regression_tests/phase1-2.
>
> Changes in
> v2: * fixed rebase conflicts
>  
Ack to series. I tested these patches in our lab.

Acked-by: Jan Tluka <jtluka(a)redhat.com&gt;