[PATCH 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.

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

 lnst/RecipeCommon/Offloads.py                      | 49 ++++++++++++++++++++++
 recipes/regression_tests/phase1/3_vlans.py         |  7 ++++
 .../regression_tests/phase1/3_vlans_over_bond.py   |  7 ++++
 recipes/regression_tests/phase1/bonding_test.py    |  7 ++++
 recipes/regression_tests/phase1/simple_netperf.py  |  7 ++++
 .../phase1/virtual_bridge_2_vlans_over_bond.py     |  7 ++++
 .../phase1/virtual_bridge_vlan_in_guest.py         |  7 ++++
 .../phase1/virtual_bridge_vlan_in_host.py          |  7 ++++
 .../regression_tests/phase2/3_vlans_over_team.py   |  7 ++++
 recipes/regression_tests/phase2/team_test.py       |  7 ++++
 ...l_ovs_bridge_2_vlans_over_active_backup_bond.py |  7 ++++
 .../phase2/virtual_ovs_bridge_vlan_in_guest.py     |  7 ++++
 .../phase2/virtual_ovs_bridge_vlan_in_host.py      |  7 ++++
 13 files changed, 133 insertions(+)
 create mode 100644 lnst/RecipeCommon/Offloads.py

-- 
2.5.5

[PATCH 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.

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

Signed-off-by: Kamil Jerabek <kjerabek(a)redhat.com&gt;
---
 lnst/RecipeCommon/Offloads.py | 49 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 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..6484a58
--- /dev/null
+++ b/lnst/RecipeCommon/Offloads.py
@@ -0,0 +1,49 @@
+"""
+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 list.
+
+    Keyword arguments:
+    offloads -- string of offloads combination separated with ';'
+    """
+
+    if offloads is None:
+        return None
+
+    is_valid = re.compile(r"^([a-z]+\s+off(\s*[;]|\s*))+$")
+    opts_split = re.compile(r".*?(?=;)|.+$")
+    opts_offloads_split = re.compile(r"([a-z]+(?=\s+(off)))+")
+    offloads_split = re.compile(r"([a-z]+)(?=\s+off)")
+
+    if re.match(is_valid, offloads) is None:
+        raise Exception('Invalid offloads format')
+
+    offload_set = (list(set(re.findall(offloads_split, offloads))),[])
+    opts_match = filter(None, re.findall(opts_split, offloads))
+
+    for opts in opts_match:
+        sett = []
+        match = re.findall(opts_offloads_split, opts)
+
+        for off in offload_set[0]:
+            if (off, 'off') in match:
+                sett.append((off, 'off'))
+            else:
+                sett.append((off, 'on'))
+
+        offload_set[1].append(sett)
+
+    return offload_set
-- 
2.5.5

[PATCH 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;
---
 recipes/regression_tests/phase1/3_vlans.py                         | 7 +++++++
 recipes/regression_tests/phase1/3_vlans_over_bond.py               | 7 +++++++
 recipes/regression_tests/phase1/bonding_test.py                    | 7 +++++++
 recipes/regression_tests/phase1/simple_netperf.py                  | 7 +++++++
 .../regression_tests/phase1/virtual_bridge_2_vlans_over_bond.py    | 7 +++++++
 recipes/regression_tests/phase1/virtual_bridge_vlan_in_guest.py    | 7 +++++++
 recipes/regression_tests/phase1/virtual_bridge_vlan_in_host.py     | 7 +++++++
 recipes/regression_tests/phase2/3_vlans_over_team.py               | 7 +++++++
 recipes/regression_tests/phase2/team_test.py                       | 7 +++++++
 .../phase2/virtual_ovs_bridge_2_vlans_over_active_backup_bond.py   | 7 +++++++
 .../regression_tests/phase2/virtual_ovs_bridge_vlan_in_guest.py    | 7 +++++++
 recipes/regression_tests/phase2/virtual_ovs_bridge_vlan_in_host.py | 7 +++++++
 12 files changed, 84 insertions(+)

diff --git a/recipes/regression_tests/phase1/3_vlans.py
b/recipes/regression_tests/phase1/3_vlans.py
index 1b68889..d5d84c5 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
@@ -47,6 +48,12 @@ 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_al = ctl.get_alias("offloads")
+offloads_par = parse_offloads(offloads_al)
+
+if offloads_par is not None:
+    offloads, offload_settings = offloads_par
+
 pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
 
 m1_phy1 = m1.get_interface("eth1")
diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py
b/recipes/regression_tests/phase1/3_vlans_over_bond.py
index 0d5afad..119c363 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
@@ -46,6 +47,12 @@ 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_al = ctl.get_alias("offloads")
+offloads_par = parse_offloads(offloads_al)
+
+if offloads_par is not None:
+    offloads, offload_settings = offloads_par
+
 pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
 
 m1_bond = m1.get_interface("test_bond")
diff --git a/recipes/regression_tests/phase1/bonding_test.py
b/recipes/regression_tests/phase1/bonding_test.py
index 44c60a0..336873c 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
@@ -46,6 +47,12 @@ 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_al = ctl.get_alias("offloads")
+offloads_par = parse_offloads(offloads_al)
+
+if offloads_par is not None:
+    offloads, offload_settings = offloads_par
+
 pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
 
 test_if1 = m1.get_interface("test_if")
diff --git a/recipes/regression_tests/phase1/simple_netperf.py
b/recipes/regression_tests/phase1/simple_netperf.py
index 60a731e..5c801bd 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
@@ -46,6 +47,12 @@ 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_al = ctl.get_alias("offloads")
+offloads_par = parse_offloads(offloads_al)
+
+if offloads_par is not None:
+    offloads, offload_settings = offloads_par
+
 pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
 
 m1_testiface = m1.get_interface("testiface")
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..b7d2a22 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
@@ -51,6 +52,12 @@ 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_al = ctl.get_alias("offloads")
+offloads_par = parse_offloads(offloads_al)
+
+if offloads_par is not None:
+    offloads, offload_settings = offloads_par
+
 pr_comment = generate_perfrepo_comment([h1, g1, g2, h2, g3, g4], pr_user_comment)
 
 mtu = ctl.get_alias("mtu")
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..e1cda1b 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
@@ -47,6 +48,12 @@ 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_al = ctl.get_alias("offloads")
+offloads_par = parse_offloads(offloads_al)
+
+if offloads_par is not None:
+    offloads, offload_settings = offloads_par
+
 pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment)
 
 mtu = ctl.get_alias("mtu")
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..de35112 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
@@ -47,6 +48,12 @@ 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_al = ctl.get_alias("offloads")
+offloads_par = parse_offloads(offloads_al)
+
+if offloads_par is not None:
+    offloads, offload_settings = offloads_par
+
 pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment)
 
 mtu = ctl.get_alias("mtu")
diff --git a/recipes/regression_tests/phase2/3_vlans_over_team.py
b/recipes/regression_tests/phase2/3_vlans_over_team.py
index 5936347..78cb730 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
@@ -46,6 +47,12 @@ 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_al = ctl.get_alias("offloads")
+offloads_par = parse_offloads(offloads_al)
+
+if offloads_par is not None:
+    offloads, offload_settings = offloads_par
+
 pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
 
 m1_team = m1.get_interface("test_if")
diff --git a/recipes/regression_tests/phase2/team_test.py
b/recipes/regression_tests/phase2/team_test.py
index 014194d..0f0b740 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
@@ -45,6 +46,12 @@ 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_al = ctl.get_alias("offloads")
+offloads_par = parse_offloads(offloads_al)
+
+if offloads_par is not None:
+    offloads, offload_settings = offloads_par
+
 pr_comment = generate_perfrepo_comment([m1, m2], pr_user_comment)
 
 test_if1 = m1.get_interface("test_if")
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..a0748aa 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
@@ -51,6 +52,12 @@ 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_al = ctl.get_alias("offloads")
+offloads_par = parse_offloads(offloads_al)
+
+if offloads_par is not None:
+    offloads, offload_settings = offloads_par
+
 pr_comment = generate_perfrepo_comment([h1, g1, g2, h2, g3, g4], pr_user_comment)
 
 h1_nic1 = h1.get_interface("nic1")
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..cc03601 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
@@ -47,6 +48,12 @@ 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_al = ctl.get_alias("offloads")
+offloads_par = parse_offloads(offloads_al)
+
+if offloads_par is not None:
+    offloads, offload_settings = offloads_par
+
 pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment)
 
 h2_vlan10 = h2.get_interface("vlan10")
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..dba0f8a 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
@@ -47,6 +48,12 @@ 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_al = ctl.get_alias("offloads")
+offloads_par = parse_offloads(offloads_al)
+
+if offloads_par is not None:
+    offloads, offload_settings = offloads_par
+
 pr_comment = generate_perfrepo_comment([h1, g1, h2], pr_user_comment)
 
 h2_vlan10 = h2.get_interface("vlan10")
-- 
2.5.5