Tests renamed to avoid confusion with team tests from phase2. Now bond tests have _bond
suffix, and team tests will have _team suffix
Signed-off-by: Jiri Prochazka <jprochaz(a)redhat.com>
diff --git a/recipes/regression_tests/phase1/3_vlans_over_active_backup.README
b/recipes/regression_tests/phase1/3_vlans_over_active_backup.README
deleted file mode 100644
index e20fcb0..0000000
--- a/recipes/regression_tests/phase1/3_vlans_over_active_backup.README
+++ /dev/null
@@ -1,54 +0,0 @@
-Topology:
-
- switch
- VLAN10 +------+ VLAN10
- +-------------------+ | | +-------------------+
- | VLAN20 | | | | VLAN20 |
- | +-------------------+ +-------------------+ |
- | | VLAN30 | | | | VLAN30 | |
- | | +-----------+ | | +-----------+ | |
- | | | +------+ | | |
- | | | | | |
- +-------+ +-------+
- | |
- | |
- | |
- +----+---+ +----+---+
- | BOND | | BOND |
- +---++---+ +---++---+
- || ||
- +--++--+ +--++--+
- | | | |
- +--+-+ +-+--+ +--+-+ +-+--+
-+---|eth1|--|eth2|---+ +---|eth1|--|eth2|---+
-| +----+ +----+ | | +----+ +----+ |
-| | | |
-| | | |
-| host1 | | host2 |
-| | | |
-| | | |
-| | | |
-+--------------------+ +--------------------+
-
-Number of hosts: 2
-Host #1 description:
- Two ethernet devices, in active-backup bond mode
- 3 VLANs on bond interface
-Host #2 description:
- Two ethernet devices, in active-backup bond mode
- 3 VLANs on bond interface
-Test name:
- 3_vlans.py
-Test description:
- Ping:
- + count: 100
- + interval: 0.1s
- + between interfaces in the same VLAN (these should pass)
- + between interfaces in different VLANs (these should fail)
- Netperf:
- + duration: 60s
- + TCP_STREAM and UDP_STREAM
- + between interfaces in the same VLAN
- Offloads:
- + TSO, GRO, GSO
- + tested both on/off variants
diff --git a/recipes/regression_tests/phase1/3_vlans_over_active_backup.xml
b/recipes/regression_tests/phase1/3_vlans_over_active_backup.xml
deleted file mode 100644
index 705e77c..0000000
--- a/recipes/regression_tests/phase1/3_vlans_over_active_backup.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<lnstrecipe>
- <network>
- <host id="testmachine1">
- <interfaces>
- <eth id="eth1" label="tnet" />
- <eth id="eth2" label="tnet" />
- <bond id="test_bond">
- <options>
- <option name="mode" value="active-backup"
/>
- <option name="miimon" value="100" />
- </options>
- <slaves>
- <slave id="eth1" />
- <slave id="eth2" />
- </slaves>
- <addresses>
- <address value="1.2.3.4/24" />
- </addresses>
- </bond>
- <vlan id="vlan10">
- <options>
- <option name="vlan_tci" value="10" />
- </options>
- <slaves>
- <slave id="test_bond" />
- </slaves>
- <addresses>
- <address value="192.168.10.1/24" />
- </addresses>
- </vlan>
- <vlan id="vlan20">
- <options>
- <option name="vlan_tci" value="20" />
- </options>
- <slaves>
- <slave id="test_bond" />
- </slaves>
- <addresses>
- <address value="192.168.20.1/24" />
- </addresses>
- </vlan>
- <vlan id="vlan30">
- <options>
- <option name="vlan_tci" value="30" />
- </options>
- <slaves>
- <slave id="test_bond" />
- </slaves>
- <addresses>
- <address value="192.168.30.1/24" />
- </addresses>
- </vlan>
- </interfaces>
- </host>
- <host id="testmachine2">
- <interfaces>
- <eth id="eth1" label="tnet" />
- <vlan id="vlan10">
- <options>
- <option name="vlan_tci" value="10" />
- </options>
- <slaves>
- <slave id="eth1" />
- </slaves>
- <addresses>
- <address value="192.168.10.2/24" />
- </addresses>
- </vlan>
- <vlan id="vlan20">
- <options>
- <option name="vlan_tci" value="20" />
- </options>
- <slaves>
- <slave id="eth1" />
- </slaves>
- <addresses>
- <address value="192.168.20.2/24" />
- </addresses>
- </vlan>
- <vlan id="vlan30">
- <options>
- <option name="vlan_tci" value="30" />
- </options>
- <slaves>
- <slave id="eth1" />
- </slaves>
- <addresses>
- <address value="192.168.30.2/24" />
- </addresses>
- </vlan>
- </interfaces>
- </host>
- </network>
-
- <task python="3_vlans.py" />
-</lnstrecipe>
diff --git a/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.README
b/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.README
new file mode 100644
index 0000000..20a571c
--- /dev/null
+++ b/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.README
@@ -0,0 +1,54 @@
+Topology:
+
+ switch
+ VLAN10 +------+ VLAN10
+ +-------------------+ | | +-------------------+
+ | VLAN20 | | | | VLAN20 |
+ | +-------------------+ +-------------------+ |
+ | | VLAN30 | | | | VLAN30 | |
+ | | +-----------+ | | +-----------+ | |
+ | | | +------+ | | |
+ | | | | | |
+ +-------+ +-------+
+ | |
+ | |
+ | |
+ +----+---+ +----+---+
+ | BOND | | BOND |
+ +---++---+ +---++---+
+ || ||
+ +--++--+ +--++--+
+ | | | |
+ +--+-+ +-+--+ +--+-+ +-+--+
++---|eth1|--|eth2|---+ +---|eth1|--|eth2|---+
+| +----+ +----+ | | +----+ +----+ |
+| | | |
+| | | |
+| host1 | | host2 |
+| | | |
+| | | |
+| | | |
++--------------------+ +--------------------+
+
+Number of hosts: 2
+Host #1 description:
+ Two ethernet devices, in active-backup bond mode
+ 3 VLANs on bond interface
+Host #2 description:
+ Two ethernet devices, in active-backup bond mode
+ 3 VLANs on bond interface
+Test name:
+ 3_vlans_over_bond.py
+Test description:
+ Ping:
+ + count: 100
+ + interval: 0.1s
+ + between interfaces in the same VLAN (these should pass)
+ + between interfaces in different VLANs (these should fail)
+ Netperf:
+ + duration: 60s
+ + TCP_STREAM and UDP_STREAM
+ + between interfaces in the same VLAN
+ Offloads:
+ + TSO, GRO, GSO
+ + tested both on/off variants
diff --git a/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml
b/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml
new file mode 100644
index 0000000..d125971
--- /dev/null
+++ b/recipes/regression_tests/phase1/3_vlans_over_active_backup_bond.xml
@@ -0,0 +1,96 @@
+<lnstrecipe>
+ <network>
+ <host id="testmachine1">
+ <interfaces>
+ <eth id="eth1" label="tnet" />
+ <eth id="eth2" label="tnet" />
+ <bond id="test_bond">
+ <options>
+ <option name="mode" value="active-backup"
/>
+ <option name="miimon" value="100" />
+ </options>
+ <slaves>
+ <slave id="eth1" />
+ <slave id="eth2" />
+ </slaves>
+ <addresses>
+ <address value="1.2.3.4/24" />
+ </addresses>
+ </bond>
+ <vlan id="vlan10">
+ <options>
+ <option name="vlan_tci" value="10" />
+ </options>
+ <slaves>
+ <slave id="test_bond" />
+ </slaves>
+ <addresses>
+ <address value="192.168.10.1/24" />
+ </addresses>
+ </vlan>
+ <vlan id="vlan20">
+ <options>
+ <option name="vlan_tci" value="20" />
+ </options>
+ <slaves>
+ <slave id="test_bond" />
+ </slaves>
+ <addresses>
+ <address value="192.168.20.1/24" />
+ </addresses>
+ </vlan>
+ <vlan id="vlan30">
+ <options>
+ <option name="vlan_tci" value="30" />
+ </options>
+ <slaves>
+ <slave id="test_bond" />
+ </slaves>
+ <addresses>
+ <address value="192.168.30.1/24" />
+ </addresses>
+ </vlan>
+ </interfaces>
+ </host>
+ <host id="testmachine2">
+ <interfaces>
+ <eth id="eth1" label="tnet" />
+ <vlan id="vlan10">
+ <options>
+ <option name="vlan_tci" value="10" />
+ </options>
+ <slaves>
+ <slave id="eth1" />
+ </slaves>
+ <addresses>
+ <address value="192.168.10.2/24" />
+ </addresses>
+ </vlan>
+ <vlan id="vlan20">
+ <options>
+ <option name="vlan_tci" value="20" />
+ </options>
+ <slaves>
+ <slave id="eth1" />
+ </slaves>
+ <addresses>
+ <address value="192.168.20.2/24" />
+ </addresses>
+ </vlan>
+ <vlan id="vlan30">
+ <options>
+ <option name="vlan_tci" value="30" />
+ </options>
+ <slaves>
+ <slave id="eth1" />
+ </slaves>
+ <addresses>
+ <address value="192.168.30.2/24" />
+ </addresses>
+ </vlan>
+ </interfaces>
+ </host>
+ </network>
+
+ <task python="3_vlans_over_bond.py" />
+</lnstrecipe>
diff --git a/recipes/regression_tests/phase1/3_vlans_over_bond.py
b/recipes/regression_tests/phase1/3_vlans_over_bond.py
new file mode 100644
index 0000000..6c6f398
--- /dev/null
+++ b/recipes/regression_tests/phase1/3_vlans_over_bond.py
@@ -0,0 +1,94 @@
+from lnst.Controller.Task import ctl
+
+# ------
+# SETUP
+# ------
+
+m1 = ctl.get_host("testmachine1")
+m2 = ctl.get_host("testmachine2")
+
+m1.sync_resources(modules=["IcmpPing", "Netperf"])
+m2.sync_resources(modules=["IcmpPing", "Netperf"])
+
+# ------
+# TESTS
+# ------
+
+vlans = ["vlan10", "vlan20", "vlan30"]
+offloads = ["gso", "gro", "tso"]
+
+for vlan1 in vlans:
+ for vlan2 in vlans:
+ ping_mod = ctl.get_module("IcmpPing",
+ options={
+ "addr" : m2.get_ip(vlan2),
+ "count" : 100,
+ "iface" : m1.get_devname(vlan1),
+ "interval" : 0.1
+ })
+ netperf_srv = ctl.get_module("Netperf",
+ options={
+ "role" : "server",
+ "bind" : m1.get_ip(vlan1),
+ })
+ netperf_cli_tcp = ctl.get_module("Netperf",
+ options={
+ "role" : "client",
+ "netperf_server" :
+ m1.get_ip(vlan1),
+ "duration" : 60,
+ "testname" :
"TCP_STREAM",
+ "netperf_opts" :
+ "-L %s" % m2.get_ip(vlan1)
+ })
+ netperf_cli_udp = ctl.get_module("Netperf",
+ options={
+ "role" : "client",
+ "netperf_server" :
+ m1.get_ip(vlan1),
+ "duration" : 60,
+ "testname" :
"UDP_STREAM",
+ "netperf_opts" :
+ "-L %s" % m2.get_ip(vlan1)
+ })
+ for offload in offloads:
+ # These tests should pass
+ # Ping between same VLANs
+ if vlan1 == vlan2:
+ for state in ["on", "off"]:
+ # Offload setup
+ m1.run("ethtool -K %s %s %s" %
(m1.get_devname("eth1"),
+ offload, state))
+ m1.run("ethtool -K %s %s %s" %
(m1.get_devname("eth2"),
+ offload, state))
+ m2.run("ethtool -K %s %s %s" %
(m2.get_devname("eth1"),
+ offload, state))
+ m2.run("ethtool -K %s %s %s" %
(m2.get_devname("eth2"),
+ offload, state))
+
+ # Ping test
+ m1.run(ping_mod)
+
+ # Netperf test (both TCP and UDP)
+ srv_proc = m1.run(netperf_srv, bg=True)
+ ctl.wait(2)
+ m2.run(netperf_cli_tcp, timeout=65)
+ m2.run(netperf_cli_udp, timeout=65)
+ srv_proc.intr()
+
+ # These tests should fail
+ # Ping across different VLAN
+ elif vlan1 != vlan2:
+ for state in ["on", "off"]:
+ # Offload setup
+ m1.run("ethtool -K %s %s %s" %
(m1.get_devname("eth1"),
+ offload, state))
+ m1.run("ethtool -K %s %s %s" %
(m1.get_devname("eth2"),
+ offload, state))
+ m2.run("ethtool -K %s %s %s" %
(m2.get_devname("eth1"),
+ offload, state))
+ m2.run("ethtool -K %s %s %s" %
(m2.get_devname("eth2"),
+ offload, state))
+
+ # Ping test
+ m1.run(ping_mod, expect="fail")
diff --git a/recipes/regression_tests/phase1/3_vlans_over_round_robin.README
b/recipes/regression_tests/phase1/3_vlans_over_round_robin.README
deleted file mode 100644
index dbf53eb..0000000
--- a/recipes/regression_tests/phase1/3_vlans_over_round_robin.README
+++ /dev/null
@@ -1,54 +0,0 @@
-Topology:
-
- switch
- VLAN10 +------+ VLAN10
- +-------------------+ | | +-------------------+
- | VLAN20 | | | | VLAN20 |
- | +-------------------+ +-------------------+ |
- | | VLAN30 | | | | VLAN30 | |
- | | +-----------+ | | +-----------+ | |
- | | | +------+ | | |
- | | | | | |
- +-------+ +-------+
- | |
- | |
- | |
- +----+---+ +----+---+
- | BOND | | BOND |
- +---++---+ +---++---+
- || ||
- +--++--+ +--++--+
- | | | |
- +--+-+ +-+--+ +--+-+ +-+--+
-+---|eth1|--|eth2|---+ +---|eth1|--|eth2|---+
-| +----+ +----+ | | +----+ +----+ |
-| | | |
-| | | |
-| host1 | | host2 |
-| | | |
-| | | |
-| | | |
-+--------------------+ +--------------------+
-
-Number of hosts: 2
-Host #1 decsription:
- Two ethernet devices, in round-robin bond mode
- 3 VLANs on bond interface
-Host #2 description:
- Two ethernet devices, in round-robin bond mode
- 3 VLANs on bond interface
-Test name:
- 3_vlans.py
-Test description:
- Ping:
- + count: 100
- + interval: 0.1s
- + between interfaces in the same VLAN (these should pass)
- + between interfaces in different VLANs (these should fail)
- Netperf:
- + duration: 60s
- + TCP_STREAM and UDP_STREAM
- + between interfaces in the same VLAN
- Offloads:
- + TSO, GRO, GSO
- + tested both on/off variants
diff --git a/recipes/regression_tests/phase1/3_vlans_over_round_robin.xml
b/recipes/regression_tests/phase1/3_vlans_over_round_robin.xml
deleted file mode 100644
index 89f01c6..0000000
--- a/recipes/regression_tests/phase1/3_vlans_over_round_robin.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<lnstrecipe>
- <network>
- <host id="testmachine1">
- <interfaces>
- <eth id="eth1" label="tnet" />
- <eth id="eth2" label="tnet" />
- <bond id="test_bond">
- <options>
- <option name="mode" value="balance-rr"
/>
- <option name="miimon" value="100" />
- </options>
- <slaves>
- <slave id="eth1" />
- <slave id="eth2" />
- </slaves>
- <addresses>
- <address value="1.2.3.4/24" />
- </addresses>
- </bond>
- <vlan id="vlan10">
- <options>
- <option name="vlan_tci" value="10" />
- </options>
- <slaves>
- <slave id="test_bond" />
- </slaves>
- <addresses>
- <address value="192.168.10.1/24" />
- </addresses>
- </vlan>
- <vlan id="vlan20">
- <options>
- <option name="vlan_tci" value="20" />
- </options>
- <slaves>
- <slave id="test_bond" />
- </slaves>
- <addresses>
- <address value="192.168.20.1/24" />
- </addresses>
- </vlan>
- <vlan id="vlan30">
- <options>
- <option name="vlan_tci" value="30" />
- </options>
- <slaves>
- <slave id="test_bond" />
- </slaves>
- <addresses>
- <address value="192.168.30.1/24" />
- </addresses>
- </vlan>
- </interfaces>
- </host>
- <host id="testmachine2">
- <interfaces>
- <eth id="eth1" label="tnet" />
- <vlan id="vlan10">
- <options>
- <option name="vlan_tci" value="10" />
- </options>
- <slaves>
- <slave id="eth1" />
- </slaves>
- <addresses>
- <address value="192.168.10.2/24" />
- </addresses>
- </vlan>
- <vlan id="vlan20">
- <options>
- <option name="vlan_tci" value="20" />
- </options>
- <slaves>
- <slave id="eth1" />
- </slaves>
- <addresses>
- <address value="192.168.20.2/24" />
- </addresses>
- </vlan>
- <vlan id="vlan30">
- <options>
- <option name="vlan_tci" value="30" />
- </options>
- <slaves>
- <slave id="eth1" />
- </slaves>
- <addresses>
- <address value="192.168.30.2/24" />
- </addresses>
- </vlan>
- </interfaces>
- </host>
- </network>
-
- <task python="3_vlans.py" />
-</lnstrecipe>
diff --git a/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.README
b/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.README
new file mode 100644
index 0000000..5fe192d
--- /dev/null
+++ b/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.README
@@ -0,0 +1,54 @@
+Topology:
+
+ switch
+ VLAN10 +------+ VLAN10
+ +-------------------+ | | +-------------------+
+ | VLAN20 | | | | VLAN20 |
+ | +-------------------+ +-------------------+ |
+ | | VLAN30 | | | | VLAN30 | |
+ | | +-----------+ | | +-----------+ | |
+ | | | +------+ | | |
+ | | | | | |
+ +-------+ +-------+
+ | |
+ | |
+ | |
+ +----+---+ +----+---+
+ | BOND | | BOND |
+ +---++---+ +---++---+
+ || ||
+ +--++--+ +--++--+
+ | | | |
+ +--+-+ +-+--+ +--+-+ +-+--+
++---|eth1|--|eth2|---+ +---|eth1|--|eth2|---+
+| +----+ +----+ | | +----+ +----+ |
+| | | |
+| | | |
+| host1 | | host2 |
+| | | |
+| | | |
+| | | |
++--------------------+ +--------------------+
+
+Number of hosts: 2
+Host #1 decsription:
+ Two ethernet devices, in round-robin bond mode
+ 3 VLANs on bond interface
+Host #2 description:
+ Two ethernet devices, in round-robin bond mode
+ 3 VLANs on bond interface
+Test name:
+ 3_vlans_over_bond.py
+Test description:
+ Ping:
+ + count: 100
+ + interval: 0.1s
+ + between interfaces in the same VLAN (these should pass)
+ + between interfaces in different VLANs (these should fail)
+ Netperf:
+ + duration: 60s
+ + TCP_STREAM and UDP_STREAM
+ + between interfaces in the same VLAN
+ Offloads:
+ + TSO, GRO, GSO
+ + tested both on/off variants
diff --git a/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml
b/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml
new file mode 100644
index 0000000..2d4aac3
--- /dev/null
+++ b/recipes/regression_tests/phase1/3_vlans_over_round_robin_bond.xml
@@ -0,0 +1,96 @@
+<lnstrecipe>
+ <network>
+ <host id="testmachine1">
+ <interfaces>
+ <eth id="eth1" label="tnet" />
+ <eth id="eth2" label="tnet" />
+ <bond id="test_bond">
+ <options>
+ <option name="mode" value="balance-rr"
/>
+ <option name="miimon" value="100" />
+ </options>
+ <slaves>
+ <slave id="eth1" />
+ <slave id="eth2" />
+ </slaves>
+ <addresses>
+ <address value="1.2.3.4/24" />
+ </addresses>
+ </bond>
+ <vlan id="vlan10">
+ <options>
+ <option name="vlan_tci" value="10" />
+ </options>
+ <slaves>
+ <slave id="test_bond" />
+ </slaves>
+ <addresses>
+ <address value="192.168.10.1/24" />
+ </addresses>
+ </vlan>
+ <vlan id="vlan20">
+ <options>
+ <option name="vlan_tci" value="20" />
+ </options>
+ <slaves>
+ <slave id="test_bond" />
+ </slaves>
+ <addresses>
+ <address value="192.168.20.1/24" />
+ </addresses>
+ </vlan>
+ <vlan id="vlan30">
+ <options>
+ <option name="vlan_tci" value="30" />
+ </options>
+ <slaves>
+ <slave id="test_bond" />
+ </slaves>
+ <addresses>
+ <address value="192.168.30.1/24" />
+ </addresses>
+ </vlan>
+ </interfaces>
+ </host>
+ <host id="testmachine2">
+ <interfaces>
+ <eth id="eth1" label="tnet" />
+ <vlan id="vlan10">
+ <options>
+ <option name="vlan_tci" value="10" />
+ </options>
+ <slaves>
+ <slave id="eth1" />
+ </slaves>
+ <addresses>
+ <address value="192.168.10.2/24" />
+ </addresses>
+ </vlan>
+ <vlan id="vlan20">
+ <options>
+ <option name="vlan_tci" value="20" />
+ </options>
+ <slaves>
+ <slave id="eth1" />
+ </slaves>
+ <addresses>
+ <address value="192.168.20.2/24" />
+ </addresses>
+ </vlan>
+ <vlan id="vlan30">
+ <options>
+ <option name="vlan_tci" value="30" />
+ </options>
+ <slaves>
+ <slave id="eth1" />
+ </slaves>
+ <addresses>
+ <address value="192.168.30.2/24" />
+ </addresses>
+ </vlan>
+ </interfaces>
+ </host>
+ </network>
+
+ <task python="3_vlans_over_bond.py" />
+</lnstrecipe>
diff --git a/recipes/regression_tests/phase1/active_backup.README
b/recipes/regression_tests/phase1/active_backup.README
deleted file mode 100644
index 8980098..0000000
--- a/recipes/regression_tests/phase1/active_backup.README
+++ /dev/null
@@ -1,51 +0,0 @@
-Topology:
-
- switch
- +------+
- | |
- | |
- +-------------------+ +------------------+
- | | | |
- | | | |
- | +------+ |
- | |
- | |
- | |
- | |
- | |
- +----+---+ |
- | BOND | |
- +---++---+ |
- || |
- +--++--+ |
- | | |
- +--+-+ +-+--+ +-+--+
-+---|eth1|--|eth2|---+ +-------|eth1|------+
-| +----+ +----+ | | +----+ |
-| | | |
-| | | |
-| host1 | | host2 |
-| | | |
-| | | |
-| | | |
-+--------------------+ +-------------------+
-
-Number of hosts: 2
-Host #1 description:
- Two ethernet devices, in active-backup bond mode
-Host #2 description:
- One ethernet device
-Test name:
- bonding_test.py
-Test description:
- Ping:
- + count: 100
- + interval: 0.1s
- + from both sides
- Netperf:
- + duration: 60s
- + TCP_STREAM and UDP_STREAM
- + from both sides
- Offloads:
- + TSO, GRO, GSO
- + tested both on/off variants
diff --git a/recipes/regression_tests/phase1/active_backup.xml
b/recipes/regression_tests/phase1/active_backup.xml
deleted file mode 100644
index 760ff8d..0000000
--- a/recipes/regression_tests/phase1/active_backup.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<lnstrecipe>
- <network>
- <host id="testmachine1">
- <interfaces>
- <eth id="eth1" label="tnet" />
- <eth id="eth2" label="tnet" />
- <bond id="test_if">
- <options>
- <option name="mode" value="active-backup"
/>
- <option name="miimon" value="100" />
- </options>
- <slaves>
- <slave id="eth1" />
- <slave id="eth2" />
- </slaves>
- <addresses>
- <address value="192.168.0.1/24" />
- </addresses>
- </bond>
- </interfaces>
- </host>
- <host id="testmachine2">
- <interfaces>
- <eth id="test_if" label="tnet">
- <addresses>
- <address value="192.168.0.2/24" />
- </addresses>
- </eth>
- </interfaces>
- </host>
- </network>
-
- <task python="bonding_test.py" />
-</lnstrecipe>
diff --git a/recipes/regression_tests/phase1/active_backup_bond.README
b/recipes/regression_tests/phase1/active_backup_bond.README
new file mode 100644
index 0000000..8980098
--- /dev/null
+++ b/recipes/regression_tests/phase1/active_backup_bond.README
@@ -0,0 +1,51 @@
+Topology:
+
+ switch
+ +------+
+ | |
+ | |
+ +-------------------+ +------------------+
+ | | | |
+ | | | |
+ | +------+ |
+ | |
+ | |
+ | |
+ | |
+ | |
+ +----+---+ |
+ | BOND | |
+ +---++---+ |
+ || |
+ +--++--+ |
+ | | |
+ +--+-+ +-+--+ +-+--+
++---|eth1|--|eth2|---+ +-------|eth1|------+
+| +----+ +----+ | | +----+ |
+| | | |
+| | | |
+| host1 | | host2 |
+| | | |
+| | | |
+| | | |
++--------------------+ +-------------------+
+
+Number of hosts: 2
+Host #1 description:
+ Two ethernet devices, in active-backup bond mode
+Host #2 description:
+ One ethernet device
+Test name:
+ bonding_test.py
+Test description:
+ Ping:
+ + count: 100
+ + interval: 0.1s
+ + from both sides
+ Netperf:
+ + duration: 60s
+ + TCP_STREAM and UDP_STREAM
+ + from both sides
+ Offloads:
+ + TSO, GRO, GSO
+ + tested both on/off variants
diff --git a/recipes/regression_tests/phase1/active_backup_bond.xml
b/recipes/regression_tests/phase1/active_backup_bond.xml
new file mode 100644
index 0000000..760ff8d
--- /dev/null
+++ b/recipes/regression_tests/phase1/active_backup_bond.xml
@@ -0,0 +1,34 @@
+<lnstrecipe>
+ <network>
+ <host id="testmachine1">
+ <interfaces>
+ <eth id="eth1" label="tnet" />
+ <eth id="eth2" label="tnet" />
+ <bond id="test_if">
+ <options>
+ <option name="mode" value="active-backup"
/>
+ <option name="miimon" value="100" />
+ </options>
+ <slaves>
+ <slave id="eth1" />
+ <slave id="eth2" />
+ </slaves>
+ <addresses>
+ <address value="192.168.0.1/24" />
+ </addresses>
+ </bond>
+ </interfaces>
+ </host>
+ <host id="testmachine2">
+ <interfaces>
+ <eth id="test_if" label="tnet">
+ <addresses>
+ <address value="192.168.0.2/24" />
+ </addresses>
+ </eth>
+ </interfaces>
+ </host>
+ </network>
+
+ <task python="bonding_test.py" />
+</lnstrecipe>
diff --git a/recipes/regression_tests/phase1/round_robin.README
b/recipes/regression_tests/phase1/round_robin.README
deleted file mode 100644
index 06244f8..0000000
--- a/recipes/regression_tests/phase1/round_robin.README
+++ /dev/null
@@ -1,51 +0,0 @@
-Topology:
-
- switch
- +------+
- | |
- | |
- +-------------------+ +------------------+
- | | | |
- | | | |
- | +------+ |
- | |
- | |
- | |
- | |
- | |
- +----+---+ |
- | BOND | |
- +---++---+ |
- || |
- +--++--+ |
- | | |
- +--+-+ +-+--+ +-+--+
-+---|eth1|--|eth2|---+ +-------|eth1|------+
-| +----+ +----+ | | +----+ |
-| | | |
-| | | |
-| host1 | | host2 |
-| | | |
-| | | |
-| | | |
-+--------------------+ +-------------------+
-
-Number of hosts: 2
-Host #1 description:
- Two ethernet devices, in round-robin bond mode
-Host #2 description:
- One ethernet device
-Test name:
- bonding_test.py
-Test description:
- Ping:
- + count: 100
- + interval: 0.1s
- + from both sides
- Netperf:
- + duration: 60s
- + TCP_STREAM and UDP_STREAM
- + from both sides
- Offloads:
- + TSO, GRO, GSO
- + tested both on/off variants
diff --git a/recipes/regression_tests/phase1/round_robin.xml
b/recipes/regression_tests/phase1/round_robin.xml
deleted file mode 100644
index 728dfa4..0000000
--- a/recipes/regression_tests/phase1/round_robin.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<lnstrecipe>
- <network>
- <host id="testmachine1">
- <interfaces>
- <eth id="eth1" label="tnet" />
- <eth id="eth2" label="tnet" />
- <bond id="test_if">
- <options>
- <option name="mode" value="balance-rr"
/>
- <option name="miimon" value="100" />
- </options>
- <slaves>
- <slave id="eth1" />
- <slave id="eth2" />
- </slaves>
- <addresses>
- <address value="192.168.0.1/24" />
- </addresses>
- </bond>
- </interfaces>
- </host>
- <host id="testmachine2">
- <interfaces>
- <eth id="test_if" label="tnet">
- <addresses>
- <address value="192.168.0.2/24" />
- </addresses>
- </eth>
- </interfaces>
- </host>
- </network>
-
- <task python="bonding_test.py" />
-</lnstrecipe>
diff --git a/recipes/regression_tests/phase1/round_robin_bond.README
b/recipes/regression_tests/phase1/round_robin_bond.README
new file mode 100644
index 0000000..06244f8
--- /dev/null
+++ b/recipes/regression_tests/phase1/round_robin_bond.README
@@ -0,0 +1,51 @@
+Topology:
+
+ switch
+ +------+
+ | |
+ | |
+ +-------------------+ +------------------+
+ | | | |
+ | | | |
+ | +------+ |
+ | |
+ | |
+ | |
+ | |
+ | |
+ +----+---+ |
+ | BOND | |
+ +---++---+ |
+ || |
+ +--++--+ |
+ | | |
+ +--+-+ +-+--+ +-+--+
++---|eth1|--|eth2|---+ +-------|eth1|------+
+| +----+ +----+ | | +----+ |
+| | | |
+| | | |
+| host1 | | host2 |
+| | | |
+| | | |
+| | | |
++--------------------+ +-------------------+
+
+Number of hosts: 2
+Host #1 description:
+ Two ethernet devices, in round-robin bond mode
+Host #2 description:
+ One ethernet device
+Test name:
+ bonding_test.py
+Test description:
+ Ping:
+ + count: 100
+ + interval: 0.1s
+ + from both sides
+ Netperf:
+ + duration: 60s
+ + TCP_STREAM and UDP_STREAM
+ + from both sides
+ Offloads:
+ + TSO, GRO, GSO
+ + tested both on/off variants
diff --git a/recipes/regression_tests/phase1/round_robin_bond.xml
b/recipes/regression_tests/phase1/round_robin_bond.xml
new file mode 100644
index 0000000..237cced
--- /dev/null
+++ b/recipes/regression_tests/phase1/round_robin_bond.xml
@@ -0,0 +1,36 @@
+<lnstrecipe>
+ <network>
+ <host id="testmachine1">
+ <interfaces>
+ <eth id="eth1" label="tnet" />
+ <eth id="eth2" label="tnet" />
+ <bond id="test_if">
+ <options>
+ <option name="mode" value="balance-rr"
/>
+ <option name="miimon" value="100" />
+ </options>
+ <slaves>
+ <slave id="eth1" />
+ <slave id="eth2" />
+ </slaves>
+ <addresses>
+ <address value="192.168.0.1/24" />
+ </addresses>
+ </bond>
+ </interfaces>
+ </host>
+ <host id="testmachine2">
+ <interfaces>
+ <eth id="test_if" label="tnet">
+ <addresses>
+ <address value="192.168.0.2/24" />
+ </addresses>
+ </eth>
+ </interfaces>
+ </host>
+ </network>
+
+ <task python="bonding_test.py" />
+</lnstrecipe>
+
+
diff --git
a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup.README
b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup.README
deleted file mode 100644
index 876c89c..0000000
--- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup.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 active-backup 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 active-backup 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_active_backup.xml
b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup.xml
deleted file mode 100644
index 950bf0d..0000000
--- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup.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="active-backup"
/>
- <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="active-backup"
/>
- <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>
diff --git
a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.README
b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.README
new file mode 100644
index 0000000..876c89c
--- /dev/null
+++
b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.README
@@ -0,0 +1,76 @@
+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 active-backup 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 active-backup 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_active_backup_bond.xml
b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml
new file mode 100644
index 0000000..f523fca
--- /dev/null
+++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_active_backup_bond.xml
@@ -0,0 +1,153 @@
+<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="active-backup"
/>
+ <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="active-backup"
/>
+ <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>
diff --git
a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_round_robin.README
b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_round_robin.README
deleted file mode 100644
index 7048b8c..0000000
--- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_round_robin.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.xml
b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_round_robin.xml
deleted file mode 100644
index e914636..0000000
--- a/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_round_robin.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>
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
new file mode 100644
index 0000000..7048b8c
--- /dev/null
+++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_round_robin_bond.README
@@ -0,0 +1,76 @@
+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
new file mode 100644
index 0000000..9f7ad4b
--- /dev/null
+++ b/recipes/regression_tests/phase1/virtual_bridge_2_vlans_over_round_robin_bond.xml
@@ -0,0 +1,153 @@
+<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>
--
1.9.3