commit 772270787eefdd5e99e16eeb1058f1ff20e8d10d
Author: Jan Tluka <jtluka(a)redhat.com>
Date: Tue Jun 10 16:13:22 2014 +0200
Restructure team recipes
This patches cleans up the team driver recipes directory. Interfaces xml files
were moved to ./interfaces and sequences to ./tasks.
One of the reasons why I make this change was that lnst-ctl is able to run
all recipes under directory if this directory is passed as recipe parameter.
But the mix of recipes, interfaces, sequence was making this impossible.
Additionally I've removed the obsolete machineconfigs that are not used
anywhere anymore.
I've tested this change by running:
./lnst-ctl -d run recipes/team/
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
.../team/{ => interfaces}/interfaces-bond_lacp.xml | 0
.../interfaces-br_queue_mapping.xml | 0
.../team/{ => interfaces}/interfaces-simple.xml | 1 +
.../team/{ => interfaces}/interfaces-simple_br.xml | 0
.../team/{ => interfaces}/interfaces-team_ab.xml | 0
.../{ => interfaces}/interfaces-team_ab_lw_001.xml | 0
.../{ => interfaces}/interfaces-team_ab_lw_002.xml | 0
.../{ => interfaces}/interfaces-team_ab_lw_003.xml | 0
.../{ => interfaces}/interfaces-team_ab_lw_004.xml | 0
.../{ => interfaces}/interfaces-team_ab_lw_005.xml | 0
.../{ => interfaces}/interfaces-team_ab_lw_006.xml | 0
.../{ => interfaces}/interfaces-team_ab_lw_007.xml | 0
.../{ => interfaces}/interfaces-team_ab_lw_008.xml | 0
.../{ => interfaces}/interfaces-team_bcast.xml | 0
.../team/{ => interfaces}/interfaces-team_lacp.xml | 0
.../{ => interfaces}/interfaces-team_lacp_act.xml | 0
.../interfaces-team_lacp_passive.xml | 0
.../interfaces-team_lacp_slowrate.xml | 0
.../team/{ => interfaces}/interfaces-team_lb.xml | 0
.../{ => interfaces}/interfaces-team_lb_act.xml | 0
.../team/{ => interfaces}/interfaces-team_rr.xml | 0
.../interfaces-team_rr_queue_mapping.xml | 0
recipes/team/machineconfig-dhcp-37-128.xml | 8 --------
recipes/team/machineconfig-peanut.xml | 8 --------
recipes/team/machineconfig-test1.xml | 7 -------
recipes/team/machineconfig-test2.xml | 7 -------
recipes/team/recipex_ab_001.xml | 6 +++---
recipes/team/recipex_ab_002.xml | 4 ++--
recipes/team/recipex_ab_003.xml | 6 +++---
recipes/team/recipex_ab_004.xml | 8 ++++----
recipes/team/recipex_bcast_001.xml | 6 +++---
recipes/team/recipex_bcast_002.xml | 4 ++--
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 | 4 ++--
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 | 4 ++--
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 | 4 ++--
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 | 4 ++--
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 | 4 ++--
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/{ => tasks}/sequence_iperf.xml | 0
recipes/team/{ => tasks}/sequence_ping_simple.xml | 0
recipes/team/{ => tasks}/sequence_pktgen.xml | 0
recipes/team/{ => tasks}/sequence_pktgen_flows.xml | 0
.../team/{ => tasks}/sequence_pktgen_hashes.xml | 0
recipes/team/{ => tasks}/sequence_pktgen_lacp.xml | 0
.../team/{ => tasks}/sequence_queue_mapping.xml | 0
76 files changed, 124 insertions(+), 153 deletions(-)
---
diff --git a/recipes/team/interfaces-bond_lacp.xml
b/recipes/team/interfaces/interfaces-bond_lacp.xml
similarity index 100%
rename from recipes/team/interfaces-bond_lacp.xml
rename to recipes/team/interfaces/interfaces-bond_lacp.xml
diff --git a/recipes/team/interfaces-br_queue_mapping.xml
b/recipes/team/interfaces/interfaces-br_queue_mapping.xml
similarity index 100%
rename from recipes/team/interfaces-br_queue_mapping.xml
rename to recipes/team/interfaces/interfaces-br_queue_mapping.xml
diff --git a/recipes/team/interfaces-simple.xml
b/recipes/team/interfaces/interfaces-simple.xml
similarity index 83%
rename from recipes/team/interfaces-simple.xml
rename to recipes/team/interfaces/interfaces-simple.xml
index bea181d..d1e3461 100644
--- a/recipes/team/interfaces-simple.xml
+++ b/recipes/team/interfaces/interfaces-simple.xml
@@ -2,6 +2,7 @@
<eth id="testiface" label="net1">
<addresses>
<address value="{$testip}"/>
+ <address value="{$testip6}"/>
</addresses>
</eth>
<eth id="2" label="net2"/>
diff --git a/recipes/team/interfaces-simple_br.xml
b/recipes/team/interfaces/interfaces-simple_br.xml
similarity index 100%
rename from recipes/team/interfaces-simple_br.xml
rename to recipes/team/interfaces/interfaces-simple_br.xml
diff --git a/recipes/team/interfaces-team_ab.xml
b/recipes/team/interfaces/interfaces-team_ab.xml
similarity index 100%
rename from recipes/team/interfaces-team_ab.xml
rename to recipes/team/interfaces/interfaces-team_ab.xml
diff --git a/recipes/team/interfaces-team_ab_lw_001.xml
b/recipes/team/interfaces/interfaces-team_ab_lw_001.xml
similarity index 100%
rename from recipes/team/interfaces-team_ab_lw_001.xml
rename to recipes/team/interfaces/interfaces-team_ab_lw_001.xml
diff --git a/recipes/team/interfaces-team_ab_lw_002.xml
b/recipes/team/interfaces/interfaces-team_ab_lw_002.xml
similarity index 100%
rename from recipes/team/interfaces-team_ab_lw_002.xml
rename to recipes/team/interfaces/interfaces-team_ab_lw_002.xml
diff --git a/recipes/team/interfaces-team_ab_lw_003.xml
b/recipes/team/interfaces/interfaces-team_ab_lw_003.xml
similarity index 100%
rename from recipes/team/interfaces-team_ab_lw_003.xml
rename to recipes/team/interfaces/interfaces-team_ab_lw_003.xml
diff --git a/recipes/team/interfaces-team_ab_lw_004.xml
b/recipes/team/interfaces/interfaces-team_ab_lw_004.xml
similarity index 100%
rename from recipes/team/interfaces-team_ab_lw_004.xml
rename to recipes/team/interfaces/interfaces-team_ab_lw_004.xml
diff --git a/recipes/team/interfaces-team_ab_lw_005.xml
b/recipes/team/interfaces/interfaces-team_ab_lw_005.xml
similarity index 100%
rename from recipes/team/interfaces-team_ab_lw_005.xml
rename to recipes/team/interfaces/interfaces-team_ab_lw_005.xml
diff --git a/recipes/team/interfaces-team_ab_lw_006.xml
b/recipes/team/interfaces/interfaces-team_ab_lw_006.xml
similarity index 100%
rename from recipes/team/interfaces-team_ab_lw_006.xml
rename to recipes/team/interfaces/interfaces-team_ab_lw_006.xml
diff --git a/recipes/team/interfaces-team_ab_lw_007.xml
b/recipes/team/interfaces/interfaces-team_ab_lw_007.xml
similarity index 100%
rename from recipes/team/interfaces-team_ab_lw_007.xml
rename to recipes/team/interfaces/interfaces-team_ab_lw_007.xml
diff --git a/recipes/team/interfaces-team_ab_lw_008.xml
b/recipes/team/interfaces/interfaces-team_ab_lw_008.xml
similarity index 100%
rename from recipes/team/interfaces-team_ab_lw_008.xml
rename to recipes/team/interfaces/interfaces-team_ab_lw_008.xml
diff --git a/recipes/team/interfaces-team_bcast.xml
b/recipes/team/interfaces/interfaces-team_bcast.xml
similarity index 100%
rename from recipes/team/interfaces-team_bcast.xml
rename to recipes/team/interfaces/interfaces-team_bcast.xml
diff --git a/recipes/team/interfaces-team_lacp.xml
b/recipes/team/interfaces/interfaces-team_lacp.xml
similarity index 100%
rename from recipes/team/interfaces-team_lacp.xml
rename to recipes/team/interfaces/interfaces-team_lacp.xml
diff --git a/recipes/team/interfaces-team_lacp_act.xml
b/recipes/team/interfaces/interfaces-team_lacp_act.xml
similarity index 100%
rename from recipes/team/interfaces-team_lacp_act.xml
rename to recipes/team/interfaces/interfaces-team_lacp_act.xml
diff --git a/recipes/team/interfaces-team_lacp_passive.xml
b/recipes/team/interfaces/interfaces-team_lacp_passive.xml
similarity index 100%
rename from recipes/team/interfaces-team_lacp_passive.xml
rename to recipes/team/interfaces/interfaces-team_lacp_passive.xml
diff --git a/recipes/team/interfaces-team_lacp_slowrate.xml
b/recipes/team/interfaces/interfaces-team_lacp_slowrate.xml
similarity index 100%
rename from recipes/team/interfaces-team_lacp_slowrate.xml
rename to recipes/team/interfaces/interfaces-team_lacp_slowrate.xml
diff --git a/recipes/team/interfaces-team_lb.xml
b/recipes/team/interfaces/interfaces-team_lb.xml
similarity index 100%
rename from recipes/team/interfaces-team_lb.xml
rename to recipes/team/interfaces/interfaces-team_lb.xml
diff --git a/recipes/team/interfaces-team_lb_act.xml
b/recipes/team/interfaces/interfaces-team_lb_act.xml
similarity index 100%
rename from recipes/team/interfaces-team_lb_act.xml
rename to recipes/team/interfaces/interfaces-team_lb_act.xml
diff --git a/recipes/team/interfaces-team_rr.xml
b/recipes/team/interfaces/interfaces-team_rr.xml
similarity index 100%
rename from recipes/team/interfaces-team_rr.xml
rename to recipes/team/interfaces/interfaces-team_rr.xml
diff --git a/recipes/team/interfaces-team_rr_queue_mapping.xml
b/recipes/team/interfaces/interfaces-team_rr_queue_mapping.xml
similarity index 100%
rename from recipes/team/interfaces-team_rr_queue_mapping.xml
rename to recipes/team/interfaces/interfaces-team_rr_queue_mapping.xml
diff --git a/recipes/team/recipex_ab_001.xml b/recipes/team/recipex_ab_001.xml
index a9500fc..65d2b87 100644
--- a/recipes/team/recipex_ab_001.xml
+++ b/recipes/team/recipex_ab_001.xml
@@ -6,7 +6,7 @@
</define>
<host id="1">
<params/>
- <xi:include href="interfaces-team_ab.xml"/>
+ <xi:include href="interfaces/interfaces-team_ab.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
@@ -14,8 +14,8 @@
</define>
<host id="2">
<params/>
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_ping_simple.xml"/>
+ <xi:include href="tasks/sequence_ping_simple.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_ab_002.xml b/recipes/team/recipex_ab_002.xml
index c1b2634..9f704ee 100644
--- a/recipes/team/recipex_ab_002.xml
+++ b/recipes/team/recipex_ab_002.xml
@@ -5,14 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_ab.xml"/>
+ <xi:include href="interfaces/interfaces-team_ab.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
<define>
diff --git a/recipes/team/recipex_ab_003.xml b/recipes/team/recipex_ab_003.xml
index 34fd881..a08bf18 100644
--- a/recipes/team/recipex_ab_003.xml
+++ b/recipes/team/recipex_ab_003.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_ab.xml"/>
+ <xi:include href="interfaces/interfaces-team_ab.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple.xml"/>
+ <xi:include href="interfaces/interfaces-simple.xml"/>
</host>
</network>
- <xi:include href="sequence_pktgen.xml"/>
+ <xi:include href="tasks/sequence_pktgen.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_ab_004.xml b/recipes/team/recipex_ab_004.xml
index 4e4c561..2964851 100644
--- a/recipes/team/recipex_ab_004.xml
+++ b/recipes/team/recipex_ab_004.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_ab.xml"/>
+ <xi:include href="interfaces/interfaces-team_ab.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple.xml"/>
</host>
</network>
- <xi:include href="sequence_iperf.xml"/>
-</lnstrecipe>
\ No newline at end of file
+ <xi:include href="tasks/sequence_iperf.xml"/>
+</lnstrecipe>
diff --git a/recipes/team/recipex_bcast_001.xml b/recipes/team/recipex_bcast_001.xml
index 7aca6bf..735bdb2 100644
--- a/recipes/team/recipex_bcast_001.xml
+++ b/recipes/team/recipex_bcast_001.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_bcast.xml"/>
+ <xi:include href="interfaces/interfaces-team_bcast.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_ping_simple.xml"/>
+ <xi:include href="tasks/sequence_ping_simple.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_bcast_002.xml b/recipes/team/recipex_bcast_002.xml
index 22e8cb0..28fd462 100644
--- a/recipes/team/recipex_bcast_002.xml
+++ b/recipes/team/recipex_bcast_002.xml
@@ -5,14 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_bcast.xml"/>
+ <xi:include href="interfaces/interfaces-team_bcast.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
<define>
diff --git a/recipes/team/recipex_bcast_003.xml b/recipes/team/recipex_bcast_003.xml
index 063e8a0..31264eb 100644
--- a/recipes/team/recipex_bcast_003.xml
+++ b/recipes/team/recipex_bcast_003.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_bcast.xml"/>
+ <xi:include href="interfaces/interfaces-team_bcast.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple.xml"/>
+ <xi:include href="interfaces/interfaces-simple.xml"/>
</host>
</network>
- <xi:include href="sequence_pktgen.xml"/>
+ <xi:include href="tasks/sequence_pktgen.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_bcast_004.xml b/recipes/team/recipex_bcast_004.xml
index 0f00872..33a05a9 100644
--- a/recipes/team/recipex_bcast_004.xml
+++ b/recipes/team/recipex_bcast_004.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_bcast.xml"/>
+ <xi:include href="interfaces/interfaces-team_bcast.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_iperf.xml"/>
+ <xi:include href="tasks/sequence_iperf.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_lacp_001.xml b/recipes/team/recipex_lacp_001.xml
index 2bb4da1..cbb9720 100644
--- a/recipes/team/recipex_lacp_001.xml
+++ b/recipes/team/recipex_lacp_001.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lacp.xml"/>
+ <xi:include href="interfaces/interfaces-team_lacp.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-bond_lacp.xml"/>
+ <xi:include href="interfaces/interfaces-bond_lacp.xml"/>
</host>
</network>
- <xi:include href="sequence_ping_simple.xml"/>
+ <xi:include href="tasks/sequence_ping_simple.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_lacp_002.xml b/recipes/team/recipex_lacp_002.xml
index 0781d66..2cc4fab 100644
--- a/recipes/team/recipex_lacp_002.xml
+++ b/recipes/team/recipex_lacp_002.xml
@@ -5,14 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lacp.xml"/>
+ <xi:include href="interfaces/interfaces-team_lacp.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-bond_lacp.xml"/>
+ <xi:include href="interfaces/interfaces-bond_lacp.xml"/>
</host>
</network>
<define>
diff --git a/recipes/team/recipex_lacp_003.xml b/recipes/team/recipex_lacp_003.xml
index aaa12a8..3c18bac 100644
--- a/recipes/team/recipex_lacp_003.xml
+++ b/recipes/team/recipex_lacp_003.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lacp.xml"/>
+ <xi:include href="interfaces/interfaces-team_lacp.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-bond_lacp.xml"/>
+ <xi:include href="interfaces/interfaces-bond_lacp.xml"/>
</host>
</network>
- <xi:include href="sequence_pktgen_lacp.xml"/>
+ <xi:include href="tasks/sequence_pktgen_lacp.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_lacp_004.xml b/recipes/team/recipex_lacp_004.xml
index b7bafab..80a8ee3 100644
--- a/recipes/team/recipex_lacp_004.xml
+++ b/recipes/team/recipex_lacp_004.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lacp.xml"/>
+ <xi:include href="interfaces/interfaces-team_lacp.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-bond_lacp.xml"/>
+ <xi:include href="interfaces/interfaces-bond_lacp.xml"/>
</host>
</network>
- <xi:include href="sequence_iperf.xml"/>
+ <xi:include href="tasks/sequence_iperf.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_lacp_act_001.xml
b/recipes/team/recipex_lacp_act_001.xml
index 9e5f730..d6774db 100644
--- a/recipes/team/recipex_lacp_act_001.xml
+++ b/recipes/team/recipex_lacp_act_001.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lacp_act.xml"/>
+ <xi:include href="interfaces/interfaces-team_lacp_act.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-bond_lacp.xml"/>
+ <xi:include href="interfaces/interfaces-bond_lacp.xml"/>
</host>
</network>
- <xi:include href="sequence_ping_simple.xml"/>
+ <xi:include href="tasks/sequence_ping_simple.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_lacp_act_002.xml
b/recipes/team/recipex_lacp_act_002.xml
index f2871e9..ddd12bf 100644
--- a/recipes/team/recipex_lacp_act_002.xml
+++ b/recipes/team/recipex_lacp_act_002.xml
@@ -5,14 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lacp_act.xml"/>
+ <xi:include href="interfaces/interfaces-team_lacp_act.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-bond_lacp.xml"/>
+ <xi:include href="interfaces/interfaces-bond_lacp.xml"/>
</host>
</network>
<define>
diff --git a/recipes/team/recipex_lacp_act_003.xml
b/recipes/team/recipex_lacp_act_003.xml
index 822aa7f..c409aae 100644
--- a/recipes/team/recipex_lacp_act_003.xml
+++ b/recipes/team/recipex_lacp_act_003.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lacp_act.xml"/>
+ <xi:include href="interfaces/interfaces-team_lacp_act.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-bond_lacp.xml"/>
+ <xi:include href="interfaces/interfaces-bond_lacp.xml"/>
</host>
</network>
- <xi:include href="sequence_pktgen_lacp.xml"/>
+ <xi:include href="tasks/sequence_pktgen_lacp.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_lacp_act_004.xml
b/recipes/team/recipex_lacp_act_004.xml
index 1585b0a..a30e654 100644
--- a/recipes/team/recipex_lacp_act_004.xml
+++ b/recipes/team/recipex_lacp_act_004.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lacp_act.xml"/>
+ <xi:include href="interfaces/interfaces-team_lacp_act.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-bond_lacp.xml"/>
+ <xi:include href="interfaces/interfaces-bond_lacp.xml"/>
</host>
</network>
- <xi:include href="sequence_iperf.xml"/>
+ <xi:include href="tasks/sequence_iperf.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_lb_001.xml b/recipes/team/recipex_lb_001.xml
index 1d36bb1..3322822 100644
--- a/recipes/team/recipex_lb_001.xml
+++ b/recipes/team/recipex_lb_001.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lb.xml"/>
+ <xi:include href="interfaces/interfaces-team_lb.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_ping_simple.xml"/>
+ <xi:include href="tasks/sequence_ping_simple.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_lb_002.xml b/recipes/team/recipex_lb_002.xml
index b056c9e..9a16597 100644
--- a/recipes/team/recipex_lb_002.xml
+++ b/recipes/team/recipex_lb_002.xml
@@ -5,14 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lb.xml"/>
+ <xi:include href="interfaces/interfaces-team_lb.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
<define>
diff --git a/recipes/team/recipex_lb_003.xml b/recipes/team/recipex_lb_003.xml
index e4c7b4a..8e3c638 100644
--- a/recipes/team/recipex_lb_003.xml
+++ b/recipes/team/recipex_lb_003.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lb.xml"/>
+ <xi:include href="interfaces/interfaces-team_lb.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple.xml"/>
+ <xi:include href="interfaces/interfaces-simple.xml"/>
</host>
</network>
- <xi:include href="sequence_pktgen.xml"/>
+ <xi:include href="tasks/sequence_pktgen.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_lb_004.xml b/recipes/team/recipex_lb_004.xml
index 44a33aa..834614f 100644
--- a/recipes/team/recipex_lb_004.xml
+++ b/recipes/team/recipex_lb_004.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lb.xml"/>
+ <xi:include href="interfaces/interfaces-team_lb.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_iperf.xml"/>
+ <xi:include href="tasks/sequence_iperf.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_lb_act_001.xml b/recipes/team/recipex_lb_act_001.xml
index 176ee06..d799229 100644
--- a/recipes/team/recipex_lb_act_001.xml
+++ b/recipes/team/recipex_lb_act_001.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lb_act.xml"/>
+ <xi:include href="interfaces/interfaces-team_lb_act.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_ping_simple.xml"/>
+ <xi:include href="tasks/sequence_ping_simple.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_lb_act_002.xml b/recipes/team/recipex_lb_act_002.xml
index c6bf6a3..2c53660 100644
--- a/recipes/team/recipex_lb_act_002.xml
+++ b/recipes/team/recipex_lb_act_002.xml
@@ -5,14 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lb_act.xml"/>
+ <xi:include href="interfaces/interfaces-team_lb_act.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
<define>
diff --git a/recipes/team/recipex_lb_act_003.xml b/recipes/team/recipex_lb_act_003.xml
index d9a457c..da9bf23 100644
--- a/recipes/team/recipex_lb_act_003.xml
+++ b/recipes/team/recipex_lb_act_003.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lb_act.xml"/>
+ <xi:include href="interfaces/interfaces-team_lb_act.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple.xml"/>
+ <xi:include href="interfaces/interfaces-simple.xml"/>
</host>
</network>
- <xi:include href="sequence_pktgen.xml"/>
+ <xi:include href="tasks/sequence_pktgen.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_lb_act_004.xml b/recipes/team/recipex_lb_act_004.xml
index 62efab3..cb20bf7 100644
--- a/recipes/team/recipex_lb_act_004.xml
+++ b/recipes/team/recipex_lb_act_004.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lb_act.xml"/>
+ <xi:include href="interfaces/interfaces-team_lb_act.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_iperf.xml"/>
+ <xi:include href="tasks/sequence_iperf.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_rr_001.xml b/recipes/team/recipex_rr_001.xml
index e17fc1e..2b3895f 100644
--- a/recipes/team/recipex_rr_001.xml
+++ b/recipes/team/recipex_rr_001.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_rr.xml"/>
+ <xi:include href="interfaces/interfaces-team_rr.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_ping_simple.xml"/>
+ <xi:include href="tasks/sequence_ping_simple.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_rr_002.xml b/recipes/team/recipex_rr_002.xml
index 0206900..7b8495a 100644
--- a/recipes/team/recipex_rr_002.xml
+++ b/recipes/team/recipex_rr_002.xml
@@ -5,14 +5,14 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_rr.xml"/>
+ <xi:include href="interfaces/interfaces-team_rr.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
<define>
diff --git a/recipes/team/recipex_rr_003.xml b/recipes/team/recipex_rr_003.xml
index d15ae32..c2e6a7a 100644
--- a/recipes/team/recipex_rr_003.xml
+++ b/recipes/team/recipex_rr_003.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_rr.xml"/>
+ <xi:include href="interfaces/interfaces-team_rr.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple.xml"/>
+ <xi:include href="interfaces/interfaces-simple.xml"/>
</host>
</network>
- <xi:include href="sequence_pktgen.xml"/>
+ <xi:include href="tasks/sequence_pktgen.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipex_rr_004.xml b/recipes/team/recipex_rr_004.xml
index 987ff9a..4b57a04 100644
--- a/recipes/team/recipex_rr_004.xml
+++ b/recipes/team/recipex_rr_004.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_rr.xml"/>
+ <xi:include href="interfaces/interfaces-team_rr.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_iperf.xml"/>
+ <xi:include href="tasks/sequence_iperf.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipey_ab_lw_001.xml b/recipes/team/recipey_ab_lw_001.xml
index 741bfae..6cd2628 100644
--- a/recipes/team/recipey_ab_lw_001.xml
+++ b/recipes/team/recipey_ab_lw_001.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_ab_lw_001.xml"/>
+ <xi:include
href="interfaces/interfaces-team_ab_lw_001.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_ping_simple.xml"/>
+ <xi:include href="tasks/sequence_ping_simple.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipey_ab_lw_002.xml b/recipes/team/recipey_ab_lw_002.xml
index e84740a..69f9901 100644
--- a/recipes/team/recipey_ab_lw_002.xml
+++ b/recipes/team/recipey_ab_lw_002.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_ab_lw_002.xml"/>
+ <xi:include
href="interfaces/interfaces-team_ab_lw_002.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_ping_simple.xml"/>
+ <xi:include href="tasks/sequence_ping_simple.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipey_ab_lw_003.xml b/recipes/team/recipey_ab_lw_003.xml
index 4ba317b..10bf124 100644
--- a/recipes/team/recipey_ab_lw_003.xml
+++ b/recipes/team/recipey_ab_lw_003.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_ab_lw_003.xml"/>
+ <xi:include
href="interfaces/interfaces-team_ab_lw_003.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_ping_simple.xml"/>
+ <xi:include href="tasks/sequence_ping_simple.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipey_ab_lw_004.xml b/recipes/team/recipey_ab_lw_004.xml
index f678bf9..4489578 100644
--- a/recipes/team/recipey_ab_lw_004.xml
+++ b/recipes/team/recipey_ab_lw_004.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_ab_lw_004.xml"/>
+ <xi:include
href="interfaces/interfaces-team_ab_lw_004.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_ping_simple.xml"/>
+ <xi:include href="tasks/sequence_ping_simple.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipey_ab_lw_005.xml b/recipes/team/recipey_ab_lw_005.xml
index afef453..001c1aa 100644
--- a/recipes/team/recipey_ab_lw_005.xml
+++ b/recipes/team/recipey_ab_lw_005.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_ab_lw_005.xml"/>
+ <xi:include
href="interfaces/interfaces-team_ab_lw_005.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_ping_simple.xml"/>
+ <xi:include href="tasks/sequence_ping_simple.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipey_ab_lw_006.xml b/recipes/team/recipey_ab_lw_006.xml
index 7f8eb5b..a9c6903 100644
--- a/recipes/team/recipey_ab_lw_006.xml
+++ b/recipes/team/recipey_ab_lw_006.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_ab_lw_006.xml"/>
+ <xi:include
href="interfaces/interfaces-team_ab_lw_006.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_ping_simple.xml"/>
+ <xi:include href="tasks/sequence_ping_simple.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipey_ab_lw_007.xml b/recipes/team/recipey_ab_lw_007.xml
index c047b51..2fa6bb0 100644
--- a/recipes/team/recipey_ab_lw_007.xml
+++ b/recipes/team/recipey_ab_lw_007.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_ab_lw_007.xml"/>
+ <xi:include
href="interfaces/interfaces-team_ab_lw_007.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_ping_simple.xml"/>
+ <xi:include href="tasks/sequence_ping_simple.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipey_ab_lw_008.xml b/recipes/team/recipey_ab_lw_008.xml
index 45e2a4e..3e144ea 100644
--- a/recipes/team/recipey_ab_lw_008.xml
+++ b/recipes/team/recipey_ab_lw_008.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_ab_lw_008.xml"/>
+ <xi:include
href="interfaces/interfaces-team_ab_lw_008.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_ping_simple.xml"/>
+ <xi:include href="tasks/sequence_ping_simple.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipey_lacp_act_flows.xml
b/recipes/team/recipey_lacp_act_flows.xml
index 028dc80..5f695a4 100644
--- a/recipes/team/recipey_lacp_act_flows.xml
+++ b/recipes/team/recipey_lacp_act_flows.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lacp_act.xml"/>
+ <xi:include href="interfaces/interfaces-team_lacp_act.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-bond_lacp.xml"/>
+ <xi:include href="interfaces/interfaces-bond_lacp.xml"/>
</host>
</network>
- <xi:include href="sequence_pktgen_flows.xml"/>
+ <xi:include href="tasks/sequence_pktgen_flows.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipey_lacp_hashes.xml b/recipes/team/recipey_lacp_hashes.xml
index 025abd3..3ffd4d7 100644
--- a/recipes/team/recipey_lacp_hashes.xml
+++ b/recipes/team/recipey_lacp_hashes.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lacp.xml"/>
+ <xi:include href="interfaces/interfaces-team_lacp.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-bond_lacp.xml"/>
+ <xi:include href="interfaces/interfaces-bond_lacp.xml"/>
</host>
</network>
- <xi:include href="sequence_pktgen_hashes.xml"/>
+ <xi:include href="tasks/sequence_pktgen_hashes.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipey_lacp_passive.xml
b/recipes/team/recipey_lacp_passive.xml
index b362b5e..6e9cfaa 100644
--- a/recipes/team/recipey_lacp_passive.xml
+++ b/recipes/team/recipey_lacp_passive.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lacp_passive.xml"/>
+ <xi:include
href="interfaces/interfaces-team_lacp_passive.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-bond_lacp.xml"/>
+ <xi:include href="interfaces/interfaces-bond_lacp.xml"/>
</host>
</network>
- <xi:include href="sequence_ping_simple.xml"/>
+ <xi:include href="tasks/sequence_ping_simple.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipey_lacp_slowrate.xml
b/recipes/team/recipey_lacp_slowrate.xml
index d0e4c4f..b299c61 100644
--- a/recipes/team/recipey_lacp_slowrate.xml
+++ b/recipes/team/recipey_lacp_slowrate.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lacp_slowrate.xml"/>
+ <xi:include
href="interfaces/interfaces-team_lacp_slowrate.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-bond_lacp.xml"/>
+ <xi:include href="interfaces/interfaces-bond_lacp.xml"/>
</host>
</network>
- <xi:include href="sequence_ping_simple.xml"/>
+ <xi:include href="tasks/sequence_ping_simple.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipey_lb_act_flows.xml
b/recipes/team/recipey_lb_act_flows.xml
index 5daf5c7..b7a1e79 100644
--- a/recipes/team/recipey_lb_act_flows.xml
+++ b/recipes/team/recipey_lb_act_flows.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lb_act.xml"/>
+ <xi:include href="interfaces/interfaces-team_lb_act.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_pktgen_flows.xml"/>
+ <xi:include href="tasks/sequence_pktgen_flows.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipey_lb_hashes.xml b/recipes/team/recipey_lb_hashes.xml
index 8b3fcde..97652c0 100644
--- a/recipes/team/recipey_lb_hashes.xml
+++ b/recipes/team/recipey_lb_hashes.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_lb.xml"/>
+ <xi:include href="interfaces/interfaces-team_lb.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-simple_br.xml"/>
+ <xi:include href="interfaces/interfaces-simple_br.xml"/>
</host>
</network>
- <xi:include href="sequence_pktgen_hashes.xml"/>
+ <xi:include href="tasks/sequence_pktgen_hashes.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/recipey_rr_queue_mapping.xml
b/recipes/team/recipey_rr_queue_mapping.xml
index 60ec9ea..65a224a 100644
--- a/recipes/team/recipey_rr_queue_mapping.xml
+++ b/recipes/team/recipey_rr_queue_mapping.xml
@@ -5,15 +5,15 @@
<alias name="testip6" value="fe01::1/64"/>
</define>
<host id="1">
- <xi:include href="interfaces-team_rr_queue_mapping.xml"/>
+ <xi:include
href="interfaces/interfaces-team_rr_queue_mapping.xml"/>
</host>
<define>
<alias name="testip" value="192.168.111.2/24"/>
<alias name="testip6" value="fe01::2/64"/>
</define>
<host id="2">
- <xi:include href="interfaces-br_queue_mapping.xml"/>
+ <xi:include
href="interfaces/interfaces-br_queue_mapping.xml"/>
</host>
</network>
- <xi:include href="sequence_queue_mapping.xml"/>
+ <xi:include href="tasks/sequence_queue_mapping.xml"/>
</lnstrecipe>
\ No newline at end of file
diff --git a/recipes/team/sequence_iperf.xml b/recipes/team/tasks/sequence_iperf.xml
similarity index 100%
rename from recipes/team/sequence_iperf.xml
rename to recipes/team/tasks/sequence_iperf.xml
diff --git a/recipes/team/sequence_ping_simple.xml
b/recipes/team/tasks/sequence_ping_simple.xml
similarity index 100%
rename from recipes/team/sequence_ping_simple.xml
rename to recipes/team/tasks/sequence_ping_simple.xml
diff --git a/recipes/team/sequence_pktgen.xml b/recipes/team/tasks/sequence_pktgen.xml
similarity index 100%
rename from recipes/team/sequence_pktgen.xml
rename to recipes/team/tasks/sequence_pktgen.xml
diff --git a/recipes/team/sequence_pktgen_flows.xml
b/recipes/team/tasks/sequence_pktgen_flows.xml
similarity index 100%
rename from recipes/team/sequence_pktgen_flows.xml
rename to recipes/team/tasks/sequence_pktgen_flows.xml
diff --git a/recipes/team/sequence_pktgen_hashes.xml
b/recipes/team/tasks/sequence_pktgen_hashes.xml
similarity index 100%
rename from recipes/team/sequence_pktgen_hashes.xml
rename to recipes/team/tasks/sequence_pktgen_hashes.xml
diff --git a/recipes/team/sequence_pktgen_lacp.xml
b/recipes/team/tasks/sequence_pktgen_lacp.xml
similarity index 100%
rename from recipes/team/sequence_pktgen_lacp.xml
rename to recipes/team/tasks/sequence_pktgen_lacp.xml
diff --git a/recipes/team/sequence_queue_mapping.xml
b/recipes/team/tasks/sequence_queue_mapping.xml
similarity index 100%
rename from recipes/team/sequence_queue_mapping.xml
rename to recipes/team/tasks/sequence_queue_mapping.xml