From: Christos Sfakianakis <csfakian(a)redhat.com>
Allow driver selection or use the default value as defined
in BaseEnrtRecipe.
Signed-off-by: Christos Sfakianakis <csfakian(a)redhat.com>
---
lnst/Recipes/ENRT/BondRecipe.py | 8 ++++----
lnst/Recipes/ENRT/DoubleBondRecipe.py | 10 +++++-----
lnst/Recipes/ENRT/DoubleTeamRecipe.py | 10 +++++-----
lnst/Recipes/ENRT/PingFloodRecipe.py | 7 ++++---
lnst/Recipes/ENRT/TeamRecipe.py | 8 ++++----
lnst/Recipes/ENRT/TeamVsBondRecipe.py | 10 +++++-----
.../ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py | 6 +++---
lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py | 6 +++---
.../ENRT/VirtualBridgeVlanInHostMirroredRecipe.py | 6 +++---
lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py | 6 +++---
lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py | 10 +++++-----
.../ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py | 6 +++---
lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 6 +++---
.../ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py | 6 +++---
lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py | 6 +++---
.../ENRT/VirtualOvsBridgeVlansOverBondRecipe.py | 10 +++++-----
lnst/Recipes/ENRT/VlansOverBondRecipe.py | 8 ++++----
lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 8 ++++----
lnst/Recipes/ENRT/VlansRecipe.py | 6 +++---
19 files changed, 72 insertions(+), 71 deletions(-)
diff --git a/lnst/Recipes/ENRT/BondRecipe.py b/lnst/Recipes/ENRT/BondRecipe.py
index 1b4dd75..bbe2d57 100644
--- a/lnst/Recipes/ENRT/BondRecipe.py
+++ b/lnst/Recipes/ENRT/BondRecipe.py
@@ -4,17 +4,17 @@ Implements scenario similar to regression_tests/phase1/
"""
from lnst.Common.Parameters import Param, IntParam, StrParam
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import BondDevice
class BondRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth0 = DeviceReq(label="net1")
- host1.eth1 = DeviceReq(label="net1")
+ host1.eth0 = DeviceReq(label="net1",
driver=RecipeParam("driver"))
+ host1.eth1 = DeviceReq(label="net1",
driver=RecipeParam("driver"))
host2 = HostReq()
- host2.eth0 = DeviceReq(label="net1")
+ host2.eth0 = DeviceReq(label="net1",
driver=RecipeParam("driver"))
offload_combinations = Param(default=(
dict(gro="on", gso="on", tso="on",
tx="on"),
diff --git a/lnst/Recipes/ENRT/DoubleBondRecipe.py
b/lnst/Recipes/ENRT/DoubleBondRecipe.py
index a3cb3bb..bc604d6 100644
--- a/lnst/Recipes/ENRT/DoubleBondRecipe.py
+++ b/lnst/Recipes/ENRT/DoubleBondRecipe.py
@@ -4,18 +4,18 @@ Implements scenario similar to regression_tests/phase1/
"""
from lnst.Common.Parameters import Param, StrParam, IntParam
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import BondDevice
class DoubleBondRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth0 = DeviceReq(label="net1")
- host1.eth1 = DeviceReq(label="net1")
+ host1.eth0 = DeviceReq(label="net1",
driver=RecipeParam("driver"))
+ host1.eth1 = DeviceReq(label="net1",
driver=RecipeParam("driver"))
host2 = HostReq()
- host2.eth0 = DeviceReq(label="net1")
- host2.eth1 = DeviceReq(label="net1")
+ host2.eth0 = DeviceReq(label="net1",
driver=RecipeParam("driver"))
+ host2.eth1 = DeviceReq(label="net1",
driver=RecipeParam("driver"))
offload_combinations = Param(default=(
dict(gro="on", gso="on", tso="on",
tx="on"),
diff --git a/lnst/Recipes/ENRT/DoubleTeamRecipe.py
b/lnst/Recipes/ENRT/DoubleTeamRecipe.py
index a4f9d5b..cea3542 100644
--- a/lnst/Recipes/ENRT/DoubleTeamRecipe.py
+++ b/lnst/Recipes/ENRT/DoubleTeamRecipe.py
@@ -4,18 +4,18 @@ Implements scenario similar to regression_tests/phase2/
"""
from lnst.Common.Parameters import Param, IntParam, StrParam, BoolParam
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import TeamDevice
class DoubleTeamRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth0 = DeviceReq(label="tnet")
- host1.eth1 = DeviceReq(label="tnet")
+ host1.eth0 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
+ host1.eth1 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
host2 = HostReq()
- host2.eth0 = DeviceReq(label="tnet")
- host2.eth1 = DeviceReq(label="tnet")
+ host2.eth0 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
+ host2.eth1 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
offload_combinations = Param(default=(
dict(gro="on", gso="on", tso="on",
tx="on"),
diff --git a/lnst/Recipes/ENRT/PingFloodRecipe.py b/lnst/Recipes/ENRT/PingFloodRecipe.py
index 93dfa19..92fbef3 100644
--- a/lnst/Recipes/ENRT/PingFloodRecipe.py
+++ b/lnst/Recipes/ENRT/PingFloodRecipe.py
@@ -6,15 +6,16 @@ Implements scenario similar to regression_tests/phase1/
from lnst.Common.Parameters import Param, IntParam, StrParam
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.RecipeCommon.Ping import PingConf, PingTestAndEvaluate
class PingFloodRecipe(PingTestAndEvaluate):
+ driver = StrParam(default='ixgbe')
host1 = HostReq()
- host1.eth0 = DeviceReq(label="net1")
+ host1.eth0 = DeviceReq(label="net1",
driver=RecipeParam("driver"))
host2 = HostReq()
- host2.eth0 = DeviceReq(label="net1")
+ host2.eth0 = DeviceReq(label="net1",
driver=RecipeParam("driver"))
#TODO: use a parameter for the network
src_addr = StrParam(default = "192.168.1.1/24")
diff --git a/lnst/Recipes/ENRT/TeamRecipe.py b/lnst/Recipes/ENRT/TeamRecipe.py
index 98e10ce..93d1c05 100644
--- a/lnst/Recipes/ENRT/TeamRecipe.py
+++ b/lnst/Recipes/ENRT/TeamRecipe.py
@@ -4,17 +4,17 @@ Implements scenario similar to regression_tests/phase2/
"""
from lnst.Common.Parameters import Param, IntParam, StrParam, BoolParam
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import TeamDevice
class TeamRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth0 = DeviceReq(label="tnet")
- host1.eth1 = DeviceReq(label="tnet")
+ host1.eth0 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
+ host1.eth1 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
host2 = HostReq()
- host2.eth0 = DeviceReq(label="tnet")
+ host2.eth0 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
offload_combinations = Param(default=(
dict(gro="on", gso="on", tso="on",
tx="on"),
diff --git a/lnst/Recipes/ENRT/TeamVsBondRecipe.py
b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
index 4820f65..5170071 100644
--- a/lnst/Recipes/ENRT/TeamVsBondRecipe.py
+++ b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
@@ -5,19 +5,19 @@ _bond.xml + team_test.py)
"""
from lnst.Common.Parameters import Param, IntParam, StrParam, BoolParam
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import TeamDevice
from lnst.Devices import BondDevice
class TeamVsBondRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth0 = DeviceReq(label="tnet")
- host1.eth1 = DeviceReq(label="tnet")
+ host1.eth0 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
+ host1.eth1 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
host2 = HostReq()
- host2.eth0 = DeviceReq(label="tnet")
- host2.eth1 = DeviceReq(label="tnet")
+ host2.eth0 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
+ host2.eth1 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
offload_combinations = Param(default=(
dict(gro="on", gso="on", tso="on",
tx="on"),
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
index 4232e36..b07ceb7 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
@@ -4,7 +4,7 @@ Implements scenario similar to regression_tests/phase1/
"""
from lnst.Common.Parameters import Param
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import VlanDevice
from lnst.Devices import BridgeDevice
@@ -12,11 +12,11 @@ from lnst.Common.LnstError import LnstError
class VirtualBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth0 = DeviceReq(label="to_switch")
+ host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
host1.tap0 = DeviceReq(label="to_guest1")
host2 = HostReq()
- host2.eth0 = DeviceReq(label="to_switch")
+ host2.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
host2.tap0 = DeviceReq(label="to_guest2")
guest1 = HostReq()
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
index ad79223..1c33020 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
@@ -4,7 +4,7 @@ Implements scenario similar to regression_tests/phase1/
"""
from lnst.Common.Parameters import Param
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import VlanDevice
from lnst.Devices import BridgeDevice
@@ -12,11 +12,11 @@ from lnst.Common.LnstError import LnstError
class VirtualBridgeVlanInGuestRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth0 = DeviceReq(label="to_switch")
+ host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
host1.tap0 = DeviceReq(label="to_guest")
host2 = HostReq()
- host2.eth0 = DeviceReq(label="to_switch")
+ host2.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
guest1 = HostReq()
guest1.eth0 = DeviceReq(label="to_guest")
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
index 6e81279..915e0d4 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
@@ -4,7 +4,7 @@ Implements scenario similar to regression_tests/phase1/
"""
from lnst.Common.Parameters import Param
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import VlanDevice
from lnst.Devices import BridgeDevice
@@ -12,11 +12,11 @@ from lnst.Common.LnstError import LnstError
class VirtualBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth0 = DeviceReq(label="to_switch")
+ host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
host1.tap0 = DeviceReq(label="to_guest1")
host2 = HostReq()
- host2.eth0 = DeviceReq(label="to_switch")
+ host2.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
host2.tap0 = DeviceReq(label="to_guest2")
guest1 = HostReq()
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
index 6b390a3..3f633f2 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
@@ -4,7 +4,7 @@ Implements scenario similar to regression_tests/phase1/
"""
from lnst.Common.Parameters import Param
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import VlanDevice
from lnst.Devices import BridgeDevice
@@ -12,11 +12,11 @@ from lnst.Common.LnstError import LnstError
class VirtualBridgeVlanInHostRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth0 = DeviceReq(label="to_switch")
+ host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
host1.tap0 = DeviceReq(label="to_guest")
host2 = HostReq()
- host2.eth0 = DeviceReq(label="to_switch")
+ host2.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
guest1 = HostReq()
guest1.eth0 = DeviceReq(label="to_guest")
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
index ba8aa2a..0ea9e34 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
@@ -4,7 +4,7 @@ Implements scenario similar to regression_tests/phase1/
"""
from lnst.Common.Parameters import Param, IntParam, StrParam
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import VlanDevice
from lnst.Devices import BondDevice
@@ -13,14 +13,14 @@ from lnst.Common.LnstError import LnstError
class VirtualBridgeVlansOverBondRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth0 = DeviceReq(label="to_switch")
- host1.eth1 = DeviceReq(label="to_switch")
+ host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
+ host1.eth1 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
host1.tap0 = DeviceReq(label="to_guest1")
host1.tap1 = DeviceReq(label="to_guest2")
host2 = HostReq()
- host2.eth0 = DeviceReq(label="to_switch")
- host2.eth1 = DeviceReq(label="to_switch")
+ host2.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
+ host2.eth1 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
host2.tap0 = DeviceReq(label="to_guest3")
host2.tap1 = DeviceReq(label="to_guest4")
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
index da3bd81..78b93ce 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
@@ -5,7 +5,7 @@ Implements scenario similar to regression_tests/phase2/
"""
from lnst.Common.Parameters import Param
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import VlanDevice
from lnst.Devices import OvsBridgeDevice
@@ -13,11 +13,11 @@ from lnst.Common.LnstError import LnstError
class VirtualOvsBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth1 = DeviceReq(label="to_switch")
+ host1.eth1 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
host1.tap0 = DeviceReq(label="to_guest1")
host2 = HostReq()
- host2.eth1 = DeviceReq(label="to_switch")
+ host2.eth1 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
host2.tap0 = DeviceReq(label="to_guest2")
guest1 = HostReq()
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
index 84928d2..2e53168 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
@@ -4,7 +4,7 @@ Implements scenario similar to regression_tests/phase2/
"""
from lnst.Common.Parameters import Param
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import VlanDevice
from lnst.Devices import OvsBridgeDevice
@@ -12,11 +12,11 @@ from lnst.Common.LnstError import LnstError
class VirtualOvsBridgeVlanInGuestRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth0 = DeviceReq(label="to_switch")
+ host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
host1.tap0 = DeviceReq(label="to_guest")
host2 = HostReq()
- host2.eth0 = DeviceReq(label="to_switch")
+ host2.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
guest1 = HostReq()
guest1.eth0 = DeviceReq(label="to_guest")
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
index 6faf002..269ed42 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
@@ -5,18 +5,18 @@ Implements scenario similar to regression_tests/phase2/
"""
from lnst.Common.Parameters import Param
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import OvsBridgeDevice
from lnst.Common.LnstError import LnstError
class VirtualOvsBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth0 = DeviceReq(label="to_switch")
+ host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
host1.tap0 = DeviceReq(label="to_guest1")
host2 = HostReq()
- host2.eth0 = DeviceReq(label="to_switch")
+ host2.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
host2.tap0 = DeviceReq(label="to_guest2")
guest1 = HostReq()
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
index 8655a7a..c54fe8b 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
@@ -4,7 +4,7 @@ Implements scenario similar to regression_tests/phase2/
"""
from lnst.Common.Parameters import Param
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import VlanDevice
from lnst.Devices import OvsBridgeDevice
@@ -12,11 +12,11 @@ from lnst.Common.LnstError import LnstError
class VirtualOvsBridgeVlanInHostRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth0 = DeviceReq(label="to_switch")
+ host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
host1.tap0 = DeviceReq(label="to_guest")
host2 = HostReq()
- host2.eth0 = DeviceReq(label="to_switch")
+ host2.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
guest1 = HostReq()
guest1.eth0 = DeviceReq(label="to_guest")
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
index c359907..31ca914 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
@@ -6,21 +6,21 @@ virtual_ovs_bridge_2_vlans_over_active_backup_bond.py
"""
from lnst.Common.Parameters import Param, IntParam, StrParam
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import OvsBridgeDevice
from lnst.Common.LnstError import LnstError
class VirtualOvsBridgeVlansOverBondRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth0 = DeviceReq(label="to_switch")
- host1.eth1 = DeviceReq(label="to_switch")
+ host1.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
+ host1.eth1 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
host1.tap0 = DeviceReq(label="to_guest1")
host1.tap1 = DeviceReq(label="to_guest2")
host2 = HostReq()
- host2.eth0 = DeviceReq(label="to_switch")
- host2.eth1 = DeviceReq(label="to_switch")
+ host2.eth0 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
+ host2.eth1 = DeviceReq(label="to_switch",
driver=RecipeParam("driver"))
host2.tap0 = DeviceReq(label="to_guest3")
host2.tap1 = DeviceReq(label="to_guest4")
diff --git a/lnst/Recipes/ENRT/VlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VlansOverBondRecipe.py
index e8bb99f..b925a56 100644
--- a/lnst/Recipes/ENRT/VlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VlansOverBondRecipe.py
@@ -5,18 +5,18 @@ but 2 Vlans are used
"""
from lnst.Common.Parameters import Param, IntParam, StrParam
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import VlanDevice
from lnst.Devices import BondDevice
class VlansOverBondRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth0 = DeviceReq(label="net1")
- host1.eth1 = DeviceReq(label="net1")
+ host1.eth0 = DeviceReq(label="net1",
driver=RecipeParam("driver"))
+ host1.eth1 = DeviceReq(label="net1",
driver=RecipeParam("driver"))
host2 = HostReq()
- host2.eth0 = DeviceReq(label="net1")
+ host2.eth0 = DeviceReq(label="net1",
driver=RecipeParam("driver"))
offload_combinations = Param(default=(
dict(gro="on", gso="on", tso="on",
tx="on"),
diff --git a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
index e1ce6f9..b35ad5d 100644
--- a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
+++ b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
@@ -4,18 +4,18 @@ Implements scenario similar to regression_tests/phase2/
"""
from lnst.Common.Parameters import Param, IntParam, StrParam
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import VlanDevice
from lnst.Devices import TeamDevice
class VlansOverTeamRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth0 = DeviceReq(label="tnet")
- host1.eth1 = DeviceReq(label="tnet")
+ host1.eth0 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
+ host1.eth1 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
host2 = HostReq()
- host2.eth0 = DeviceReq(label="tnet")
+ host2.eth0 = DeviceReq(label="tnet",
driver=RecipeParam("driver"))
offload_combinations = Param(default=(
dict(gro="on", gso="on", tso="on",
tx="on"),
diff --git a/lnst/Recipes/ENRT/VlansRecipe.py b/lnst/Recipes/ENRT/VlansRecipe.py
index f025dba..104d1b2 100644
--- a/lnst/Recipes/ENRT/VlansRecipe.py
+++ b/lnst/Recipes/ENRT/VlansRecipe.py
@@ -4,16 +4,16 @@ Implements scenario similar to regression_tests/phase1/
"""
from lnst.Common.Parameters import Param
from lnst.Common.IpAddress import ipaddress
-from lnst.Controller import HostReq, DeviceReq
+from lnst.Controller import HostReq, DeviceReq, RecipeParam
from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe, EnrtConfiguration
from lnst.Devices import VlanDevice
class VlansRecipe(BaseEnrtRecipe):
host1 = HostReq()
- host1.eth0 = DeviceReq(label="net1")
+ host1.eth0 = DeviceReq(label="net1",
driver=RecipeParam("driver"))
host2 = HostReq()
- host2.eth0 = DeviceReq(label="net1")
+ host2.eth0 = DeviceReq(label="net1",
driver=RecipeParam("driver"))
offload_combinations = Param(default=(
dict(gro="on", gso="on", tso="on",
tx="on", rx="on"),
--
2.17.1