[PATCH 0/3] Summary output format change
by Ondrej Lichtner
From: Ondrej Lichtner <olichtne(a)redhat.com>
Hi everyone,
yesterday I posted an email containing the first version of how I am
reimplementing the summary output. Today I bring you the, hopefully, finished
version in the following patches.
The slightly changed format now looks like this:
2013-05-30 15:09:07| (127.0.0.1)| INFO: ========================================= SUMMARY =========================================
2013-05-30 15:09:07| (127.0.0.1)| INFO: recipes/smoke/tests/recipe-bond-bond.xml PASS
2013-05-30 15:09:07| (127.0.0.1)| INFO: cmd_seq: 1
2013-05-30 15:09:07| (127.0.0.1)| INFO: test IcmpPing bg_id: 1 PASS
2013-05-30 15:09:07| (127.0.0.1)| INFO: ctl_wait 5s PASS
2013-05-30 15:09:07| (127.0.0.1)| INFO: intr id: 1 PASS
2013-05-30 15:09:07| (127.0.0.1)| INFO: cmd_seq: 2
2013-05-30 15:09:07| (127.0.0.1)| INFO: exec [ `ip -o link | grep t_bond0 | wc -l` -gt 0 ] PASS
2013-05-30 15:09:07| (127.0.0.1)| INFO: cmd_seq: 3
2013-05-30 15:09:07| (127.0.0.1)| INFO: test IcmpPing PASS
2013-05-30 15:09:07| (127.0.0.1)| INFO: cmd_seq: 4
2013-05-30 15:09:07| (127.0.0.1)| INFO: system_config PASS
2013-05-30 15:09:07| (127.0.0.1)| INFO: /proc/sys/net/ipv4/igmp_max_memberships previous: 20 current: 8
2013-05-30 15:09:07| (127.0.0.1)| INFO: ===========================================================================================
Ondrej Lichtner (3):
NetTestResultSerializer: add support for command_sequences
NetTestResultSerializer: add method print_summary
lnst-ctl: use the new print_summary method
lnst-ctl | 12 +--
lnst/Controller/NetTestController.py | 1 +
lnst/Controller/NetTestResultSerializer.py | 163 ++++++++++++++++++++++++++++-
3 files changed, 164 insertions(+), 12 deletions(-)
--
1.8.1.4
10 years, 10 months
[lnst trac] #77: no action specified should be treated as error
by fedora-badges
#77: no action specified should be treated as error
----------------------+-----------------------------
Reporter: jtluka | Owner:
Type: defect | Status: new
Priority: trivial | Milestone: Stable Release
Component: lnst-ctl | Version: git
Keywords: | Blocked By:
Blocking: |
----------------------+-----------------------------
If no action is specified to lnst-ctl user should be informed that he
needs to pass some of the 'config_only', 'run', 'match_setup'. Currently
only following information is displayed:
2013-05-23 14:55:51| (127.0.0.1)| INFO: ======================
SUMMARY =====================
2013-05-23 14:55:51| (127.0.0.1)| INFO:
=====================================================
--
Ticket URL: <https://fedorahosted.org/lnst/ticket/77>
lnst <https://fedorahosted.org/lnst/>
Linux Network Stack Test
10 years, 10 months
[lnst] Update team driver recipes to new recipe xml syntax
by Jiří Pírko
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"/>
10 years, 11 months
[PATCH] Update team driver recipes to new recipe xml syntax
by Jan Tluka
This commit converts all recipes under recipes/team directory to
recently changed recipe syntax.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
recipes/team/interfaces-bond_lacp.xml | 20 +++++
recipes/team/interfaces-br_queue_mapping.xml | 18 +++++
recipes/team/interfaces-simple.xml | 9 +++
recipes/team/interfaces-simple_br.xml | 16 ++++
recipes/team/interfaces-team_ab.xml | 50 +++++++++++++
recipes/team/interfaces-team_ab_lw_001.xml | 25 +++++++
recipes/team/interfaces-team_ab_lw_002.xml | 60 +++++++++++++++
recipes/team/interfaces-team_ab_lw_003.xml | 31 ++++++++
recipes/team/interfaces-team_ab_lw_004.xml | 68 +++++++++++++++++
recipes/team/interfaces-team_ab_lw_005.xml | 30 ++++++++
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 +++++++++++++++++++++++
recipes/team/interfaces-team_bcast.xml | 24 ++++++
recipes/team/interfaces-team_lacp.xml | 38 ++++++++++
recipes/team/interfaces-team_lacp_act.xml | 41 +++++++++++
recipes/team/interfaces-team_lacp_passive.xml | 38 ++++++++++
recipes/team/interfaces-team_lacp_slowrate.xml | 38 ++++++++++
recipes/team/interfaces-team_lb.xml | 27 +++++++
recipes/team/interfaces-team_lb_act.xml | 30 ++++++++
recipes/team/interfaces-team_rr.xml | 24 ++++++
recipes/team/interfaces-team_rr_queue_mapping.xml | 50 +++++++++++++
recipes/team/netconfig-bond_lacp.xml | 20 -----
recipes/team/netconfig-br_queue_mapping.xml | 18 -----
recipes/team/netconfig-simple.xml | 9 ---
recipes/team/netconfig-simple_br.xml | 16 ----
recipes/team/netconfig-team_ab.xml | 50 -------------
recipes/team/netconfig-team_ab_lw_001.xml | 25 -------
recipes/team/netconfig-team_ab_lw_002.xml | 60 ---------------
recipes/team/netconfig-team_ab_lw_003.xml | 31 --------
recipes/team/netconfig-team_ab_lw_004.xml | 68 -----------------
recipes/team/netconfig-team_ab_lw_005.xml | 30 --------
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_bcast.xml | 24 ------
recipes/team/netconfig-team_lacp.xml | 38 ----------
recipes/team/netconfig-team_lacp_act.xml | 41 -----------
recipes/team/netconfig-team_lacp_passive.xml | 38 ----------
recipes/team/netconfig-team_lacp_slowrate.xml | 38 ----------
recipes/team/netconfig-team_lb.xml | 27 -------
recipes/team/netconfig-team_lb_act.xml | 30 --------
recipes/team/netconfig-team_rr.xml | 24 ------
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 +-
94 files changed, 953 insertions(+), 1034 deletions(-)
create mode 100644 recipes/team/interfaces-bond_lacp.xml
create mode 100644 recipes/team/interfaces-br_queue_mapping.xml
create mode 100644 recipes/team/interfaces-simple.xml
create mode 100644 recipes/team/interfaces-simple_br.xml
create mode 100644 recipes/team/interfaces-team_ab.xml
create mode 100644 recipes/team/interfaces-team_ab_lw_001.xml
create mode 100644 recipes/team/interfaces-team_ab_lw_002.xml
create mode 100644 recipes/team/interfaces-team_ab_lw_003.xml
create mode 100644 recipes/team/interfaces-team_ab_lw_004.xml
create mode 100644 recipes/team/interfaces-team_ab_lw_005.xml
create mode 100644 recipes/team/interfaces-team_ab_lw_006.xml
create mode 100644 recipes/team/interfaces-team_ab_lw_007.xml
create mode 100644 recipes/team/interfaces-team_ab_lw_008.xml
create mode 100644 recipes/team/interfaces-team_bcast.xml
create mode 100644 recipes/team/interfaces-team_lacp.xml
create mode 100644 recipes/team/interfaces-team_lacp_act.xml
create mode 100644 recipes/team/interfaces-team_lacp_passive.xml
create mode 100644 recipes/team/interfaces-team_lacp_slowrate.xml
create mode 100644 recipes/team/interfaces-team_lb.xml
create mode 100644 recipes/team/interfaces-team_lb_act.xml
create mode 100644 recipes/team/interfaces-team_rr.xml
create mode 100644 recipes/team/interfaces-team_rr_queue_mapping.xml
delete mode 100644 recipes/team/netconfig-bond_lacp.xml
delete mode 100644 recipes/team/netconfig-br_queue_mapping.xml
delete mode 100644 recipes/team/netconfig-simple.xml
delete mode 100644 recipes/team/netconfig-simple_br.xml
delete mode 100644 recipes/team/netconfig-team_ab.xml
delete mode 100644 recipes/team/netconfig-team_ab_lw_001.xml
delete mode 100644 recipes/team/netconfig-team_ab_lw_002.xml
delete mode 100644 recipes/team/netconfig-team_ab_lw_003.xml
delete mode 100644 recipes/team/netconfig-team_ab_lw_004.xml
delete mode 100644 recipes/team/netconfig-team_ab_lw_005.xml
delete mode 100644 recipes/team/netconfig-team_ab_lw_006.xml
delete mode 100644 recipes/team/netconfig-team_ab_lw_007.xml
delete mode 100644 recipes/team/netconfig-team_ab_lw_008.xml
delete mode 100644 recipes/team/netconfig-team_bcast.xml
delete mode 100644 recipes/team/netconfig-team_lacp.xml
delete mode 100644 recipes/team/netconfig-team_lacp_act.xml
delete mode 100644 recipes/team/netconfig-team_lacp_passive.xml
delete mode 100644 recipes/team/netconfig-team_lacp_slowrate.xml
delete mode 100644 recipes/team/netconfig-team_lb.xml
delete mode 100644 recipes/team/netconfig-team_lb_act.xml
delete mode 100644 recipes/team/netconfig-team_rr.xml
delete mode 100644 recipes/team/netconfig-team_rr_queue_mapping.xml
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/interfaces-br_queue_mapping.xml b/recipes/team/interfaces-br_queue_mapping.xml
new file mode 100644
index 0000000..dc864fa
--- /dev/null
+++ b/recipes/team/interfaces-br_queue_mapping.xml
@@ -0,0 +1,18 @@
+<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"/>
+ <slave id="3"/>
+ </slaves>
+ <addresses>
+ <address value="172.0.1.2/24"/>
+ <address value="172.0.2.2/24"/>
+ <address value="172.0.3.2/24"/>
+ <address value="172.0.4.2/24"/>
+ </addresses>
+ </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/interfaces-simple_br.xml b/recipes/team/interfaces-simple_br.xml
new file mode 100644
index 0000000..0b83caa
--- /dev/null
+++ b/recipes/team/interfaces-simple_br.xml
@@ -0,0 +1,16 @@
+<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"/>
+ <slave id="3"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </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/interfaces-team_ab_lw_001.xml b/recipes/team/interfaces-team_ab_lw_001.xml
new file mode 100644
index 0000000..2a0e3f5
--- /dev/null
+++ b/recipes/team/interfaces-team_ab_lw_001.xml
@@ -0,0 +1,25 @@
+<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"/>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </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/interfaces-team_ab_lw_003.xml b/recipes/team/interfaces-team_ab_lw_003.xml
new file mode 100644
index 0000000..bbda268
--- /dev/null
+++ b/recipes/team/interfaces-team_ab_lw_003.xml
@@ -0,0 +1,31 @@
+<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"
+ }
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1"/>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </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/interfaces-team_ab_lw_005.xml b/recipes/team/interfaces-team_ab_lw_005.xml
new file mode 100644
index 0000000..634528d
--- /dev/null
+++ b/recipes/team/interfaces-team_ab_lw_005.xml
@@ -0,0 +1,30 @@
+<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"
+ }
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1"/>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </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/interfaces-team_bcast.xml b/recipes/team/interfaces-team_bcast.xml
new file mode 100644
index 0000000..d99c321
--- /dev/null
+++ b/recipes/team/interfaces-team_bcast.xml
@@ -0,0 +1,24 @@
+<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": "broadcast"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1"/>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </team>
+</interfaces>
diff --git a/recipes/team/interfaces-team_lacp.xml b/recipes/team/interfaces-team_lacp.xml
new file mode 100644
index 0000000..6bf0d5b
--- /dev/null
+++ b/recipes/team/interfaces-team_lacp.xml
@@ -0,0 +1,38 @@
+<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": "lacp",
+ "active": true,
+ "fast_rate": true,
+ "tx_hash": ["eth", "ipv4", "ipv6"]
+ },
+ "link_watch": {"name": "ethtool"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": -10
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </team>
+</interfaces>
diff --git a/recipes/team/interfaces-team_lacp_act.xml b/recipes/team/interfaces-team_lacp_act.xml
new file mode 100644
index 0000000..658976c
--- /dev/null
+++ b/recipes/team/interfaces-team_lacp_act.xml
@@ -0,0 +1,41 @@
+<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": "lacp",
+ "active": true,
+ "fast_rate": true,
+ "tx_hash": ["eth", "ipv4", "ipv6"],
+ "tx_balancer": {
+ "name": "basic"
+ }
+ },
+ "link_watch": {"name": "ethtool"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": -10
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </team>
+</interfaces>
diff --git a/recipes/team/interfaces-team_lacp_passive.xml b/recipes/team/interfaces-team_lacp_passive.xml
new file mode 100644
index 0000000..e25bd7c
--- /dev/null
+++ b/recipes/team/interfaces-team_lacp_passive.xml
@@ -0,0 +1,38 @@
+<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": "lacp",
+ "active": false,
+ "fast_rate": true,
+ "tx_hash": ["eth", "ipv4", "ipv6"]
+ },
+ "link_watch": {"name": "ethtool"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": -10
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </team>
+</interfaces>
diff --git a/recipes/team/interfaces-team_lacp_slowrate.xml b/recipes/team/interfaces-team_lacp_slowrate.xml
new file mode 100644
index 0000000..52cab70
--- /dev/null
+++ b/recipes/team/interfaces-team_lacp_slowrate.xml
@@ -0,0 +1,38 @@
+<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": "lacp",
+ "active": true,
+ "fast_rate": false,
+ "tx_hash": ["eth", "ipv4", "ipv6"]
+ },
+ "link_watch": {"name": "ethtool"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": -10
+ }
+ </option>
+ </options>
+ </slave>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </team>
+</interfaces>
diff --git a/recipes/team/interfaces-team_lb.xml b/recipes/team/interfaces-team_lb.xml
new file mode 100644
index 0000000..7091501
--- /dev/null
+++ b/recipes/team/interfaces-team_lb.xml
@@ -0,0 +1,27 @@
+<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"]
+ }
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1"/>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </team>
+</interfaces>
diff --git a/recipes/team/interfaces-team_lb_act.xml b/recipes/team/interfaces-team_lb_act.xml
new file mode 100644
index 0000000..3b9a8ca
--- /dev/null
+++ b/recipes/team/interfaces-team_lb_act.xml
@@ -0,0 +1,30 @@
+<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"
+ }
+ }
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1"/>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </team>
+</interfaces>
diff --git a/recipes/team/interfaces-team_rr.xml b/recipes/team/interfaces-team_rr.xml
new file mode 100644
index 0000000..02d5252
--- /dev/null
+++ b/recipes/team/interfaces-team_rr.xml
@@ -0,0 +1,24 @@
+<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"/>
+ <slave id="2"/>
+ <slave id="3"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ <address value="{$testip6}"/>
+ </addresses>
+ </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/netconfig-bond_lacp.xml b/recipes/team/netconfig-bond_lacp.xml
deleted file mode 100644
index 0492c22..0000000
--- a/recipes/team/netconfig-bond_lacp.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<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-br_queue_mapping.xml b/recipes/team/netconfig-br_queue_mapping.xml
deleted file mode 100644
index 0331142..0000000
--- a/recipes/team/netconfig-br_queue_mapping.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<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="172.0.1.2/24"/>
- <address value="172.0.2.2/24"/>
- <address value="172.0.3.2/24"/>
- <address value="172.0.4.2/24"/>
- </addresses>
- </interface>
-</netconfig>
diff --git a/recipes/team/netconfig-simple.xml b/recipes/team/netconfig-simple.xml
deleted file mode 100644
index 78bebde..0000000
--- a/recipes/team/netconfig-simple.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<netconfig>
- <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
deleted file mode 100644
index 867d390..0000000
--- a/recipes/team/netconfig-simple_br.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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.xml b/recipes/team/netconfig-team_ab.xml
deleted file mode 100644
index 107ab3f..0000000
--- a/recipes/team/netconfig-team_ab.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<netconfig>
- <interface id="1" phys_id="1" type="eth">
- <options>
- <option name="teamd_port_config">
- {
- "prio": -10,
- "sticky": true
- }
- </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" 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"}
- }
- </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_lw_001.xml b/recipes/team/netconfig-team_ab_lw_001.xml
deleted file mode 100644
index 5a59ab7..0000000
--- a/recipes/team/netconfig-team_ab_lw_001.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<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": "activebackup"},
- "link_watch": {"name": "ethtool"}
- }
- </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_lw_002.xml b/recipes/team/netconfig-team_ab_lw_002.xml
deleted file mode 100644
index afbe591..0000000
--- a/recipes/team/netconfig-team_ab_lw_002.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<netconfig>
- <interface id="1" phys_id="1" type="eth">
- <options>
- <option name="teamd_port_config">
- {
- "link_watch": {
- "name": "ethtool",
- "delay_up": 3000,
- "delay_down": 3000
- }
- }
- </option>
- </options>
- </interface>
- <interface id="2" phys_id="2" type="eth">
- <options>
- <option name="teamd_port_config">
- {
- "link_watch": {
- "name": "ethtool",
- "delay_up": 1000,
- "delay_down": 1000
- }
- }
- </option>
- </options>
- </interface>
- <interface id="3" phys_id="3" type="eth">
- <options>
- <option name="teamd_port_config">
- {
- "link_watch": {
- "name": "ethtool",
- "delay_up": 500,
- "delay_down": 500
- }
- }
- </option>
- </options>
- </interface>
- <interface id="testiface" type="team">
- <options>
- <option name="teamd_config">
- {
- "hwaddr": "00:11:22:33:44:55",
- "runner": {"name": "activebackup"}
- }
- </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_lw_003.xml b/recipes/team/netconfig-team_ab_lw_003.xml
deleted file mode 100644
index 8290c95..0000000
--- a/recipes/team/netconfig-team_ab_lw_003.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<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": "activebackup"},
- "link_watch": {
- "name": "arp_ping",
- "interval": 100,
- "missed_max": 30,
- "source_host": "192.168.111.1",
- "target_host": "192.168.111.2"
- }
- }
- </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_lw_004.xml b/recipes/team/netconfig-team_ab_lw_004.xml
deleted file mode 100644
index 497b6e3..0000000
--- a/recipes/team/netconfig-team_ab_lw_004.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<netconfig>
- <interface id="1" phys_id="1" type="eth">
- <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>
- </interface>
- <interface id="2" phys_id="2" type="eth">
- <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>
- </interface>
- <interface id="3" phys_id="3" type="eth">
- <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>
- </interface>
- <interface id="testiface" type="team">
- <options>
- <option name="teamd_config">
- {
- "hwaddr": "00:11:22:33:44:55",
- "runner": {"name": "activebackup"}
- }
- </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_lw_005.xml b/recipes/team/netconfig-team_ab_lw_005.xml
deleted file mode 100644
index 68045a4..0000000
--- a/recipes/team/netconfig-team_ab_lw_005.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<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": "activebackup"},
- "link_watch": {
- "name": "nsna_ping",
- "interval": 200,
- "missed_max": 15,
- "target_host": "fe01::2"
- }
- }
- </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_lw_006.xml b/recipes/team/netconfig-team_ab_lw_006.xml
deleted file mode 100644
index 395c011..0000000
--- a/recipes/team/netconfig-team_ab_lw_006.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<netconfig>
- <interface id="1" phys_id="1" type="eth">
- <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>
- </interface>
- <interface id="2" phys_id="2" type="eth">
- <options>
- <option name="teamd_port_config">
- {
- "link_watch": {
- "name": "nsna_ping",
- "interval": 500,
- "missed_max": 20,
- "target_host": "fe01::2"
- }
- }
- </option>
- </options>
- </interface>
- <interface id="3" phys_id="3" type="eth">
- <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>
- </interface>
- <interface id="testiface" type="team">
- <options>
- <option name="teamd_config">
- {
- "hwaddr": "00:11:22:33:44:55",
- "runner": {"name": "activebackup"}
- }
- </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_lw_007.xml b/recipes/team/netconfig-team_ab_lw_007.xml
deleted file mode 100644
index bc72e1b..0000000
--- a/recipes/team/netconfig-team_ab_lw_007.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<netconfig>
- <interface id="1" phys_id="1" type="eth">
- <options>
- <option name="teamd_port_config">
- {
- "link_watch": {
- "name": "ethtool",
- "delay_up": 1000,
- "delay_down": 1000
- }
- }
- </option>
- </options>
- </interface>
- <interface id="2" phys_id="2" type="eth">
- <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>
- </interface>
- <interface id="3" phys_id="3" type="eth">
- <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>
- </interface>
- <interface id="testiface" type="team">
- <options>
- <option name="teamd_config">
- {
- "hwaddr": "00:11:22:33:44:55",
- "runner": {"name": "activebackup"}
- }
- </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_lw_008.xml b/recipes/team/netconfig-team_ab_lw_008.xml
deleted file mode 100644
index af9f328..0000000
--- a/recipes/team/netconfig-team_ab_lw_008.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<netconfig>
- <interface id="1" phys_id="1" type="eth">
- <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>
- </interface>
- <interface id="2" phys_id="2" type="eth">
- <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>
- </interface>
- <interface id="3" phys_id="3" type="eth">
- <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>
- </interface>
- <interface id="testiface" type="team">
- <options>
- <option name="teamd_config">
- {
- "hwaddr": "00:11:22:33:44:55",
- "runner": {"name": "activebackup"}
- }
- </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_bcast.xml b/recipes/team/netconfig-team_bcast.xml
deleted file mode 100644
index 9bfab08..0000000
--- a/recipes/team/netconfig-team_bcast.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<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_lacp.xml b/recipes/team/netconfig-team_lacp.xml
deleted file mode 100644
index 57eda3f..0000000
--- a/recipes/team/netconfig-team_lacp.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<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">
- <options>
- <option name="teamd_config">
- {
- "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>
- </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_lacp_act.xml b/recipes/team/netconfig-team_lacp_act.xml
deleted file mode 100644
index 386e1a4..0000000
--- a/recipes/team/netconfig-team_lacp_act.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<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">
- <options>
- <option name="teamd_config">
- {
- "hwaddr": "00:11:22:33:44:55",
- "runner": {
- "name": "lacp",
- "active": true,
- "fast_rate": true,
- "tx_hash": ["eth", "ipv4", "ipv6"],
- "tx_balancer": {
- "name": "basic"
- }
- },
- "link_watch": {"name": "ethtool"}
- }
- </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_lacp_passive.xml b/recipes/team/netconfig-team_lacp_passive.xml
deleted file mode 100644
index ef4cf91..0000000
--- a/recipes/team/netconfig-team_lacp_passive.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<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">
- <options>
- <option name="teamd_config">
- {
- "hwaddr": "00:11:22:33:44:55",
- "runner": {
- "name": "lacp",
- "active": false,
- "fast_rate": true,
- "tx_hash": ["eth", "ipv4", "ipv6"]
- },
- "link_watch": {"name": "ethtool"}
- }
- </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_lacp_slowrate.xml b/recipes/team/netconfig-team_lacp_slowrate.xml
deleted file mode 100644
index c90fece..0000000
--- a/recipes/team/netconfig-team_lacp_slowrate.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<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">
- <options>
- <option name="teamd_config">
- {
- "hwaddr": "00:11:22:33:44:55",
- "runner": {
- "name": "lacp",
- "active": true,
- "fast_rate": false,
- "tx_hash": ["eth", "ipv4", "ipv6"]
- },
- "link_watch": {"name": "ethtool"}
- }
- </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_lb.xml b/recipes/team/netconfig-team_lb.xml
deleted file mode 100644
index 5a305ed..0000000
--- a/recipes/team/netconfig-team_lb.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<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_lb_act.xml b/recipes/team/netconfig-team_lb_act.xml
deleted file mode 100644
index fca08ce..0000000
--- a/recipes/team/netconfig-team_lb_act.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<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"],
- "tx_balancer": {
- "name": "basic"
- }
- }
- }
- </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
deleted file mode 100644
index b223c1a..0000000
--- a/recipes/team/netconfig-team_rr.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<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": "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/netconfig-team_rr_queue_mapping.xml b/recipes/team/netconfig-team_rr_queue_mapping.xml
deleted file mode 100644
index b07f521..0000000
--- a/recipes/team/netconfig-team_rr_queue_mapping.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<netconfig>
- <interface id="1" phys_id="1" type="eth">
- <options>
- <option name="teamd_port_config">
- {
- "queue_id": 1
- }
- </option>
- </options>
- </interface>
- <interface id="2" phys_id="2" type="eth">
- <options>
- <option name="teamd_port_config">
- {
- "queue_id": 2
- }
- </option>
- </options>
- </interface>
- <interface id="3" phys_id="3" type="eth">
- <options>
- <option name="teamd_port_config">
- {
- "queue_id": 3
- }
- </option>
- </options>
- </interface>
- <interface id="testiface" type="team">
- <options>
- <option name="teamd_config">
- {
- "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="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>
- </interface>
-</netconfig>
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"/>
--
1.7.11.7
10 years, 11 months
[lnst] Fix unspecified action bug v2
by Jiří Pírko
commit 2a7961e9ce646b46c0ea120a153fbf29120284cc
Author: Jan Tluka <jtluka(a)redhat.com>
Date: Fri May 24 10:52:04 2013 +0200
Fix unspecified action bug v2
If a user omitted action in the lnst-ctl arguments the script would continue
in its execution with no obvious error. I fixed the code so the user gets
information about incorrect arguments and script stops if no action is
specified.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
lnst-ctl | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/lnst-ctl b/lnst-ctl
index dcb4cd2..1ed3515 100755
--- a/lnst-ctl
+++ b/lnst-ctl
@@ -143,12 +143,12 @@ def main():
log_dir=config.get_option('environment', 'log_dir'),
log_subdir=date)
- if not args:
+ action = args.pop()
+
+ if not action in {'run', 'dump', 'config_only', 'match_setup'}:
logging.error("No action command passed")
usage();
- action = args.pop()
-
summary = []
res_serializer = NetTestResultSerializer()
10 years, 11 months
[lnst] add recipe-schema.rng
by Jiří Pírko
commit 6fb8841047ef76c93b9ec3e4ff0a74d5a3d5a140
Author: Ondrej Lichtner <olichtne(a)redhat.com>
Date: Fri May 24 10:44:06 2013 +0200
add recipe-schema.rng
This commit adds a RelaxNG schema describing the xml format of recipes.
RelaxNG was chosen because XML Schema has problems with
non-deterministic behaviour of elements which occurs because of the
<define> tag that can be used anywhere.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
recipe-schema.rng | 462 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 462 insertions(+), 0 deletions(-)
---
diff --git a/recipe-schema.rng b/recipe-schema.rng
new file mode 100644
index 0000000..aa6d375
--- /dev/null
+++ b/recipe-schema.rng
@@ -0,0 +1,462 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0"
+ datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+ <start>
+ <element name="lnstrecipe">
+ <interleave>
+ <zeroOrMore>
+ <ref name="define"/>
+ </zeroOrMore>
+
+ <ref name="machines"/>
+
+ <oneOrMore>
+ <ref name="command_sequence"/>
+ </oneOrMore>
+ </interleave>
+ </element>
+ </start>
+
+ <define name="define">
+ <element name="define">
+ <optional>
+ <attribute name="source"/>
+ </optional>
+ <zeroOrMore>
+ <element name="alias">
+ <attribute name="name"/>
+ <attribute name="value"/>
+ <text/>
+ </element>
+ </zeroOrMore>
+ </element>
+ </define>
+
+ <define name="machines">
+ <element name="machines">
+ <optional>
+ <attribute name="source"/>
+ </optional>
+
+ <interleave>
+ <zeroOrMore>
+ <ref name="define"/>
+ </zeroOrMore>
+
+ <oneOrMore>
+ <ref name="machine"/>
+ </oneOrMore>
+ </interleave>
+ </element>
+ </define>
+
+ <define name="command_sequence">
+ <element name="command_sequence">
+ <optional>
+ <attribute name="source"/>
+ </optional>
+
+ <optional>
+ <attribute name="quit_on_fail">
+ <choice>
+ <value>yes</value>
+ <value>no</value>
+ </choice>
+ </attribute>
+ </optional>
+
+ <interleave>
+ <zeroOrMore>
+ <ref name="define"/>
+ </zeroOrMore>
+
+ <zeroOrMore>
+ <ref name="command"/>
+ </zeroOrMore>
+ </interleave>
+ </element>
+ </define>
+
+ <define name="machine">
+ <element name="machine">
+ <attribute name="id"/>
+ <optional>
+ <attribute name="source"/>
+ </optional>
+
+ <interleave>
+ <zeroOrMore>
+ <ref name="define"/>
+ </zeroOrMore>
+
+ <zeroOrMore>
+ <ref name="params"/>
+ </zeroOrMore>
+
+ <element name="interfaces">
+ <optional>
+ <attribute name="source"/>
+ </optional>
+ <zeroOrMore>
+ <choice>
+ <ref name="eth"/>
+ <ref name="bond"/>
+ <ref name="bridge"/>
+ <ref name="vlan"/>
+ <ref name="macvlan"/>
+ <ref name="team"/>
+ </choice>
+ </zeroOrMore>
+ </element>
+ </interleave>
+ </element>
+ </define>
+
+ <define name="eth">
+ <element name="eth">
+ <attribute name="id"/>
+ <attribute name="network"/>
+ <optional>
+ <attribute name="source"/>
+ </optional>
+ <interleave>
+ <zeroOrMore>
+ <ref name="define"/>
+ </zeroOrMore>
+
+ <zeroOrMore>
+ <ref name="params"/>
+ </zeroOrMore>
+
+ <optional>
+ <ref name="addresses"/>
+ </optional>
+ </interleave>
+ </element>
+ </define>
+
+ <define name="bond">
+ <element name="bond">
+ <attribute name="id"/>
+ <optional>
+ <attribute name="source"/>
+ </optional>
+ <ref name="softdevice"/>
+ </element>
+ </define>
+
+ <define name="bridge">
+ <element name="bridge">
+ <attribute name="id"/>
+ <optional>
+ <attribute name="source"/>
+ </optional>
+ <ref name="softdevice"/>
+ </element>
+ </define>
+
+ <define name="vlan">
+ <element name="vlan">
+ <attribute name="id"/>
+ <optional>
+ <attribute name="source"/>
+ </optional>
+ <ref name="softdevice"/>
+ </element>
+ </define>
+
+ <define name="macvlan">
+ <element name="macvlan">
+ <attribute name="id"/>
+ <optional>
+ <attribute name="source"/>
+ </optional>
+ <ref name="softdevice"/>
+ </element>
+ </define>
+
+ <define name="team">
+ <element name="team">
+ <attribute name="id"/>
+ <optional>
+ <attribute name="source"/>
+ </optional>
+ <ref name="softdevice"/>
+ </element>
+ </define>
+
+ <define name="softdevice">
+ <interleave>
+ <zeroOrMore>
+ <ref name="define"/>
+ </zeroOrMore>
+
+ <optional>
+ <ref name="options"/>
+ </optional>
+
+ <optional>
+ <element name="slaves">
+ <optional>
+ <attribute name="source"/>
+ </optional>
+
+ <interleave>
+ <zeroOrMore>
+ <ref name="define"/>
+ </zeroOrMore>
+
+ <zeroOrMore>
+ <element name="slave">
+ <attribute name="id"/>
+
+ <optional>
+ <attribute name="source"/>
+ </optional>
+
+ <optional>
+ <interleave>
+ <zeroOrMore>
+ <ref name="define"/>
+ </zeroOrMore>
+
+ <zeroOrMore>
+ <ref name="options"/>
+ </zeroOrMore>
+ </interleave>
+ </optional>
+
+ </element>
+ </zeroOrMore>
+ </interleave>
+ </element>
+ </optional>
+
+ <optional>
+ <ref name="addresses"/>
+ </optional>
+ </interleave>
+ </define>
+
+ <define name="options">
+ <element name="options">
+ <optional>
+ <attribute name="source"/>
+ </optional>
+
+ <interleave>
+ <zeroOrMore>
+ <ref name="define"/>
+ </zeroOrMore>
+
+ <zeroOrMore>
+ <element name="option">
+ <optional>
+ <attribute name="source"/>
+ </optional>
+ <attribute name="name"/>
+ <choice>
+ <attribute name="value"/>
+ <text/>
+ </choice>
+ </element>
+ </zeroOrMore>
+ </interleave>
+ </element>
+ </define>
+
+ <define name="addresses">
+ <element name="addresses">
+ <optional>
+ <attribute name="source"/>
+ </optional>
+
+ <interleave>
+ <zeroOrMore>
+ <ref name="define"/>
+ </zeroOrMore>
+
+ <zeroOrMore>
+ <element name="address">
+ <optional>
+ <attribute name="source"/>
+ </optional>
+ <attribute name="value"/>
+ <text/>
+ </element>
+ </zeroOrMore>
+ </interleave>
+ </element>
+ </define>
+
+ <define name="params">
+ <element name="params">
+ <optional>
+ <attribute name="source"/>
+ </optional>
+
+ <interleave>
+ <zeroOrMore>
+ <ref name="define"/>
+ </zeroOrMore>
+
+ <zeroOrMore>
+ <element name="param">
+ <optional>
+ <attribute name="source"/>
+ </optional>
+ <attribute name="name"/>
+ <attribute name="value"/>
+ <text/>
+ </element>
+ </zeroOrMore>
+ </interleave>
+ </element>
+ </define>
+
+ <define name="command">
+ <element name="command">
+ <choice>
+ <ref name="ctl_wait"/>
+ <ref name="exec"/>
+ <ref name="system_config"/>
+ <ref name="other_commands"/>
+ </choice>
+
+ <optional>
+ <ref name="options"/>
+ </optional>
+ </element>
+ </define>
+
+ <define name="ctl_wait">
+ <attribute name="type">
+ <value>ctl_wait</value>
+ </attribute>
+
+ <optional>
+ <attribute name="value">
+ <data type="integer"/>
+ </attribute>
+ </optional>
+ </define>
+
+ <define name="exec">
+ <attribute name="machine_id"/>
+
+ <attribute name="type">
+ <value>exec</value>
+ </attribute>
+
+ <optional>
+ <attribute name="bg_id"/>
+ </optional>
+
+ <optional>
+ <attribute name="value"/>
+ </optional>
+
+ <optional>
+ <attribute name="timeout">
+ <data type="integer"/>
+ </attribute>
+ </optional>
+
+ <optional>
+ <attribute name="option"/>
+ </optional>
+
+ <optional>
+ <attribute name="desc"/>
+ </optional>
+
+ <optional>
+ <attribute name="from"/>
+ </optional>
+
+ <optional>
+ <attribute name="source"/>
+ </optional>
+ </define>
+
+ <define name="system_config">
+ <attribute name="machine_id"/>
+
+ <attribute name="type">
+ <value>system_config</value>
+ </attribute>
+
+ <optional>
+ <attribute name="bg_id"/>
+ </optional>
+
+ <optional>
+ <attribute name="value"/>
+ </optional>
+
+ <optional>
+ <attribute name="timeout">
+ <data type="integer"/>
+ </attribute>
+ </optional>
+
+ <optional>
+ <attribute name="option"/>
+ </optional>
+
+ <optional>
+ <attribute name="persistent">
+ <choice>
+ <value>true</value>
+ <value>false</value>
+ </choice>
+ </attribute>
+ </optional>
+
+ <optional>
+ <attribute name="desc"/>
+ </optional>
+
+ <optional>
+ <attribute name="source"/>
+ </optional>
+ </define>
+
+ <define name="other_commands">
+ <attribute name="machine_id"/>
+
+ <attribute name="type">
+ <choice>
+ <value>test</value>
+ <value>wait</value>
+ <value>intr</value>
+ <value>kill</value>
+ </choice>
+ </attribute>
+
+ <optional>
+ <attribute name="bg_id"/>
+ </optional>
+
+ <optional>
+ <attribute name="value"/>
+ </optional>
+
+ <optional>
+ <attribute name="timeout">
+ <data type="integer"/>
+ </attribute>
+ </optional>
+
+ <optional>
+ <attribute name="option"/>
+ </optional>
+
+ <optional>
+ <attribute name="desc"/>
+ </optional>
+
+ <optional>
+ <attribute name="source"/>
+ </optional>
+ </define>
+</grammar>
10 years, 11 months
[PATCH] Fix unspecified action bug
by Jan Tluka
If a user omitted action in the lnst-ctl arguments the script would continue
in its execution with no obvious error. I fixed the code so the user gets
information about incorrect arguments and script stops if no action is
specified.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
lnst-ctl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lnst-ctl b/lnst-ctl
index dcb4cd2..364e73c 100755
--- a/lnst-ctl
+++ b/lnst-ctl
@@ -143,12 +143,12 @@ def main():
log_dir=config.get_option('environment', 'log_dir'),
log_subdir=date)
- if not args:
+ action = args.pop()
+
+ if not action in {'run', 'config_only', 'match_setup'}:
logging.error("No action command passed")
usage();
- action = args.pop()
-
summary = []
res_serializer = NetTestResultSerializer()
--
1.7.11.7
10 years, 11 months
[PATCH] Fix unspecified action bug v2
by Jan Tluka
If a user omitted action in the lnst-ctl arguments the script would continue
in its execution with no obvious error. I fixed the code so the user gets
information about incorrect arguments and script stops if no action is
specified.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
lnst-ctl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lnst-ctl b/lnst-ctl
index dcb4cd2..1ed3515 100755
--- a/lnst-ctl
+++ b/lnst-ctl
@@ -143,12 +143,12 @@ def main():
log_dir=config.get_option('environment', 'log_dir'),
log_subdir=date)
- if not args:
+ action = args.pop()
+
+ if not action in {'run', 'dump', 'config_only', 'match_setup'}:
logging.error("No action command passed")
usage();
- action = args.pop()
-
summary = []
res_serializer = NetTestResultSerializer()
--
1.7.11.7
10 years, 11 months
[PATCH] recipe schema
by Ondrej Lichtner
From: Ondrej Lichtner <olichtne(a)redhat.com>
I'm sending this patch again because I changed the recipe format before the
previous one was applied. This updated schema now accepts <options> tags under
the <slave> tags. This change was already applied so this schema is consistent
with the currently accepted recipe format. After this I hope there wil only be
small incremental changes.
Ondrej Lichtner (1):
add recipe-schema.rng
recipe-schema.rng | 462 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 462 insertions(+)
create mode 100644 recipe-schema.rng
--
1.7.11.7
10 years, 11 months
[lnst] recipe format: <options> under <eth> moved under <slave>
by Jiří Pírko
commit aeb59d84f8258e572b80b68b506ded03649b8dbd
Author: Ondrej Lichtner <olichtne(a)redhat.com>
Date: Thu May 23 15:57:04 2013 +0200
recipe format: <options> under <eth> moved under <slave>
Until now when setting options of team interface slaves the options had
to be specified under the <netdevice> or <eth> tag (in the new format).
However the new format didn't accept any <options> tags under the <eth>
tag. This commit fixes that by moving the <options> tag under its
respective <slave> tag. The team configuration now looks something like
this:
<eth id="1" network="A"/>
<team id="testiface">
<options>
<option>...</option>
</options>
<slaves>
<slave id="1">
<options>
<option name="teamd_port_config">
{
"prio": -10,
"sticky": true
}
</option>
</options>
</slave>
</slaves>
<addresses>
<address>...</address>
</addresses>
</team>
This doesn't change the behaviour of <options> tag that are under the
not-eth tags.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
lnst/Controller/Machine.py | 10 +++++++++-
lnst/Controller/NetTestController.py | 1 +
lnst/Controller/RecipeParse.py | 21 +++++++++++++++++++++
lnst/Slave/NetConfigCommon.py | 10 ++++++++++
lnst/Slave/NetConfigDevice.py | 5 +++--
5 files changed, 44 insertions(+), 3 deletions(-)
---
diff --git a/lnst/Controller/Machine.py b/lnst/Controller/Machine.py
index 78f4c70..d8162fc 100644
--- a/lnst/Controller/Machine.py
+++ b/lnst/Controller/Machine.py
@@ -309,6 +309,7 @@ class Interface(object):
self._network = None
self._slaves = {}
+ self._slave_options = {}
self._addresses = []
self._options = []
@@ -351,6 +352,12 @@ class Interface(object):
def add_slave(self, iface):
self._slaves[iface.get_id()] = iface
+ def set_slave_options(self, slave_options):
+ self._slave_options = slave_options
+
+ def get_slave_options(self):
+ return self._slave_options
+
def add_address(self, addr):
self._addresses.append(addr)
@@ -360,7 +367,8 @@ class Interface(object):
def _get_config(self):
config = {"hwaddr": self._hwaddr, "type": self._type,
"addresses": self._addresses, "slaves": self._slaves.keys(),
- "options": self._options}
+ "options": self._options,
+ "slave_options": self._slave_options}
if self._type == "eth":
config["phys_id"] = self.get_id()
return config
diff --git a/lnst/Controller/NetTestController.py b/lnst/Controller/NetTestController.py
index 9f1c9fa..a43c299 100644
--- a/lnst/Controller/NetTestController.py
+++ b/lnst/Controller/NetTestController.py
@@ -153,6 +153,7 @@ class NetTestController:
if "slaves" in ifconfig:
for slave_id in ifconfig["slaves"]:
iface.add_slave(machine.get_interface(slave_id))
+ iface.set_slave_options(ifconfig["slave_options"])
if "addresses" in ifconfig:
for addr in ifconfig["addresses"]:
diff --git a/lnst/Controller/RecipeParse.py b/lnst/Controller/RecipeParse.py
index 9a91a7c..8cac525 100644
--- a/lnst/Controller/RecipeParse.py
+++ b/lnst/Controller/RecipeParse.py
@@ -296,6 +296,7 @@ class InterfaceParse(LnstParser):
self._iface["options"].append((name, value))
def _slaves(self, node, params):
+ self._iface["slave_options"] = {}
self._list_init(node, params, "slaves", {"slave": self._slave})
def _slave(self, node, params):
@@ -306,6 +307,26 @@ class InterfaceParse(LnstParser):
self._iface["slaves"].append(slave_id)
+ self._iface["slave_options"][slave_id] = []
+ self._slave_opts = self._iface["slave_options"][slave_id]
+
+ scheme = {"options": self._slave_options}
+ self._process_child_nodes(node, scheme, params)
+
+ def _slave_options(self, node, params):
+ scheme = {"option": self._slave_option}
+ self._process_child_nodes(node, scheme, params)
+
+ def _slave_option(self, node, params):
+ name = self._get_attribute(node, "name")
+
+ if self._has_attribute(node, "value"):
+ value = self._get_attribute(node, "value")
+ else:
+ value = self._get_text_content(node)
+
+ self._slave_opts.append((name, value))
+
def _list_init(self, node, params, node_name, scheme):
self._iface[node_name] = []
diff --git a/lnst/Slave/NetConfigCommon.py b/lnst/Slave/NetConfigCommon.py
index f3f2f5d..c60419b 100644
--- a/lnst/Slave/NetConfigCommon.py
+++ b/lnst/Slave/NetConfigCommon.py
@@ -25,3 +25,13 @@ def get_option(netdev, opt_name):
if option == opt_name:
return value
return None
+
+def get_slave_option(netdev, slave_id, opt_name):
+ try:
+ options = netdev["slave_options"][slave_id]
+ except KeyError:
+ return None
+ for option, value in options:
+ if option == opt_name:
+ return value
+ return None
diff --git a/lnst/Slave/NetConfigDevice.py b/lnst/Slave/NetConfigDevice.py
index c781e83..d9806db 100644
--- a/lnst/Slave/NetConfigDevice.py
+++ b/lnst/Slave/NetConfigDevice.py
@@ -15,7 +15,7 @@ import logging
import re
import sys
from lnst.Common.ExecCmd import exec_cmd
-from lnst.Slave.NetConfigCommon import get_slaves, get_option
+from lnst.Slave.NetConfigCommon import get_slaves, get_option, get_slave_option
from lnst.Common.Utils import kmod_in_use, bool_it
class NetConfigDeviceGeneric:
@@ -270,7 +270,8 @@ class NetConfigDeviceTeam(NetConfigDeviceGeneric):
dev_name = self._netdev["name"]
port_netdev = self._config[slaveid]
port_name = port_netdev["name"]
- teamd_port_config = get_option(port_netdev, "teamd_port_config")
+ teamd_port_config = get_slave_option(self._netdev,
+ slaveid, "teamd_port_config")
dbus_option = "-D" if self._should_enable_dbus() else ""
if teamd_port_config:
teamd_port_config = prepare_json_str(teamd_port_config)
10 years, 11 months