3:47 a.m.
commit bb14b25eb9e3754b538e797d46dc40ccb9557963
Author: Jiri Pirko <jiri(a)resnulli.us>
Date: Fri Sep 7 19:35:41 2012 +0200
team recipes: add some new and do some cleanup
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
recipes/multicast/cmd_sequences/block_source.xml | 10 ++--
recipes/multicast/cmd_sequences/if.xml | 6 +-
recipes/multicast/cmd_sequences/loop.xml | 8 ++--
recipes/multicast/cmd_sequences/max_groups.xml | 4 +-
recipes/multicast/cmd_sequences/membership.xml | 4 +-
recipes/multicast/cmd_sequences/simple.xml | 4 +-
.../multicast/cmd_sequences/source_membership.xml | 10 ++--
recipes/multicast/cmd_sequences/ttl.xml | 12 +++---
recipes/multicast/multicast-all.xml | 4 +-
recipes/team/machineconfig-dhcp-37-128.xml | 8 ++++
recipes/team/machineconfig-peanut.xml | 8 ++++
recipes/team/netconfig-bond_lacp.xml | 20 +++++++++
recipes/team/netconfig-simple.xml | 4 +-
recipes/team/netconfig-simple_br.xml | 16 +++++++
...onfig-team_ab_001.xml => netconfig-team_ab.xml} | 14 ++++++-
recipes/team/netconfig-team_ab_002.xml | 44 --------------------
recipes/team/netconfig-team_bcast.xml | 24 +++++++++++
...fig-team_ab_001.xml => netconfig-team_lacp.xml} | 26 ++++++------
recipes/team/netconfig-team_lb.xml | 27 ++++++++++++
recipes/team/netconfig-team_rr.xml | 8 +++-
.../team/{recipe_002.xml => recipex_ab_001.xml} | 10 +++--
recipes/team/recipex_ab_002.xml | 36 ++++++++++++++++
.../team/{recipe_003.xml => recipex_ab_003.xml} | 12 +++--
recipes/team/recipex_ab_004.xml | 21 +++++++++
.../team/{recipe_003.xml => recipex_bcast_001.xml} | 10 +++--
recipes/team/recipex_bcast_002.xml | 36 ++++++++++++++++
.../team/{recipe_003.xml => recipex_bcast_003.xml} | 12 +++--
recipes/team/recipex_bcast_004.xml | 21 +++++++++
.../team/{recipe_003.xml => recipex_lacp_001.xml} | 10 +++--
recipes/team/recipex_lacp_002.xml | 36 ++++++++++++++++
recipes/team/recipex_lacp_003.xml | 21 +++++++++
recipes/team/recipex_lacp_004.xml | 21 +++++++++
.../team/{recipe_003.xml => recipex_lb_001.xml} | 10 +++--
recipes/team/recipex_lb_002.xml | 36 ++++++++++++++++
.../team/{recipe_003.xml => recipex_lb_003.xml} | 12 +++--
recipes/team/recipex_lb_004.xml | 21 +++++++++
.../team/{recipe_001.xml => recipex_rr_001.xml} | 8 ++-
recipes/team/recipex_rr_002.xml | 36 ++++++++++++++++
.../team/{recipe_003.xml => recipex_rr_003.xml} | 12 +++--
.../team/{recipe_003.xml => recipex_rr_004.xml} | 12 +++--
recipes/team/sequence_iperf.xml | 18 ++++++++
recipes/team/sequence_ping_simple.xml | 16 +++++--
recipes/team/sequence_pktgen.xml | 21 +++++++++
recipes/team/sequence_pktgen_lacp.xml | 21 +++++++++
44 files changed, 590 insertions(+), 140 deletions(-)
---
diff --git a/recipes/multicast/cmd_sequences/block_source.xml
b/recipes/multicast/cmd_sequences/block_source.xml
index f351a79..ae3a9c0 100644
--- a/recipes/multicast/cmd_sequences/block_source.xml
+++ b/recipes/multicast/cmd_sequences/block_source.xml
@@ -24,7 +24,7 @@
<option name="duration" value="10"/>
<option name="delay" value="0.1"/>
<option name="ttl" value="1"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
</options>
</command>
@@ -34,8 +34,8 @@
<option name="address" value="238.0.0.1"/>
<option name="port" value="1337"/>
<option name="duration" value="10"/>
- <option name="interface" value="{ip(2,1)}"/>
- <option name="source" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(2,testiface)}"/>
+ <option name="source" value="{ip(1,testiface)}"/>
<option name="condition" value="packets_received >
0"/>
<option name="condition"
value="packets_received_while_blocking == 0"/>
@@ -55,7 +55,7 @@
<option name="duration" value="10"/>
<option name="delay" value="0.1"/>
<option name="ttl" value="1"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
</options>
</command>
@@ -65,7 +65,7 @@
<option name="address" value="238.0.0.1"/>
<option name="port" value="1337"/>
<option name="duration" value="10"/>
- <option name="interface" value="{ip(2,1)}"/>
+ <option name="interface"
value="{ip(2,testiface)}"/>
<option name="source" value="127.0.0.200"/>
<option name="condition" value="packets_received >
0"/>
diff --git a/recipes/multicast/cmd_sequences/if.xml
b/recipes/multicast/cmd_sequences/if.xml
index dfd1108..3de948c 100644
--- a/recipes/multicast/cmd_sequences/if.xml
+++ b/recipes/multicast/cmd_sequences/if.xml
@@ -26,7 +26,7 @@
<option name="duration" value="{$test_duration}"/>
<option name="delay" value="{$send_delay}"/>
<option name="ttl" value="1"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
</options>
</command>
@@ -36,7 +36,7 @@
<option name="address"
value="{$multicast_group}"/>
<option name="port" value="{$port}"/>
<option name="duration" value="{$test_duration}"/>
- <option name="interface" value="{ip(2,1)}"/>
+ <option name="interface"
value="{ip(2,testiface)}"/>
<option name="condition" value="packets_received >
0"/>
</options>
@@ -55,7 +55,7 @@
<option name="duration" value="{$test_duration}"/>
<option name="delay" value="{$send_delay}"/>
<option name="ttl" value="1"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
</options>
</command>
diff --git a/recipes/multicast/cmd_sequences/loop.xml
b/recipes/multicast/cmd_sequences/loop.xml
index d4b57d6..c1dbcc3 100644
--- a/recipes/multicast/cmd_sequences/loop.xml
+++ b/recipes/multicast/cmd_sequences/loop.xml
@@ -20,7 +20,7 @@
<option name="duration" value="{$test_duration}"/>
<option name="delay" value="{$send_delay}"/>
<option name="loop" value="1"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
</options>
</command>
@@ -30,7 +30,7 @@
<option name="address"
value="{$multicast_group}"/>
<option name="port" value="{$port}"/>
<option name="duration" value="{$test_duration}"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
<option name="condition" value="packets_received >
0"/>
</options>
@@ -49,7 +49,7 @@
<option name="duration" value="{$test_duration}"/>
<option name="delay" value="{$send_delay}"/>
<option name="loop" value="0"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
</options>
</command>
@@ -59,7 +59,7 @@
<option name="address"
value="{$multicast_group}"/>
<option name="port" value="{$port}"/>
<option name="duration" value="{$test_duration}"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
<option name="condition" value="packets_received ==
0"/>
</options>
diff --git a/recipes/multicast/cmd_sequences/max_groups.xml
b/recipes/multicast/cmd_sequences/max_groups.xml
index a27197f..1082d74 100644
--- a/recipes/multicast/cmd_sequences/max_groups.xml
+++ b/recipes/multicast/cmd_sequences/max_groups.xml
@@ -5,7 +5,7 @@
<command machine_id="1" timeout="30" type="test"
value="Multicast">
<options>
<option name="setup" value="max_groups"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
<option name="condition" value="max_groups >
0"/>
</options>
</command>
@@ -15,7 +15,7 @@
<command machine_id="1" timeout="30" type="test"
value="Multicast">
<options>
<option name="setup" value="max_groups"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
<option name="condition" value="max_groups == 5"/>
</options>
</command>
diff --git a/recipes/multicast/cmd_sequences/membership.xml
b/recipes/multicast/cmd_sequences/membership.xml
index b4c63be..ecea8ba 100644
--- a/recipes/multicast/cmd_sequences/membership.xml
+++ b/recipes/multicast/cmd_sequences/membership.xml
@@ -26,7 +26,7 @@
<option name="duration" value="{$test_duration}"/>
<option name="delay" value="{$send_delay}"/>
<option name="ttl" value="1"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
</options>
</command>
@@ -36,7 +36,7 @@
<option name="address"
value="{$multicast_group}"/>
<option name="port" value="{$port}"/>
<option name="duration" value="{$test_duration}"/>
- <option name="interface" value="{ip(2,1)}"/>
+ <option name="interface"
value="{ip(2,testiface)}"/>
<option name="condition" value="packets_received >
0"/>
<option name="condition" value="packets_received_after_drop
== 0"/>
diff --git a/recipes/multicast/cmd_sequences/simple.xml
b/recipes/multicast/cmd_sequences/simple.xml
index 88cddd1..d3c3119 100644
--- a/recipes/multicast/cmd_sequences/simple.xml
+++ b/recipes/multicast/cmd_sequences/simple.xml
@@ -11,7 +11,7 @@
<option name="port" value="{$port}"/>
<option name="duration" value="{$test_duration}"/>
<option name="delay" value="{$send_delay}"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
</options>
</command>
@@ -21,7 +21,7 @@
<option name="address"
value="{$multicast_group}"/>
<option name="port" value="{$port}"/>
<option name="duration" value="{$test_duration}"/>
- <option name="interface" value="{ip(2,1)}"/>
+ <option name="interface"
value="{ip(2,testiface)}"/>
<option name="condition" value="packets_received >
0"/>
</options>
diff --git a/recipes/multicast/cmd_sequences/source_membership.xml
b/recipes/multicast/cmd_sequences/source_membership.xml
index a659e74..62bfa86 100644
--- a/recipes/multicast/cmd_sequences/source_membership.xml
+++ b/recipes/multicast/cmd_sequences/source_membership.xml
@@ -29,7 +29,7 @@
<option name="duration" value="{$test_duration}"/>
<option name="delay" value="{$send_delay}"/>
<option name="ttl" value="1"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
</options>
</command>
@@ -39,8 +39,8 @@
<option name="address"
value="{$multicast_group}"/>
<option name="port" value="{$port}"/>
<option name="duration" value="{$test_duration}"/>
- <option name="interface" value="{ip(2,1)}"/>
- <option name="source" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(2,testiface)}"/>
+ <option name="source" value="{ip(1,testiface)}"/>
<option name="condition" value="packets_received >
0"/>
<option name="condition" value="packets_received_after_drop
== 0"/>
@@ -60,7 +60,7 @@
<option name="duration" value="{$test_duration}"/>
<option name="delay" value="{$send_delay}"/>
<option name="ttl" value="1"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
</options>
</command>
@@ -70,7 +70,7 @@
<option name="address"
value="{$multicast_group}"/>
<option name="port" value="{$port}"/>
<option name="duration" value="{$test_duration}"/>
- <option name="interface" value="{ip(2,1)}"/>
+ <option name="interface"
value="{ip(2,testiface)}"/>
<option name="source" value="127.0.0.200"/>
<option name="condition" value="packets_received ==
0"/>
diff --git a/recipes/multicast/cmd_sequences/ttl.xml
b/recipes/multicast/cmd_sequences/ttl.xml
index 72d0759..b96ad8c 100644
--- a/recipes/multicast/cmd_sequences/ttl.xml
+++ b/recipes/multicast/cmd_sequences/ttl.xml
@@ -23,7 +23,7 @@
<option name="delay" value="{$send_delay}"/>
<option name="ttl" value="0"/>
<option name="loop" value="1"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
</options>
</command>
@@ -33,7 +33,7 @@
<option name="address"
value="{$multicast_group}"/>
<option name="port" value="{$port}"/>
<option name="duration" value="{$test_duration}"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
<option name="condition" value="packets_received >
0"/>
</options>
@@ -61,7 +61,7 @@
<option name="duration" value="{$test_duration}"/>
<option name="delay" value="{$send_delay}"/>
<option name="ttl" value="0"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
</options>
</command>
@@ -71,7 +71,7 @@
<option name="address"
value="{$multicast_group}"/>
<option name="port" value="{$port}"/>
<option name="duration" value="{$test_duration}"/>
- <option name="interface" value="{ip(2,1)}"/>
+ <option name="interface"
value="{ip(2,testiface)}"/>
<option name="condition" value="packets_received >
0"/>
</options>
@@ -90,7 +90,7 @@
<option name="duration" value="{$test_duration}"/>
<option name="delay" value="{$send_delay}"/>
<option name="ttl" value="1"/>
- <option name="interface" value="{ip(1,1)}"/>
+ <option name="interface"
value="{ip(1,testiface)}"/>
</options>
</command>
@@ -100,7 +100,7 @@
<option name="address"
value="{$multicast_group}"/>
<option name="port" value="{$port}"/>
<option name="duration" value="{$test_duration}"/>
- <option name="interface" value="{ip(2,1)}"/>
+ <option name="interface"
value="{ip(2,testiface)}"/>
<option name="condition" value="packets_received >
0"/>
</options>
diff --git a/recipes/multicast/multicast-all.xml b/recipes/multicast/multicast-all.xml
index 0796059..af9aae9 100644
--- a/recipes/multicast/multicast-all.xml
+++ b/recipes/multicast/multicast-all.xml
@@ -21,7 +21,7 @@
</netdevices>
</machineconfig>
<netconfig>
- <interface id="1" phys_id="1"
type="eth">
+ <interface id="testiface" phys_id="1"
type="eth">
<addresses>
<address value="192.168.100.226/24"/>
</addresses>
@@ -44,7 +44,7 @@
</netdevices>
</machineconfig>
<netconfig>
- <interface id="1" phys_id="1"
type="eth">
+ <interface id="testiface" phys_id="1"
type="eth">
<addresses>
<address value="192.168.100.215/24"/>
</addresses>
diff --git a/recipes/team/machineconfig-dhcp-37-128.xml
b/recipes/team/machineconfig-dhcp-37-128.xml
new file mode 100644
index 0000000..59a4940
--- /dev/null
+++ b/recipes/team/machineconfig-dhcp-37-128.xml
@@ -0,0 +1,8 @@
+<machineconfig>
+ <info hostname="10.34.37.128"/>
+ <netdevices>
+ <netdevice type="eth" phys_id="1"
hwaddr="00:10:18:61:35:9b" network="testing_green"/>
+ <netdevice type="eth" phys_id="2"
hwaddr="00:10:18:48:15:fa" network="testing_magenta"/>
+ <netdevice type="eth" phys_id="3"
hwaddr="00:0e:0c:b3:09:4e" network="testing_blue"/>
+ </netdevices>
+</machineconfig>
diff --git a/recipes/team/machineconfig-peanut.xml
b/recipes/team/machineconfig-peanut.xml
new file mode 100644
index 0000000..43d7e61
--- /dev/null
+++ b/recipes/team/machineconfig-peanut.xml
@@ -0,0 +1,8 @@
+<machineconfig>
+ <info hostname="10.34.33.99"/>
+ <netdevices>
+ <netdevice type="eth" phys_id="1"
hwaddr="d4:85:64:01:46:9e" network="testing_green"/>
+ <netdevice type="eth" phys_id="2"
hwaddr="00:e0:4c:14:2e:5d" network="testing_magenta"/>
+ <netdevice type="eth" phys_id="3"
hwaddr="00:30:4f:7f:fd:30" network="testing_blue"/>
+ </netdevices>
+</machineconfig>
diff --git a/recipes/team/netconfig-bond_lacp.xml b/recipes/team/netconfig-bond_lacp.xml
new file mode 100644
index 0000000..0492c22
--- /dev/null
+++ b/recipes/team/netconfig-bond_lacp.xml
@@ -0,0 +1,20 @@
+<netconfig>
+ <interface id="1" phys_id="1" type="eth"/>
+ <interface id="2" phys_id="2" type="eth"/>
+ <interface id="3" phys_id="3" type="eth"/>
+ <interface id="testiface" type="bond">
+ <options>
+ <option name="mode" value="4"/>
+ <option name="lacp_rate" value="1"/>
+ </options>
+ <slaves>
+ <slave id="1"/>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </interface>
+</netconfig>
diff --git a/recipes/team/netconfig-simple.xml b/recipes/team/netconfig-simple.xml
index b0473e5..78bebde 100644
--- a/recipes/team/netconfig-simple.xml
+++ b/recipes/team/netconfig-simple.xml
@@ -1,7 +1,9 @@
<netconfig>
- <interface id="1" phys_id="1" type="eth">
+ <interface id="testiface" phys_id="1"
type="eth">
<addresses>
<address value="{$testip}"/>
</addresses>
</interface>
+ <interface id="2" phys_id="2" type="eth"/>
+ <interface id="3" phys_id="3" type="eth"/>
</netconfig>
diff --git a/recipes/team/netconfig-simple_br.xml b/recipes/team/netconfig-simple_br.xml
new file mode 100644
index 0000000..867d390
--- /dev/null
+++ b/recipes/team/netconfig-simple_br.xml
@@ -0,0 +1,16 @@
+<netconfig>
+ <interface id="1" phys_id="1" type="eth"/>
+ <interface id="2" phys_id="2" type="eth"/>
+ <interface id="3" phys_id="3" type="eth"/>
+ <interface id="testiface" type="bridge">
+ <slaves>
+ <slave id="1"/>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </interface>
+</netconfig>
diff --git a/recipes/team/netconfig-team_ab_001.xml b/recipes/team/netconfig-team_ab.xml
similarity index 70%
copy from recipes/team/netconfig-team_ab_001.xml
copy to recipes/team/netconfig-team_ab.xml
index d3ed392..107ab3f 100644
--- a/recipes/team/netconfig-team_ab_001.xml
+++ b/recipes/team/netconfig-team_ab.xml
@@ -18,10 +18,20 @@
</option>
</options>
</interface>
- <interface id="3" type="team">
+ <interface id="3" phys_id="3" type="eth">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": 50
+ }
+ </option>
+ </options>
+ </interface>
+ <interface id="testiface" type="team">
<options>
<option name="teamd_config">
{
+ "hwaddr": "00:11:22:33:44:55",
"runner": {"name": "activebackup"},
"link_watch": {"name": "ethtool"}
}
@@ -30,9 +40,11 @@
<slaves>
<slave id="1"/>
<slave id="2"/>
+ <slave id="3"/>
</slaves>
<addresses>
<address value="{$testip}"/>
+ <address value="{$testip6}"/>
</addresses>
</interface>
</netconfig>
diff --git a/recipes/team/netconfig-team_bcast.xml
b/recipes/team/netconfig-team_bcast.xml
new file mode 100644
index 0000000..9bfab08
--- /dev/null
+++ b/recipes/team/netconfig-team_bcast.xml
@@ -0,0 +1,24 @@
+<netconfig>
+ <interface id="1" phys_id="1" type="eth"/>
+ <interface id="2" phys_id="2" type="eth"/>
+ <interface id="3" phys_id="3" type="eth"/>
+ <interface id="testiface" type="team">
+ <options>
+ <option name="teamd_config">
+ {
+ "hwaddr": "00:11:22:33:44:55",
+ "runner": {"name": "broadcast"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1"/>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </interface>
+</netconfig>
diff --git a/recipes/team/netconfig-team_ab_001.xml
b/recipes/team/netconfig-team_lacp.xml
similarity index 53%
rename from recipes/team/netconfig-team_ab_001.xml
rename to recipes/team/netconfig-team_lacp.xml
index d3ed392..57eda3f 100644
--- a/recipes/team/netconfig-team_ab_001.xml
+++ b/recipes/team/netconfig-team_lacp.xml
@@ -3,26 +3,24 @@
<options>
<option name="teamd_port_config">
{
- "prio": -10,
- "sticky": true
+ "prio": -10
}
</option>
</options>
</interface>
- <interface id="2" phys_id="2" type="eth">
- <options>
- <option name="teamd_port_config">
- {
- "prio": 100
- }
- </option>
- </options>
- </interface>
- <interface id="3" type="team">
+ <interface id="2" phys_id="2" type="eth"/>
+ <interface id="3" phys_id="3" type="eth"/>
+ <interface id="testiface" type="team">
<options>
<option name="teamd_config">
{
- "runner": {"name": "activebackup"},
+ "hwaddr": "00:11:22:33:44:55",
+ "runner": {
+ "name": "lacp",
+ "active": true,
+ "fast_rate": true,
+ "tx_hash": ["eth", "ipv4",
"ipv6"]
+ },
"link_watch": {"name": "ethtool"}
}
</option>
@@ -30,9 +28,11 @@
<slaves>
<slave id="1"/>
<slave id="2"/>
+ <slave id="3"/>
</slaves>
<addresses>
<address value="{$testip}"/>
+ <address value="{$testip6}"/>
</addresses>
</interface>
</netconfig>
diff --git a/recipes/team/netconfig-team_lb.xml b/recipes/team/netconfig-team_lb.xml
new file mode 100644
index 0000000..5a305ed
--- /dev/null
+++ b/recipes/team/netconfig-team_lb.xml
@@ -0,0 +1,27 @@
+<netconfig>
+ <interface id="1" phys_id="1" type="eth"/>
+ <interface id="2" phys_id="2" type="eth"/>
+ <interface id="3" phys_id="3" type="eth"/>
+ <interface id="testiface" type="team">
+ <options>
+ <option name="teamd_config">
+ {
+ "hwaddr": "00:11:22:33:44:55",
+ "runner": {
+ "name": "loadbalance",
+ "tx_hash": ["eth", "ipv4", "ipv6"]
+ }
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1"/>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </interface>
+</netconfig>
diff --git a/recipes/team/netconfig-team_rr.xml b/recipes/team/netconfig-team_rr.xml
index 4dd0a9f..b223c1a 100644
--- a/recipes/team/netconfig-team_rr.xml
+++ b/recipes/team/netconfig-team_rr.xml
@@ -1,20 +1,24 @@
<netconfig>
<interface id="1" phys_id="1" type="eth"/>
<interface id="2" phys_id="2" type="eth"/>
- <interface id="3" type="team">
+ <interface id="3" phys_id="3" type="eth"/>
+ <interface id="testiface" type="team">
<options>
<option name="teamd_config">
{
- "runner": {"name": "roundrobin"}
+ "hwaddr": "00:11:22:33:44:55",
+ "runner": {"name": "roundrobin"}
}
</option>
</options>
<slaves>
<slave id="1"/>
<slave id="2"/>
+ <slave id="3"/>
</slaves>
<addresses>
<address value="{$testip}"/>
+ <address value="{$testip6}"/>
</addresses>
</interface>
</netconfig>
diff --git a/recipes/team/recipe_002.xml b/recipes/team/recipex_ab_001.xml
similarity index 52%
rename from recipes/team/recipe_002.xml
rename to recipes/team/recipex_ab_001.xml
index d985507..0176df1 100644
--- a/recipes/team/recipe_002.xml
+++ b/recipes/team/recipex_ab_001.xml
@@ -2,17 +2,19 @@
<machines>
<define>
<alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-test1.xml"/>
- <netconfig source="netconfig-team_ab_001.xml"/>
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_ab.xml"/>
</machine>
<define>
<alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
</define>
<machine id="2">
- <machineconfig source="machineconfig-test2.xml"/>
- <netconfig source="netconfig-team_ab_001.xml"/>
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_ping_simple.xml"/>
diff --git a/recipes/team/recipex_ab_002.xml b/recipes/team/recipex_ab_002.xml
new file mode 100644
index 0000000..aec1644
--- /dev/null
+++ b/recipes/team/recipex_ab_002.xml
@@ -0,0 +1,36 @@
+<nettestrecipe>
+ <machines>
+ <define>
+ <alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
+ </define>
+ <machine id="1">
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_ab.xml"/>
+ </machine>
+ <define>
+ <alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
+ </define>
+ <machine id="2">
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-simple_br.xml"/>
+ </machine>
+ </machines>
+ <define>
+ <alias name="multicast_group" value="239.1.2.3"/>
+ <alias name="port" value="1337"/>
+ <alias name="test_duration" value="10"/>
+ <alias name="send_delay" value="0.1"/>
+ <alias name="nonexistent_ip" value="127.0.0.200"/>
+ </define>
+
+ <command_sequence
source="../multicast/cmd_sequences/max_groups.xml"/>
+ <command_sequence
source="../multicast/cmd_sequences/block_source.xml"/>
+ <command_sequence
source="../multicast/cmd_sequences/source_membership.xml"/>
+ <command_sequence
source="../multicast/cmd_sequences/membership.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/if.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/ttl.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/loop.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/simple.xml"/>
+</nettestrecipe>
diff --git a/recipes/team/recipe_003.xml b/recipes/team/recipex_ab_003.xml
similarity index 53%
copy from recipes/team/recipe_003.xml
copy to recipes/team/recipex_ab_003.xml
index 77fa51c..7796ec9 100644
--- a/recipes/team/recipe_003.xml
+++ b/recipes/team/recipex_ab_003.xml
@@ -2,18 +2,20 @@
<machines>
<define>
<alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-test1.xml"/>
- <netconfig source="netconfig-simple.xml"/>
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_ab.xml"/>
</machine>
<define>
<alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
</define>
<machine id="2">
- <machineconfig source="machineconfig-test2.xml"/>
- <netconfig source="netconfig-team_rr.xml"/>
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-simple.xml"/>
</machine>
</machines>
- <command_sequence source="sequence_ping_simple.xml"/>
+ <command_sequence source="sequence_pktgen.xml"/>
</nettestrecipe>
diff --git a/recipes/team/recipex_ab_004.xml b/recipes/team/recipex_ab_004.xml
new file mode 100644
index 0000000..d74113e
--- /dev/null
+++ b/recipes/team/recipex_ab_004.xml
@@ -0,0 +1,21 @@
+<nettestrecipe>
+ <machines>
+ <define>
+ <alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
+ </define>
+ <machine id="1">
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_ab.xml"/>
+ </machine>
+ <define>
+ <alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
+ </define>
+ <machine id="2">
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-simple_br.xml"/>
+ </machine>
+ </machines>
+ <command_sequence source="sequence_iperf.xml"/>
+</nettestrecipe>
diff --git a/recipes/team/recipe_003.xml b/recipes/team/recipex_bcast_001.xml
similarity index 52%
copy from recipes/team/recipe_003.xml
copy to recipes/team/recipex_bcast_001.xml
index 77fa51c..7e10cbc 100644
--- a/recipes/team/recipe_003.xml
+++ b/recipes/team/recipex_bcast_001.xml
@@ -2,17 +2,19 @@
<machines>
<define>
<alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-test1.xml"/>
- <netconfig source="netconfig-simple.xml"/>
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_bcast.xml"/>
</machine>
<define>
<alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
</define>
<machine id="2">
- <machineconfig source="machineconfig-test2.xml"/>
- <netconfig source="netconfig-team_rr.xml"/>
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_ping_simple.xml"/>
diff --git a/recipes/team/recipex_bcast_002.xml b/recipes/team/recipex_bcast_002.xml
new file mode 100644
index 0000000..ad3e893
--- /dev/null
+++ b/recipes/team/recipex_bcast_002.xml
@@ -0,0 +1,36 @@
+<nettestrecipe>
+ <machines>
+ <define>
+ <alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
+ </define>
+ <machine id="1">
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_bcast.xml"/>
+ </machine>
+ <define>
+ <alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
+ </define>
+ <machine id="2">
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-simple_br.xml"/>
+ </machine>
+ </machines>
+ <define>
+ <alias name="multicast_group" value="239.1.2.3"/>
+ <alias name="port" value="1337"/>
+ <alias name="test_duration" value="10"/>
+ <alias name="send_delay" value="0.1"/>
+ <alias name="nonexistent_ip" value="127.0.0.200"/>
+ </define>
+
+ <command_sequence
source="../multicast/cmd_sequences/max_groups.xml"/>
+ <command_sequence
source="../multicast/cmd_sequences/block_source.xml"/>
+ <command_sequence
source="../multicast/cmd_sequences/source_membership.xml"/>
+ <command_sequence
source="../multicast/cmd_sequences/membership.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/if.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/ttl.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/loop.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/simple.xml"/>
+</nettestrecipe>
diff --git a/recipes/team/recipe_003.xml b/recipes/team/recipex_bcast_003.xml
similarity index 52%
copy from recipes/team/recipe_003.xml
copy to recipes/team/recipex_bcast_003.xml
index 77fa51c..acaad20 100644
--- a/recipes/team/recipe_003.xml
+++ b/recipes/team/recipex_bcast_003.xml
@@ -2,18 +2,20 @@
<machines>
<define>
<alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-test1.xml"/>
- <netconfig source="netconfig-simple.xml"/>
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_bcast.xml"/>
</machine>
<define>
<alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
</define>
<machine id="2">
- <machineconfig source="machineconfig-test2.xml"/>
- <netconfig source="netconfig-team_rr.xml"/>
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-simple.xml"/>
</machine>
</machines>
- <command_sequence source="sequence_ping_simple.xml"/>
+ <command_sequence source="sequence_pktgen.xml"/>
</nettestrecipe>
diff --git a/recipes/team/recipex_bcast_004.xml b/recipes/team/recipex_bcast_004.xml
new file mode 100644
index 0000000..b857b99
--- /dev/null
+++ b/recipes/team/recipex_bcast_004.xml
@@ -0,0 +1,21 @@
+<nettestrecipe>
+ <machines>
+ <define>
+ <alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
+ </define>
+ <machine id="1">
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_bcast.xml"/>
+ </machine>
+ <define>
+ <alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
+ </define>
+ <machine id="2">
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-simple_br.xml"/>
+ </machine>
+ </machines>
+ <command_sequence source="sequence_iperf.xml"/>
+</nettestrecipe>
diff --git a/recipes/team/recipe_003.xml b/recipes/team/recipex_lacp_001.xml
similarity index 52%
copy from recipes/team/recipe_003.xml
copy to recipes/team/recipex_lacp_001.xml
index 77fa51c..3e70ece 100644
--- a/recipes/team/recipe_003.xml
+++ b/recipes/team/recipex_lacp_001.xml
@@ -2,17 +2,19 @@
<machines>
<define>
<alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-test1.xml"/>
- <netconfig source="netconfig-simple.xml"/>
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_lacp.xml"/>
</machine>
<define>
<alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
</define>
<machine id="2">
- <machineconfig source="machineconfig-test2.xml"/>
- <netconfig source="netconfig-team_rr.xml"/>
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-bond_lacp.xml"/>
</machine>
</machines>
<command_sequence source="sequence_ping_simple.xml"/>
diff --git a/recipes/team/recipex_lacp_002.xml b/recipes/team/recipex_lacp_002.xml
new file mode 100644
index 0000000..ddae1d0
--- /dev/null
+++ b/recipes/team/recipex_lacp_002.xml
@@ -0,0 +1,36 @@
+<nettestrecipe>
+ <machines>
+ <define>
+ <alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
+ </define>
+ <machine id="1">
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_lacp.xml"/>
+ </machine>
+ <define>
+ <alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
+ </define>
+ <machine id="2">
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-bond_lacp.xml"/>
+ </machine>
+ </machines>
+ <define>
+ <alias name="multicast_group" value="239.1.2.3"/>
+ <alias name="port" value="1337"/>
+ <alias name="test_duration" value="10"/>
+ <alias name="send_delay" value="0.1"/>
+ <alias name="nonexistent_ip" value="127.0.0.200"/>
+ </define>
+
+ <command_sequence
source="../multicast/cmd_sequences/max_groups.xml"/>
+ <command_sequence
source="../multicast/cmd_sequences/block_source.xml"/>
+ <command_sequence
source="../multicast/cmd_sequences/source_membership.xml"/>
+ <command_sequence
source="../multicast/cmd_sequences/membership.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/if.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/ttl.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/loop.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/simple.xml"/>
+</nettestrecipe>
diff --git a/recipes/team/recipex_lacp_003.xml b/recipes/team/recipex_lacp_003.xml
new file mode 100644
index 0000000..82ba25f
--- /dev/null
+++ b/recipes/team/recipex_lacp_003.xml
@@ -0,0 +1,21 @@
+<nettestrecipe>
+ <machines>
+ <define>
+ <alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
+ </define>
+ <machine id="1">
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_lacp.xml"/>
+ </machine>
+ <define>
+ <alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
+ </define>
+ <machine id="2">
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-bond_lacp.xml"/>
+ </machine>
+ </machines>
+ <command_sequence source="sequence_pktgen_lacp.xml"/>
+</nettestrecipe>
diff --git a/recipes/team/recipex_lacp_004.xml b/recipes/team/recipex_lacp_004.xml
new file mode 100644
index 0000000..aae1ef8
--- /dev/null
+++ b/recipes/team/recipex_lacp_004.xml
@@ -0,0 +1,21 @@
+<nettestrecipe>
+ <machines>
+ <define>
+ <alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
+ </define>
+ <machine id="1">
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_lacp.xml"/>
+ </machine>
+ <define>
+ <alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
+ </define>
+ <machine id="2">
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-bond_lacp.xml"/>
+ </machine>
+ </machines>
+ <command_sequence source="sequence_iperf.xml"/>
+</nettestrecipe>
diff --git a/recipes/team/recipe_003.xml b/recipes/team/recipex_lb_001.xml
similarity index 52%
copy from recipes/team/recipe_003.xml
copy to recipes/team/recipex_lb_001.xml
index 77fa51c..b680b4b 100644
--- a/recipes/team/recipe_003.xml
+++ b/recipes/team/recipex_lb_001.xml
@@ -2,17 +2,19 @@
<machines>
<define>
<alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-test1.xml"/>
- <netconfig source="netconfig-simple.xml"/>
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_lb.xml"/>
</machine>
<define>
<alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
</define>
<machine id="2">
- <machineconfig source="machineconfig-test2.xml"/>
- <netconfig source="netconfig-team_rr.xml"/>
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_ping_simple.xml"/>
diff --git a/recipes/team/recipex_lb_002.xml b/recipes/team/recipex_lb_002.xml
new file mode 100644
index 0000000..2519716
--- /dev/null
+++ b/recipes/team/recipex_lb_002.xml
@@ -0,0 +1,36 @@
+<nettestrecipe>
+ <machines>
+ <define>
+ <alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
+ </define>
+ <machine id="1">
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_lb.xml"/>
+ </machine>
+ <define>
+ <alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
+ </define>
+ <machine id="2">
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-simple_br.xml"/>
+ </machine>
+ </machines>
+ <define>
+ <alias name="multicast_group" value="239.1.2.3"/>
+ <alias name="port" value="1337"/>
+ <alias name="test_duration" value="10"/>
+ <alias name="send_delay" value="0.1"/>
+ <alias name="nonexistent_ip" value="127.0.0.200"/>
+ </define>
+
+ <command_sequence
source="../multicast/cmd_sequences/max_groups.xml"/>
+ <command_sequence
source="../multicast/cmd_sequences/block_source.xml"/>
+ <command_sequence
source="../multicast/cmd_sequences/source_membership.xml"/>
+ <command_sequence
source="../multicast/cmd_sequences/membership.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/if.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/ttl.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/loop.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/simple.xml"/>
+</nettestrecipe>
diff --git a/recipes/team/recipe_003.xml b/recipes/team/recipex_lb_003.xml
similarity index 53%
copy from recipes/team/recipe_003.xml
copy to recipes/team/recipex_lb_003.xml
index 77fa51c..87c9538 100644
--- a/recipes/team/recipe_003.xml
+++ b/recipes/team/recipex_lb_003.xml
@@ -2,18 +2,20 @@
<machines>
<define>
<alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-test1.xml"/>
- <netconfig source="netconfig-simple.xml"/>
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_lb.xml"/>
</machine>
<define>
<alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
</define>
<machine id="2">
- <machineconfig source="machineconfig-test2.xml"/>
- <netconfig source="netconfig-team_rr.xml"/>
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-simple.xml"/>
</machine>
</machines>
- <command_sequence source="sequence_ping_simple.xml"/>
+ <command_sequence source="sequence_pktgen.xml"/>
</nettestrecipe>
diff --git a/recipes/team/recipex_lb_004.xml b/recipes/team/recipex_lb_004.xml
new file mode 100644
index 0000000..e3a9632
--- /dev/null
+++ b/recipes/team/recipex_lb_004.xml
@@ -0,0 +1,21 @@
+<nettestrecipe>
+ <machines>
+ <define>
+ <alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
+ </define>
+ <machine id="1">
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_lb.xml"/>
+ </machine>
+ <define>
+ <alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
+ </define>
+ <machine id="2">
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-simple_br.xml"/>
+ </machine>
+ </machines>
+ <command_sequence source="sequence_iperf.xml"/>
+</nettestrecipe>
diff --git a/recipes/team/recipe_001.xml b/recipes/team/recipex_rr_001.xml
similarity index 60%
rename from recipes/team/recipe_001.xml
rename to recipes/team/recipex_rr_001.xml
index ad5a536..7fde885 100644
--- a/recipes/team/recipe_001.xml
+++ b/recipes/team/recipex_rr_001.xml
@@ -2,17 +2,19 @@
<machines>
<define>
<alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-test1.xml"/>
+ <machineconfig source="machineconfig-peanut.xml"/>
<netconfig source="netconfig-team_rr.xml"/>
</machine>
<define>
<alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
</define>
<machine id="2">
- <machineconfig source="machineconfig-test2.xml"/>
- <netconfig source="netconfig-team_rr.xml"/>
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_ping_simple.xml"/>
diff --git a/recipes/team/recipex_rr_002.xml b/recipes/team/recipex_rr_002.xml
new file mode 100644
index 0000000..e8caa42
--- /dev/null
+++ b/recipes/team/recipex_rr_002.xml
@@ -0,0 +1,36 @@
+<nettestrecipe>
+ <machines>
+ <define>
+ <alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
+ </define>
+ <machine id="1">
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_rr.xml"/>
+ </machine>
+ <define>
+ <alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
+ </define>
+ <machine id="2">
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-simple_br.xml"/>
+ </machine>
+ </machines>
+ <define>
+ <alias name="multicast_group" value="239.1.2.3"/>
+ <alias name="port" value="1337"/>
+ <alias name="test_duration" value="10"/>
+ <alias name="send_delay" value="0.1"/>
+ <alias name="nonexistent_ip" value="127.0.0.200"/>
+ </define>
+
+ <command_sequence
source="../multicast/cmd_sequences/max_groups.xml"/>
+ <command_sequence
source="../multicast/cmd_sequences/block_source.xml"/>
+ <command_sequence
source="../multicast/cmd_sequences/source_membership.xml"/>
+ <command_sequence
source="../multicast/cmd_sequences/membership.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/if.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/ttl.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/loop.xml"/>
+ <command_sequence source="../multicast/cmd_sequences/simple.xml"/>
+</nettestrecipe>
diff --git a/recipes/team/recipe_003.xml b/recipes/team/recipex_rr_003.xml
similarity index 60%
copy from recipes/team/recipe_003.xml
copy to recipes/team/recipex_rr_003.xml
index 77fa51c..c5fec2d 100644
--- a/recipes/team/recipe_003.xml
+++ b/recipes/team/recipex_rr_003.xml
@@ -2,18 +2,20 @@
<machines>
<define>
<alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-test1.xml"/>
- <netconfig source="netconfig-simple.xml"/>
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_rr.xml"/>
</machine>
<define>
<alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
</define>
<machine id="2">
- <machineconfig source="machineconfig-test2.xml"/>
- <netconfig source="netconfig-team_rr.xml"/>
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-simple.xml"/>
</machine>
</machines>
- <command_sequence source="sequence_ping_simple.xml"/>
+ <command_sequence source="sequence_pktgen.xml"/>
</nettestrecipe>
diff --git a/recipes/team/recipe_003.xml b/recipes/team/recipex_rr_004.xml
similarity index 53%
rename from recipes/team/recipe_003.xml
rename to recipes/team/recipex_rr_004.xml
index 77fa51c..299016e 100644
--- a/recipes/team/recipe_003.xml
+++ b/recipes/team/recipex_rr_004.xml
@@ -2,18 +2,20 @@
<machines>
<define>
<alias name="testip" value="192.168.111.1/24"/>
+ <alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-test1.xml"/>
- <netconfig source="netconfig-simple.xml"/>
+ <machineconfig source="machineconfig-peanut.xml"/>
+ <netconfig source="netconfig-team_rr.xml"/>
</machine>
<define>
<alias name="testip" value="192.168.111.2/24"/>
+ <alias name="testip6" value="fe01::2/64"/>
</define>
<machine id="2">
- <machineconfig source="machineconfig-test2.xml"/>
- <netconfig source="netconfig-team_rr.xml"/>
+ <machineconfig source="machineconfig-dhcp-37-128.xml"/>
+ <netconfig source="netconfig-simple_br.xml"/>
</machine>
</machines>
- <command_sequence source="sequence_ping_simple.xml"/>
+ <command_sequence source="sequence_iperf.xml"/>
</nettestrecipe>
diff --git a/recipes/team/sequence_iperf.xml b/recipes/team/sequence_iperf.xml
new file mode 100644
index 0000000..a279705
--- /dev/null
+++ b/recipes/team/sequence_iperf.xml
@@ -0,0 +1,18 @@
+<command_sequence>
+ <command type="exec" value="sleep 3" />
+ <command machine_id="2" type="test" value="Iperf"
bg_id="1">
+ <options>
+ <option name="role" value="server" />
+ <option name="bind" value="{ip(2,testiface)}" />
+ </options>
+ </command>
+ <command type="exec" value="sleep 3" />
+ <command machine_id="1" type="test" value="Iperf">
+ <options>
+ <option name="role" value="client" />
+ <option name="duration" value="15"/>
+ <option name="iperf_server" value="{ip(2,testiface)}" />
+ </options>
+ </command>
+ <command type="kill" machine_id="2" value="1" />
+</command_sequence>
diff --git a/recipes/team/sequence_ping_simple.xml
b/recipes/team/sequence_ping_simple.xml
index 41d053c..9f3c2f2 100644
--- a/recipes/team/sequence_ping_simple.xml
+++ b/recipes/team/sequence_ping_simple.xml
@@ -1,10 +1,18 @@
<command_sequence>
<command type="exec" value="sleep 4"/>
- <command machine_id="1" timeout="30" type="test"
value="IcmpPing">
+ <command machine_id="1" timeout="60" type="test"
value="IcmpPing">
<options>
- <option name="addr"
value="{$recipe['machines']['2']['netconfig']['3']['addresses'][0]}"/>
- <option name="count" value="40"/>
- <option name="interval" value="0.2"/>
+ <option name="addr" value="{ip(2,testiface)}"/>
+ <option name="count" value="2000"/>
+ <option name="interval" value="0.01"/>
+ <option name="limit_rate" value="95"/>
+ </options>
+ </command>
+ <command machine_id="1" timeout="60" type="test"
value="Icmp6Ping">
+ <options>
+ <option name="addr" value="{ip(2,testiface,1)}"/>
+ <option name="count" value="2000"/>
+ <option name="interval" value="0.01"/>
<option name="limit_rate" value="95"/>
</options>
</command>
diff --git a/recipes/team/sequence_pktgen.xml b/recipes/team/sequence_pktgen.xml
new file mode 100644
index 0000000..d375a41
--- /dev/null
+++ b/recipes/team/sequence_pktgen.xml
@@ -0,0 +1,21 @@
+<command_sequence>
+ <command type="exec" value="sleep 4"/>
+ <command machine_id="1" type="test" value="PktCounter"
bg_id="1">
+ <options>
+ <option name="input_netdev_name"
value="{devname(1,testiface)}"/>
+ <option name="proto" value="udp"/>
+ <option name="dport" value="9"/>
+ </options>
+ </command>
+ <command machine_id="2" type="test" value="PktgenTx"
timeout="200">
+ <options>
+ <option name="pktgen_option" value="dst
{ip(1,testiface)}"/>
+ <option name="pktgen_option" value="dst_mac
00:11:22:33:44:55"/>
+ <option name="pktgen_option" value="src_min
{ip(2,testiface)}"/>
+ <option name="netdev_name"
value="{devname(2,testiface)}"/>
+ <option name="netdev_name" value="{devname(2,2)}"/>
+ <option name="netdev_name" value="{devname(2,3)}"/>
+ </options>
+ </command>
+ <command machine_id="1" type="intr" value="1"/>
+</command_sequence>
diff --git a/recipes/team/sequence_pktgen_lacp.xml
b/recipes/team/sequence_pktgen_lacp.xml
new file mode 100644
index 0000000..c1e4395
--- /dev/null
+++ b/recipes/team/sequence_pktgen_lacp.xml
@@ -0,0 +1,21 @@
+<command_sequence>
+ <command type="exec" value="sleep 4"/>
+ <command machine_id="1" type="test" value="PktCounter"
bg_id="1">
+ <options>
+ <option name="input_netdev_name"
value="{devname(1,testiface)}"/>
+ <option name="proto" value="udp"/>
+ <option name="dport" value="9"/>
+ </options>
+ </command>
+ <command machine_id="2" type="test" value="PktgenTx"
timeout="200">
+ <options>
+ <option name="pktgen_option" value="dst
{ip(1,testiface)}"/>
+ <option name="pktgen_option" value="dst_mac
00:11:22:33:44:55"/>
+ <option name="pktgen_option" value="src_min
{ip(2,testiface)}"/>
+ <option name="netdev_name" value="{devname(2,1)}"/>
+ <option name="netdev_name" value="{devname(2,2)}"/>
+ <option name="netdev_name" value="{devname(2,3)}"/>
+ </options>
+ </command>
+ <command machine_id="1" type="intr" value="1"/>
+</command_sequence>