[PATCH v2 07/11] refactor lnst.Recipes.ENRT.BaseEnrtRecipe

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

Some of the subconfig and perf mixins are not relevant on the generic
BaseEnrtRecipe level and should be separated into a more specific
derived class. This is relevant for example for ovs+dpdk based recipes
where we don't want to do any device specific configuration (as devices
are reconfigured to use a different driver module than standard).

For now this includes the move of some of the base classes into the
BaremetalEnrtRecipe and VirtualEnrtRecipe that are then reused in the
specific recipes.

Eventually similar steps should be done with the ovs+dpdk type recipes.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Recipes/ENRT/BaseEnrtRecipe.py                   | 11 +++--------
 lnst/Recipes/ENRT/BondRecipe.py                       |  4 ++--
 lnst/Recipes/ENRT/DoubleBondRecipe.py                 |  4 ++--
 lnst/Recipes/ENRT/DoubleTeamRecipe.py                 |  4 ++--
 lnst/Recipes/ENRT/IpsecEspAeadRecipe.py               |  4 ++--
 lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py             |  4 ++--
 lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py             |  4 ++--
 lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py      |  4 ++--
 lnst/Recipes/ENRT/SimpleMacsecRecipe.py               |  4 ++--
 lnst/Recipes/ENRT/SimpleNetworkRecipe.py              |  7 ++++---
 lnst/Recipes/ENRT/TeamRecipe.py                       |  4 ++--
 lnst/Recipes/ENRT/TeamVsBondRecipe.py                 |  4 ++--
 lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py               |  4 ++--
 .../ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py    |  4 ++--
 lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py   |  4 ++--
 .../ENRT/VirtualBridgeVlanInHostMirroredRecipe.py     |  4 ++--
 lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py    |  4 ++--
 lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py |  4 ++--
 .../ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py |  4 ++--
 .../Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py |  4 ++--
 .../ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py  |  4 ++--
 lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py |  4 ++--
 .../ENRT/VirtualOvsBridgeVlansOverBondRecipe.py       |  4 ++--
 lnst/Recipes/ENRT/VlansOverBondRecipe.py              |  4 ++--
 lnst/Recipes/ENRT/VlansOverTeamRecipe.py              |  4 ++--
 lnst/Recipes/ENRT/VlansRecipe.py                      |  4 ++--
 lnst/Recipes/ENRT/VxlanMulticastRecipe.py             |  4 ++--
 lnst/Recipes/ENRT/VxlanRemoteRecipe.py                |  4 ++--
 28 files changed, 59 insertions(+), 63 deletions(-)

diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
index 0b881d9..110ee88 100644
--- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py
+++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py
@@ -13,11 +13,6 @@
 from lnst.Common.IpAddress import AF_INET, AF_INET6
 
 from lnst.Recipes.ENRT.ConfigMixins.BaseSubConfigMixin import BaseSubConfigMixin
-from lnst.Recipes.ENRT.PerfTestMixins import CommonPerfTestTweakMixin
-from lnst.Recipes.ENRT.ConfigMixins.DisableTurboboostMixin import (
-        DisableTurboboostMixin)
-from lnst.Recipes.ENRT.ConfigMixins.DisableIdleStatesMixin import (
-        DisableIdleStatesMixin)
 from lnst.Recipes.ENRT.MeasurementGenerators.BaseMeasurementGenerator import (
     BaseMeasurementGenerator,
 )
@@ -39,9 +34,9 @@ class EnrtConfiguration(object):
     """
     pass
 
-class BaseEnrtRecipe(CommonPerfTestTweakMixin,
-        DisableTurboboostMixin, DisableIdleStatesMixin,
-        BaseSubConfigMixin,
+
+class BaseEnrtRecipe(
+    BaseSubConfigMixin,
     BaseMeasurementGenerator,
     PingTestAndEvaluate,
     PerfRecipe,
diff --git a/lnst/Recipes/ENRT/BondRecipe.py b/lnst/Recipes/ENRT/BondRecipe.py
index 751d196..fd8b3f1 100644
--- a/lnst/Recipes/ENRT/BondRecipe.py
+++ b/lnst/Recipes/ENRT/BondRecipe.py
@@ -1,7 +1,7 @@
 from lnst.Common.Parameters import Param, IntParam, StrParam
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.BaremetalEnrtRecipe import BaremetalEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -12,7 +12,7 @@
 from lnst.Devices import BondDevice
 
 class BondRecipe(PerfReversibleFlowMixin, CommonHWSubConfigMixin, OffloadSubConfigMixin,
-    BaseEnrtRecipe):
+    BaremetalEnrtRecipe):
     """
     This recipe implements Enrt testing for a network scenario that looks
     as follows
diff --git a/lnst/Recipes/ENRT/DoubleBondRecipe.py
b/lnst/Recipes/ENRT/DoubleBondRecipe.py
index 73a7222..582b729 100644
--- a/lnst/Recipes/ENRT/DoubleBondRecipe.py
+++ b/lnst/Recipes/ENRT/DoubleBondRecipe.py
@@ -1,7 +1,7 @@
 from lnst.Common.Parameters import Param, StrParam, IntParam
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.BaremetalEnrtRecipe import BaremetalEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -10,7 +10,7 @@
 from lnst.Devices import BondDevice
 
 class DoubleBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin,
-    BaseEnrtRecipe):
+    BaremetalEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="net1",
driver=RecipeParam("driver"))
     host1.eth1 = DeviceReq(label="net1",
driver=RecipeParam("driver"))
diff --git a/lnst/Recipes/ENRT/DoubleTeamRecipe.py
b/lnst/Recipes/ENRT/DoubleTeamRecipe.py
index 305ffde..018211b 100644
--- a/lnst/Recipes/ENRT/DoubleTeamRecipe.py
+++ b/lnst/Recipes/ENRT/DoubleTeamRecipe.py
@@ -1,7 +1,7 @@
 from lnst.Common.Parameters import Param, StrParam, BoolParam
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.BaremetalEnrtRecipe import BaremetalEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -10,7 +10,7 @@
 from lnst.Devices import TeamDevice
 
 class DoubleTeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin,
-    BaseEnrtRecipe):
+    BaremetalEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
     host1.eth1 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
diff --git a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
index 015db74..cc74ddc 100644
--- a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
+++ b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
@@ -6,7 +6,7 @@
 from lnst.Common.Parameters import StrParam
 from lnst.Common.LnstError import LnstError
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.BaremetalEnrtRecipe import BaremetalEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.BaseSubConfigMixin import (
     BaseSubConfigMixin as ConfMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -19,7 +19,7 @@
                                          generate_key)
 
 
-class IpsecEspAeadRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe,
+class IpsecEspAeadRecipe(CommonHWSubConfigMixin, BaremetalEnrtRecipe,
                          PacketAssertTestAndEvaluate):
     """
     This recipe implements Enrt testing for a simple IPsec scenario that looks
diff --git a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
index 8d7d0c9..59cb09d 100644
--- a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
+++ b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
@@ -6,7 +6,7 @@
 from lnst.Common.Parameters import StrParam
 from lnst.Common.LnstError import LnstError
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.BaremetalEnrtRecipe import BaremetalEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.BaseSubConfigMixin import (
     BaseSubConfigMixin as ConfMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -18,7 +18,7 @@
 from lnst.Recipes.ENRT.XfrmTools import (configure_ipsec_esp_ah_comp,
     generate_key)
 
-class IpsecEspAhCompRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe,
+class IpsecEspAhCompRecipe(CommonHWSubConfigMixin, BaremetalEnrtRecipe,
     PacketAssertTestAndEvaluate):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
diff --git a/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
b/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
index 92dc3a1..da987db 100644
--- a/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
+++ b/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
@@ -1,12 +1,12 @@
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.BaremetalEnrtRecipe import BaremetalEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
     CommonHWSubConfigMixin)
 from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints
 from lnst.Devices import OvsBridgeDevice
 
-class NoVirtOvsVxlanRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe):
+class NoVirtOvsVxlanRecipe(CommonHWSubConfigMixin, BaremetalEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
 
diff --git a/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
b/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
index 85c768a..5323672 100644
--- a/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
+++ b/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
@@ -1,11 +1,11 @@
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.BaremetalEnrtRecipe import BaremetalEnrtRecipe
 from lnst.Common.Parameters import Param, IntParam, ListParam
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
     CommonHWSubConfigMixin)
 
-class ShortLivedConnectionsRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe):
+class ShortLivedConnectionsRecipe(CommonHWSubConfigMixin, BaremetalEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
 
diff --git a/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
b/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
index 069263d..a903dea 100644
--- a/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
+++ b/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
@@ -5,7 +5,7 @@
 from lnst.Common.LnstError import LnstError
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
 from lnst.Devices import MacsecDevice
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.BaremetalEnrtRecipe import BaremetalEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.BaseSubConfigMixin import (
     BaseSubConfigMixin as ConfMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -14,7 +14,7 @@
 from lnst.RecipeCommon.Perf.Measurements import Flow as PerfFlow
 from lnst.RecipeCommon.Ping.Recipe import PingConf
 
-class SimpleMacsecRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe):
+class SimpleMacsecRecipe(CommonHWSubConfigMixin, BaremetalEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
 
diff --git a/lnst/Recipes/ENRT/SimpleNetworkRecipe.py
b/lnst/Recipes/ENRT/SimpleNetworkRecipe.py
index 506cbda..88628a5 100644
--- a/lnst/Recipes/ENRT/SimpleNetworkRecipe.py
+++ b/lnst/Recipes/ENRT/SimpleNetworkRecipe.py
@@ -1,17 +1,18 @@
 from lnst.Common.Parameters import Param
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.BaremetalEnrtRecipe import BaremetalEnrtRecipe
+from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin,
 )
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
     CommonHWSubConfigMixin,
 )
-from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints
+
 
 class SimpleNetworkRecipe(
-    CommonHWSubConfigMixin, OffloadSubConfigMixin, BaseEnrtRecipe
+    CommonHWSubConfigMixin, OffloadSubConfigMixin, BaremetalEnrtRecipe
 ):
     """
     This recipe implements Enrt testing for a simple network scenario that looks
diff --git a/lnst/Recipes/ENRT/TeamRecipe.py b/lnst/Recipes/ENRT/TeamRecipe.py
index da746dd..b58458f 100644
--- a/lnst/Recipes/ENRT/TeamRecipe.py
+++ b/lnst/Recipes/ENRT/TeamRecipe.py
@@ -1,7 +1,7 @@
 from lnst.Common.Parameters import Param, StrParam, BoolParam
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.BaremetalEnrtRecipe import BaremetalEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -13,7 +13,7 @@
 
 
 class TeamRecipe(PerfReversibleFlowMixin, CommonHWSubConfigMixin, OffloadSubConfigMixin,
-    BaseEnrtRecipe):
+    BaremetalEnrtRecipe):
     """
     This recipe implements Enrt testing for a network scenario that looks
     as follows
diff --git a/lnst/Recipes/ENRT/TeamVsBondRecipe.py
b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
index b87402d..9c4db03 100644
--- a/lnst/Recipes/ENRT/TeamVsBondRecipe.py
+++ b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
@@ -1,7 +1,7 @@
 from lnst.Common.Parameters import Param, IntParam, StrParam, BoolParam
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.BaremetalEnrtRecipe import BaremetalEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -13,7 +13,7 @@
 from lnst.Devices import BondDevice
 
 class TeamVsBondRecipe(PerfReversibleFlowMixin, CommonHWSubConfigMixin,
-    OffloadSubConfigMixin, BaseEnrtRecipe):
+    OffloadSubConfigMixin, BaremetalEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
     host1.eth1 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
diff --git a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py
b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py
index 66e6575..23ac76e 100644
--- a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py
+++ b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py
@@ -1,7 +1,7 @@
 from itertools import combinations
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.VirtualEnrtRecipe import VirtualEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
     CommonHWSubConfigMixin)
 from lnst.Recipes.ENRT.PingMixins import VlanPingEvaluatorMixin
@@ -9,7 +9,7 @@
 from lnst.Devices import OvsBridgeDevice
 
 class VirtOvsVxlanRecipe(VlanPingEvaluatorMixin,
-    CommonHWSubConfigMixin, BaseEnrtRecipe):
+    CommonHWSubConfigMixin, VirtualEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
     host1.tap0 = DeviceReq(label="to_guest1")
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
index 494e79d..7941294 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
@@ -2,7 +2,7 @@
 from lnst.Common.Parameters import Param
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.VirtualEnrtRecipe import VirtualEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -12,7 +12,7 @@
 from lnst.Devices import BridgeDevice
 
 class VirtualBridgeVlanInGuestMirroredRecipe(CommonHWSubConfigMixin,
-    OffloadSubConfigMixin, BaseEnrtRecipe):
+    OffloadSubConfigMixin, VirtualEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
     host1.tap0 = DeviceReq(label="to_guest1")
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
index 65732bb..0b65688 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
@@ -2,7 +2,7 @@
 from lnst.Common.Parameters import Param, IntParam
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.VirtualEnrtRecipe import VirtualEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -13,7 +13,7 @@
 from lnst.Devices import BridgeDevice
 
 class VirtualBridgeVlanInGuestRecipe(CommonHWSubConfigMixin,
-    OffloadSubConfigMixin, BaseEnrtRecipe):
+    OffloadSubConfigMixin, VirtualEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
     host1.tap0 = DeviceReq(label="to_guest")
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
index f17228b..afb4e65 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
@@ -2,7 +2,7 @@
 from lnst.Common.Parameters import Param
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.VirtualEnrtRecipe import VirtualEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -12,7 +12,7 @@
 from lnst.Devices import BridgeDevice
 
 class VirtualBridgeVlanInHostMirroredRecipe(CommonHWSubConfigMixin,
-    OffloadSubConfigMixin, BaseEnrtRecipe):
+    OffloadSubConfigMixin, VirtualEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
     host1.tap0 = DeviceReq(label="to_guest1")
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
index d94ed70..8373b22 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
@@ -1,7 +1,7 @@
 from lnst.Common.Parameters import Param, IntParam
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.VirtualEnrtRecipe import VirtualEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -11,7 +11,7 @@
 from lnst.Devices import BridgeDevice
 
 class VirtualBridgeVlanInHostRecipe(CommonHWSubConfigMixin,
-    OffloadSubConfigMixin, BaseEnrtRecipe):
+    OffloadSubConfigMixin, VirtualEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
     host1.tap0 = DeviceReq(label="to_guest")
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
index eb29fdc..2cf3820 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
@@ -3,7 +3,7 @@
 from lnst.Common.Parameters import Param, IntParam, StrParam
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.VirtualEnrtRecipe import VirtualEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -15,7 +15,7 @@
 from lnst.Devices import BridgeDevice
 
 class VirtualBridgeVlansOverBondRecipe(VlanPingEvaluatorMixin,
-    CommonHWSubConfigMixin, OffloadSubConfigMixin, BaseEnrtRecipe):
+    CommonHWSubConfigMixin, OffloadSubConfigMixin, VirtualEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
     host1.eth1 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
index daba9f4..d79e107 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
@@ -2,7 +2,7 @@
 from lnst.Common.Parameters import Param
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.VirtualEnrtRecipe import VirtualEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -12,7 +12,7 @@
 from lnst.Devices import OvsBridgeDevice
 
 class VirtualOvsBridgeVlanInGuestMirroredRecipe(CommonHWSubConfigMixin,
-    OffloadSubConfigMixin, BaseEnrtRecipe):
+    OffloadSubConfigMixin, VirtualEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
     host1.tap0 = DeviceReq(label="to_guest1")
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
index 7137600..c8a0da9 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
@@ -1,7 +1,7 @@
 from lnst.Common.Parameters import Param, IntParam
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.VirtualEnrtRecipe import VirtualEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -11,7 +11,7 @@
 from lnst.Devices import OvsBridgeDevice
 
 class VirtualOvsBridgeVlanInGuestRecipe(CommonHWSubConfigMixin,
-    OffloadSubConfigMixin, BaseEnrtRecipe):
+    OffloadSubConfigMixin, VirtualEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
     host1.tap0 = DeviceReq(label="to_guest")
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
index 5e68862..9d1df89 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
@@ -2,7 +2,7 @@
 from lnst.Common.Parameters import Param
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.VirtualEnrtRecipe import VirtualEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -11,7 +11,7 @@
 from lnst.Devices import OvsBridgeDevice
 
 class VirtualOvsBridgeVlanInHostMirroredRecipe(CommonHWSubConfigMixin,
-    OffloadSubConfigMixin, BaseEnrtRecipe):
+    OffloadSubConfigMixin, VirtualEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
     host1.tap0 = DeviceReq(label="to_guest1")
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
index 3355cdb..e3494cd 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
@@ -2,7 +2,7 @@
 from lnst.Common.Parameters import Param, IntParam
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.VirtualEnrtRecipe import VirtualEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -12,7 +12,7 @@
 from lnst.Devices import OvsBridgeDevice
 
 class VirtualOvsBridgeVlanInHostRecipe(CommonHWSubConfigMixin,
-    OffloadSubConfigMixin, BaseEnrtRecipe):
+    OffloadSubConfigMixin, VirtualEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
     host1.tap0 = DeviceReq(label="to_guest")
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
index b1ace76..b72edca 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
@@ -3,7 +3,7 @@
 from lnst.Common.Parameters import Param, IntParam, StrParam
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.VirtualEnrtRecipe import VirtualEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -13,7 +13,7 @@
 from lnst.Devices import OvsBridgeDevice
 
 class VirtualOvsBridgeVlansOverBondRecipe(VlanPingEvaluatorMixin,
-    CommonHWSubConfigMixin, OffloadSubConfigMixin, BaseEnrtRecipe):
+    CommonHWSubConfigMixin, OffloadSubConfigMixin, VirtualEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
     host1.eth1 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
diff --git a/lnst/Recipes/ENRT/VlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VlansOverBondRecipe.py
index d483161..74867e0 100644
--- a/lnst/Recipes/ENRT/VlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VlansOverBondRecipe.py
@@ -1,7 +1,7 @@
 from lnst.Common.Parameters import Param, IntParam, StrParam
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.BaremetalEnrtRecipe import BaremetalEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -16,7 +16,7 @@
 
 class VlansOverBondRecipe(PerfReversibleFlowMixin, VlanPingEvaluatorMixin,
     CommonHWSubConfigMixin, OffloadSubConfigMixin,
-    BaseEnrtRecipe):
+    BaremetalEnrtRecipe):
     """
     This recipe implements Enrt testing for a network scenario that looks
     as follows
diff --git a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
index c9fd8da..1d9cd6e 100644
--- a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
+++ b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
@@ -1,7 +1,7 @@
 from lnst.Common.Parameters import Param, StrParam
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.BaremetalEnrtRecipe import BaremetalEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -17,7 +17,7 @@
 
 class VlansOverTeamRecipe(PerfReversibleFlowMixin, VlanPingEvaluatorMixin,
     CommonHWSubConfigMixin, OffloadSubConfigMixin,
-    BaseEnrtRecipe):
+    BaremetalEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
     host1.eth1 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
diff --git a/lnst/Recipes/ENRT/VlansRecipe.py b/lnst/Recipes/ENRT/VlansRecipe.py
index 34e7b20..01a9a3c 100644
--- a/lnst/Recipes/ENRT/VlansRecipe.py
+++ b/lnst/Recipes/ENRT/VlansRecipe.py
@@ -1,7 +1,7 @@
 from lnst.Common.Parameters import Param
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.BaremetalEnrtRecipe import BaremetalEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
     OffloadSubConfigMixin)
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
@@ -12,7 +12,7 @@
 
 class VlansRecipe(VlanPingEvaluatorMixin,
     CommonHWSubConfigMixin, OffloadSubConfigMixin,
-    BaseEnrtRecipe):
+    BaremetalEnrtRecipe):
     """
     This recipe implements Enrt testing for a network scenario that looks
     as follows
diff --git a/lnst/Recipes/ENRT/VxlanMulticastRecipe.py
b/lnst/Recipes/ENRT/VxlanMulticastRecipe.py
index f6eec48..8e9e5a9 100644
--- a/lnst/Recipes/ENRT/VxlanMulticastRecipe.py
+++ b/lnst/Recipes/ENRT/VxlanMulticastRecipe.py
@@ -1,13 +1,13 @@
 from itertools import permutations
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.VirtualEnrtRecipe import VirtualEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
     CommonHWSubConfigMixin)
 from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints
 from lnst.Devices import BridgeDevice, VxlanDevice
 
-class VxlanMulticastRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe):
+class VxlanMulticastRecipe(CommonHWSubConfigMixin, VirtualEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
     host1.tap0 = DeviceReq(label="to_guest1")
diff --git a/lnst/Recipes/ENRT/VxlanRemoteRecipe.py
b/lnst/Recipes/ENRT/VxlanRemoteRecipe.py
index 465fdc1..91237f4 100644
--- a/lnst/Recipes/ENRT/VxlanRemoteRecipe.py
+++ b/lnst/Recipes/ENRT/VxlanRemoteRecipe.py
@@ -1,12 +1,12 @@
 from lnst.Common.IpAddress import ipaddress
 from lnst.Controller import HostReq, DeviceReq, RecipeParam
-from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
+from lnst.Recipes.ENRT.BaremetalEnrtRecipe import BaremetalEnrtRecipe
 from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
     CommonHWSubConfigMixin)
 from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints
 from lnst.Devices import VxlanDevice
 
-class VxlanRemoteRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe):
+class VxlanRemoteRecipe(CommonHWSubConfigMixin, BaremetalEnrtRecipe):
     host1 = HostReq()
     host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
 
-- 
2.30.0