From: Ondrej Lichtner <olichtne(a)redhat.com>
Device interrupts need to be configured every time an "up/down" cycle
happens for a device, as the ENRT recipes are designed around a
sub_configuration loop that often times involves such configuration, the
order of CommonHWConfigMixin needs to be adjusted.
After additional discussion with Ivan Vecera I decided that it makes
quite a bit of sense to look at common hw configuration as just another
SubConfigMixin class that should be called as the final sub config class
in the BaseENRT sub config loop.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
lnst/Recipes/ENRT/BondRecipe.py | 6 +++---
...nfigMixin.py => CommonHWSubConfigMixin.py} | 21 ++++++++++---------
lnst/Recipes/ENRT/DoubleBondRecipe.py | 6 +++---
lnst/Recipes/ENRT/DoubleTeamRecipe.py | 6 +++---
lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 6 +++---
lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py | 6 +++---
lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py | 6 +++---
.../ENRT/ShortLivedConnectionsRecipe.py | 6 +++---
lnst/Recipes/ENRT/SimpleMacsecRecipe.py | 6 +++---
lnst/Recipes/ENRT/SimpleNetworkRecipe.py | 6 +++---
lnst/Recipes/ENRT/TeamRecipe.py | 6 +++---
lnst/Recipes/ENRT/TeamVsBondRecipe.py | 6 +++---
lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py | 6 +++---
.../VirtualBridgeVlanInGuestMirroredRecipe.py | 8 +++----
.../ENRT/VirtualBridgeVlanInGuestRecipe.py | 8 +++----
.../VirtualBridgeVlanInHostMirroredRecipe.py | 8 +++----
.../ENRT/VirtualBridgeVlanInHostRecipe.py | 8 +++----
.../ENRT/VirtualBridgeVlansOverBondRecipe.py | 8 +++----
...rtualOvsBridgeVlanInGuestMirroredRecipe.py | 8 +++----
.../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 8 +++----
...irtualOvsBridgeVlanInHostMirroredRecipe.py | 8 +++----
.../ENRT/VirtualOvsBridgeVlanInHostRecipe.py | 8 +++----
.../VirtualOvsBridgeVlansOverBondRecipe.py | 8 +++----
lnst/Recipes/ENRT/VlansOverBondRecipe.py | 6 +++---
lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 6 +++---
lnst/Recipes/ENRT/VlansRecipe.py | 6 +++---
lnst/Recipes/ENRT/VxlanMulticastRecipe.py | 6 +++---
lnst/Recipes/ENRT/VxlanRemoteRecipe.py | 6 +++---
28 files changed, 102 insertions(+), 101 deletions(-)
rename lnst/Recipes/ENRT/ConfigMixins/{CommonHWConfigMixin.py => CommonHWSubConfigMixin.py} (53%)
diff --git a/lnst/Recipes/ENRT/BondRecipe.py b/lnst/Recipes/ENRT/BondRecipe.py
index 8a62e8d..2757829 100644
--- a/lnst/Recipes/ENRT/BondRecipe.py
+++ b/lnst/Recipes/ENRT/BondRecipe.py
@@ -4,11 +4,11 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import BondDevice
-class BondRecipe(OffloadSubConfigMixin, CommonHWConfigMixin,
+class BondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin,
BaseEnrtRecipe):
host1 = HostReq()
host1.eth0 = DeviceReq(label="net1", driver=RecipeParam("driver"))
diff --git a/lnst/Recipes/ENRT/ConfigMixins/CommonHWConfigMixin.py b/lnst/Recipes/ENRT/ConfigMixins/CommonHWSubConfigMixin.py
similarity index 53%
rename from lnst/Recipes/ENRT/ConfigMixins/CommonHWConfigMixin.py
rename to lnst/Recipes/ENRT/ConfigMixins/CommonHWSubConfigMixin.py
index cdac770..fdb5878 100644
--- a/lnst/Recipes/ENRT/ConfigMixins/CommonHWConfigMixin.py
+++ b/lnst/Recipes/ENRT/ConfigMixins/CommonHWSubConfigMixin.py
@@ -8,24 +8,25 @@
CoalescingHWConfigMixin,
)
from lnst.Recipes.ENRT.ConfigMixins.MTUHWConfigMixin import MTUHWConfigMixin
+from lnst.Recipes.ENRT.ConfigMixins.BaseSubConfigMixin import BaseSubConfigMixin
-class CommonHWConfigMixin(
+class CommonHWSubConfigMixin(
ParallelStreamQDiscHWConfigMixin,
DevInterruptHWConfigMixin,
CoalescingHWConfigMixin,
MTUHWConfigMixin,
+ BaseSubConfigMixin,
):
- def test_wide_configuration(self):
- configuration = super().test_wide_configuration()
- self.hw_config(configuration)
- return configuration
+ def apply_sub_configuration(self, config):
+ super().apply_sub_configuration(config)
+ self.hw_config(config)
- def test_wide_deconfiguration(self, configuration):
- self.hw_deconfig(configuration)
- return super().test_wide_deconfiguration(configuration)
+ def remove_sub_configuration(self, config):
+ self.hw_deconfig(config)
+ return super().remove_sub_configuration(config)
- def generate_test_wide_description(self, config):
- desc = super().generate_test_wide_description(config)
+ def generate_sub_configuration_description(self, config):
+ desc = super().generate_sub_configuration_description(config)
desc.extend(self.describe_hw_config(config))
return desc
diff --git a/lnst/Recipes/ENRT/DoubleBondRecipe.py b/lnst/Recipes/ENRT/DoubleBondRecipe.py
index 0d51e50..c375928 100644
--- a/lnst/Recipes/ENRT/DoubleBondRecipe.py
+++ b/lnst/Recipes/ENRT/DoubleBondRecipe.py
@@ -4,11 +4,11 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import BondDevice
-class DoubleBondRecipe(OffloadSubConfigMixin, CommonHWConfigMixin,
+class DoubleBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin,
BaseEnrtRecipe):
host1 = HostReq()
host1.eth0 = DeviceReq(label="net1", driver=RecipeParam("driver"))
diff --git a/lnst/Recipes/ENRT/DoubleTeamRecipe.py b/lnst/Recipes/ENRT/DoubleTeamRecipe.py
index 3d5ddcb..193b2c4 100644
--- a/lnst/Recipes/ENRT/DoubleTeamRecipe.py
+++ b/lnst/Recipes/ENRT/DoubleTeamRecipe.py
@@ -4,11 +4,11 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import TeamDevice
-class DoubleTeamRecipe(OffloadSubConfigMixin, CommonHWConfigMixin,
+class DoubleTeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin,
BaseEnrtRecipe):
host1 = HostReq()
host1.eth0 = DeviceReq(label="tnet", driver=RecipeParam("driver"))
diff --git a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
index 8a997bd..fd8b1bd 100644
--- a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
+++ b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py
@@ -9,8 +9,8 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.BaseSubConfigMixin import (
BaseSubConfigMixin as ConfMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.RecipeCommon.PacketAssert import (PacketAssertConf,
PacketAssertTestAndEvaluate)
from lnst.RecipeCommon.Perf.Measurements import Flow as PerfFlow
@@ -18,7 +18,7 @@
from lnst.Recipes.ENRT.XfrmTools import (configure_ipsec_esp_aead,
generate_key)
-class IpsecEspAeadRecipe(CommonHWConfigMixin, BaseEnrtRecipe,
+class IpsecEspAeadRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe,
PacketAssertTestAndEvaluate):
host1 = HostReq()
host1.eth0 = DeviceReq(label="to_switch", driver=RecipeParam("driver"))
diff --git a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
index 5ca633e..26ecda0 100644
--- a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
+++ b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py
@@ -9,8 +9,8 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.BaseSubConfigMixin import (
BaseSubConfigMixin as ConfMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.RecipeCommon.PacketAssert import (PacketAssertConf,
PacketAssertTestAndEvaluate)
from lnst.RecipeCommon.Perf.Measurements import Flow as PerfFlow
@@ -18,7 +18,7 @@
from lnst.Recipes.ENRT.XfrmTools import (configure_ipsec_esp_ah_comp,
generate_key)
-class IpsecEspAhCompRecipe(CommonHWConfigMixin, BaseEnrtRecipe,
+class IpsecEspAhCompRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe,
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 31f0326..ecddb70 100644
--- a/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py
+++ b/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.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.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import OvsBridgeDevice
-class NoVirtOvsVxlanRecipe(CommonHWConfigMixin, BaseEnrtRecipe):
+class NoVirtOvsVxlanRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe):
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 309522e..0bc4b51 100644
--- a/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
+++ b/lnst/Recipes/ENRT/ShortLivedConnectionsRecipe.py
@@ -2,10 +2,10 @@
from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Common.Parameters import Param, IntParam, ListParam
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
-class ShortLivedConnectionsRecipe(CommonHWConfigMixin, BaseEnrtRecipe):
+class ShortLivedConnectionsRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe):
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 b62e1d5..a48d34e 100644
--- a/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
+++ b/lnst/Recipes/ENRT/SimpleMacsecRecipe.py
@@ -8,13 +8,13 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.BaseSubConfigMixin import (
BaseSubConfigMixin as ConfMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.RecipeCommon.Perf.Recipe import RecipeConf as PerfRecipeConf
from lnst.RecipeCommon.Perf.Measurements import Flow as PerfFlow
from lnst.RecipeCommon.Ping import PingConf
-class SimpleMacsecRecipe(CommonHWConfigMixin, BaseEnrtRecipe):
+class SimpleMacsecRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe):
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 9e56cc1..a378c3a 100644
--- a/lnst/Recipes/ENRT/SimpleNetworkRecipe.py
+++ b/lnst/Recipes/ENRT/SimpleNetworkRecipe.py
@@ -5,12 +5,12 @@
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin,
)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin,
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin,
)
class SimpleNetworkRecipe(
- OffloadSubConfigMixin, CommonHWConfigMixin, BaseEnrtRecipe
+ CommonHWSubConfigMixin, OffloadSubConfigMixin, BaseEnrtRecipe
):
host1 = HostReq()
host1.eth0 = DeviceReq(label="net1", driver=RecipeParam("driver"))
diff --git a/lnst/Recipes/ENRT/TeamRecipe.py b/lnst/Recipes/ENRT/TeamRecipe.py
index c6a714b..2b2594a 100644
--- a/lnst/Recipes/ENRT/TeamRecipe.py
+++ b/lnst/Recipes/ENRT/TeamRecipe.py
@@ -4,11 +4,11 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import TeamDevice
-class TeamRecipe(OffloadSubConfigMixin, CommonHWConfigMixin,
+class TeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin,
BaseEnrtRecipe):
host1 = HostReq()
host1.eth0 = DeviceReq(label="tnet", driver=RecipeParam("driver"))
diff --git a/lnst/Recipes/ENRT/TeamVsBondRecipe.py b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
index 753a9d1..8dfa0ed 100644
--- a/lnst/Recipes/ENRT/TeamVsBondRecipe.py
+++ b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
@@ -4,12 +4,12 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import TeamDevice
from lnst.Devices import BondDevice
-class TeamVsBondRecipe(OffloadSubConfigMixin, CommonHWConfigMixin,
+class TeamVsBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin,
BaseEnrtRecipe):
host1 = HostReq()
host1.eth0 = DeviceReq(label="tnet", driver=RecipeParam("driver"))
diff --git a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py
index c88eb50..f7c7511 100644
--- a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py
+++ b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py
@@ -2,11 +2,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.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import OvsBridgeDevice
-class VirtOvsVxlanRecipe(CommonHWConfigMixin, BaseEnrtRecipe):
+class VirtOvsVxlanRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe):
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 95e6e5a..2a134f8 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
@@ -5,13 +5,13 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import VlanDevice
from lnst.Devices import BridgeDevice
-class VirtualBridgeVlanInGuestMirroredRecipe(OffloadSubConfigMixin,
- CommonHWConfigMixin, BaseEnrtRecipe):
+class VirtualBridgeVlanInGuestMirroredRecipe(CommonHWSubConfigMixin,
+ OffloadSubConfigMixin, BaseEnrtRecipe):
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 80df189..ad87279 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
@@ -5,14 +5,14 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import VlanDevice
from lnst.Devices.VlanDevice import VlanDevice as Vlan
from lnst.Devices import BridgeDevice
-class VirtualBridgeVlanInGuestRecipe(OffloadSubConfigMixin,
- CommonHWConfigMixin, BaseEnrtRecipe):
+class VirtualBridgeVlanInGuestRecipe(CommonHWSubConfigMixin,
+ OffloadSubConfigMixin, BaseEnrtRecipe):
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 77489c8..6f068b5 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
@@ -5,13 +5,13 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import VlanDevice
from lnst.Devices import BridgeDevice
-class VirtualBridgeVlanInHostMirroredRecipe(OffloadSubConfigMixin,
- CommonHWConfigMixin, BaseEnrtRecipe):
+class VirtualBridgeVlanInHostMirroredRecipe(CommonHWSubConfigMixin,
+ OffloadSubConfigMixin, BaseEnrtRecipe):
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 40e2985..b87aeaf 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
@@ -4,13 +4,13 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import VlanDevice
from lnst.Devices import BridgeDevice
-class VirtualBridgeVlanInHostRecipe(OffloadSubConfigMixin,
- CommonHWConfigMixin, BaseEnrtRecipe):
+class VirtualBridgeVlanInHostRecipe(CommonHWSubConfigMixin,
+ OffloadSubConfigMixin, BaseEnrtRecipe):
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 b607d35..c12d194 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
@@ -5,14 +5,14 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import VlanDevice
from lnst.Devices import BondDevice
from lnst.Devices import BridgeDevice
-class VirtualBridgeVlansOverBondRecipe(OffloadSubConfigMixin,
- CommonHWConfigMixin, BaseEnrtRecipe):
+class VirtualBridgeVlansOverBondRecipe(CommonHWSubConfigMixin,
+ OffloadSubConfigMixin, BaseEnrtRecipe):
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 c4814c1..00d95b8 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
@@ -5,13 +5,13 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import VlanDevice
from lnst.Devices import OvsBridgeDevice
-class VirtualOvsBridgeVlanInGuestMirroredRecipe(OffloadSubConfigMixin,
- CommonHWConfigMixin, BaseEnrtRecipe):
+class VirtualOvsBridgeVlanInGuestMirroredRecipe(CommonHWSubConfigMixin,
+ OffloadSubConfigMixin, BaseEnrtRecipe):
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 ef67874..5da0903 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
@@ -4,13 +4,13 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import VlanDevice
from lnst.Devices import OvsBridgeDevice
-class VirtualOvsBridgeVlanInGuestRecipe(OffloadSubConfigMixin,
- CommonHWConfigMixin, BaseEnrtRecipe):
+class VirtualOvsBridgeVlanInGuestRecipe(CommonHWSubConfigMixin,
+ OffloadSubConfigMixin, BaseEnrtRecipe):
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 2a30119..328b9db 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
@@ -5,12 +5,12 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import OvsBridgeDevice
-class VirtualOvsBridgeVlanInHostMirroredRecipe(OffloadSubConfigMixin,
- CommonHWConfigMixin, BaseEnrtRecipe):
+class VirtualOvsBridgeVlanInHostMirroredRecipe(CommonHWSubConfigMixin,
+ OffloadSubConfigMixin, BaseEnrtRecipe):
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 292ab7f..ea83b15 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
@@ -5,13 +5,13 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import VlanDevice
from lnst.Devices import OvsBridgeDevice
-class VirtualOvsBridgeVlanInHostRecipe(OffloadSubConfigMixin,
- CommonHWConfigMixin, BaseEnrtRecipe):
+class VirtualOvsBridgeVlanInHostRecipe(CommonHWSubConfigMixin,
+ OffloadSubConfigMixin, BaseEnrtRecipe):
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 a11372f..e8efd1d 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
@@ -5,12 +5,12 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import OvsBridgeDevice
-class VirtualOvsBridgeVlansOverBondRecipe(OffloadSubConfigMixin,
- CommonHWConfigMixin, BaseEnrtRecipe):
+class VirtualOvsBridgeVlansOverBondRecipe(CommonHWSubConfigMixin,
+ OffloadSubConfigMixin, BaseEnrtRecipe):
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 758b8c3..f47d0a2 100644
--- a/lnst/Recipes/ENRT/VlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VlansOverBondRecipe.py
@@ -4,13 +4,13 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import VlanDevice
from lnst.Devices.VlanDevice import VlanDevice as Vlan
from lnst.Devices import BondDevice
-class VlansOverBondRecipe(OffloadSubConfigMixin, CommonHWConfigMixin,
+class VlansOverBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin,
BaseEnrtRecipe):
host1 = HostReq()
host1.eth0 = DeviceReq(label="net1", driver=RecipeParam("driver"))
diff --git a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
index a3ba791..4b62be8 100644
--- a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
+++ b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
@@ -4,13 +4,13 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import VlanDevice
from lnst.Devices.VlanDevice import VlanDevice as Vlan
from lnst.Devices import TeamDevice
-class VlansOverTeamRecipe(OffloadSubConfigMixin, CommonHWConfigMixin,
+class VlansOverTeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin,
BaseEnrtRecipe):
host1 = HostReq()
host1.eth0 = DeviceReq(label="tnet", driver=RecipeParam("driver"))
diff --git a/lnst/Recipes/ENRT/VlansRecipe.py b/lnst/Recipes/ENRT/VlansRecipe.py
index 0db72ed..bfaa51d 100644
--- a/lnst/Recipes/ENRT/VlansRecipe.py
+++ b/lnst/Recipes/ENRT/VlansRecipe.py
@@ -4,11 +4,11 @@
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe
from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import (
OffloadSubConfigMixin)
-from lnst.Recipes.ENRT.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import VlanDevice
-class VlansRecipe(OffloadSubConfigMixin, CommonHWConfigMixin,
+class VlansRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin,
BaseEnrtRecipe):
host1 = HostReq()
host1.eth0 = DeviceReq(label="net1", driver=RecipeParam("driver"))
diff --git a/lnst/Recipes/ENRT/VxlanMulticastRecipe.py b/lnst/Recipes/ENRT/VxlanMulticastRecipe.py
index 0e7e94f..bef9655 100644
--- a/lnst/Recipes/ENRT/VxlanMulticastRecipe.py
+++ b/lnst/Recipes/ENRT/VxlanMulticastRecipe.py
@@ -2,11 +2,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.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import BridgeDevice, VxlanDevice
-class VxlanMulticastRecipe(CommonHWConfigMixin, BaseEnrtRecipe):
+class VxlanMulticastRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe):
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 4b11ae8..6335e3a 100644
--- a/lnst/Recipes/ENRT/VxlanRemoteRecipe.py
+++ b/lnst/Recipes/ENRT/VxlanRemoteRecipe.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.ConfigMixins.CommonHWConfigMixin import (
- CommonHWConfigMixin)
+from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import (
+ CommonHWSubConfigMixin)
from lnst.Devices import VxlanDevice
-class VxlanRemoteRecipe(CommonHWConfigMixin, BaseEnrtRecipe):
+class VxlanRemoteRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe):
host1 = HostReq()
host1.eth0 = DeviceReq(label="to_switch", driver=RecipeParam("driver"))
--
2.22.1