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

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