From: Christos Sfakianakis <csfakian(a)redhat.com>
Rename all devices that have "to_guest" label to tap[0-9] instead
of eth[0-9] to avoid confusion.
v2: Remove 'tap' names from guest machines (they are 'eth'
from their point of view)
Signed-off-by: Christos Sfakianakis <csfakian(a)redhat.com>
---
.../VirtualBridgeVlanInGuestMirroredRecipe.py | 16 ++++++++--------
.../ENRT/VirtualBridgeVlanInGuestRecipe.py | 8 ++++----
.../VirtualBridgeVlanInHostMirroredRecipe.py | 16 ++++++++--------
.../ENRT/VirtualBridgeVlanInHostRecipe.py | 8 ++++----
.../ENRT/VirtualBridgeVlansOverBondRecipe.py | 8 ++++----
5 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
index d349d5b..84fb0ea 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py
@@ -12,11 +12,11 @@ from lnst.Devices import BridgeDevice
class VirtualBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
host1 = HostReq()
host1.eth0 = DeviceReq(label="to_switch")
- host1.eth1 = DeviceReq(label="to_guest1")
+ host1.tap0 = DeviceReq(label="to_guest1")
host2 = HostReq()
host2.eth0 = DeviceReq(label="to_switch")
- host2.eth1 = DeviceReq(label="to_guest2")
+ host2.tap0 = DeviceReq(label="to_guest2")
guest1 = HostReq()
guest1.eth0 = DeviceReq(label="to_guest1")
@@ -35,16 +35,16 @@ class VirtualBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
host1, host2, guest1, guest2 = self.matched.host1, self.matched.host2,
self.matched.guest1, self.matched.guest2
host1.eth0.down()
- host1.eth1.down()
+ host1.tap0.down()
host1.br0 = BridgeDevice()
host1.br0.slave_add(host1.eth0)
- host1.br0.slave_add(host1.eth1)
+ host1.br0.slave_add(host1.tap0)
host2.eth0.down()
- host2.eth1.down()
+ host2.tap0.down()
host2.br0 = BridgeDevice()
host2.br0.slave_add(host2.eth0)
- host2.br0.slave_add(host2.eth1)
+ host2.br0.slave_add(host2.tap0)
guest1.eth0.down()
guest1.vlan1 = VlanDevice(realdev=guest1.eth0, vlan_id=10)
@@ -75,10 +75,10 @@ class VirtualBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe):
guest2.vlan1.ip_add(ipaddress(net_addr6_1 + "::4/64"))
host1.eth0.up()
- host1.eth1.up()
+ host1.tap0.up()
host1.br0.up()
host2.eth0.up()
- host2.eth1.up()
+ host2.tap0.up()
host2.br0.up()
guest1.eth0.up()
guest1.vlan1.up()
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
index 4a90a1b..e78d420 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py
@@ -12,7 +12,7 @@ from lnst.Devices import BridgeDevice
class VirtualBridgeVlanInGuestRecipe(BaseEnrtRecipe):
host1 = HostReq()
host1.eth0 = DeviceReq(label="to_switch")
- host1.eth1 = DeviceReq(label="to_guest")
+ host1.tap0 = DeviceReq(label="to_guest")
host2 = HostReq()
host2.eth0 = DeviceReq(label="to_switch")
@@ -31,10 +31,10 @@ class VirtualBridgeVlanInGuestRecipe(BaseEnrtRecipe):
host1, host2, guest1 = self.matched.host1, self.matched.host2,
self.matched.guest1
host1.eth0.down()
- host1.eth1.down()
+ host1.tap0.down()
host1.br0 = BridgeDevice()
host1.br0.slave_add(host1.eth0)
- host1.br0.slave_add(host1.eth1)
+ host1.br0.slave_add(host1.tap0)
host2.eth0.down()
host2.vlan1 = VlanDevice(realdev=host2.eth0, vlan_id=10)
@@ -63,7 +63,7 @@ class VirtualBridgeVlanInGuestRecipe(BaseEnrtRecipe):
guest1.vlan1.ip_add(ipaddress(net_addr6_1 + "::3/64"))
host1.eth0.up()
- host1.eth1.up()
+ host1.tap0.up()
host1.br0.up()
host2.eth0.up()
host2.vlan1.up()
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
index e85b54c..f1c42e6 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py
@@ -12,11 +12,11 @@ from lnst.Devices import BridgeDevice
class VirtualBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe):
host1 = HostReq()
host1.eth0 = DeviceReq(label="to_switch")
- host1.eth1 = DeviceReq(label="to_guest1")
+ host1.tap0 = DeviceReq(label="to_guest1")
host2 = HostReq()
host2.eth0 = DeviceReq(label="to_switch")
- host2.eth1 = DeviceReq(label="to_guest2")
+ host2.tap0 = DeviceReq(label="to_guest2")
guest1 = HostReq()
guest1.eth0 = DeviceReq(label="to_guest1")
@@ -35,18 +35,18 @@ class VirtualBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe):
host1, host2, guest1, guest2 = self.matched.host1, self.matched.host2,
self.matched.guest1, self.matched.guest2
host1.eth0.down()
- host1.eth1.down()
+ host1.tap0.down()
host1.vlan1 = VlanDevice(realdev=host1.eth0, vlan_id=10)
host1.br0 = BridgeDevice()
host1.br0.slave_add(host1.vlan1)
- host1.br0.slave_add(host1.eth1)
+ host1.br0.slave_add(host1.tap0)
host2.eth0.down()
- host2.eth1.down()
+ host2.tap0.down()
host2.vlan1 = VlanDevice(realdev=host2.eth0, vlan_id=10)
host2.br0 = BridgeDevice()
host2.br0.slave_add(host2.vlan1)
- host2.br0.slave_add(host2.eth1)
+ host2.br0.slave_add(host2.tap0)
guest1.eth0.down()
@@ -73,11 +73,11 @@ class VirtualBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe):
guest2.eth0.ip_add(ipaddress(net_addr6_1 + "::4/64"))
host1.eth0.up()
- host1.eth1.up()
+ host1.tap0.up()
host1.vlan1.up()
host1.br0.up()
host2.eth0.up()
- host2.eth1.up()
+ host2.tap0.up()
host2.vlan1.up()
host2.br0.up()
guest1.eth0.up()
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
index 1382b2b..466a2a2 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py
@@ -12,7 +12,7 @@ from lnst.Devices import BridgeDevice
class VirtualBridgeVlanInHostRecipe(BaseEnrtRecipe):
host1 = HostReq()
host1.eth0 = DeviceReq(label="to_switch")
- host1.eth1 = DeviceReq(label="to_guest")
+ host1.tap0 = DeviceReq(label="to_guest")
host2 = HostReq()
host2.eth0 = DeviceReq(label="to_switch")
@@ -31,11 +31,11 @@ class VirtualBridgeVlanInHostRecipe(BaseEnrtRecipe):
host1, host2, guest1 = self.matched.host1, self.matched.host2,
self.matched.guest1
host1.eth0.down()
- host1.eth1.down()
+ host1.tap0.down()
host1.vlan1 = VlanDevice(realdev=host1.eth0, vlan_id=10)
host1.br0 = BridgeDevice()
host1.br0.slave_add(host1.vlan1)
- host1.br0.slave_add(host1.eth1)
+ host1.br0.slave_add(host1.tap0)
host2.eth0.down()
host2.vlan1 = VlanDevice(realdev=host2.eth0, vlan_id=10)
@@ -61,7 +61,7 @@ class VirtualBridgeVlanInHostRecipe(BaseEnrtRecipe):
guest1.eth0.ip_add(ipaddress(net_addr6_1 + "::3/64"))
host1.eth0.up()
- host1.eth1.up()
+ host1.tap0.up()
host1.vlan1.up()
host1.br0.up()
host2.eth0.up()
diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
index 587bd95..5917b88 100644
--- a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
+++ b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py
@@ -14,14 +14,14 @@ class VirtualBridgeVlansOverBondRecipe(BaseEnrtRecipe):
host1 = HostReq()
host1.eth0 = DeviceReq(label="to_switch")
host1.eth1 = DeviceReq(label="to_switch")
- host1.eth2 = DeviceReq(label="to_guest1")
- host1.eth3 = DeviceReq(label="to_guest2")
+ 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.eth2 = DeviceReq(label="to_guest3")
- host2.eth3 = DeviceReq(label="to_guest4")
+ host2.tap0 = DeviceReq(label="to_guest3")
+ host2.tap1 = DeviceReq(label="to_guest4")
guest1 = HostReq()
guest1.eth0 = DeviceReq(label="to_guest1")
--
2.17.1