[PATCH v4 0/2] offloads alias

[Kamil Jerabek]

Patch 1 add Offloads module that contains method for offloads alias parsing.

Patch 2 add offloads alias to all tasks in regression_tests phase1 and phase2.

Changes in
v2: * in [PATCH 2/2] I merged offloads definition into one if statement with
      offloads alias

v3: * in [PATCH 1/2] I added support for accepting offload "on" option and
      also offload names with "-" are accepted now.

v4: * in [PATCH 1/2] the parse_offloads now return offloads set in order 
      as it is specified on input

Kamil Jerabek (2):
  RecipeCommon: add Offloads module
  regression_tests: add offloads alias

 lnst/RecipeCommon/Offloads.py                      | 56 ++++++++++++++++++++++
 recipes/regression_tests/phase1/3_vlans.py         | 18 ++++---
 .../regression_tests/phase1/3_vlans_over_bond.py   | 16 +++++--
 recipes/regression_tests/phase1/bonding_test.py    | 17 ++++---
 recipes/regression_tests/phase1/simple_netperf.py  | 19 +++++---
 .../phase1/virtual_bridge_2_vlans_over_bond.py     | 17 ++++---
 .../phase1/virtual_bridge_vlan_in_guest.py         | 19 +++++---
 .../phase1/virtual_bridge_vlan_in_host.py          | 19 +++++---
 .../regression_tests/phase2/3_vlans_over_team.py   | 16 +++++--
 recipes/regression_tests/phase2/team_test.py       | 17 ++++---
 ...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 17 ++++---
 .../phase2/virtual_ovs_bridge_vlan_in_guest.py     | 19 +++++---
 .../phase2/virtual_ovs_bridge_vlan_in_host.py      | 19 +++++---
 13 files changed, 194 insertions(+), 75 deletions(-)
 create mode 100644 lnst/RecipeCommon/Offloads.py

-- 
2.5.5

[PATCH v4 1/2] RecipeCommon: add Offloads module

[Kamil Jerabek]

This module provides functions that are related to Offloads.

The function parse_offloads in the module is intended to be use for parsing
offloads alias. The function parse all used offloads, in each set all offloads
are on, except the ones specified as off.

It takes argument offloads string and returns tuple of used offloads and its
combinations.

It returns list of tuple, containing summary of all used offloads, and list
of all offloads settings.

Expected input: "tso on gso on tx off; tso off tx off ;rx off".

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

---
v3 * parse_offloads modified to accept also offload "on" and offload name
     containing "-"

v4 * parse_offloads now return offloads set in order as it is specified on
     input
---
 lnst/RecipeCommon/Offloads.py | 56 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 lnst/RecipeCommon/Offloads.py

diff --git a/lnst/RecipeCommon/Offloads.py b/lnst/RecipeCommon/Offloads.py
new file mode 100644
index 0000000..a109a06
--- /dev/null
+++ b/lnst/RecipeCommon/Offloads.py
@@ -0,0 +1,56 @@
+"""
+This module defines the functions for Offloads tuning that can be imported
+directly into LNST Python tasks.
+
+Copyright 2016 Red Hat, Inc.
+Licensed under the GNU General Public License, version 2 as
+published by the Free Software Foundation; see COPYING for details.
+"""
+
+__author__ = """
+kjerabek(a)redhat.com (Kamil Jerabek)
+"""
+
+import re
+
+def parse_offloads(offloads):
+    """Parse offloads combination in string to tuple, containing list of
+    summary of all used offloads, and list of all offloads settings.
+    The function parse all used offloads, in each set all offloads are on,
+    except the ones specified as off.
+
+    Keyword arguments:
+    offloads -- string of offloads combination separated with ';'
+    Expected input: "tso on gso on tx off; tso off tx off ;rx off".
+    """
+
+    if offloads is None:
+        return None
+
+    is_valid = re.compile(r"^([a-z\-]+\s+(off|on)(\s*[;]\s*|\s*))+$")
+    opts_split = re.compile(r".*?(?=;)|.+$")
+    opts_offloads_split = re.compile(r"([a-z]+(?=\s+(off|on)))+")
+    offloads_split = re.compile(r"([a-z\-]+)(?=\s+off|\s+on)")
+
+    if re.match(is_valid, offloads) is None:
+        raise Exception('Invalid offloads format')
+
+    offload_set = ([], [])
+    sequence = re.findall(offloads_split, offloads)
+    [offload_set[0].append(i) for i in sequence if not offload_set[0].count(i)]
+
+    opts_match = filter(None, re.findall(opts_split, offloads))
+
+    for opts in opts_match:
+        sett = []
+        match = re.findall(opts_offloads_split, opts)
+
+        for offload in offload_set[0]:
+            if (offload, 'off') in match:
+                sett.append((offload, 'off'))
+            else:
+                sett.append((offload, 'on'))
+
+        offload_set[1].append(sett)
+
+    return offload_set
-- 
2.5.5

[PATCH v4 2/2] regression_tests: add offloads alias

[Kamil Jerabek]

This commit adds offloads alias to all phase1 and phase2 tasks in our
regression_tests directory. If the alias is used, offloads and offload_settings
defined in task are overwriten.

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

---
v2: * static offloads definition merged into one if else statement with offloads
      alias
    * changed variables names
---
 recipes/regression_tests/phase1/3_vlans.py            | 18 ++++++++++++------
 recipes/regression_tests/phase1/3_vlans_over_bond.py  | 16 +++++++++++-----
 recipes/regression_tests/phase1/bonding_test.py       | 17 +++++++++++------
 recipes/regression_tests/phase1/simple_netperf.py     | 19 ++++++++++++-------
 .../phase1/virtual_bridge_2_vlans_over_bond.py        | 17 +++++++++++------
 .../phase1/virtual_bridge_vlan_in_guest.py            | 19 ++++++++++++-------
 .../phase1/virtual_bridge_vlan_in_host.py             | 19 ++++++++++++-------
 recipes/regression_tests/phase2/3_vlans_over_team.py  | 16 +++++++++++-----
 recipes/regression_tests/phase2/team_test.py          | 17 +++++++++++------
 ...tual_ovs_bridge_2_vlans_over_active_backup_bond.py | 17 +++++++++++------
 .../phase2/virtual_ovs_bridge_vlan_in_guest.py        | 19 ++++++++++++-------
 .../phase2/virtual_ovs_bridge_vlan_in_host.py         | 19 ++++++++++++-------
 12 files changed, 138 insertions(+), 75 deletions(-)

diff --git a/recipes/regression_tests/phase1/3_vlans.py
b/recipes/regression_tests/phase1/3_vlans.py
index 1b68889..4b028f6 100644
--- a/recipes/regression_tests/phase1/3_vlans.py
+++ b/recipes/regression_tests/phase1/3_vlans.py
@@ -4,6 +4,7 @@ from lnst.Controller.PerfRepoUtils import netperf_result_template
 
 from lnst.RecipeCommon.IRQ import pin_dev_irqs
 from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment
+from lnst.RecipeCommon.Offloads import parse_offloads
 
 # ------
 # SETUP
@@ -25,12 +26,6 @@ m2.sync_resources(modules=["IcmpPing", "Icmp6Ping",
"Netperf"])
 # ------
 
 vlans = ["vlan10", "vlan20", "vlan30"]
-offloads = ["gro", "gso", "tso", "rx",
"tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
 
 ipv = ctl.get_alias("ipv")
 mtu = ctl.get_alias("mtu")
@@ -46,6 +41,17 @@ 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")
+offloads_alias = ctl.get_alias("offloads")
+
+if offloads_alias is not None:
+    offloads, offload_settings = parse_offloads(offloads_alias)
+else:
+    offloads = ["gro", "gso", "tso", "rx",
"tx"]
+    offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
 
 pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
 
diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py
b/recipes/regression_tests/phase1/3_vlans_over_bond.py
index 0d5afad..e557bda 100644
--- a/recipes/regression_tests/phase1/3_vlans_over_bond.py
+++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py
@@ -4,6 +4,7 @@ from lnst.Controller.PerfRepoUtils import netperf_result_template
 
 from lnst.RecipeCommon.IRQ import pin_dev_irqs
 from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment
+from lnst.RecipeCommon.Offloads import parse_offloads
 
 # ------
 # SETUP
@@ -25,11 +26,6 @@ m2.sync_resources(modules=["IcmpPing", "Icmp6Ping",
"Netperf"])
 # ------
 
 vlans = ["vlan10", "vlan20", "vlan30"]
-offloads = ["gro", "gso", "tso", "tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
-                     [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
-                     [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
 
 ipv = ctl.get_alias("ipv")
 mtu = ctl.get_alias("mtu")
@@ -45,6 +41,16 @@ 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")
+offloads_alias = ctl.get_alias("offloads")
+
+if offloads_alias is not None:
+    offloads, offload_settings = parse_offloads(offloads_alias)
+else:
+    offloads = ["gro", "gso", "tso", "tx"]
+    offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+                         [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+                         [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
 
 pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
 
diff --git a/recipes/regression_tests/phase1/bonding_test.py
b/recipes/regression_tests/phase1/bonding_test.py
index 44c60a0..3884b4f 100644
--- a/recipes/regression_tests/phase1/bonding_test.py
+++ b/recipes/regression_tests/phase1/bonding_test.py
@@ -4,6 +4,7 @@ from lnst.Controller.PerfRepoUtils import netperf_result_template
 
 from lnst.RecipeCommon.IRQ import pin_dev_irqs
 from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment
+from lnst.RecipeCommon.Offloads import parse_offloads
 
 # ------
 # SETUP
@@ -25,12 +26,6 @@ m2.sync_resources(modules=["IcmpPing", "Icmp6Ping",
"Netperf"])
 # TESTS
 # ------
 
-offloads = ["gro", "gso", "tso", "tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
-                     [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
-                     [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
-
 ipv = ctl.get_alias("ipv")
 mtu = ctl.get_alias("mtu")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
@@ -45,6 +40,16 @@ 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")
+offloads_alias = ctl.get_alias("offloads")
+
+if offloads_alias is not None:
+    offloads, offload_settings = parse_offloads(offloads_alias)
+else:
+    offloads = ["gro", "gso", "tso", "tx"]
+    offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+                         [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+                         [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
 
 pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
 
diff --git a/recipes/regression_tests/phase1/simple_netperf.py
b/recipes/regression_tests/phase1/simple_netperf.py
index 60a731e..2c8f6f6 100644
--- a/recipes/regression_tests/phase1/simple_netperf.py
+++ b/recipes/regression_tests/phase1/simple_netperf.py
@@ -4,6 +4,7 @@ from lnst.Controller.PerfRepoUtils import netperf_result_template
 
 from lnst.RecipeCommon.IRQ import pin_dev_irqs
 from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment
+from lnst.RecipeCommon.Offloads import parse_offloads
 
 # ------
 # SETUP
@@ -24,13 +25,6 @@ m2.sync_resources(modules=["Netperf"])
 # TESTS
 # ------
 
-offloads = ["gro", "gso", "tso", "tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
-
 ipv = ctl.get_alias("ipv")
 mtu = ctl.get_alias("mtu")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
@@ -45,6 +39,17 @@ 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")
+offloads_alias = ctl.get_alias("offloads")
+
+if offloads_alias is not None:
+    offloads, offload_settings = parse_offloads(offloads_alias)
+else:
+    offloads = ["gro", "gso", "tso", "tx"]
+    offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
 
 pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
 
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 a2d5399..ce88e82 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
@@ -4,6 +4,7 @@ from lnst.Controller.PerfRepoUtils import netperf_result_template
 
 from lnst.RecipeCommon.IRQ import pin_dev_irqs
 from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment
+from lnst.RecipeCommon.Offloads import parse_offloads
 
 # ------
 # SETUP
@@ -32,12 +33,6 @@ g4.sync_resources(modules=["IcmpPing", "Icmp6Ping",
"Netperf"])
 # TESTS
 # ------
 
-offloads = ["gro", "gso", "tso", "tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
-                     [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
-                     [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
-
 ipv = ctl.get_alias("ipv")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
 nperf_reserve = int(ctl.get_alias("nperf_reserve"))
@@ -50,6 +45,16 @@ 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")
+offloads_alias = ctl.get_alias("offloads")
+
+if offloads_alias is not None:
+    offloads, offload_settings = parse_offloads(offloads_alias)
+else:
+    offloads = ["gro", "gso", "tso", "tx"]
+    offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+                         [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+                         [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
 
 pr_comment = generate_perfrepo_comment([h1, g1, g2, h2, g3, g4], pr_user_comment)
 
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 66620f7..9688025 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py
@@ -4,6 +4,7 @@ from lnst.Controller.PerfRepoUtils import netperf_result_template
 
 from lnst.RecipeCommon.IRQ import pin_dev_irqs
 from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment
+from lnst.RecipeCommon.Offloads import parse_offloads
 
 # ------
 # SETUP
@@ -26,13 +27,6 @@ h2.sync_resources(modules=["IcmpPing", "Icmp6Ping",
"Netperf"])
 # TESTS
 # ------
 
-offloads = ["gro", "gso", "tso", "rx",
"tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
-
 ipv = ctl.get_alias("ipv")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
 nperf_reserve = int(ctl.get_alias("nperf_reserve"))
@@ -46,6 +40,17 @@ 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")
+offloads_alias = ctl.get_alias("offloads")
+
+if offloads_alias is not None:
+    offloads, offload_settings = parse_offloads(offloads_alias)
+else:
+    offloads = ["gro", "gso", "tso", "rx",
"tx"]
+    offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
 
 pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment)
 
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 2160e0b..03f483d 100644
--- a/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
+++ b/recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py
@@ -4,6 +4,7 @@ from lnst.Controller.PerfRepoUtils import netperf_result_template
 
 from lnst.RecipeCommon.IRQ import pin_dev_irqs
 from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment
+from lnst.RecipeCommon.Offloads import parse_offloads
 
 # ------
 # SETUP
@@ -26,13 +27,6 @@ h2.sync_resources(modules=["IcmpPing", "Icmp6Ping",
"Netperf"])
 # TESTS
 # ------
 
-offloads = ["gro", "gso", "tso", "rx",
"tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
-
 ipv = ctl.get_alias("ipv")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
 nperf_reserve = int(ctl.get_alias("nperf_reserve"))
@@ -46,6 +40,17 @@ 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")
+offloads_alias = ctl.get_alias("offloads")
+
+if offloads_alias is not None:
+    offloads, offload_settings = parse_offloads(offloads_alias)
+else:
+    offloads = ["gro", "gso", "tso", "rx",
"tx"]
+    offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
 
 pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment)
 
diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py
b/recipes/regression_tests/phase2/3_vlans_over_team.py
index 5936347..37fe0d0 100644
--- a/recipes/regression_tests/phase2/3_vlans_over_team.py
+++ b/recipes/regression_tests/phase2/3_vlans_over_team.py
@@ -4,6 +4,7 @@ from lnst.Controller.PerfRepoUtils import netperf_result_template
 
 from lnst.RecipeCommon.IRQ import pin_dev_irqs
 from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment
+from lnst.RecipeCommon.Offloads import parse_offloads
 
 # ------
 # SETUP
@@ -25,11 +26,6 @@ m2.sync_resources(modules=["IcmpPing", "Icmp6Ping",
"Netperf"])
 # ------
 
 vlans = ["vlan10", "vlan20", "vlan30"]
-offloads = ["gro", "gso", "tso", "tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
-                     [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
-                     [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
 
 ipv = ctl.get_alias("ipv")
 mtu = ctl.get_alias("mtu")
@@ -45,6 +41,16 @@ 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")
+offloads_alias = ctl.get_alias("offloads")
+
+if offloads_alias is not None:
+    offloads, offload_settings = parse_offloads(offloads_alias)
+else:
+    offloads = ["gro", "gso", "tso", "tx"]
+    offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+                         [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+                         [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
 
 pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
 
diff --git a/recipes/regression_tests/phase2/team_test.py
b/recipes/regression_tests/phase2/team_test.py
index 014194d..af8ac13 100644
--- a/recipes/regression_tests/phase2/team_test.py
+++ b/recipes/regression_tests/phase2/team_test.py
@@ -4,6 +4,7 @@ from lnst.Controller.PerfRepoUtils import netperf_result_template
 
 from lnst.RecipeCommon.IRQ import pin_dev_irqs
 from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment
+from lnst.RecipeCommon.Offloads import parse_offloads
 
 # ------
 # SETUP
@@ -24,12 +25,6 @@ m2.sync_resources(modules=["IcmpPing", "Icmp6Ping",
"Netperf"])
 # TESTS
 # ------
 
-offloads = ["gro", "gso", "tso", "tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
-                     [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
-                     [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
-
 ipv = ctl.get_alias("ipv")
 mtu = ctl.get_alias("mtu")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
@@ -44,6 +39,16 @@ 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")
+offloads_alias = ctl.get_alias("offloads")
+
+if offloads_alias is not None:
+    offloads, offload_settings = parse_offloads(offloads_alias)
+else:
+    offloads = ["gro", "gso", "tso", "tx"]
+    offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+                         [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+                         [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
 
 pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
 
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 897b173..409cb88 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
@@ -4,6 +4,7 @@ from lnst.Controller.PerfRepoUtils import netperf_result_template
 
 from lnst.RecipeCommon.IRQ import pin_dev_irqs
 from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment
+from lnst.RecipeCommon.Offloads import parse_offloads
 
 # ------
 # SETUP
@@ -32,12 +33,6 @@ g4.sync_resources(modules=["IcmpPing", "Icmp6Ping",
"Netperf"])
 # TESTS
 # ------
 
-offloads = ["gro", "gso", "tso", "tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
-                     [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
-                     [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
-
 ipv = ctl.get_alias("ipv")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
 nperf_reserve = int(ctl.get_alias("nperf_reserve"))
@@ -50,6 +45,16 @@ 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")
+offloads_alias = ctl.get_alias("offloads")
+
+if offloads_alias is not None:
+    offloads, offload_settings = parse_offloads(offloads_alias)
+else:
+    offloads = ["gro", "gso", "tso", "tx"]
+    offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+                         [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on")],
+                         [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off")]]
 
 pr_comment = generate_perfrepo_comment([h1, g1, g2, h2, g3, g4], pr_user_comment)
 
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 f084f37..b0dc574 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
@@ -4,6 +4,7 @@ from lnst.Controller.PerfRepoUtils import netperf_result_template
 
 from lnst.RecipeCommon.IRQ import pin_dev_irqs
 from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment
+from lnst.RecipeCommon.Offloads import parse_offloads
 
 # ------
 # SETUP
@@ -26,13 +27,6 @@ h2.sync_resources(modules=["IcmpPing", "Icmp6Ping",
"Netperf"])
 # TESTS
 # ------
 
-offloads = ["gro", "gso", "tso", "rx",
"tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
-
 ipv = ctl.get_alias("ipv")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
 nperf_reserve = int(ctl.get_alias("nperf_reserve"))
@@ -46,6 +40,17 @@ 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")
+offloads_alias = ctl.get_alias("offloads")
+
+if offloads_alias is not None:
+    offloads, offload_settings = parse_offloads(offloads_alias)
+else:
+    offloads = ["gro", "gso", "tso", "rx",
"tx"]
+    offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
 
 pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment)
 
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 31e57af..25f19f1 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
@@ -4,6 +4,7 @@ from lnst.Controller.PerfRepoUtils import netperf_result_template
 
 from lnst.RecipeCommon.IRQ import pin_dev_irqs
 from lnst.RecipeCommon.PerfRepo import generate_perfrepo_comment
+from lnst.RecipeCommon.Offloads import parse_offloads
 
 # ------
 # SETUP
@@ -26,13 +27,6 @@ h2.sync_resources(modules=["IcmpPing", "Icmp6Ping",
"Netperf"])
 # TESTS
 # ------
 
-offloads = ["gro", "gso", "tso", "rx",
"tx"]
-offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
-                     [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
-
 ipv = ctl.get_alias("ipv")
 netperf_duration = int(ctl.get_alias("netperf_duration"))
 nperf_reserve = int(ctl.get_alias("nperf_reserve"))
@@ -46,6 +40,17 @@ 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")
+offloads_alias = ctl.get_alias("offloads")
+
+if offloads_alias is not None:
+    offloads, offload_settings = parse_offloads(offloads_alias)
+else:
+    offloads = ["gro", "gso", "tso", "rx",
"tx"]
+    offload_settings = [ [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "off"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"off"),  ("tso", "off"), ("tx", "on"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "off"), ("tx", "off"),
("rx", "on")],
+                         [("gro", "on"), ("gso",
"on"), ("tso", "on"), ("tx", "on"),
("rx", "off")]]
 
 pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment)
 
-- 
2.5.5

[Jan Tluka]

Tue, Oct 18, 2016 at 02:01:09PM CEST, kjerabek(a)redhat.com wrote:
> Patch 1 add Offloads module that contains method for offloads alias
> parsing.
>
> Patch 2 add offloads alias to all tasks in regression_tests phase1 and phase2.
>
> Changes in
> v2: * in [PATCH 2/2] I merged offloads definition into one if statement with
>       offloads alias
>
> v3: * in [PATCH 1/2] I added support for accepting offload "on" option and
>       also offload names with "-" are accepted now.
>
> v4: * in [PATCH 1/2] the parse_offloads now return offloads set in order 
>       as it is specified on input
>
> Kamil Jerabek (2):
>   RecipeCommon: add Offloads module
>   regression_tests: add offloads alias
>
>  lnst/RecipeCommon/Offloads.py                      | 56 ++++++++++++++++++++++
>  recipes/regression_tests/phase1/3_vlans.py         | 18 ++++---
>  .../regression_tests/phase1/3_vlans_over_bond.py   | 16 +++++--
>  recipes/regression_tests/phase1/bonding_test.py    | 17 ++++---
>  recipes/regression_tests/phase1/simple_netperf.py  | 19 +++++---
>  .../phase1/virtual_bridge_2_vlans_over_bond.py     | 17 ++++---
>  .../phase1/virtual_bridge_vlan_in_guest.py         | 19 +++++---
>  .../phase1/virtual_bridge_vlan_in_host.py          | 19 +++++---
>  .../regression_tests/phase2/3_vlans_over_team.py   | 16 +++++--
>  recipes/regression_tests/phase2/team_test.py       | 17 ++++---
>  ...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 17 ++++---
>  .../phase2/virtual_ovs_bridge_vlan_in_guest.py     | 19 +++++---
>  .../phase2/virtual_ovs_bridge_vlan_in_host.py      | 19 +++++---
>  13 files changed, 194 insertions(+), 75 deletions(-)
>  create mode 100644 lnst/RecipeCommon/Offloads.py
>
> -- 
> 2.5.5
> _______________________________________________
> LNST-developers mailing list -- lnst-developers(a)lists.fedorahosted.org
> To unsubscribe send an email to lnst-developers-leave(a)lists.fedorahosted.org 
Ack to series.

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

[Ondrej Lichtner]

On Tue, Oct 18, 2016 at 02:01:09PM +0200, Kamil Jerabek wrote:
>  Patch 1 add Offloads module that contains method for offloads alias
> parsing.
>  
>  Patch 2 add offloads alias to all tasks in regression_tests phase1 and phase2.
>  
>  Changes in
>  v2: * in [PATCH 2/2] I merged offloads definition into one if statement with
>        offloads alias
>  
>  v3: * in [PATCH 1/2] I added support for accepting offload "on" option and
>        also offload names with "-" are accepted now.
>  
>  v4: * in [PATCH 1/2] the parse_offloads now return offloads set in order 
>        as it is specified on input
>  
>  Kamil Jerabek (2):
>    RecipeCommon: add Offloads module
>    regression_tests: add offloads alias
>  
>   lnst/RecipeCommon/Offloads.py                      | 56 ++++++++++++++++++++++
>   recipes/regression_tests/phase1/3_vlans.py         | 18 ++++---
>   .../regression_tests/phase1/3_vlans_over_bond.py   | 16 +++++--
>   recipes/regression_tests/phase1/bonding_test.py    | 17 ++++---
>   recipes/regression_tests/phase1/simple_netperf.py  | 19 +++++---
>   .../phase1/virtual_bridge_2_vlans_over_bond.py     | 17 ++++---
>   .../phase1/virtual_bridge_vlan_in_guest.py         | 19 +++++---
>   .../phase1/virtual_bridge_vlan_in_host.py          | 19 +++++---
>   .../regression_tests/phase2/3_vlans_over_team.py   | 16 +++++--
>   recipes/regression_tests/phase2/team_test.py       | 17 ++++---
>   ...l_ovs_bridge_2_vlans_over_active_backup_bond.py | 17 ++++---
>   .../phase2/virtual_ovs_bridge_vlan_in_guest.py     | 19 +++++---
>   .../phase2/virtual_ovs_bridge_vlan_in_host.py      | 19 +++++---
>   13 files changed, 194 insertions(+), 75 deletions(-)
>   create mode 100644 lnst/RecipeCommon/Offloads.py
>  
>  -- 
>  2.5.5
>  _______________________________________________
>  LNST-developers mailing list -- lnst-developers(a)lists.fedorahosted.org
>  To unsubscribe send an email to lnst-developers-leave(a)lists.fedorahosted.org 
pushed, thanks

-Ondrej