Signed-off-by: Jiri Prochazka jprochaz@redhat.com
diff --git a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_round_robin_bond.README b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_round_robin_bond.README deleted file mode 100644 index 7048b8c..0000000 --- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_round_robin_bond.README +++ /dev/null @@ -1,76 +0,0 @@ -Topology: - - switch - +--------+ - | | - +-------------------------+ +--------------------------+ - | | | | - | +---------------+ +----------------+ | - | | | | | | - | | +--------+ | | - | | | | - | | | | - +--+-+ +--+-+ +-+--+ +-+--+ -+----+eth1+----+eth2+----+ +----+eth1+----+eth2+----+ -| +-+--+ +--+-+ | | +-+--+ +--+-+ | -| +--++ ++--+ | | +--++ ++--+ | -| | | | | | | | -| | | | | | | | -| +-+--+-+ | | +-+--+-+ | -| | bond | | | | bond | | -| VLAN10 +-+--+-+ VLAN20 | | VLAN10 +-+--+-+ VLAN20 | -| +---+-+ +-+---+ | | +---+-+ +-+---+ | -| | | | | | | | -| +-+-+ +-+-+ | | +-+-+ +-+-+ | -| |br0| host1 |br1| | | |br0| host2 |br1| | -| +-+-+ +-+-+ | | +-+-+ +-+-+ | -| | | | | | | | -| | | | | | | | -| | | | | | | | -| +-+-+ +-+-+ | | +-+-+ +-+-+ | -+--+tap+----------+tap+--+ +--+tap+----------+tap+--+ - +-+-+ +-+-+ +-+-+ +-+-+ - | | | | - +-+-+ +-+-+ +-+-+ +-+-+ -+--+eth+--+ +--+eth+--+ +--+eth+--+ +--+eth+--+ -| +---+ | | +---+ | | +---+ | | +---+ | -| | | | | | | | -| guest1 | | guest2 | | guest3 | | guest4 | -| | | | | | | | -| | | | | | | | -+---------+ +---------+ +---------+ +---------+ - -Number of hosts: 4 -Host #1 description: - Two ethernet devices - Two tap devices - One bond in round-robin mode, bonding ethernet devices - Two VLANs over bond device - Two bridge devices, bridging VLAN and tap devices - Host for guest1 and guest2 virtual machines -Host #2 description: - Two ethernet devices - Two tap devices - One bond in round-robin mode, bonding ethernet devices - Two VLANs over bond device - Two bridge devices, bridging VLAN and tap devices - Host for guest3 and guest4 virtual machines -Guest #1 description: - One ethernet device -Guest #2 description: - One ethernet device -Guest #3 description: - One ethernet device -Guest #4 description: - One ethernet device -Test name: - virtual_bridge_2_vlans_over_bond.py -Test description: - Ping: - + count: 100 - + interval: 0.1s - + between guests in same VLANs - Netperf: - + duration: 5 - + TCP_STREAM and UDP_STREAM - + between guests in same VLANs diff --git a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_round_robin_bond.xml b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_round_robin_bond.xml deleted file mode 100644 index e914636..0000000 --- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_round_robin_bond.xml +++ /dev/null @@ -1,153 +0,0 @@ -<lnstrecipe> - <network> - <host id="host1"> - <interfaces> - <eth id="nic1" label="to_switch" /> - <eth id="nic2" label="to_switch" /> - <eth id="tap1" label="to_guest1" /> - <eth id="tap2" label="to_guest2" /> - <bond id="bond"> - <options> - <option name="mode" value="balance-rr" /> - <option name="miimon" value="100" /> - </options> - <slaves> - <slave id="nic1" /> - <slave id="nic2" /> - </slaves> - <addresses> - <address>1.2.3.4/24</address> - </addresses> - </bond> - <vlan id="vlan10"> - <options> - <option name="vlan_tci" value="10" /> - </options> - <slaves> - <slave id="bond" /> - </slaves> - </vlan> - <vlan id="vlan20"> - <options> - <option name="vlan_tci" value="20" /> - </options> - <slaves> - <slave id="bond" /> - </slaves> - </vlan> - <bridge id="br1"> - <slaves> - <slave id="tap1" /> - <slave id="vlan10" /> - </slaves> - <addresses> - <address>192.168.10.10/24</address> - </addresses> - </bridge> - <bridge id="br2"> - <slaves> - <slave id="tap2" /> - <slave id="vlan20" /> - </slaves> - <addresses> - <address>192.168.20.10/24</address> - </addresses> - </bridge> - </interfaces> - </host> - <host id="guest1"> - <interfaces> - <eth id="guestnic" label="to_guest1"> - <addresses> - <address>192.168.10.100/24</address> - </addresses> - </eth> - </interfaces> - </host> - <host id="guest2"> - <interfaces> - <eth id="guestnic" label="to_guest2"> - <addresses> - <address>192.168.20.100/24</address> - </addresses> - </eth> - </interfaces> - </host> - - <host id="host2"> - <interfaces> - <eth id="nic1" label="to_switch"/> - <eth id="nic2" label="to_switch"/> - <eth id="tap1" label="to_guest3"/> - <eth id="tap2" label="to_guest4"/> - <bond id="bond"> - <options> - <option name="mode" value="balance-rr" /> - <option name="miimon" value="100" /> - </options> - <slaves> - <slave id="nic1" /> - <slave id="nic2" /> - </slaves> - <addresses> - <address>1.2.3.4/24</address> - </addresses> - </bond> - <vlan id="vlan10"> - <options> - <option name="vlan_tci" value="10" /> - </options> - <slaves> - <slave id="bond" /> - </slaves> - </vlan> - <vlan id="vlan20"> - <options> - <option name="vlan_tci" value="20" /> - </options> - <slaves> - <slave id="bond" /> - </slaves> - </vlan> - <bridge id="br1"> - <slaves> - <slave id="vlan10"/> - <slave id="tap1"/> - </slaves> - <addresses> - <address>192.168.10.11/24</address> - </addresses> - </bridge> - <bridge id="br2"> - <slaves> - <slave id="vlan20"/> - <slave id="tap2"/> - </slaves> - <addresses> - <address>192.168.20.11/24</address> - </addresses> - </bridge> - </interfaces> - </host> - <host id="guest3"> - <interfaces> - <eth id="guestnic" label="to_guest3"> - <addresses> - <address>192.168.10.101/24</address> - </addresses> - </eth> - </interfaces> - </host> - <host id="guest4"> - <interfaces> - <eth id="guestnic" label="to_guest4"> - <addresses> - <address>192.168.20.101/24</address> - </addresses> - </eth> - </interfaces> - </host> - </network> - - <task python="virtual_bridge_2_vlans_over_bond.py" /> -</lnstrecipe>
lnst-developers@lists.fedorahosted.org