From: Christos Sfakianakis <csfakian(a)redhat.com>
Have the settings of a vlan device defined during creation
and avoid post-creation modifications. This seems to help with
avoiding underlying nl errors.
Signed-off-by: Christos Sfakianakis <csfakian(a)redhat.com>
---
.../VirtualBridgeVlanInGuestMirroredRecipe.py | 23 +++++----
.../ENRT/VirtualBridgeVlanInGuestRecipe.py | 21 ++++----
.../VirtualBridgeVlanInHostMirroredRecipe.py | 21 ++++----
.../ENRT/VirtualBridgeVlanInHostRecipe.py | 20 ++++----
.../ENRT/VirtualBridgeVlansOverBondRecipe.py | 48 +++++++++----------
...rtualOvsBridgeVlanInGuestMirroredRecipe.py | 23 +++++----
.../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 23 +++++----
...irtualOvsBridgeVlanInHostMirroredRecipe.py | 2 +-
.../ENRT/VirtualOvsBridgeVlanInHostRecipe.py | 19 ++++----
.../VirtualOvsBridgeVlansOverBondRecipe.py | 2 +-
lnst/Recipes/ENRT/VlansOverBondRecipe.py | 27 ++++++-----
lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 26 +++++-----
lnst/Recipes/ENRT/VlansRecipe.py | 29 ++++++-----
13 files changed, 156 insertions(+), 128 deletions(-)
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
index 4232e36..03a1d9a 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
@@ -48,17 +48,11 @@ class VirtualBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
host2.br0.slave_add(host2.tap0)
guest1.eth0.down()
- guest1.vlan0 = VlanDevice(realdev=guest1.eth0, vlan_id=10)
guest2.eth0.down()
- guest2.vlan0 = VlanDevice(realdev=guest2.eth0, vlan_id=10)
-
- #Due to limitations in the current EnrtConfiguration
- #class, a single vlan test pair is chosen
- configuration = EnrtConfiguration()
- configuration.endpoint1 = guest1.vlan0
- configuration.endpoint2 = guest2.vlan0
+ guest1_vlan_args0 = dict(realdev=guest1.eth0, vlan_id=10)
+ guest2_vlan_args0 = dict(realdev=guest2.eth0, vlan_id=10)
if "mtu" in self.params:
host1.eth0.mtu = self.params.mtu
host1.tap0.mtu = self.params.mtu
@@ -68,8 +62,17 @@ class VirtualBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
host2.br0.mtu = self.params.mtu
guest1.eth0.mtu = self.params.mtu
guest2.eth0.mtu = self.params.mtu
- guest1.vlan0.mtu = self.params.mtu
- guest2.vlan0.mtu = self.params.mtu
+ for vlan_args in (guest1_vlan_args0, guest2_vlan_args0):
+ vlan_args["mtu"] = self.params.mtu
+
+ guest1.vlan0 = VlanDevice(**guest1_vlan_args0)
+ guest2.vlan0 = VlanDevice(**guest2_vlan_args0)
+
+ #Due to limitations in the current EnrtConfiguration
+ #class, a single vlan test pair is chosen
+ configuration = EnrtConfiguration()
+ configuration.endpoint1 = guest1.vlan0
+ configuration.endpoint2 = guest2.vlan0
net_addr_1 = "192.168.10"
net_addr6_1 = "fc00:0:0:1"
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
index 4875db7..fc96ff1 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
@@ -38,24 +38,29 @@ class VirtualBridgeVlanInGuestRecipe(BaseEnrtRecipe):
host1.br0.slave_add(host1.tap0)
host2.eth0.down()
- host2.vlan0 = VlanDevice(realdev=host2.eth0, vlan_id=10)
guest1.eth0.down()
- guest1.vlan0 = VlanDevice(realdev=guest1.eth0, vlan_id=10)
- #Due to limitations in the current EnrtConfiguration
- #class, a single vlan test pair is chosen
- configuration = EnrtConfiguration()
- configuration.endpoint1 = guest1.vlan0
- configuration.endpoint2 = host2.vlan0
+ host2_vlan_args0 = dict(realdev=host2.eth0, vlan_id=10)
+ guest1_vlan_args0 = dict(realdev=guest1.eth0, vlan_id=10)
if "mtu" in self.params:
host1.eth0.mtu = self.params.mtu
host1.tap0.mtu = self.params.mtu
host1.br0.mtu = self.params.mtu
guest1.eth0.mtu = self.params.mtu
- guest1.vlan0.mtu = self.params.mtu
host2.eth0.mtu = self.params.mtu
+ for vlan_args in (host2_vlan_args0, guest1_vlan_args0):
+ vlan_args["mtu"] = self.params.mtu
+
+ host2.vlan0 = VlanDevice(**host2_vlan_args0)
+ guest1.vlan0 = VlanDevice(**guest1_vlan_args0)
+
+ #Due to limitations in the current EnrtConfiguration
+ #class, a single vlan test pair is chosen
+ configuration = EnrtConfiguration()
+ configuration.endpoint1 = guest1.vlan0
+ configuration.endpoint2 = host2.vlan0
net_addr_1 = "192.168.10"
net_addr6_1 = "fc00:0:0:1"
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
index 6e81279..ed4fb21 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
@@ -37,37 +37,38 @@ class VirtualBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe):
host1.eth0.down()
host1.tap0.down()
- host1.vlan0 = VlanDevice(realdev=host1.eth0, vlan_id=10)
host1.br0 = BridgeDevice()
- host1.br0.slave_add(host1.vlan0)
host1.br0.slave_add(host1.tap0)
host2.eth0.down()
host2.tap0.down()
- host2.vlan0 = VlanDevice(realdev=host2.eth0, vlan_id=10)
host2.br0 = BridgeDevice()
- host2.br0.slave_add(host2.vlan0)
host2.br0.slave_add(host2.tap0)
guest1.eth0.down()
guest2.eth0.down()
- configuration = EnrtConfiguration()
- configuration.endpoint1 = guest1.eth0
- configuration.endpoint2 = guest2.eth0
-
+ host1_vlan_args0 = dict(realdev=host1.eth0, vlan_id=10, master=host1.br0)
+ host2_vlan_args0 = dict(realdev=host2.eth0, vlan_id=10, master=host2.br0)
if "mtu" in self.params:
host1.eth0.mtu = self.params.mtu
host1.tap0.mtu = self.params.mtu
- host1.vlan0.mtu = self.params.mtu
host1.br0.mtu = self.params.mtu
host2.eth0.mtu = self.params.mtu
host2.tap0.mtu = self.params.mtu
- host2.vlan0.mtu = self.params.mtu
host2.br0.mtu = self.params.mtu
guest1.eth0.mtu = self.params.mtu
guest2.eth0.mtu = self.params.mtu
+ for vlan_args in (host1_vlan_args0, host2_vlan_args0):
+ vlan_args["mtu"] = self.params.mtu
+
+ host1.vlan0 = VlanDevice(**host1_vlan_args0)
+ host2.vlan0 = VlanDevice(**host2_vlan_args0)
+
+ configuration = EnrtConfiguration()
+ configuration.endpoint1 = guest1.eth0
+ configuration.endpoint2 = guest2.eth0
net_addr_1 = "192.168.10"
net_addr6_1 = "fc00:0:0:1"
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
index 6b390a3..2f3bcda 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
@@ -33,28 +33,30 @@ class VirtualBridgeVlanInHostRecipe(BaseEnrtRecipe):
host1.eth0.down()
host1.tap0.down()
- host1.vlan0 = VlanDevice(realdev=host1.eth0, vlan_id=10)
host1.br0 = BridgeDevice()
- host1.br0.slave_add(host1.vlan0)
host1.br0.slave_add(host1.tap0)
host2.eth0.down()
- host2.vlan0 = VlanDevice(realdev=host2.eth0, vlan_id=10)
guest1.eth0.down()
- configuration = EnrtConfiguration()
- configuration.endpoint1 = guest1.eth0
- configuration.endpoint2 = host2.vlan0
-
+ host1_vlan_args0 = dict(realdev=host1.eth0, vlan_id=10, master=host1.br0)
+ host2_vlan_args0 = dict(realdev=host2.eth0, vlan_id=10)
if "mtu" in self.params:
host1.eth0.mtu = self.params.mtu
host1.tap0.mtu = self.params.mtu
- host1.vlan0.mtu = self.params.mtu
host1.br0.mtu = self.params.mtu
host2.eth0.mtu = self.params.mtu
- host2.vlan0.mtu = self.params.mtu
guest1.eth0.mtu = self.params.mtu
+ for vlan_args in (host1_vlan_args0, host2_vlan_args0):
+ vlan_args["mtu"] = self.params.mtu
+
+ host1.vlan0 = VlanDevice(**host1_vlan_args0)
+ host2.vlan0 = VlanDevice(**host2_vlan_args0)
+
+ configuration = EnrtConfiguration()
+ configuration.endpoint1 = guest1.eth0
+ configuration.endpoint2 = host2.vlan0
net_addr_1 = "192.168.10"
net_addr6_1 = "fc00:0:0:1"
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
index ba8aa2a..55a5414 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
@@ -48,7 +48,7 @@ class VirtualBridgeVlansOverBondRecipe(BaseEnrtRecipe):
def test_wide_configuration(self):
host1, host2, guest1, guest2, guest3, guest4 = self.matched.host1,
self.matched.host2, self.matched.guest1, self.matched.guest2, self.matched.guest3,
self.matched.guest4
- for host, n in [(host1, 10), (host2, 10)]:
+ for host in [host1, host2]:
host.eth0.down()
host.eth1.down()
host.tap0.down()
@@ -56,44 +56,42 @@ class VirtualBridgeVlansOverBondRecipe(BaseEnrtRecipe):
host.bond0 = BondDevice(mode=self.params.bonding_mode,
miimon=self.params.miimon_value)
host.bond0.slave_add(host.eth0)
host.bond0.slave_add(host.eth1)
- host.vlan0 = VlanDevice(realdev=host.bond0, vlan_id=n)
- host.vlan1 = VlanDevice(realdev=host.bond0, vlan_id=2*n)
host.br0 = BridgeDevice()
- host.br0.slave_add(host.vlan0)
host.br0.slave_add(host.tap0)
host.br1 = BridgeDevice()
- host.br1.slave_add(host.vlan1)
host.br1.slave_add(host.tap1)
for guest in (guest1, guest2, guest3, guest4):
guest.eth0.down()
+ host1_vlan_args0 = dict(realdev=host1.bond0, vlan_id=10, master=host1.br0)
+ host1_vlan_args1 = dict(realdev=host1.bond0, vlan_id=20, master=host1.br1)
+ host2_vlan_args0 = dict(realdev=host2.bond0, vlan_id=10, master=host2.br0)
+ host2_vlan_args1 = dict(realdev=host2.bond0, vlan_id=20, master=host2.br1)
+ if "mtu" in self.params:
+ for host in [host1, host2]:
+ host1.bond0.mtu = self.params.mtu
+ host1.tap0.mtu = self.params.mtu
+ host1.tap1.mtu = self.params.mtu
+ host1.br0.mtu = self.params.mtu
+ host1.br1.mtu = self.params.mtu
+ for guest in [guest1, guest2, guest3, guest4]:
+ guest.eth0.mtu = self.params.mtu
+ for vlan_args in (host1_vlan_args0, host1_vlan_args1,
+ host2_vlan_args0, host2_vlan_args1):
+ vlan_args["mtu"] = self.params.mtu
+
+ host1.vlan0 = VlanDevice(**host1_vlan_args0)
+ host1.vlan1 = VlanDevice(**host1_vlan_args1)
+ host2.vlan0 = VlanDevice(**host2_vlan_args0)
+ host2.vlan1 = VlanDevice(**host2_vlan_args1)
+
#Due to limitations in the current EnrtConfiguration
#class, a single vlan test pair is chosen
configuration = EnrtConfiguration()
configuration.endpoint1 = guest1.eth0
configuration.endpoint2 = guest3.eth0
- if "mtu" in self.params:
- host1.bond0.mtu = self.params.mtu
- host1.tap0.mtu = self.params.mtu
- host1.tap1.mtu = self.params.mtu
- host1.vlan0.mtu = self.params.mtu
- host1.vlan1.mtu = self.params.mtu
- host1.br0.mtu = self.params.mtu
- host1.br1.mtu = self.params.mtu
- host2.bond0.mtu = self.params.mtu
- host2.tap0.mtu = self.params.mtu
- host2.tap1.mtu = self.params.mtu
- host2.vlan0.mtu = self.params.mtu
- host2.vlan1.mtu = self.params.mtu
- host2.br0.mtu = self.params.mtu
- host2.br1.mtu = self.params.mtu
- guest1.eth0.mtu = self.params.mtu
- guest2.eth0.mtu = self.params.mtu
- guest3.eth0.mtu = self.params.mtu
- guest4.eth0.mtu = self.params.mtu
-
net_addr_1 = "192.168.10"
net_addr_2 = "192.168.20"
net_addr6_1 = "fc00:0:0:1"
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
index da3bd81..5b7796e 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
@@ -53,17 +53,11 @@ class VirtualOvsBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
host.br0.port_add(dev)
guest1.eth0.down()
- guest1.vlan0 = VlanDevice(realdev=guest1.eth0, vlan_id=10)
guest2.eth0.down()
- guest2.vlan0 = VlanDevice(realdev=guest2.eth0, vlan_id=10)
-
- #Due to limitations in the current EnrtConfiguration
- #class, a single vlan test pair is chosen
- configuration = EnrtConfiguration()
- configuration.endpoint1 = guest1.vlan0
- configuration.endpoint2 = guest2.vlan0
+ guest1_vlan_args0 = dict(realdev=guest1.eth0, vlan_id=10)
+ guest2_vlan_args0 = dict(realdev=guest2.eth0, vlan_id=10)
if "mtu" in self.params:
host1.eth1.mtu = self.params.mtu
host1.tap0.mtu = self.params.mtu
@@ -72,9 +66,18 @@ class VirtualOvsBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
host2.tap0.mtu = self.params.mtu
host2.br0.mtu = self.params.mtu
guest1.eth0.mtu = self.params.mtu
- guest1.vlan0.mtu = self.params.mtu
guest2.eth0.mtu = self.params.mtu
- guest2.vlan0.mtu = self.params.mtu
+ for vlan_args in (guest1_vlan_args0, guest2_vlan_args0):
+ vlan_args["mtu"] = self.params.mtu
+
+ guest1.vlan0 = VlanDevice(**guest1_vlan_args0)
+ guest2.vlan0 = VlanDevice(**guest2_vlan_args0)
+
+ #Due to limitations in the current EnrtConfiguration
+ #class, a single vlan test pair is chosen
+ configuration = EnrtConfiguration()
+ configuration.endpoint1 = guest1.vlan0
+ configuration.endpoint2 = guest2.vlan0
net_addr_1 = "192.168.10"
net_addr6_1 = "fc00:0:0:1"
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
index 84928d2..0eb1cf9 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
@@ -38,25 +38,28 @@ class VirtualOvsBridgeVlanInGuestRecipe(BaseEnrtRecipe):
host1.br0.port_add(host1.tap0)
host2.eth0.down()
- host2.vlan0 = VlanDevice(realdev=host2.eth0, vlan_id=10)
guest1.eth0.down()
- guest1.vlan0 = VlanDevice(realdev=guest1.eth0, vlan_id=10)
-
- #Due to limitations in the current EnrtConfiguration
- #class, a single vlan test pair is chosen
- configuration = EnrtConfiguration()
- configuration.endpoint1 = guest1.vlan0
- configuration.endpoint2 = host2.vlan0
+ host2_vlan_args0 = dict(realdev=host2.eth0, vlan_id=10)
+ guest1_vlan_args0 = dict(realdev=guest1.eth0, vlan_id=10)
if "mtu" in self.params:
host1.eth0.mtu = self.params.mtu
host1.tap0.mtu = self.params.mtu
host1.br0.mtu = self.params.mtu
host2.eth0.mtu = self.params.mtu
- host2.vlan0.mtu = self.params.mtu
guest1.eth0.mtu = self.params.mtu
- guest1.vlan0.mtu = self.params.mtu
+ for vlan_args in (host2_vlan_args0, guest1_vlan_args0):
+ vlan_args["mtu"] = self.params.mtu
+
+ host2.vlan0 = VlanDevice(**host2_vlan_args0)
+ guest1.vlan0 = VlanDevice(**guest1_vlan_args0)
+
+ #Due to limitations in the current EnrtConfiguration
+ #class, a single vlan test pair is chosen
+ configuration = EnrtConfiguration()
+ configuration.endpoint1 = guest1.vlan0
+ configuration.endpoint2 = host2.vlan0
net_addr_1 = "192.168.10"
net_addr6_1 = "fc00:0:0:1"
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
index fcb5bf3..2b40357 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
@@ -52,7 +52,7 @@ class VirtualOvsBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe):
guest2.eth0.down()
#Due to limitations in the current EnrtConfiguration
- #class, a single vlan test pair is chosen
+ #class, a single test pair is chosen
configuration = EnrtConfiguration()
configuration.endpoint1 = guest1.eth0
configuration.endpoint2 = guest2.eth0
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
index 8655a7a..8cfbdf2 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
@@ -38,24 +38,27 @@ class VirtualOvsBridgeVlanInHostRecipe(BaseEnrtRecipe):
host1.br0.port_add(host1.tap0, tag="10")
host2.eth0.down()
- host2.vlan0 = VlanDevice(realdev=host2.eth0, vlan_id="10")
guest1.eth0.down()
- #Due to limitations in the current EnrtConfiguration
- #class, a single vlan test pair is chosen
- configuration = EnrtConfiguration()
- configuration.endpoint1 = host2.vlan0
- configuration.endpoint2 = guest1.eth0
-
+ host2_vlan_args0 = dict(realdev=host2.eth0, vlan_id=10)
if "mtu" in self.params:
host1.eth0.mtu = self.params.mtu
host1.tap0.mtu = self.params.mtu
host1.br0.mtu = self.params.mtu
host2.eth0.mtu = self.params.mtu
- host2.vlan0.mtu = self.params.mtu
guest1.eth0.mtu = self.params.mtu
+ host2_vlan_args0["mtu"] = self.params.mtu
+
+ host2.vlan0 = VlanDevice(**host2_vlan_args0)
+
+ #Due to limitations in the current EnrtConfiguration
+ #class, a single vlan test pair is chosen
+ configuration = EnrtConfiguration()
+ configuration.endpoint1 = host2.vlan0
+ configuration.endpoint2 = guest1.eth0
+
net_addr_1 = "192.168.10"
net_addr6_1 = "fc00:0:0:1"
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
index c359907..cc8e329 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
@@ -80,7 +80,7 @@ class VirtualOvsBridgeVlansOverBondRecipe(BaseEnrtRecipe):
guest4.eth0.down()
#Due to limitations in the current EnrtConfiguration
- #class, a single vlan test pair is chosen
+ #class, a single test pair is chosen
configuration = EnrtConfiguration()
configuration.endpoint1 = guest1.eth0
configuration.endpoint2 = guest3.eth0
diff --git a/lnst/Recipes/ENRT/VlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VlansOverBondRecipe.py
index e8bb99f..e5d9b67 100644
--- a/lnst/Recipes/ENRT/VlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VlansOverBondRecipe.py
@@ -35,11 +35,22 @@ class VlansOverBondRecipe(BaseEnrtRecipe):
host1.eth1.down()
host1.bond.slave_add(host1.eth0)
host1.bond.slave_add(host1.eth1)
- host1.vlan0 = VlanDevice(realdev=host1.bond, vlan_id=10)
- host1.vlan1 = VlanDevice(realdev=host1.bond, vlan_id=20)
- host2.vlan0 = VlanDevice(realdev=host2.eth0, vlan_id=10)
- host2.vlan1 = VlanDevice(realdev=host2.eth0, vlan_id=20)
+ host1_vlan_args0 = dict(realdev=host1.bond, vlan_id=10)
+ host1_vlan_args1 = dict(realdev=host1.bond, vlan_id=20)
+ host2_vlan_args0 = dict(realdev=host2.eth0, vlan_id=10)
+ host2_vlan_args1 = dict(realdev=host2.eth0, vlan_id=20)
+ if "mtu" in self.params:
+ host1.bond.mtu = self.params.mtu
+ host2.eth0.mtu = self.params.mtu
+ for vlan_args in (host1_vlan_args0, host1_vlan_args1,
+ host2_vlan_args0, host2_vlan_args1):
+ vlan_args["mtu"] = self.params.mtu
+
+ host1.vlan0 = VlanDevice(**host1_vlan_args0)
+ host1.vlan1 = VlanDevice(**host1_vlan_args1)
+ host2.vlan0 = VlanDevice(**host2_vlan_args0)
+ host2.vlan1 = VlanDevice(**host2_vlan_args1)
#Due to limitations in the current EnrtConfiguration
#class, a single vlan test pair is chosen
@@ -47,14 +58,6 @@ class VlansOverBondRecipe(BaseEnrtRecipe):
configuration.endpoint1 = host1.vlan0
configuration.endpoint2 = host2.vlan0
- if "mtu" in self.params:
- host1.bond.mtu = self.params.mtu
- host2.eth0.mtu = self.params.mtu
- host1.vlan0.mtu = self.params.mtu
- host1.vlan1.mtu = self.params.mtu
- host2.vlan0.mtu = self.params.mtu
- host2.vlan1.mtu = self.params.mtu
-
net_addr_1 = "192.168.10"
net_addr_2 = "192.168.20"
net_addr6_1 = "fc00:0:0:1"
diff --git a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
index e1ce6f9..181a397 100644
--- a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
+++ b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
@@ -35,11 +35,22 @@ class VlansOverTeamRecipe(BaseEnrtRecipe):
host1.team0 = TeamDevice()
host1.team0.slave_add(host1.eth0)
host1.team0.slave_add(host1.eth1)
- host1.vlan0 = VlanDevice(realdev=host1.team0, vlan_id=10)
- host1.vlan1 = VlanDevice(realdev=host1.team0, vlan_id=20)
- host2.vlan0 = VlanDevice(realdev=host2.eth0, vlan_id=10)
- host2.vlan1 = VlanDevice(realdev=host2.eth0, vlan_id=20)
+ host1_vlan_args0 = dict(realdev=host1.team0, vlan_id=10)
+ host1_vlan_args1 = dict(realdev=host1.team0, vlan_id=20)
+ host2_vlan_args0 = dict(realdev=host2.eth0, vlan_id=10)
+ host2_vlan_args1 = dict(realdev=host2.eth0, vlan_id=20)
+ if "mtu" in self.params:
+ host1.team0.mtu = self.params.mtu
+ host2.eth0.mtu = self.params.mtu
+ for vlan_args in (host1_vlan_args0, host1_vlan_args1,
+ host2_vlan_args0, host2_vlan_args1):
+ vlan_args["mtu"] = self.params.mtu
+
+ host1.vlan0 = VlanDevice(**host1_vlan_args0)
+ host1.vlan1 = VlanDevice(**host1_vlan_args1)
+ host2.vlan0 = VlanDevice(**host2_vlan_args0)
+ host2.vlan1 = VlanDevice(**host2_vlan_args1)
#Due to limitations in the current EnrtConfiguration
#class, a single vlan test pair is chosen
@@ -47,13 +58,6 @@ class VlansOverTeamRecipe(BaseEnrtRecipe):
configuration.endpoint1 = host1.vlan0
configuration.endpoint2 = host2.vlan0
- if "mtu" in self.params:
- for host in (host1, host2):
- host.vlan0.mtu = self.params.mtu
- host.vlan1.mtu = self.params.mtu
- host1.team0.mtu = self.params.mtu
- host2.eth0.mtu = self.params.mtu
-
net_addr_1 = "192.168.10"
net_addr_2 = "192.168.20"
net_addr6_1 = "fc00:0:0:1"
diff --git a/lnst/Recipes/ENRT/VlansRecipe.py b/lnst/Recipes/ENRT/VlansRecipe.py
index f025dba..f05a27c 100644
--- a/lnst/Recipes/ENRT/VlansRecipe.py
+++ b/lnst/Recipes/ENRT/VlansRecipe.py
@@ -26,12 +26,23 @@ class VlansRecipe(BaseEnrtRecipe):
host1, host2 = self.matched.host1, self.matched.host2
host1.eth0.down()
- host1.vlan0 = VlanDevice(realdev=host1.eth0, vlan_id=10)
- host1.vlan1 = VlanDevice(realdev=host1.eth0, vlan_id=20)
-
host2.eth0.down()
- host2.vlan0 = VlanDevice(realdev=host2.eth0, vlan_id=10)
- host2.vlan1 = VlanDevice(realdev=host2.eth0, vlan_id=20)
+
+ host1_vlan_args0 = dict(realdev=host1.eth0, vlan_id=10)
+ host1_vlan_args1 = dict(realdev=host1.eth0, vlan_id=20)
+ host2_vlan_args0 = dict(realdev=host2.eth0, vlan_id=10)
+ host2_vlan_args1 = dict(realdev=host2.eth0, vlan_id=20)
+ if "mtu" in self.params:
+ host1.eth0.mtu = self.params.mtu
+ host2.eth0.mtu = self.params.mtu
+ for vlan_args in (host1_vlan_args0, host1_vlan_args1,
+ host2_vlan_args0, host2_vlan_args1):
+ vlan_args["mtu"] = self.params.mtu
+
+ host1.vlan0 = VlanDevice(**host1_vlan_args0)
+ host1.vlan1 = VlanDevice(**host1_vlan_args1)
+ host2.vlan0 = VlanDevice(**host2_vlan_args0)
+ host2.vlan1 = VlanDevice(**host2_vlan_args1)
#Due to limitations in the current EnrtConfiguration
#class, a single vlan test pair is chosen
@@ -39,14 +50,6 @@ class VlansRecipe(BaseEnrtRecipe):
configuration.endpoint1 = host1.vlan0
configuration.endpoint2 = host2.vlan0
- if "mtu" in self.params:
- host1.eth0.mtu = self.params.mtu
- host2.eth0.mtu = self.params.mtu
- host1.vlan0.mtu = self.params.mtu
- host1.vlan1.mtu = self.params.mtu
- host2.vlan0.mtu = self.params.mtu
- host2.vlan1.mtu = self.params.mtu
-
net_addr_1 = "192.168.10"
net_addr_2 = "192.168.20"
net_addr6_1 = "fc00:0:0:1"
--
2.17.1