commit 31680f58327ac0e7ddb33ccadc5e9f5bb1610989
Author: Jan Tluka <jtluka(a)redhat.com>
Date: Fri May 24 16:10:09 2013 +0200
Update team driver recipes to new recipe xml syntax
This commit converts all recipes under recipes/team directory to
recently changed recipe syntax.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
recipes/team/interfaces-bond_lacp.xml | 20 +++++
...mapping.xml => interfaces-br_queue_mapping.xml} | 14 ++--
recipes/team/interfaces-simple.xml | 9 ++
...nfig-simple_br.xml => interfaces-simple_br.xml} | 14 ++--
recipes/team/interfaces-team_ab.xml | 50 +++++++++++
...ab_lw_001.xml => interfaces-team_ab_lw_001.xml} | 14 ++--
recipes/team/interfaces-team_ab_lw_002.xml | 60 +++++++++++++
...ab_lw_005.xml => interfaces-team_ab_lw_003.xml} | 27 +++---
recipes/team/interfaces-team_ab_lw_004.xml | 68 +++++++++++++++
...ab_lw_003.xml => interfaces-team_ab_lw_005.xml} | 27 +++---
recipes/team/interfaces-team_ab_lw_006.xml | 65 ++++++++++++++
recipes/team/interfaces-team_ab_lw_007.xml | 64 ++++++++++++++
recipes/team/interfaces-team_ab_lw_008.xml | 90 ++++++++++++++++++++
...ig-team_bcast.xml => interfaces-team_bcast.xml} | 14 ++--
...nfig-team_lacp.xml => interfaces-team_lacp.xml} | 32 ++++----
...m_lacp_act.xml => interfaces-team_lacp_act.xml} | 38 ++++----
...assive.xml => interfaces-team_lacp_passive.xml} | 32 ++++----
...wrate.xml => interfaces-team_lacp_slowrate.xml} | 32 ++++----
...etconfig-team_lb.xml => interfaces-team_lb.xml} | 20 ++--
...-team_lb_act.xml => interfaces-team_lb_act.xml} | 26 +++---
...etconfig-team_rr.xml => interfaces-team_rr.xml} | 14 ++--
recipes/team/interfaces-team_rr_queue_mapping.xml | 50 +++++++++++
recipes/team/netconfig-bond_lacp.xml | 20 -----
recipes/team/netconfig-simple.xml | 9 --
recipes/team/netconfig-team_ab.xml | 50 -----------
recipes/team/netconfig-team_ab_lw_002.xml | 60 -------------
recipes/team/netconfig-team_ab_lw_004.xml | 68 ---------------
recipes/team/netconfig-team_ab_lw_006.xml | 65 --------------
recipes/team/netconfig-team_ab_lw_007.xml | 64 --------------
recipes/team/netconfig-team_ab_lw_008.xml | 87 -------------------
recipes/team/netconfig-team_rr_queue_mapping.xml | 50 -----------
recipes/team/recipex_ab_001.xml | 8 +-
recipes/team/recipex_ab_002.xml | 6 +-
recipes/team/recipex_ab_003.xml | 6 +-
recipes/team/recipex_ab_004.xml | 6 +-
recipes/team/recipex_bcast_001.xml | 6 +-
recipes/team/recipex_bcast_002.xml | 6 +-
recipes/team/recipex_bcast_003.xml | 6 +-
recipes/team/recipex_bcast_004.xml | 6 +-
recipes/team/recipex_lacp_001.xml | 6 +-
recipes/team/recipex_lacp_002.xml | 6 +-
recipes/team/recipex_lacp_003.xml | 6 +-
recipes/team/recipex_lacp_004.xml | 6 +-
recipes/team/recipex_lacp_act_001.xml | 6 +-
recipes/team/recipex_lacp_act_002.xml | 6 +-
recipes/team/recipex_lacp_act_003.xml | 6 +-
recipes/team/recipex_lacp_act_004.xml | 6 +-
recipes/team/recipex_lb_001.xml | 6 +-
recipes/team/recipex_lb_002.xml | 6 +-
recipes/team/recipex_lb_003.xml | 6 +-
recipes/team/recipex_lb_004.xml | 6 +-
recipes/team/recipex_lb_act_001.xml | 6 +-
recipes/team/recipex_lb_act_002.xml | 6 +-
recipes/team/recipex_lb_act_003.xml | 6 +-
recipes/team/recipex_lb_act_004.xml | 6 +-
recipes/team/recipex_rr_001.xml | 6 +-
recipes/team/recipex_rr_002.xml | 6 +-
recipes/team/recipex_rr_003.xml | 6 +-
recipes/team/recipex_rr_004.xml | 6 +-
recipes/team/recipey_ab_lw_001.xml | 6 +-
recipes/team/recipey_ab_lw_002.xml | 6 +-
recipes/team/recipey_ab_lw_003.xml | 6 +-
recipes/team/recipey_ab_lw_004.xml | 6 +-
recipes/team/recipey_ab_lw_005.xml | 6 +-
recipes/team/recipey_ab_lw_006.xml | 6 +-
recipes/team/recipey_ab_lw_007.xml | 6 +-
recipes/team/recipey_ab_lw_008.xml | 6 +-
recipes/team/recipey_lacp_act_flows.xml | 6 +-
recipes/team/recipey_lacp_hashes.xml | 6 +-
recipes/team/recipey_lacp_passive.xml | 6 +-
recipes/team/recipey_lacp_slowrate.xml | 6 +-
recipes/team/recipey_lb_act_flows.xml | 6 +-
recipes/team/recipey_lb_hashes.xml | 6 +-
recipes/team/recipey_rr_queue_mapping.xml | 6 +-
recipes/team/sequence_iperf.xml | 4 +-
recipes/team/sequence_ping_simple.xml | 2 +-
recipes/team/sequence_pktgen.xml | 2 +-
recipes/team/sequence_pktgen_flows.xml | 4 +-
recipes/team/sequence_pktgen_hashes.xml | 2 +-
recipes/team/sequence_pktgen_lacp.xml | 2 +-
recipes/team/sequence_queue_mapping.xml | 2 +-
81 files changed, 725 insertions(+), 806 deletions(-)
---
diff --git a/recipes/team/interfaces-bond_lacp.xml
b/recipes/team/interfaces-bond_lacp.xml
new file mode 100644
index 0000000..4b53158
--- /dev/null
+++ b/recipes/team/interfaces-bond_lacp.xml
@@ -0,0 +1,20 @@
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <bond id="testiface">
+ <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>
+ </bond>
+</interfaces>
diff --git a/recipes/team/netconfig-br_queue_mapping.xml
b/recipes/team/interfaces-br_queue_mapping.xml
similarity index 59%
rename from recipes/team/netconfig-br_queue_mapping.xml
rename to recipes/team/interfaces-br_queue_mapping.xml
index 0331142..dc864fa 100644
--- a/recipes/team/netconfig-br_queue_mapping.xml
+++ b/recipes/team/interfaces-br_queue_mapping.xml
@@ -1,8 +1,8 @@
-<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">
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <bridge id="testiface">
<slaves>
<slave id="1"/>
<slave id="2"/>
@@ -14,5 +14,5 @@
<address value="172.0.3.2/24"/>
<address value="172.0.4.2/24"/>
</addresses>
- </interface>
-</netconfig>
+ </bridge>
+</interfaces>
diff --git a/recipes/team/interfaces-simple.xml b/recipes/team/interfaces-simple.xml
new file mode 100644
index 0000000..7367512
--- /dev/null
+++ b/recipes/team/interfaces-simple.xml
@@ -0,0 +1,9 @@
+<interfaces>
+ <eth id="testiface" network="net1">
+ <addresses>
+ <address value="{$testip}"/>
+ </addresses>
+ </eth>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+</interfaces>
diff --git a/recipes/team/netconfig-simple_br.xml b/recipes/team/interfaces-simple_br.xml
similarity index 51%
rename from recipes/team/netconfig-simple_br.xml
rename to recipes/team/interfaces-simple_br.xml
index 867d390..0b83caa 100644
--- a/recipes/team/netconfig-simple_br.xml
+++ b/recipes/team/interfaces-simple_br.xml
@@ -1,8 +1,8 @@
-<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">
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <bridge id="testiface">
<slaves>
<slave id="1"/>
<slave id="2"/>
@@ -12,5 +12,5 @@
<address value="{$testip}"/>
<address value="{$testip6}"/>
</addresses>
- </interface>
-</netconfig>
+ </bridge>
+</interfaces>
diff --git a/recipes/team/interfaces-team_ab.xml b/recipes/team/interfaces-team_ab.xml
new file mode 100644
index 0000000..3177fbb
--- /dev/null
+++ b/recipes/team/interfaces-team_ab.xml
@@ -0,0 +1,50 @@
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <team id="testiface">
+ <options>
+ <option name="teamd_config">
+ {
+ "hwaddr": "00:11:22:33:44:55",
+ "runner": {"name": "activebackup"},
+ "link_watch": {"name": "ethtool"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": -10,
+ "sticky": true
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="2">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": 100
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="3">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": 50
+ }
+ </option>
+ </options>
+ </slave>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </team>
+</interfaces>
diff --git a/recipes/team/netconfig-team_ab_lw_001.xml
b/recipes/team/interfaces-team_ab_lw_001.xml
similarity index 70%
rename from recipes/team/netconfig-team_ab_lw_001.xml
rename to recipes/team/interfaces-team_ab_lw_001.xml
index 5a59ab7..2a0e3f5 100644
--- a/recipes/team/netconfig-team_ab_lw_001.xml
+++ b/recipes/team/interfaces-team_ab_lw_001.xml
@@ -1,8 +1,8 @@
-<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">
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <team id="testiface">
<options>
<option name="teamd_config">
{
@@ -21,5 +21,5 @@
<address value="{$testip}"/>
<address value="{$testip6}"/>
</addresses>
- </interface>
-</netconfig>
+ </team>
+</interfaces>
diff --git a/recipes/team/interfaces-team_ab_lw_002.xml
b/recipes/team/interfaces-team_ab_lw_002.xml
new file mode 100644
index 0000000..b589ea0
--- /dev/null
+++ b/recipes/team/interfaces-team_ab_lw_002.xml
@@ -0,0 +1,60 @@
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <team id="testiface">
+ <options>
+ <option name="teamd_config">
+ {
+ "hwaddr": "00:11:22:33:44:55",
+ "runner": {"name": "activebackup"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "link_watch": {
+ "name": "ethtool",
+ "delay_up": 3000,
+ "delay_down": 3000
+ }
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="2">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "link_watch": {
+ "name": "ethtool",
+ "delay_up": 1000,
+ "delay_down": 1000
+ }
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="3">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "link_watch": {
+ "name": "ethtool",
+ "delay_up": 500,
+ "delay_down": 500
+ }
+ }
+ </option>
+ </options>
+ </slave>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </team>
+</interfaces>
diff --git a/recipes/team/netconfig-team_ab_lw_005.xml
b/recipes/team/interfaces-team_ab_lw_003.xml
similarity index 51%
rename from recipes/team/netconfig-team_ab_lw_005.xml
rename to recipes/team/interfaces-team_ab_lw_003.xml
index 68045a4..bbda268 100644
--- a/recipes/team/netconfig-team_ab_lw_005.xml
+++ b/recipes/team/interfaces-team_ab_lw_003.xml
@@ -1,19 +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="team">
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <team id="testiface">
<options>
<option name="teamd_config">
{
"hwaddr": "00:11:22:33:44:55",
"runner": {"name": "activebackup"},
- "link_watch": {
- "name": "nsna_ping",
- "interval": 200,
- "missed_max": 15,
- "target_host": "fe01::2"
- }
+ "link_watch": {
+ "name": "arp_ping",
+ "interval": 100,
+ "missed_max": 30,
+ "source_host": "192.168.111.1",
+ "target_host": "192.168.111.2"
+ }
}
</option>
</options>
@@ -26,5 +27,5 @@
<address value="{$testip}"/>
<address value="{$testip6}"/>
</addresses>
- </interface>
-</netconfig>
+ </team>
+</interfaces>
diff --git a/recipes/team/interfaces-team_ab_lw_004.xml
b/recipes/team/interfaces-team_ab_lw_004.xml
new file mode 100644
index 0000000..628ed03
--- /dev/null
+++ b/recipes/team/interfaces-team_ab_lw_004.xml
@@ -0,0 +1,68 @@
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <team id="testiface">
+ <options>
+ <option name="teamd_config">
+ {
+ "hwaddr": "00:11:22:33:44:55",
+ "runner": {"name": "activebackup"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "link_watch": {
+ "name": "arp_ping",
+ "interval": 1000,
+ "missed_max": 5,
+ "init_wait": 10000,
+ "source_host": "192.168.111.1",
+ "target_host": "192.168.111.2"
+ }
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="2">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "link_watch": {
+ "name": "arp_ping",
+ "interval": 500,
+ "missed_max": 20,
+ "source_host": "192.168.111.1",
+ "target_host": "192.168.111.2"
+ }
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="3">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "link_watch": {
+ "name": "arp_ping",
+ "interval": 100,
+ "missed_max": 30,
+ "init_wait": 0,
+ "source_host": "192.168.111.1",
+ "target_host": "192.168.111.2"
+ }
+ }
+ </option>
+ </options>
+ </slave>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </team>
+</interfaces>
diff --git a/recipes/team/netconfig-team_ab_lw_003.xml
b/recipes/team/interfaces-team_ab_lw_005.xml
similarity index 55%
rename from recipes/team/netconfig-team_ab_lw_003.xml
rename to recipes/team/interfaces-team_ab_lw_005.xml
index 8290c95..634528d 100644
--- a/recipes/team/netconfig-team_ab_lw_003.xml
+++ b/recipes/team/interfaces-team_ab_lw_005.xml
@@ -1,20 +1,19 @@
-<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">
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <team id="testiface">
<options>
<option name="teamd_config">
{
"hwaddr": "00:11:22:33:44:55",
"runner": {"name": "activebackup"},
- "link_watch": {
- "name": "arp_ping",
- "interval": 100,
- "missed_max": 30,
- "source_host": "192.168.111.1",
- "target_host": "192.168.111.2"
- }
+ "link_watch": {
+ "name": "nsna_ping",
+ "interval": 200,
+ "missed_max": 15,
+ "target_host": "fe01::2"
+ }
}
</option>
</options>
@@ -27,5 +26,5 @@
<address value="{$testip}"/>
<address value="{$testip6}"/>
</addresses>
- </interface>
-</netconfig>
+ </team>
+</interfaces>
diff --git a/recipes/team/interfaces-team_ab_lw_006.xml
b/recipes/team/interfaces-team_ab_lw_006.xml
new file mode 100644
index 0000000..cc65c27
--- /dev/null
+++ b/recipes/team/interfaces-team_ab_lw_006.xml
@@ -0,0 +1,65 @@
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <team id="testiface">
+ <options>
+ <option name="teamd_config">
+ {
+ "hwaddr": "00:11:22:33:44:55",
+ "runner": {"name": "activebackup"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "link_watch": {
+ "name": "nsna_ping",
+ "interval": 1000,
+ "missed_max": 5,
+ "init_wait": 10000,
+ "target_host": "fe01::2"
+ }
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="2">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "link_watch": {
+ "name": "nsna_ping",
+ "interval": 500,
+ "missed_max": 20,
+ "target_host": "fe01::2"
+ }
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="3">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "link_watch": {
+ "name": "nsna_ping",
+ "interval": 100,
+ "missed_max": 30,
+ "init_wait": 0,
+ "target_host": "fe01::2"
+ }
+ }
+ </option>
+ </options>
+ </slave>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </team>
+</interfaces>
diff --git a/recipes/team/interfaces-team_ab_lw_007.xml
b/recipes/team/interfaces-team_ab_lw_007.xml
new file mode 100644
index 0000000..6ef0efb
--- /dev/null
+++ b/recipes/team/interfaces-team_ab_lw_007.xml
@@ -0,0 +1,64 @@
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <team id="testiface">
+ <options>
+ <option name="teamd_config">
+ {
+ "hwaddr": "00:11:22:33:44:55",
+ "runner": {"name": "activebackup"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "link_watch": {
+ "name": "ethtool",
+ "delay_up": 1000,
+ "delay_down": 1000
+ }
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="2">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "link_watch": {
+ "name": "arp_ping",
+ "interval": 500,
+ "missed_max": 20,
+ "source_host": "192.168.111.1",
+ "target_host": "192.168.111.2"
+ }
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="3">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "link_watch": {
+ "name": "nsna_ping",
+ "interval": 100,
+ "missed_max": 30,
+ "init_wait": 0,
+ "target_host": "fe01::2"
+ }
+ }
+ </option>
+ </options>
+ </slave>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </team>
+</interfaces>
diff --git a/recipes/team/interfaces-team_ab_lw_008.xml
b/recipes/team/interfaces-team_ab_lw_008.xml
new file mode 100644
index 0000000..0f0085a
--- /dev/null
+++ b/recipes/team/interfaces-team_ab_lw_008.xml
@@ -0,0 +1,90 @@
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <team id="testiface">
+ <options>
+ <option name="teamd_config">
+ {
+ "hwaddr": "00:11:22:33:44:55",
+ "runner": {"name": "activebackup"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "link_watch": [
+ {
+ "name": "nsna_ping",
+ "interval": 1000,
+ "missed_max": 5,
+ "init_wait": 10000,
+ "target_host": "fe01::2"
+ },
+ {
+ "name": "arp_ping",
+ "interval": 1000,
+ "missed_max": 5,
+ "init_wait": 13000,
+ "source_host": "192.168.111.1",
+ "target_host": "192.168.111.2"
+ }
+ ]
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="2">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "link_watch": [
+ {
+ "name": "arp_ping",
+ "interval": 500,
+ "missed_max": 20,
+ "source_host": "192.168.111.1",
+ "target_host": "192.168.111.2"
+ },
+ {
+ "name": "ethtool",
+ "delay_up": 1000,
+ "delay_down": 1000
+ }
+ ]
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="3">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "link_watch": [
+ {
+ "name": "nsna_ping",
+ "interval": 100,
+ "missed_max": 30,
+ "init_wait": 0,
+ "target_host": "fe01::2"
+ },
+ {
+ "name": "ethtool",
+ "delay_up": 500,
+ "delay_down": 500
+ }
+ ]
+ }
+ </option>
+ </options>
+ </slave>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </team>
+</interfaces>
diff --git a/recipes/team/netconfig-team_bcast.xml
b/recipes/team/interfaces-team_bcast.xml
similarity index 68%
rename from recipes/team/netconfig-team_bcast.xml
rename to recipes/team/interfaces-team_bcast.xml
index 9bfab08..d99c321 100644
--- a/recipes/team/netconfig-team_bcast.xml
+++ b/recipes/team/interfaces-team_bcast.xml
@@ -1,8 +1,8 @@
-<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">
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <team id="testiface">
<options>
<option name="teamd_config">
{
@@ -20,5 +20,5 @@
<address value="{$testip}"/>
<address value="{$testip6}"/>
</addresses>
- </interface>
-</netconfig>
+ </team>
+</interfaces>
diff --git a/recipes/team/netconfig-team_lacp.xml b/recipes/team/interfaces-team_lacp.xml
similarity index 61%
rename from recipes/team/netconfig-team_lacp.xml
rename to recipes/team/interfaces-team_lacp.xml
index 57eda3f..6bf0d5b 100644
--- a/recipes/team/netconfig-team_lacp.xml
+++ b/recipes/team/interfaces-team_lacp.xml
@@ -1,16 +1,8 @@
-<netconfig>
- <interface id="1" phys_id="1" type="eth">
- <options>
- <option name="teamd_port_config">
- {
- "prio": -10
- }
- </option>
- </options>
- </interface>
- <interface id="2" phys_id="2" type="eth"/>
- <interface id="3" phys_id="3" type="eth"/>
- <interface id="testiface" type="team">
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <team id="testiface">
<options>
<option name="teamd_config">
{
@@ -26,7 +18,15 @@
</option>
</options>
<slaves>
- <slave id="1"/>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": -10
+ }
+ </option>
+ </options>
+ </slave>
<slave id="2"/>
<slave id="3"/>
</slaves>
@@ -34,5 +34,5 @@
<address value="{$testip}"/>
<address value="{$testip6}"/>
</addresses>
- </interface>
-</netconfig>
+ </team>
+</interfaces>
diff --git a/recipes/team/netconfig-team_lacp_act.xml
b/recipes/team/interfaces-team_lacp_act.xml
similarity index 55%
rename from recipes/team/netconfig-team_lacp_act.xml
rename to recipes/team/interfaces-team_lacp_act.xml
index 386e1a4..658976c 100644
--- a/recipes/team/netconfig-team_lacp_act.xml
+++ b/recipes/team/interfaces-team_lacp_act.xml
@@ -1,16 +1,8 @@
-<netconfig>
- <interface id="1" phys_id="1" type="eth">
- <options>
- <option name="teamd_port_config">
- {
- "prio": -10
- }
- </option>
- </options>
- </interface>
- <interface id="2" phys_id="2" type="eth"/>
- <interface id="3" phys_id="3" type="eth"/>
- <interface id="testiface" type="team">
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <team id="testiface">
<options>
<option name="teamd_config">
{
@@ -20,16 +12,24 @@
"active": true,
"fast_rate": true,
"tx_hash": ["eth", "ipv4",
"ipv6"],
- "tx_balancer": {
- "name": "basic"
- }
+ "tx_balancer": {
+ "name": "basic"
+ }
},
"link_watch": {"name": "ethtool"}
}
</option>
</options>
<slaves>
- <slave id="1"/>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": -10
+ }
+ </option>
+ </options>
+ </slave>
<slave id="2"/>
<slave id="3"/>
</slaves>
@@ -37,5 +37,5 @@
<address value="{$testip}"/>
<address value="{$testip6}"/>
</addresses>
- </interface>
-</netconfig>
+ </team>
+</interfaces>
diff --git a/recipes/team/netconfig-team_lacp_passive.xml
b/recipes/team/interfaces-team_lacp_passive.xml
similarity index 61%
rename from recipes/team/netconfig-team_lacp_passive.xml
rename to recipes/team/interfaces-team_lacp_passive.xml
index ef4cf91..e25bd7c 100644
--- a/recipes/team/netconfig-team_lacp_passive.xml
+++ b/recipes/team/interfaces-team_lacp_passive.xml
@@ -1,16 +1,8 @@
-<netconfig>
- <interface id="1" phys_id="1" type="eth">
- <options>
- <option name="teamd_port_config">
- {
- "prio": -10
- }
- </option>
- </options>
- </interface>
- <interface id="2" phys_id="2" type="eth"/>
- <interface id="3" phys_id="3" type="eth"/>
- <interface id="testiface" type="team">
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <team id="testiface">
<options>
<option name="teamd_config">
{
@@ -26,7 +18,15 @@
</option>
</options>
<slaves>
- <slave id="1"/>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": -10
+ }
+ </option>
+ </options>
+ </slave>
<slave id="2"/>
<slave id="3"/>
</slaves>
@@ -34,5 +34,5 @@
<address value="{$testip}"/>
<address value="{$testip6}"/>
</addresses>
- </interface>
-</netconfig>
+ </team>
+</interfaces>
diff --git a/recipes/team/netconfig-team_lacp_slowrate.xml
b/recipes/team/interfaces-team_lacp_slowrate.xml
similarity index 61%
rename from recipes/team/netconfig-team_lacp_slowrate.xml
rename to recipes/team/interfaces-team_lacp_slowrate.xml
index c90fece..52cab70 100644
--- a/recipes/team/netconfig-team_lacp_slowrate.xml
+++ b/recipes/team/interfaces-team_lacp_slowrate.xml
@@ -1,16 +1,8 @@
-<netconfig>
- <interface id="1" phys_id="1" type="eth">
- <options>
- <option name="teamd_port_config">
- {
- "prio": -10
- }
- </option>
- </options>
- </interface>
- <interface id="2" phys_id="2" type="eth"/>
- <interface id="3" phys_id="3" type="eth"/>
- <interface id="testiface" type="team">
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <team id="testiface">
<options>
<option name="teamd_config">
{
@@ -26,7 +18,15 @@
</option>
</options>
<slaves>
- <slave id="1"/>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": -10
+ }
+ </option>
+ </options>
+ </slave>
<slave id="2"/>
<slave id="3"/>
</slaves>
@@ -34,5 +34,5 @@
<address value="{$testip}"/>
<address value="{$testip6}"/>
</addresses>
- </interface>
-</netconfig>
+ </team>
+</interfaces>
diff --git a/recipes/team/netconfig-team_lb.xml b/recipes/team/interfaces-team_lb.xml
similarity index 60%
rename from recipes/team/netconfig-team_lb.xml
rename to recipes/team/interfaces-team_lb.xml
index 5a305ed..7091501 100644
--- a/recipes/team/netconfig-team_lb.xml
+++ b/recipes/team/interfaces-team_lb.xml
@@ -1,16 +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="team">
+<interfaces>
+ <eth id="1" network="1"/>
+ <eth id="2" network="2"/>
+ <eth id="3" network="3"/>
+ <team id="testiface">
<options>
<option name="teamd_config">
{
"hwaddr": "00:11:22:33:44:55",
"runner": {
- "name": "loadbalance",
- "tx_hash": ["eth", "ipv4", "ipv6"]
- }
+ "name": "loadbalance",
+ "tx_hash": ["eth", "ipv4",
"ipv6"]
+ }
}
</option>
</options>
@@ -23,5 +23,5 @@
<address value="{$testip}"/>
<address value="{$testip6}"/>
</addresses>
- </interface>
-</netconfig>
+ </team>
+</interfaces>
diff --git a/recipes/team/netconfig-team_lb_act.xml
b/recipes/team/interfaces-team_lb_act.xml
similarity index 53%
rename from recipes/team/netconfig-team_lb_act.xml
rename to recipes/team/interfaces-team_lb_act.xml
index fca08ce..3b9a8ca 100644
--- a/recipes/team/netconfig-team_lb_act.xml
+++ b/recipes/team/interfaces-team_lb_act.xml
@@ -1,19 +1,19 @@
-<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">
+<interfaces>
+ <eth id="1" network="net1" />
+ <eth id="2" network="net2" />
+ <eth id="3" network="net3" />
+ <team id="testiface">
<options>
<option name="teamd_config">
{
"hwaddr": "00:11:22:33:44:55",
"runner": {
- "name": "loadbalance",
- "tx_hash": ["eth", "ipv4", "ipv6"],
- "tx_balancer": {
- "name": "basic"
- }
- }
+ "name": "loadbalance",
+ "tx_hash": ["eth", "ipv4",
"ipv6"],
+ "tx_balancer": {
+ "name": "basic"
+ }
+ }
}
</option>
</options>
@@ -26,5 +26,5 @@
<address value="{$testip}"/>
<address value="{$testip6}"/>
</addresses>
- </interface>
-</netconfig>
+ </team>
+</interfaces>
diff --git a/recipes/team/netconfig-team_rr.xml b/recipes/team/interfaces-team_rr.xml
similarity index 68%
rename from recipes/team/netconfig-team_rr.xml
rename to recipes/team/interfaces-team_rr.xml
index b223c1a..02d5252 100644
--- a/recipes/team/netconfig-team_rr.xml
+++ b/recipes/team/interfaces-team_rr.xml
@@ -1,8 +1,8 @@
-<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">
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <team id="testiface">
<options>
<option name="teamd_config">
{
@@ -20,5 +20,5 @@
<address value="{$testip}"/>
<address value="{$testip6}"/>
</addresses>
- </interface>
-</netconfig>
+ </team>
+</interfaces>
diff --git a/recipes/team/interfaces-team_rr_queue_mapping.xml
b/recipes/team/interfaces-team_rr_queue_mapping.xml
new file mode 100644
index 0000000..989782e
--- /dev/null
+++ b/recipes/team/interfaces-team_rr_queue_mapping.xml
@@ -0,0 +1,50 @@
+<interfaces>
+ <eth id="1" network="net1"/>
+ <eth id="2" network="net2"/>
+ <eth id="3" network="net3"/>
+ <team id="testiface">
+ <options>
+ <option name="teamd_config">
+ {
+ "hwaddr": "00:11:22:33:44:55",
+ "runner": {"name": "roundrobin"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "queue_id": 1
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="2">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "queue_id": 2
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="3">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "queue_id": 3
+ }
+ </option>
+ </options>
+ </slave>
+ </slaves>
+ <addresses>
+ <address value="172.0.1.1/24"/>
+ <address value="172.0.2.1/24"/>
+ <address value="172.0.3.1/24"/>
+ <address value="172.0.4.1/24"/>
+ </addresses>
+ </team>
+</interfaces>
diff --git a/recipes/team/recipex_ab_001.xml b/recipes/team/recipex_ab_001.xml
index f329131..9ba2947 100644
--- a/recipes/team/recipex_ab_001.xml
+++ b/recipes/team/recipex_ab_001.xml
@@ -5,16 +5,16 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_ab.xml"/>
+ <params/>
+ <interfaces source="interfaces-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"/>
+ <params/>
+ <interfaces source="interfaces-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
index f4c954d..df5c138 100644
--- a/recipes/team/recipex_ab_002.xml
+++ b/recipes/team/recipex_ab_002.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_ab.xml"/>
+ <interfaces source="interfaces-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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<define>
diff --git a/recipes/team/recipex_ab_003.xml b/recipes/team/recipex_ab_003.xml
index 97b62ef..858c330 100644
--- a/recipes/team/recipex_ab_003.xml
+++ b/recipes/team/recipex_ab_003.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_ab.xml"/>
+ <interfaces source="interfaces-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.xml"/>
+ <interfaces source="interfaces-simple.xml"/>
</machine>
</machines>
<command_sequence source="sequence_pktgen.xml"/>
diff --git a/recipes/team/recipex_ab_004.xml b/recipes/team/recipex_ab_004.xml
index 70727e3..0cefe69 100644
--- a/recipes/team/recipex_ab_004.xml
+++ b/recipes/team/recipex_ab_004.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_ab.xml"/>
+ <interfaces source="interfaces-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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_iperf.xml"/>
diff --git a/recipes/team/recipex_bcast_001.xml b/recipes/team/recipex_bcast_001.xml
index 6eea76d..e369dd8 100644
--- a/recipes/team/recipex_bcast_001.xml
+++ b/recipes/team/recipex_bcast_001.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_bcast.xml"/>
+ <interfaces source="interfaces-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"/>
+ <interfaces source="interfaces-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
index d1b352c..268f185 100644
--- a/recipes/team/recipex_bcast_002.xml
+++ b/recipes/team/recipex_bcast_002.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_bcast.xml"/>
+ <interfaces source="interfaces-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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<define>
diff --git a/recipes/team/recipex_bcast_003.xml b/recipes/team/recipex_bcast_003.xml
index 2874a81..d878298 100644
--- a/recipes/team/recipex_bcast_003.xml
+++ b/recipes/team/recipex_bcast_003.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_bcast.xml"/>
+ <interfaces source="interfaces-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.xml"/>
+ <interfaces source="interfaces-simple.xml"/>
</machine>
</machines>
<command_sequence source="sequence_pktgen.xml"/>
diff --git a/recipes/team/recipex_bcast_004.xml b/recipes/team/recipex_bcast_004.xml
index 2f34a26..720957c 100644
--- a/recipes/team/recipex_bcast_004.xml
+++ b/recipes/team/recipex_bcast_004.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_bcast.xml"/>
+ <interfaces source="interfaces-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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_iperf.xml"/>
diff --git a/recipes/team/recipex_lacp_001.xml b/recipes/team/recipex_lacp_001.xml
index fe116ed..95e1a1e 100644
--- a/recipes/team/recipex_lacp_001.xml
+++ b/recipes/team/recipex_lacp_001.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lacp.xml"/>
+ <interfaces source="interfaces-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"/>
+ <interfaces source="interfaces-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
index 189b22e..fb0602c 100644
--- a/recipes/team/recipex_lacp_002.xml
+++ b/recipes/team/recipex_lacp_002.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lacp.xml"/>
+ <interfaces source="interfaces-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"/>
+ <interfaces source="interfaces-bond_lacp.xml"/>
</machine>
</machines>
<define>
diff --git a/recipes/team/recipex_lacp_003.xml b/recipes/team/recipex_lacp_003.xml
index 130caad..94515c8 100644
--- a/recipes/team/recipex_lacp_003.xml
+++ b/recipes/team/recipex_lacp_003.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lacp.xml"/>
+ <interfaces source="interfaces-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"/>
+ <interfaces source="interfaces-bond_lacp.xml"/>
</machine>
</machines>
<command_sequence source="sequence_pktgen_lacp.xml"/>
diff --git a/recipes/team/recipex_lacp_004.xml b/recipes/team/recipex_lacp_004.xml
index 758036c..59c52de 100644
--- a/recipes/team/recipex_lacp_004.xml
+++ b/recipes/team/recipex_lacp_004.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lacp.xml"/>
+ <interfaces source="interfaces-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"/>
+ <interfaces source="interfaces-bond_lacp.xml"/>
</machine>
</machines>
<command_sequence source="sequence_iperf.xml"/>
diff --git a/recipes/team/recipex_lacp_act_001.xml
b/recipes/team/recipex_lacp_act_001.xml
index d48cbac..aa7d198 100644
--- a/recipes/team/recipex_lacp_act_001.xml
+++ b/recipes/team/recipex_lacp_act_001.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lacp_act.xml"/>
+ <interfaces source="interfaces-team_lacp_act.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"/>
+ <interfaces source="interfaces-bond_lacp.xml"/>
</machine>
</machines>
<command_sequence source="sequence_ping_simple.xml"/>
diff --git a/recipes/team/recipex_lacp_act_002.xml
b/recipes/team/recipex_lacp_act_002.xml
index f4e5c6e..0ab7a23 100644
--- a/recipes/team/recipex_lacp_act_002.xml
+++ b/recipes/team/recipex_lacp_act_002.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lacp_act.xml"/>
+ <interfaces source="interfaces-team_lacp_act.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"/>
+ <interfaces source="interfaces-bond_lacp.xml"/>
</machine>
</machines>
<define>
diff --git a/recipes/team/recipex_lacp_act_003.xml
b/recipes/team/recipex_lacp_act_003.xml
index cfa62ea..64751f6 100644
--- a/recipes/team/recipex_lacp_act_003.xml
+++ b/recipes/team/recipex_lacp_act_003.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lacp_act.xml"/>
+ <interfaces source="interfaces-team_lacp_act.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"/>
+ <interfaces source="interfaces-bond_lacp.xml"/>
</machine>
</machines>
<command_sequence source="sequence_pktgen_lacp.xml"/>
diff --git a/recipes/team/recipex_lacp_act_004.xml
b/recipes/team/recipex_lacp_act_004.xml
index 26ee907..2d6de99 100644
--- a/recipes/team/recipex_lacp_act_004.xml
+++ b/recipes/team/recipex_lacp_act_004.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lacp_act.xml"/>
+ <interfaces source="interfaces-team_lacp_act.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"/>
+ <interfaces source="interfaces-bond_lacp.xml"/>
</machine>
</machines>
<command_sequence source="sequence_iperf.xml"/>
diff --git a/recipes/team/recipex_lb_001.xml b/recipes/team/recipex_lb_001.xml
index 84f64c0..00f34aa 100644
--- a/recipes/team/recipex_lb_001.xml
+++ b/recipes/team/recipex_lb_001.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lb.xml"/>
+ <interfaces source="interfaces-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"/>
+ <interfaces source="interfaces-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
index 9145b74..8c49a4f 100644
--- a/recipes/team/recipex_lb_002.xml
+++ b/recipes/team/recipex_lb_002.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lb.xml"/>
+ <interfaces source="interfaces-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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<define>
diff --git a/recipes/team/recipex_lb_003.xml b/recipes/team/recipex_lb_003.xml
index dfab190..586536a 100644
--- a/recipes/team/recipex_lb_003.xml
+++ b/recipes/team/recipex_lb_003.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lb.xml"/>
+ <interfaces source="interfaces-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.xml"/>
+ <interfaces source="interfaces-simple.xml"/>
</machine>
</machines>
<command_sequence source="sequence_pktgen.xml"/>
diff --git a/recipes/team/recipex_lb_004.xml b/recipes/team/recipex_lb_004.xml
index 3b84288..772781d 100644
--- a/recipes/team/recipex_lb_004.xml
+++ b/recipes/team/recipex_lb_004.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lb.xml"/>
+ <interfaces source="interfaces-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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_iperf.xml"/>
diff --git a/recipes/team/recipex_lb_act_001.xml b/recipes/team/recipex_lb_act_001.xml
index 1efd3a7..4e9c362 100644
--- a/recipes/team/recipex_lb_act_001.xml
+++ b/recipes/team/recipex_lb_act_001.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lb_act.xml"/>
+ <interfaces source="interfaces-team_lb_act.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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_ping_simple.xml"/>
diff --git a/recipes/team/recipex_lb_act_002.xml b/recipes/team/recipex_lb_act_002.xml
index 37c7d0f..f8fbd13 100644
--- a/recipes/team/recipex_lb_act_002.xml
+++ b/recipes/team/recipex_lb_act_002.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lb_act.xml"/>
+ <interfaces source="interfaces-team_lb_act.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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<define>
diff --git a/recipes/team/recipex_lb_act_003.xml b/recipes/team/recipex_lb_act_003.xml
index c28393d..af9dba6 100644
--- a/recipes/team/recipex_lb_act_003.xml
+++ b/recipes/team/recipex_lb_act_003.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lb_act.xml"/>
+ <interfaces source="interfaces-team_lb_act.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.xml"/>
+ <interfaces source="interfaces-simple.xml"/>
</machine>
</machines>
<command_sequence source="sequence_pktgen.xml"/>
diff --git a/recipes/team/recipex_lb_act_004.xml b/recipes/team/recipex_lb_act_004.xml
index 0cba207..fff409d 100644
--- a/recipes/team/recipex_lb_act_004.xml
+++ b/recipes/team/recipex_lb_act_004.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lb_act.xml"/>
+ <interfaces source="interfaces-team_lb_act.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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_iperf.xml"/>
diff --git a/recipes/team/recipex_rr_001.xml b/recipes/team/recipex_rr_001.xml
index 2b5b129..8a8e561 100644
--- a/recipes/team/recipex_rr_001.xml
+++ b/recipes/team/recipex_rr_001.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_rr.xml"/>
+ <interfaces source="interfaces-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"/>
+ <interfaces source="interfaces-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
index cdf4611..0a283cc 100644
--- a/recipes/team/recipex_rr_002.xml
+++ b/recipes/team/recipex_rr_002.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_rr.xml"/>
+ <interfaces source="interfaces-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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<define>
diff --git a/recipes/team/recipex_rr_003.xml b/recipes/team/recipex_rr_003.xml
index 99b0d21..2b8407b 100644
--- a/recipes/team/recipex_rr_003.xml
+++ b/recipes/team/recipex_rr_003.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_rr.xml"/>
+ <interfaces source="interfaces-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.xml"/>
+ <interfaces source="interfaces-simple.xml"/>
</machine>
</machines>
<command_sequence source="sequence_pktgen.xml"/>
diff --git a/recipes/team/recipex_rr_004.xml b/recipes/team/recipex_rr_004.xml
index 4b379c2..c244424 100644
--- a/recipes/team/recipex_rr_004.xml
+++ b/recipes/team/recipex_rr_004.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_rr.xml"/>
+ <interfaces source="interfaces-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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_iperf.xml"/>
diff --git a/recipes/team/recipey_ab_lw_001.xml b/recipes/team/recipey_ab_lw_001.xml
index 23a0e38..359fa03 100644
--- a/recipes/team/recipey_ab_lw_001.xml
+++ b/recipes/team/recipey_ab_lw_001.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_ab_lw_001.xml"/>
+ <interfaces source="interfaces-team_ab_lw_001.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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_ping_simple.xml"/>
diff --git a/recipes/team/recipey_ab_lw_002.xml b/recipes/team/recipey_ab_lw_002.xml
index 75e96b4..cacb765 100644
--- a/recipes/team/recipey_ab_lw_002.xml
+++ b/recipes/team/recipey_ab_lw_002.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_ab_lw_002.xml"/>
+ <interfaces source="interfaces-team_ab_lw_002.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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_ping_simple.xml"/>
diff --git a/recipes/team/recipey_ab_lw_003.xml b/recipes/team/recipey_ab_lw_003.xml
index fbe4446..d00f0be 100644
--- a/recipes/team/recipey_ab_lw_003.xml
+++ b/recipes/team/recipey_ab_lw_003.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_ab_lw_003.xml"/>
+ <interfaces source="interfaces-team_ab_lw_003.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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_ping_simple.xml"/>
diff --git a/recipes/team/recipey_ab_lw_004.xml b/recipes/team/recipey_ab_lw_004.xml
index bb0b5d0..280f556 100644
--- a/recipes/team/recipey_ab_lw_004.xml
+++ b/recipes/team/recipey_ab_lw_004.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_ab_lw_004.xml"/>
+ <interfaces source="interfaces-team_ab_lw_004.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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_ping_simple.xml"/>
diff --git a/recipes/team/recipey_ab_lw_005.xml b/recipes/team/recipey_ab_lw_005.xml
index b3d507e..00781d9 100644
--- a/recipes/team/recipey_ab_lw_005.xml
+++ b/recipes/team/recipey_ab_lw_005.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_ab_lw_005.xml"/>
+ <interfaces source="interfaces-team_ab_lw_005.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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_ping_simple.xml"/>
diff --git a/recipes/team/recipey_ab_lw_006.xml b/recipes/team/recipey_ab_lw_006.xml
index e6380a9..48b9669 100644
--- a/recipes/team/recipey_ab_lw_006.xml
+++ b/recipes/team/recipey_ab_lw_006.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_ab_lw_006.xml"/>
+ <interfaces source="interfaces-team_ab_lw_006.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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_ping_simple.xml"/>
diff --git a/recipes/team/recipey_ab_lw_007.xml b/recipes/team/recipey_ab_lw_007.xml
index 32fe454..39f9f68 100644
--- a/recipes/team/recipey_ab_lw_007.xml
+++ b/recipes/team/recipey_ab_lw_007.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_ab_lw_007.xml"/>
+ <interfaces source="interfaces-team_ab_lw_007.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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_ping_simple.xml"/>
diff --git a/recipes/team/recipey_ab_lw_008.xml b/recipes/team/recipey_ab_lw_008.xml
index a3ed494..56ab7f7 100644
--- a/recipes/team/recipey_ab_lw_008.xml
+++ b/recipes/team/recipey_ab_lw_008.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_ab_lw_008.xml"/>
+ <interfaces source="interfaces-team_ab_lw_008.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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_ping_simple.xml"/>
diff --git a/recipes/team/recipey_lacp_act_flows.xml
b/recipes/team/recipey_lacp_act_flows.xml
index 0926aeb..e6cd481 100644
--- a/recipes/team/recipey_lacp_act_flows.xml
+++ b/recipes/team/recipey_lacp_act_flows.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lacp_act.xml"/>
+ <interfaces source="interfaces-team_lacp_act.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"/>
+ <interfaces source="interfaces-bond_lacp.xml"/>
</machine>
</machines>
<command_sequence source="sequence_pktgen_flows.xml"/>
diff --git a/recipes/team/recipey_lacp_hashes.xml b/recipes/team/recipey_lacp_hashes.xml
index aaf25e7..be23faa 100644
--- a/recipes/team/recipey_lacp_hashes.xml
+++ b/recipes/team/recipey_lacp_hashes.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lacp.xml"/>
+ <interfaces source="interfaces-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"/>
+ <interfaces source="interfaces-bond_lacp.xml"/>
</machine>
</machines>
<command_sequence source="sequence_pktgen_hashes.xml"/>
diff --git a/recipes/team/recipey_lacp_passive.xml
b/recipes/team/recipey_lacp_passive.xml
index 53f43a4..f6127b3 100644
--- a/recipes/team/recipey_lacp_passive.xml
+++ b/recipes/team/recipey_lacp_passive.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lacp_passive.xml"/>
+ <interfaces source="interfaces-team_lacp_passive.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"/>
+ <interfaces source="interfaces-bond_lacp.xml"/>
</machine>
</machines>
<command_sequence source="sequence_ping_simple.xml"/>
diff --git a/recipes/team/recipey_lacp_slowrate.xml
b/recipes/team/recipey_lacp_slowrate.xml
index 6681bc2..dc2cbe4 100644
--- a/recipes/team/recipey_lacp_slowrate.xml
+++ b/recipes/team/recipey_lacp_slowrate.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lacp_slowrate.xml"/>
+ <interfaces source="interfaces-team_lacp_slowrate.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"/>
+ <interfaces source="interfaces-bond_lacp.xml"/>
</machine>
</machines>
<command_sequence source="sequence_ping_simple.xml"/>
diff --git a/recipes/team/recipey_lb_act_flows.xml
b/recipes/team/recipey_lb_act_flows.xml
index ef02b4c..3e08ed1 100644
--- a/recipes/team/recipey_lb_act_flows.xml
+++ b/recipes/team/recipey_lb_act_flows.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lb_act.xml"/>
+ <interfaces source="interfaces-team_lb_act.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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_pktgen_flows.xml"/>
diff --git a/recipes/team/recipey_lb_hashes.xml b/recipes/team/recipey_lb_hashes.xml
index 433ed06..25eb9f6 100644
--- a/recipes/team/recipey_lb_hashes.xml
+++ b/recipes/team/recipey_lb_hashes.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_lb.xml"/>
+ <interfaces source="interfaces-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"/>
+ <interfaces source="interfaces-simple_br.xml"/>
</machine>
</machines>
<command_sequence source="sequence_pktgen_hashes.xml"/>
diff --git a/recipes/team/recipey_rr_queue_mapping.xml
b/recipes/team/recipey_rr_queue_mapping.xml
index 6893f9e..72efb19 100644
--- a/recipes/team/recipey_rr_queue_mapping.xml
+++ b/recipes/team/recipey_rr_queue_mapping.xml
@@ -5,16 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<machine id="1">
- <machineconfig source="machineconfig-peanut.xml"/>
- <netconfig source="netconfig-team_rr_queue_mapping.xml"/>
+ <interfaces source="interfaces-team_rr_queue_mapping.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-br_queue_mapping.xml"/>
+ <interfaces source="interfaces-br_queue_mapping.xml"/>
</machine>
</machines>
<command_sequence source="sequence_queue_mapping.xml"/>
diff --git a/recipes/team/sequence_iperf.xml b/recipes/team/sequence_iperf.xml
index a279705..a92977b 100644
--- a/recipes/team/sequence_iperf.xml
+++ b/recipes/team/sequence_iperf.xml
@@ -1,12 +1,12 @@
<command_sequence>
- <command type="exec" value="sleep 3" />
+ <command type="ctl_wait" value="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 type="ctl_wait" value="3" />
<command machine_id="1" type="test" value="Iperf">
<options>
<option name="role" value="client" />
diff --git a/recipes/team/sequence_ping_simple.xml
b/recipes/team/sequence_ping_simple.xml
index 9f3c2f2..ecccb9c 100644
--- a/recipes/team/sequence_ping_simple.xml
+++ b/recipes/team/sequence_ping_simple.xml
@@ -1,5 +1,5 @@
<command_sequence>
- <command type="exec" value="sleep 4"/>
+ <command type="ctl_wait" value="4"/>
<command machine_id="1" timeout="60" type="test"
value="IcmpPing">
<options>
<option name="addr" value="{ip(2,testiface)}"/>
diff --git a/recipes/team/sequence_pktgen.xml b/recipes/team/sequence_pktgen.xml
index d375a41..f969c69 100644
--- a/recipes/team/sequence_pktgen.xml
+++ b/recipes/team/sequence_pktgen.xml
@@ -1,5 +1,5 @@
<command_sequence>
- <command type="exec" value="sleep 4"/>
+ <command type="ctl_wait" value="4"/>
<command machine_id="1" type="test" value="PktCounter"
bg_id="1">
<options>
<option name="input_netdev_name"
value="{devname(1,testiface)}"/>
diff --git a/recipes/team/sequence_pktgen_flows.xml
b/recipes/team/sequence_pktgen_flows.xml
index 9975f86..b65edd5 100644
--- a/recipes/team/sequence_pktgen_flows.xml
+++ b/recipes/team/sequence_pktgen_flows.xml
@@ -1,5 +1,5 @@
<command_sequence>
- <command type="exec" value="sleep 4"/>
+ <command type="ctl_wait" value="4"/>
<command machine_id="1" type="test" value="PktgenTx"
bg_id="1">
<options>
<option name="pktgen_option" value="count 0"/>
@@ -17,6 +17,6 @@
<option name="netdev_name"
value="{devname(1,testiface)}"/>
</options>
</command>
- <command type="exec" value="sleep 400"/>
+ <command type="ctl_wait" value="400"/>
<command machine_id="1" type="intr" value="1"/>
</command_sequence>
diff --git a/recipes/team/sequence_pktgen_hashes.xml
b/recipes/team/sequence_pktgen_hashes.xml
index 978e8c1..f2d61d4 100644
--- a/recipes/team/sequence_pktgen_hashes.xml
+++ b/recipes/team/sequence_pktgen_hashes.xml
@@ -1,5 +1,5 @@
<command_sequence>
- <command type="exec" value="sleep 4"/>
+ <command type="ctl_wait" value="4"/>
<command machine_id="1" type="test" value="PktgenTx"
timeout="200">
<options>
<option name="pktgen_option" value="count 10000"/>
diff --git a/recipes/team/sequence_pktgen_lacp.xml
b/recipes/team/sequence_pktgen_lacp.xml
index c1e4395..9a78e98 100644
--- a/recipes/team/sequence_pktgen_lacp.xml
+++ b/recipes/team/sequence_pktgen_lacp.xml
@@ -1,5 +1,5 @@
<command_sequence>
- <command type="exec" value="sleep 4"/>
+ <command type="ctl_wait" value="4"/>
<command machine_id="1" type="test" value="PktCounter"
bg_id="1">
<options>
<option name="input_netdev_name"
value="{devname(1,testiface)}"/>
diff --git a/recipes/team/sequence_queue_mapping.xml
b/recipes/team/sequence_queue_mapping.xml
index d3999f7..e74138c 100644
--- a/recipes/team/sequence_queue_mapping.xml
+++ b/recipes/team/sequence_queue_mapping.xml
@@ -1,5 +1,5 @@
<command_sequence>
- <command type="exec" value="sleep 4"/>
+ <command type="ctl_wait" value="4"/>
<command machine_id="1" type="exec" value="tc qdisc add dev
{devname(1,testiface)} handle 1 root multiq"/>
<command machine_id="1" type="exec" value="tc filter add
dev {devname(1,testiface)} protocol ip parent 1: prio 1 u32 match ip dst
{ip(2,testiface,0)} action skbedit queue_mapping 1"/>
<command machine_id="1" type="exec" value="tc filter add
dev {devname(1,testiface)} protocol ip parent 1: prio 1 u32 match ip dst
{ip(2,testiface,1)} action skbedit queue_mapping 2"/>