[PATCH v2 1/2] Recipes.ENRT.TeamVsBondRecipe: extend the recipe with PerfReversibleFlowMixin

[Jan Tluka]

Signed-off-by: Jan Tluka 
---
 lnst/Recipes/ENRT/TeamVsBondRecipe.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lnst/Recipes/ENRT/TeamVsBondRecipe.py b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
index 515d2ea9..a617473c 100644
--- a/lnst/Recipes/ENRT/TeamVsBondRecipe.py
+++ b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
@@ -6,12 +6,14 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
     CommonHWSubConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.PerfReversibleFlowMixin import (
+    PerfReversibleFlowMixin)
 from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints
 from lnst.Devices import TeamDevice
 from lnst.Devices import BondDevice

-class TeamVsBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin,
-    BaseEnrtRecipe):
+class TeamVsBondRecipe(PerfReversibleFlowMixin, CommonHWSubConfigMixin,
+    OffloadSubConfigMixin, BaseEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="tnet", driver=RecipeParam("driver"))
     host1.eth1 = DeviceReq(label="tnet", driver=RecipeParam("driver"))
@@ -108,8 +110,7 @@ class TeamVsBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin,
         ]

def generate_perf_endpoints(self, config):
-        return [(self.matched.host1.team0, self.matched.host2.bond0),
-            (self.matched.host2.bond0, self.matched.host1.team0)]
+        return [(self.matched.host1.team0, self.matched.host2.bond0)]

@property
     def offload_nics(self):

[PATCH v2 2/2] lnst.Recipes.ENRT: remove perf_reverse parameter from specific recipes

[Jan Tluka]

If any recipe needs this parameter it should inherit it from the
PerfReversibleFlowMixin class.

Signed-off-by: Jan Tluka 
---
 lnst/Recipes/ENRT/DoubleTeamRecipe.py | 1 -
 lnst/Recipes/ENRT/TeamVsBondRecipe.py | 1 -
 2 files changed, 2 deletions(-)

diff --git a/lnst/Recipes/ENRT/DoubleTeamRecipe.py b/lnst/Recipes/ENRT/DoubleTeamRecipe.py
index 711019d7..39e069e5 100644
--- a/lnst/Recipes/ENRT/DoubleTeamRecipe.py
+++ b/lnst/Recipes/ENRT/DoubleTeamRecipe.py
@@ -25,7 +25,6 @@ class DoubleTeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin,
         dict(gro="on", gso="off", tso="off", tx="on"),
         dict(gro="on", gso="on", tso="off", tx="off")))

-    perf_reverse = BoolParam(default=True)
     runner_name = StrParam(mandatory=True)

def test_wide_configuration(self):
diff --git a/lnst/Recipes/ENRT/TeamVsBondRecipe.py b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
index a617473c..b87402d2 100644
--- a/lnst/Recipes/ENRT/TeamVsBondRecipe.py
+++ b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
@@ -28,7 +28,6 @@ class TeamVsBondRecipe(PerfReversibleFlowMixin, CommonHWSubConfigMixin,
         dict(gro="on", gso="off", tso="off", tx="on"),
         dict(gro="on", gso="on", tso="off", tx="off")))

-    perf_reverse = BoolParam(default=True)
     runner_name = StrParam(mandatory = True)
     bonding_mode = StrParam(mandatory = True)
     miimon_value = IntParam(mandatory = True)

[Jan Tluka]

Wed, Aug 12, 2020 at 06:01:27PM CEST, [e-mail] wrote:
> Signed-off-by: Jan Tluka
>
> lnst/Recipes/ENRT/TeamVsBondRecipe.py | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/lnst/Recipes/ENRT/TeamVsBondRecipe.py b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
> index 515d2ea9..a617473c 100644
> --- a/lnst/Recipes/ENRT/TeamVsBondRecipe.py
> +++ b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
> @@ -6,12 +6,14 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
>     OffloadSubConfigMixin)
> from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
>     CommonHWSubConfigMixin)
> +from lnst.Recipes.ENRT.ConfigMixins.PerfReversibleFlowMixin import (
> PerfReversibleFlowMixin)
>
> from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints
> from lnst.Devices import TeamDevice
> from lnst.Devices import BondDevice
>
> -class TeamVsBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin,
> BaseEnrtRecipe):
>
> +class TeamVsBondRecipe(PerfReversibleFlowMixin, CommonHWSubConfigMixin,
> OffloadSubConfigMixin, BaseEnrtRecipe):
> host1 = HostReq()
> host1.eth0 = DeviceReq(label="tnet", driver=RecipeParam("driver"))
> host1.eth1 = DeviceReq(label="tnet", driver=RecipeParam("driver"))
>
> @@ -108,8 +110,7 @@ class TeamVsBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin,
>         ]
> def generate_perf_endpoints(self, config):
>    return [(self.matched.host1.team0, self.matched.host2.bond0),
>        (self.matched.host2.bond0, self.matched.host1.team0)]
>    return [(self.matched.host1.team0, self.matched.host2.bond0)]
>
> @property
>   def offload_nics(self):
>
> -- 
> 2.21.3

I've applied the patch set.

-Jan