From: Christos Sfakianakis <csfakian(a)redhat.com>
Adjust mtu checks in recipes so that they follow the old
scheme precisely.
Signed-off-by: Christos Sfakianakis <csfakian(a)redhat.com>
---
lnst/Recipes/ENRT/TeamVsBondRecipe.py | 2 +-
.../ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py | 6 ++++++
lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py | 5 ++++-
.../ENRT/VirtualBridgeVlanInHostMirroredRecipe.py | 6 ++++++
lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py | 4 ++++
.../Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py | 12 +++++++++++-
.../VirtualOvsBridgeVlanInGuestMirroredRecipe.py | 6 ++++++
.../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 4 ++++
.../ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py | 4 ++++
.../Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py | 3 +++
.../ENRT/VirtualOvsBridgeVlansOverBondRecipe.py | 8 ++++++++
lnst/Recipes/ENRT/VlansOverBondRecipe.py | 4 ++++
lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 1 +
lnst/Recipes/ENRT/VlansRecipe.py | 4 ++++
14 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/lnst/Recipes/ENRT/TeamVsBondRecipe.py
b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
index 597579b..fe39d13 100644
--- a/lnst/Recipes/ENRT/TeamVsBondRecipe.py
+++ b/lnst/Recipes/ENRT/TeamVsBondRecipe.py
@@ -53,7 +53,7 @@ class TeamVsBondRecipe(BaseEnrtRecipe):
if "mtu" in self.params:
m1.team.mtu = self.params.mtu
- m2.team.mtu = self.params.mtu
+ m2.bond.mtu = self.params.mtu
net_addr_1 = "192.168.10"
net_addr6_1 = "fc00:0:0:1"
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
index 84fb0ea..2fd74ae 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
@@ -59,8 +59,14 @@ class VirtualBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
configuration.endpoint2 = guest2.vlan1
if "mtu" in self.params:
+ host1.eth0.mtu = self.params.mtu
+ host1.tap0.mtu = self.params.mtu
+ host2.eth0.mtu = self.params.mtu
+ host2.tap0.mtu = self.params.mtu
host1.br0.mtu = self.params.mtu
host2.br0.mtu = self.params.mtu
+ guest1.eth0.mtu = self.params.mtu
+ guest2.eth0.mtu = self.params.mtu
guest1.vlan1.mtu = self.params.mtu
guest2.vlan1.mtu = self.params.mtu
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
index e78d420..8bb7582 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
@@ -49,9 +49,12 @@ class VirtualBridgeVlanInGuestRecipe(BaseEnrtRecipe):
configuration.endpoint2 = host2.vlan1
if "mtu" in self.params:
+ host1.eth0.mtu = self.params.mtu
+ host1.tap0.mtu = self.params.mtu
host1.br0.mtu = self.params.mtu
- host2.vlan1.mtu = self.params.mtu
+ guest1.eth0.mtu = self.params.mtu
guest1.vlan1.mtu = self.params.mtu
+ host2.eth0.mtu = self.params.mtu
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 f1c42e6..1a7c4d0 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
@@ -57,7 +57,13 @@ class VirtualBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe):
configuration.endpoint2 = guest2.eth0
if "mtu" in self.params:
+ host1.eth0.mtu = self.params.mtu
+ host1.tap0.mtu = self.params.mtu
+ host1.vlan1.mtu = self.params.mtu
host1.br0.mtu = self.params.mtu
+ host2.eth0.mtu = self.params.mtu
+ host2.tap0.mtu = self.params.mtu
+ host2.vlan1.mtu = self.params.mtu
host2.br0.mtu = self.params.mtu
guest1.eth0.mtu = self.params.mtu
guest2.eth0.mtu = self.params.mtu
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
index 466a2a2..2a2f905 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
@@ -47,7 +47,11 @@ class VirtualBridgeVlanInHostRecipe(BaseEnrtRecipe):
configuration.endpoint2 = host2.vlan1
if "mtu" in self.params:
+ host1.eth0.mtu = self.params.mtu
+ host1.tap0.mtu = self.params.mtu
+ host1.vlan1.mtu = self.params.mtu
host1.br0.mtu = self.params.mtu
+ host2.eth0.mtu = self.params.mtu
host2.vlan1.mtu = self.params.mtu
guest1.eth0.mtu = self.params.mtu
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
index 162e3c1..e5d0b9b 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
@@ -74,10 +74,20 @@ class VirtualBridgeVlansOverBondRecipe(BaseEnrtRecipe):
configuration.endpoint2 = guest3.eth0
if "mtu" in self.params:
+ host1.bond.mtu = self.params.mtu
+ host1.tap0.mtu = self.params.mtu
+ host1.tap1.mtu = self.params.mtu
+ host1.vlan1.mtu = self.params.mtu
+ host1.vlan2.mtu = self.params.mtu
host1.br0.mtu = self.params.mtu
host1.br1.mtu = self.params.mtu
+ host2.bond.mtu = self.params.mtu
+ host2.tap0.mtu = self.params.mtu
+ host2.tap1.mtu = self.params.mtu
+ host2.vlan1.mtu = self.params.mtu
+ host2.vlan2.mtu = self.params.mtu
host2.br0.mtu = self.params.mtu
- host1.br1.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
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
index c77e03a..f0041fc 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py
@@ -64,9 +64,15 @@ class VirtualOvsBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
configuration.endpoint2 = guest2.vlan1
if "mtu" in self.params:
+ host1.eth1.mtu = self.params.mtu
+ host1.tap0.mtu = self.params.mtu
host1.br0.mtu = self.params.mtu
+ host2.eth1.mtu = self.params.mtu
+ host2.tap0.mtu = self.params.mtu
host2.br0.mtu = self.params.mtu
+ guest1.eth0.mtu = self.params.mtu
guest1.vlan1.mtu = self.params.mtu
+ guest2.eth0.mtu = self.params.mtu
guest2.vlan1.mtu = self.params.mtu
net_addr_1 = "192.168.10"
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
index a681355..df44ae2 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py
@@ -49,8 +49,12 @@ class VirtualOvsBridgeVlanInGuestRecipe(BaseEnrtRecipe):
configuration.endpoint2 = host2.vlan1
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.vlan1.mtu = self.params.mtu
+ guest1.eth0.mtu = self.params.mtu
guest1.vlan1.mtu = self.params.mtu
net_addr_1 = "192.168.10"
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
index 7b640b8..58d2a9b 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py
@@ -58,7 +58,11 @@ class VirtualOvsBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe):
configuration.endpoint2 = guest2.eth0
if "mtu" in self.params:
+ host1.eth1.mtu = self.params.mtu
+ host1.tap0.mtu = self.params.mtu
host1.br0.mtu = self.params.mtu
+ host2.eth1.mtu = self.params.mtu
+ host2.tap0.mtu = self.params.mtu
host2.br0.mtu = self.params.mtu
guest1.eth0.mtu = self.params.mtu
guest2.eth0.mtu = self.params.mtu
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
index 9b3dd10..64830bd 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py
@@ -48,7 +48,10 @@ class VirtualOvsBridgeVlanInHostRecipe(BaseEnrtRecipe):
configuration.endpoint2 = guest1.eth0
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.vlan1.mtu = self.params.mtu
guest1.eth0.mtu = self.params.mtu
diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
index 7595dbf..c9c5413 100644
--- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py
@@ -86,7 +86,15 @@ class VirtualOvsBridgeVlansOverBondRecipe(BaseEnrtRecipe):
configuration.endpoint2 = guest3.eth0
if "mtu" in self.params:
+ host1.eth1.mtu = self.params.mtu
+ host1.eth2.mtu = self.params.mtu
+ host1.tap0.mtu = self.params.mtu
+ host1.tap1.mtu = self.params.mtu
host1.br0.mtu = self.params.mtu
+ host2.eth1.mtu = self.params.mtu
+ host2.eth2.mtu = self.params.mtu
+ host2.tap0.mtu = self.params.mtu
+ host2.tap1.mtu = self.params.mtu
host2.br0.mtu = self.params.mtu
guest1.eth0.mtu = self.params.mtu
guest2.eth0.mtu = self.params.mtu
diff --git a/lnst/Recipes/ENRT/VlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VlansOverBondRecipe.py
index 9104423..2720bcf 100644
--- a/lnst/Recipes/ENRT/VlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VlansOverBondRecipe.py
@@ -50,6 +50,10 @@ class VlansOverBondRecipe(BaseEnrtRecipe):
if "mtu" in self.params:
m1.bond.mtu = self.params.mtu
m2.eth0.mtu = self.params.mtu
+ m1.vlan1.mtu = self.params.mtu
+ m1.vlan2.mtu = self.params.mtu
+ m2.vlan1.mtu = self.params.mtu
+ m2.vlan2.mtu = self.params.mtu
net_addr_1 = "192.168.10"
net_addr_2 = "192.168.20"
diff --git a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
index 2e929b8..0e93d31 100644
--- a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
+++ b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py
@@ -52,6 +52,7 @@ class VlansOverTeamRecipe(BaseEnrtRecipe):
m.vlan1.mtu = self.params.mtu
m.vlan2.mtu = self.params.mtu
m1.team.mtu = self.params.mtu
+ m2.eth1.mtu = self.params.mtu
net_addr_1 = "192.168.10"
net_addr_2 = "192.168.20"
diff --git a/lnst/Recipes/ENRT/VlansRecipe.py b/lnst/Recipes/ENRT/VlansRecipe.py
index 96e5933..3eab6de 100644
--- a/lnst/Recipes/ENRT/VlansRecipe.py
+++ b/lnst/Recipes/ENRT/VlansRecipe.py
@@ -42,6 +42,10 @@ class VlansRecipe(BaseEnrtRecipe):
if "mtu" in self.params:
m1.eth0.mtu = self.params.mtu
m2.eth0.mtu = self.params.mtu
+ m1.vlan1.mtu = self.params.mtu
+ m1.vlan2.mtu = self.params.mtu
+ m2.vlan1.mtu = self.params.mtu
+ m2.vlan2.mtu = self.params.mtu
net_addr_1 = "192.168.10"
net_addr_2 = "192.168.20"
--
2.17.1
_______________________________________________
LNST-developers mailing list -- lnst-developers(a)lists.fedorahosted.org
To unsubscribe send an email to lnst-developers-leave(a)lists.fedorahosted.org
Fedora Code of Conduct:
https://getfedora.org/code-of-conduct.html
List Guidelines:
https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedorahosted.org/archives/list/lnst-developers@lists.fedora...