[PATCH-next 10/11] lnst.Recipes.ENRT: update names of guest devices

From: Christos Sfakianakis csfakian@redhat.com

Remove 'tap' names from guest machines (they are 'eth' from their point of view) in VirtualOvsBridge* recipes.

Signed-off-by: Christos Sfakianakis csfakian@redhat.com --- ...rtualOvsBridgeVlanInGuestMirroredRecipe.py | 16 ++++----- .../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 8 ++--- ...irtualOvsBridgeVlanInHostMirroredRecipe.py | 28 +++++++-------- .../ENRT/VirtualOvsBridgeVlanInHostRecipe.py | 14 ++++---- .../VirtualOvsBridgeVlansOverBondRecipe.py | 36 +++++++++---------- 5 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py index acb5922..c77e03a 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py @@ -20,10 +20,10 @@ class VirtualOvsBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe): host2.tap0 = DeviceReq(label="to_guest2")

guest1 = HostReq() - guest1.tap0 = DeviceReq(label="to_guest1") + guest1.eth0 = DeviceReq(label="to_guest1")

guest2 = HostReq() - guest2.tap0 = DeviceReq(label="to_guest2") + guest2.eth0 = DeviceReq(label="to_guest2")

offload_combinations = Param(default=( dict(gro="on", gso="on", tso="on", tx="on", rx="on"), @@ -51,11 +51,11 @@ class VirtualOvsBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe): else: m.br0.port_add(d)

- guest1.tap0.down() - guest1.vlan1 = VlanDevice(realdev=guest1.tap0, vlan_id=10) + guest1.eth0.down() + guest1.vlan1 = VlanDevice(realdev=guest1.eth0, vlan_id=10)

- guest2.tap0.down() - guest2.vlan1 = VlanDevice(realdev=guest2.tap0, vlan_id=10) + guest2.eth0.down() + guest2.vlan1 = VlanDevice(realdev=guest2.eth0, vlan_id=10)

#Due to limitations in the current EnrtConfiguration #class, a single vlan test pair is chosen @@ -83,9 +83,9 @@ class VirtualOvsBridgeVlanInGuestMirroredRecipe(BaseEnrtRecipe): host2.eth1.up() host2.tap0.up() host2.br0.up() - guest1.tap0.up() + guest1.eth0.up() guest1.vlan1.up() - guest2.tap0.up() + guest2.eth0.up() guest2.vlan1.up()

#TODO better service handling through HostAPI diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py index 041276e..a681355 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py @@ -18,7 +18,7 @@ class VirtualOvsBridgeVlanInGuestRecipe(BaseEnrtRecipe): host2.eth0 = DeviceReq(label="to_switch")

guest1 = HostReq() - guest1.tap0 = DeviceReq(label="to_guest") + guest1.eth0 = DeviceReq(label="to_guest")

offload_combinations = Param(default=( dict(gro="on", gso="on", tso="on", tx="on", rx="on"), @@ -39,8 +39,8 @@ class VirtualOvsBridgeVlanInGuestRecipe(BaseEnrtRecipe): host2.eth0.down() host2.vlan1 = VlanDevice(realdev=host2.eth0, vlan_id=10)

- guest1.tap0.down() - guest1.vlan1 = VlanDevice(realdev=guest1.tap0, vlan_id=10) + guest1.eth0.down() + guest1.vlan1 = VlanDevice(realdev=guest1.eth0, vlan_id=10)

#Due to limitations in the current EnrtConfiguration #class, a single vlan test pair is chosen @@ -66,7 +66,7 @@ class VirtualOvsBridgeVlanInGuestRecipe(BaseEnrtRecipe): host1.br0.up() host2.eth0.up() host2.vlan1.up() - guest1.tap0.up() + guest1.eth0.up() guest1.vlan1.up()

#TODO better service handling through HostAPI diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py index e5f90ad..7b640b8 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py @@ -20,10 +20,10 @@ class VirtualOvsBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe): host2.tap0 = DeviceReq(label="to_guest2")

guest1 = HostReq() - guest1.tap0 = DeviceReq(label="to_guest1") + guest1.eth0 = DeviceReq(label="to_guest1")

guest2 = HostReq() - guest2.tap0 = DeviceReq(label="to_guest2") + guest2.eth0 = DeviceReq(label="to_guest2")

offload_combinations = Param(default=( dict(gro="on", gso="on", tso="on", tx="on", rx="on"), @@ -47,29 +47,29 @@ class VirtualOvsBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe): host2.br0.port_add(host2.eth1) host2.br0.port_add(host2.tap0, tag="10")

- guest1.tap0.down() + guest1.eth0.down()

- guest2.tap0.down() + guest2.eth0.down()

#Due to limitations in the current EnrtConfiguration #class, a single vlan test pair is chosen configuration = EnrtConfiguration() - configuration.endpoint1 = guest1.tap0 - configuration.endpoint2 = guest2.tap0 + configuration.endpoint1 = guest1.eth0 + configuration.endpoint2 = guest2.eth0

if "mtu" in self.params: host1.br0.mtu = self.params.mtu host2.br0.mtu = self.params.mtu - guest1.tap0.mtu = self.params.mtu - guest2.tap0.mtu = self.params.mtu + guest1.eth0.mtu = self.params.mtu + guest2.eth0.mtu = self.params.mtu

net_addr_1 = "192.168.10" net_addr6_1 = "fc00:0:0:1"

- guest1.tap0.ip_add(ipaddress(net_addr_1 + ".3/24")) - guest1.tap0.ip_add(ipaddress(net_addr6_1 + "::3/64")) - guest2.tap0.ip_add(ipaddress(net_addr_1 + ".4/24")) - guest2.tap0.ip_add(ipaddress(net_addr6_1 + "::4/64")) + guest1.eth0.ip_add(ipaddress(net_addr_1 + ".3/24")) + guest1.eth0.ip_add(ipaddress(net_addr6_1 + "::3/64")) + guest2.eth0.ip_add(ipaddress(net_addr_1 + ".4/24")) + guest2.eth0.ip_add(ipaddress(net_addr6_1 + "::4/64"))

host1.eth1.up() host1.tap0.up() @@ -77,8 +77,8 @@ class VirtualOvsBridgeVlanInHostMirroredRecipe(BaseEnrtRecipe): host2.eth1.up() host2.tap0.up() host2.br0.up() - guest1.tap0.up() - guest2.tap0.up() + guest1.eth0.up() + guest2.eth0.up()

#TODO better service handling through HostAPI host1.run("service irqbalance stop") diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py index aadd304..9b3dd10 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py @@ -18,7 +18,7 @@ class VirtualOvsBridgeVlanInHostRecipe(BaseEnrtRecipe): host2.eth0 = DeviceReq(label="to_switch")

guest1 = HostReq() - guest1.tap0 = DeviceReq(label="to_guest") + guest1.eth0 = DeviceReq(label="to_guest")

offload_combinations = Param(default=( dict(gro="on", gso="on", tso="on", tx="on", rx="on"), @@ -39,33 +39,33 @@ class VirtualOvsBridgeVlanInHostRecipe(BaseEnrtRecipe): host2.eth0.down() host2.vlan1 = VlanDevice(realdev=host2.eth0, vlan_id="10")

- guest1.tap0.down() + guest1.eth0.down()

#Due to limitations in the current EnrtConfiguration #class, a single vlan test pair is chosen configuration = EnrtConfiguration() configuration.endpoint1 = host2.vlan1 - configuration.endpoint2 = guest1.tap0 + configuration.endpoint2 = guest1.eth0

if "mtu" in self.params: host1.br0.mtu = self.params.mtu host2.vlan1.mtu = self.params.mtu - guest1.tap0.mtu = self.params.mtu + guest1.eth0.mtu = self.params.mtu

net_addr_1 = "192.168.10" net_addr6_1 = "fc00:0:0:1"

host2.vlan1.ip_add(ipaddress(net_addr_1 + ".2/24")) host2.vlan1.ip_add(ipaddress(net_addr6_1 + "::2/64")) - guest1.tap0.ip_add(ipaddress(net_addr_1 + ".3/24")) - guest1.tap0.ip_add(ipaddress(net_addr6_1 + "::3/64")) + guest1.eth0.ip_add(ipaddress(net_addr_1 + ".3/24")) + guest1.eth0.ip_add(ipaddress(net_addr6_1 + "::3/64"))

host1.eth0.up() host1.tap0.up() host1.br0.up() host2.eth0.up() host2.vlan1.up() - guest1.tap0.up() + guest1.eth0.up()

#TODO better service handling through HostAPI host1.run("service irqbalance stop") diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py index 1719161..7595dbf 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py @@ -25,16 +25,16 @@ class VirtualOvsBridgeVlansOverBondRecipe(BaseEnrtRecipe): host2.tap1 = DeviceReq(label="to_guest4")

guest1 = HostReq() - guest1.tap0 = DeviceReq(label="to_guest1") + guest1.eth0 = DeviceReq(label="to_guest1")

guest2 = HostReq() - guest2.tap0 = DeviceReq(label="to_guest2") + guest2.eth0 = DeviceReq(label="to_guest2")

guest3 = HostReq() - guest3.tap0 = DeviceReq(label="to_guest3") + guest3.eth0 = DeviceReq(label="to_guest3")

guest4 = HostReq() - guest4.tap0 = DeviceReq(label="to_guest4") + guest4.eth0 = DeviceReq(label="to_guest4")

offload_combinations = Param(default=( dict(gro="on", gso="on", tso="on", tx="on"), @@ -71,27 +71,27 @@ class VirtualOvsBridgeVlansOverBondRecipe(BaseEnrtRecipe):

host2.br0.bond_add("bond_host2", (host2.eth1, host2.eth2), bond_mode=self.params.bonding_mode)

- guest1.tap0.down() + guest1.eth0.down()

- guest2.tap0.down() + guest2.eth0.down()

- guest3.tap0.down() + guest3.eth0.down()

- guest4.tap0.down() + guest4.eth0.down()

#Due to limitations in the current EnrtConfiguration #class, a single vlan test pair is chosen configuration = EnrtConfiguration() - configuration.endpoint1 = guest1.tap0 - configuration.endpoint2 = guest3.tap0 + configuration.endpoint1 = guest1.eth0 + configuration.endpoint2 = guest3.eth0

if "mtu" in self.params: host1.br0.mtu = self.params.mtu host2.br0.mtu = self.params.mtu - guest1.tap0.mtu = self.params.mtu - guest2.tap0.mtu = self.params.mtu - guest3.tap0.mtu = self.params.mtu - guest4.tap0.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_addr6_1 = "fc00:0:0:1" @@ -116,10 +116,10 @@ class VirtualOvsBridgeVlansOverBondRecipe(BaseEnrtRecipe): host2.tap0.up() host2.tap1.up() host2.br0.up() - guest1.tap0.up() - guest2.tap0.up() - guest3.tap0.up() - guest4.tap0.up() + guest1.eth0.up() + guest2.eth0.up() + guest3.eth0.up() + guest4.eth0.up()

#TODO better service handling through HostAPI host1.run("service irqbalance stop")