[PATCH] 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&gt; --- 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/interfaces/interfaces-bond_lacp.xml | 20 +++++ .../interfaces/interfaces-br_queue_mapping.xml | 18 +++++ recipes/team/interfaces/interfaces-simple.xml | 10 +++ recipes/team/interfaces/interfaces-simple_br.xml | 16 ++++ recipes/team/interfaces/interfaces-team_ab.xml | 50 ++++++++++++ .../team/interfaces/interfaces-team_ab_lw_001.xml | 25 ++++++ .../team/interfaces/interfaces-team_ab_lw_002.xml | 60 +++++++++++++++ .../team/interfaces/interfaces-team_ab_lw_003.xml | 31 ++++++++ .../team/interfaces/interfaces-team_ab_lw_004.xml | 68 ++++++++++++++++ .../team/interfaces/interfaces-team_ab_lw_005.xml | 30 ++++++++ .../team/interfaces/interfaces-team_ab_lw_006.xml | 65 ++++++++++++++++ .../team/interfaces/interfaces-team_ab_lw_007.xml | 64 +++++++++++++++ .../team/interfaces/interfaces-team_ab_lw_008.xml | 90 ++++++++++++++++++++++ recipes/team/interfaces/interfaces-team_bcast.xml | 24 ++++++ recipes/team/interfaces/interfaces-team_lacp.xml | 38 +++++++++ .../team/interfaces/interfaces-team_lacp_act.xml | 41 ++++++++++ .../interfaces/interfaces-team_lacp_passive.xml | 38 +++++++++ .../interfaces/interfaces-team_lacp_slowrate.xml | 38 +++++++++ recipes/team/interfaces/interfaces-team_lb.xml | 27 +++++++ recipes/team/interfaces/interfaces-team_lb_act.xml | 30 ++++++++ recipes/team/interfaces/interfaces-team_rr.xml | 24 ++++++ .../interfaces-team_rr_queue_mapping.xml | 50 ++++++++++++ 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/sequence_iperf.xml | 18 ----- recipes/team/sequence_ping_simple.xml | 19 ----- recipes/team/sequence_pktgen.xml | 21 ----- recipes/team/sequence_pktgen_flows.xml | 22 ------ recipes/team/sequence_pktgen_hashes.xml | 14 ---- recipes/team/sequence_pktgen_lacp.xml | 21 ----- recipes/team/sequence_queue_mapping.xml | 43 ----------- recipes/team/tasks/sequence_iperf.xml | 18 +++++ recipes/team/tasks/sequence_ping_simple.xml | 19 +++++ recipes/team/tasks/sequence_pktgen.xml | 21 +++++ recipes/team/tasks/sequence_pktgen_flows.xml | 22 ++++++ recipes/team/tasks/sequence_pktgen_hashes.xml | 14 ++++ recipes/team/tasks/sequence_pktgen_lacp.xml | 21 +++++ recipes/team/tasks/sequence_queue_mapping.xml | 43 +++++++++++ 105 files changed, 1138 insertions(+), 1167 deletions(-) delete mode 100644 recipes/team/interfaces-bond_lacp.xml delete mode 100644 recipes/team/interfaces-br_queue_mapping.xml delete mode 100644 recipes/team/interfaces-simple.xml delete mode 100644 recipes/team/interfaces-simple_br.xml delete mode 100644 recipes/team/interfaces-team_ab.xml delete mode 100644 recipes/team/interfaces-team_ab_lw_001.xml delete mode 100644 recipes/team/interfaces-team_ab_lw_002.xml delete mode 100644 recipes/team/interfaces-team_ab_lw_003.xml delete mode 100644 recipes/team/interfaces-team_ab_lw_004.xml delete mode 100644 recipes/team/interfaces-team_ab_lw_005.xml delete mode 100644 recipes/team/interfaces-team_ab_lw_006.xml delete mode 100644 recipes/team/interfaces-team_ab_lw_007.xml delete mode 100644 recipes/team/interfaces-team_ab_lw_008.xml delete mode 100644 recipes/team/interfaces-team_bcast.xml delete mode 100644 recipes/team/interfaces-team_lacp.xml delete mode 100644 recipes/team/interfaces-team_lacp_act.xml delete mode 100644 recipes/team/interfaces-team_lacp_passive.xml delete mode 100644 recipes/team/interfaces-team_lacp_slowrate.xml delete mode 100644 recipes/team/interfaces-team_lb.xml delete mode 100644 recipes/team/interfaces-team_lb_act.xml delete mode 100644 recipes/team/interfaces-team_rr.xml delete mode 100644 recipes/team/interfaces-team_rr_queue_mapping.xml create mode 100644 recipes/team/interfaces/interfaces-bond_lacp.xml create mode 100644 recipes/team/interfaces/interfaces-br_queue_mapping.xml create mode 100644 recipes/team/interfaces/interfaces-simple.xml create mode 100644 recipes/team/interfaces/interfaces-simple_br.xml create mode 100644 recipes/team/interfaces/interfaces-team_ab.xml create mode 100644 recipes/team/interfaces/interfaces-team_ab_lw_001.xml create mode 100644 recipes/team/interfaces/interfaces-team_ab_lw_002.xml create mode 100644 recipes/team/interfaces/interfaces-team_ab_lw_003.xml create mode 100644 recipes/team/interfaces/interfaces-team_ab_lw_004.xml create mode 100644 recipes/team/interfaces/interfaces-team_ab_lw_005.xml create mode 100644 recipes/team/interfaces/interfaces-team_ab_lw_006.xml create mode 100644 recipes/team/interfaces/interfaces-team_ab_lw_007.xml create mode 100644 recipes/team/interfaces/interfaces-team_ab_lw_008.xml create mode 100644 recipes/team/interfaces/interfaces-team_bcast.xml create mode 100644 recipes/team/interfaces/interfaces-team_lacp.xml create mode 100644 recipes/team/interfaces/interfaces-team_lacp_act.xml create mode 100644 recipes/team/interfaces/interfaces-team_lacp_passive.xml create mode 100644 recipes/team/interfaces/interfaces-team_lacp_slowrate.xml create mode 100644 recipes/team/interfaces/interfaces-team_lb.xml create mode 100644 recipes/team/interfaces/interfaces-team_lb_act.xml create mode 100644 recipes/team/interfaces/interfaces-team_rr.xml create mode 100644 recipes/team/interfaces/interfaces-team_rr_queue_mapping.xml delete mode 100644 recipes/team/machineconfig-dhcp-37-128.xml delete mode 100644 recipes/team/machineconfig-peanut.xml delete mode 100644 recipes/team/machineconfig-test1.xml delete mode 100644 recipes/team/machineconfig-test2.xml delete mode 100644 recipes/team/sequence_iperf.xml delete mode 100644 recipes/team/sequence_ping_simple.xml delete mode 100644 recipes/team/sequence_pktgen.xml delete mode 100644 recipes/team/sequence_pktgen_flows.xml delete mode 100644 recipes/team/sequence_pktgen_hashes.xml delete mode 100644 recipes/team/sequence_pktgen_lacp.xml delete mode 100644 recipes/team/sequence_queue_mapping.xml create mode 100644 recipes/team/tasks/sequence_iperf.xml create mode 100644 recipes/team/tasks/sequence_ping_simple.xml create mode 100644 recipes/team/tasks/sequence_pktgen.xml create mode 100644 recipes/team/tasks/sequence_pktgen_flows.xml create mode 100644 recipes/team/tasks/sequence_pktgen_hashes.xml create mode 100644 recipes/team/tasks/sequence_pktgen_lacp.xml create mode 100644 recipes/team/tasks/sequence_queue_mapping.xml diff --git a/recipes/team/interfaces-bond_lacp.xml b/recipes/team/interfaces-bond_lacp.xml deleted file mode 100644 index 4cb9202..0000000 --- a/recipes/team/interfaces-bond_lacp.xml +++ /dev/null @@ -1,20 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index d5be8e4..0000000 --- a/recipes/team/interfaces-br_queue_mapping.xml +++ /dev/null @@ -1,18 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index bea181d..0000000 --- a/recipes/team/interfaces-simple.xml +++ /dev/null @@ -1,9 +0,0 @@ -<interfaces> - <eth id="testiface" label="net1"> - <addresses> - <address value="{$testip}"/> - </addresses> - </eth> - <eth id="2" label="net2"/> - <eth id="3" label="net3"/> -</interfaces> diff --git a/recipes/team/interfaces-simple_br.xml b/recipes/team/interfaces-simple_br.xml deleted file mode 100644 index 278ad40..0000000 --- a/recipes/team/interfaces-simple_br.xml +++ /dev/null @@ -1,16 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index 8a10755..0000000 --- a/recipes/team/interfaces-team_ab.xml +++ /dev/null @@ -1,50 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index bda72a2..0000000 --- a/recipes/team/interfaces-team_ab_lw_001.xml +++ /dev/null @@ -1,25 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index ab178cf..0000000 --- a/recipes/team/interfaces-team_ab_lw_002.xml +++ /dev/null @@ -1,60 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index 3a1fd64..0000000 --- a/recipes/team/interfaces-team_ab_lw_003.xml +++ /dev/null @@ -1,31 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index bb7417e..0000000 --- a/recipes/team/interfaces-team_ab_lw_004.xml +++ /dev/null @@ -1,68 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index b06ecb2..0000000 --- a/recipes/team/interfaces-team_ab_lw_005.xml +++ /dev/null @@ -1,30 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index a139c21..0000000 --- a/recipes/team/interfaces-team_ab_lw_006.xml +++ /dev/null @@ -1,65 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index 325361e..0000000 --- a/recipes/team/interfaces-team_ab_lw_007.xml +++ /dev/null @@ -1,64 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index 0587bee..0000000 --- a/recipes/team/interfaces-team_ab_lw_008.xml +++ /dev/null @@ -1,90 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index 5ae7e3d..0000000 --- a/recipes/team/interfaces-team_bcast.xml +++ /dev/null @@ -1,24 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index 362cafd..0000000 --- a/recipes/team/interfaces-team_lacp.xml +++ /dev/null @@ -1,38 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index c5e7917..0000000 --- a/recipes/team/interfaces-team_lacp_act.xml +++ /dev/null @@ -1,41 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index e0b69b8..0000000 --- a/recipes/team/interfaces-team_lacp_passive.xml +++ /dev/null @@ -1,38 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index 36d07dd..0000000 --- a/recipes/team/interfaces-team_lacp_slowrate.xml +++ /dev/null @@ -1,38 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index 79e9024..0000000 --- a/recipes/team/interfaces-team_lb.xml +++ /dev/null @@ -1,27 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="net3"/> - <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 deleted file mode 100644 index 343e89f..0000000 --- a/recipes/team/interfaces-team_lb_act.xml +++ /dev/null @@ -1,30 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index 2a9cf33..0000000 --- a/recipes/team/interfaces-team_rr.xml +++ /dev/null @@ -1,24 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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 deleted file mode 100644 index 265db42..0000000 --- a/recipes/team/interfaces-team_rr_queue_mapping.xml +++ /dev/null @@ -1,50 +0,0 @@ -<interfaces> - <eth id="1" label="net1"/> - <eth id="2" label="net2"/> - <eth id="3" label="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/interfaces/interfaces-bond_lacp.xml b/recipes/team/interfaces/interfaces-bond_lacp.xml new file mode 100644 index 0000000..4cb9202 --- /dev/null +++ b/recipes/team/interfaces/interfaces-bond_lacp.xml @@ -0,0 +1,20 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-br_queue_mapping.xml b/recipes/team/interfaces/interfaces-br_queue_mapping.xml new file mode 100644 index 0000000..d5be8e4 --- /dev/null +++ b/recipes/team/interfaces/interfaces-br_queue_mapping.xml @@ -0,0 +1,18 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-simple.xml b/recipes/team/interfaces/interfaces-simple.xml new file mode 100644 index 0000000..d1e3461 --- /dev/null +++ b/recipes/team/interfaces/interfaces-simple.xml @@ -0,0 +1,10 @@ +<interfaces> + <eth id="testiface" label="net1"> + <addresses> + <address value="{$testip}"/> + <address value="{$testip6}"/> + </addresses> + </eth> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> +</interfaces> diff --git a/recipes/team/interfaces/interfaces-simple_br.xml b/recipes/team/interfaces/interfaces-simple_br.xml new file mode 100644 index 0000000..278ad40 --- /dev/null +++ b/recipes/team/interfaces/interfaces-simple_br.xml @@ -0,0 +1,16 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-team_ab.xml b/recipes/team/interfaces/interfaces-team_ab.xml new file mode 100644 index 0000000..8a10755 --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_ab.xml @@ -0,0 +1,50 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-team_ab_lw_001.xml b/recipes/team/interfaces/interfaces-team_ab_lw_001.xml new file mode 100644 index 0000000..bda72a2 --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_ab_lw_001.xml @@ -0,0 +1,25 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-team_ab_lw_002.xml b/recipes/team/interfaces/interfaces-team_ab_lw_002.xml new file mode 100644 index 0000000..ab178cf --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_ab_lw_002.xml @@ -0,0 +1,60 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-team_ab_lw_003.xml b/recipes/team/interfaces/interfaces-team_ab_lw_003.xml new file mode 100644 index 0000000..3a1fd64 --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_ab_lw_003.xml @@ -0,0 +1,31 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-team_ab_lw_004.xml b/recipes/team/interfaces/interfaces-team_ab_lw_004.xml new file mode 100644 index 0000000..bb7417e --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_ab_lw_004.xml @@ -0,0 +1,68 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-team_ab_lw_005.xml b/recipes/team/interfaces/interfaces-team_ab_lw_005.xml new file mode 100644 index 0000000..b06ecb2 --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_ab_lw_005.xml @@ -0,0 +1,30 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-team_ab_lw_006.xml b/recipes/team/interfaces/interfaces-team_ab_lw_006.xml new file mode 100644 index 0000000..a139c21 --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_ab_lw_006.xml @@ -0,0 +1,65 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-team_ab_lw_007.xml b/recipes/team/interfaces/interfaces-team_ab_lw_007.xml new file mode 100644 index 0000000..325361e --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_ab_lw_007.xml @@ -0,0 +1,64 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-team_ab_lw_008.xml b/recipes/team/interfaces/interfaces-team_ab_lw_008.xml new file mode 100644 index 0000000..0587bee --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_ab_lw_008.xml @@ -0,0 +1,90 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-team_bcast.xml b/recipes/team/interfaces/interfaces-team_bcast.xml new file mode 100644 index 0000000..5ae7e3d --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_bcast.xml @@ -0,0 +1,24 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-team_lacp.xml b/recipes/team/interfaces/interfaces-team_lacp.xml new file mode 100644 index 0000000..362cafd --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_lacp.xml @@ -0,0 +1,38 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-team_lacp_act.xml b/recipes/team/interfaces/interfaces-team_lacp_act.xml new file mode 100644 index 0000000..c5e7917 --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_lacp_act.xml @@ -0,0 +1,41 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-team_lacp_passive.xml b/recipes/team/interfaces/interfaces-team_lacp_passive.xml new file mode 100644 index 0000000..e0b69b8 --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_lacp_passive.xml @@ -0,0 +1,38 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-team_lacp_slowrate.xml b/recipes/team/interfaces/interfaces-team_lacp_slowrate.xml new file mode 100644 index 0000000..36d07dd --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_lacp_slowrate.xml @@ -0,0 +1,38 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-team_lb.xml b/recipes/team/interfaces/interfaces-team_lb.xml new file mode 100644 index 0000000..79e9024 --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_lb.xml @@ -0,0 +1,27 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> + <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/interfaces-team_lb_act.xml b/recipes/team/interfaces/interfaces-team_lb_act.xml new file mode 100644 index 0000000..343e89f --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_lb_act.xml @@ -0,0 +1,30 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-team_rr.xml b/recipes/team/interfaces/interfaces-team_rr.xml new file mode 100644 index 0000000..2a9cf33 --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_rr.xml @@ -0,0 +1,24 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/interfaces-team_rr_queue_mapping.xml b/recipes/team/interfaces/interfaces-team_rr_queue_mapping.xml new file mode 100644 index 0000000..265db42 --- /dev/null +++ b/recipes/team/interfaces/interfaces-team_rr_queue_mapping.xml @@ -0,0 +1,50 @@ +<interfaces> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="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/machineconfig-dhcp-37-128.xml b/recipes/team/machineconfig-dhcp-37-128.xml deleted file mode 100644 index d55f8d1..0000000 --- a/recipes/team/machineconfig-dhcp-37-128.xml +++ /dev/null @@ -1,8 +0,0 @@ -<machineconfig> - <info hostname="10.34.37.128"/> - <netdevices> - <netdevice hwaddr="00:10:18:61:35:9b" network="testing_green" phys_id="1" type="eth"/> - <netdevice hwaddr="00:10:18:48:15:fa" network="testing_magenta" phys_id="2" type="eth"/> - <netdevice hwaddr="00:0e:0c:b3:09:4e" network="testing_blue" phys_id="3" type="eth"/> - </netdevices> -</machineconfig> \ No newline at end of file diff --git a/recipes/team/machineconfig-peanut.xml b/recipes/team/machineconfig-peanut.xml deleted file mode 100644 index 3c7a286..0000000 --- a/recipes/team/machineconfig-peanut.xml +++ /dev/null @@ -1,8 +0,0 @@ -<machineconfig> - <info hostname="10.34.33.99"/> - <netdevices> - <netdevice hwaddr="d4:85:64:01:46:9e" network="testing_green" phys_id="1" type="eth"/> - <netdevice hwaddr="00:e0:4c:14:2e:5d" network="testing_magenta" phys_id="2" type="eth"/> - <netdevice hwaddr="00:30:4f:7f:fd:30" network="testing_blue" phys_id="3" type="eth"/> - </netdevices> -</machineconfig> \ No newline at end of file diff --git a/recipes/team/machineconfig-test1.xml b/recipes/team/machineconfig-test1.xml deleted file mode 100644 index 2d4bb0b..0000000 --- a/recipes/team/machineconfig-test1.xml +++ /dev/null @@ -1,7 +0,0 @@ -<machineconfig> - <info hostname="192.168.122.182"/> - <netdevices> - <netdevice hwaddr="52:54:00:3d:c7:6d" network="testing" phys_id="1" type="eth"/> - <netdevice hwaddr="52:54:00:73:15:c2" network="testing" phys_id="2" type="eth"/> - </netdevices> -</machineconfig> \ No newline at end of file diff --git a/recipes/team/machineconfig-test2.xml b/recipes/team/machineconfig-test2.xml deleted file mode 100644 index a9327af..0000000 --- a/recipes/team/machineconfig-test2.xml +++ /dev/null @@ -1,7 +0,0 @@ -<machineconfig> - <info hostname="192.168.122.223"/> - <netdevices> - <netdevice hwaddr="52:54:00:99:bb:27" network="testing" phys_id="1" type="eth"/> - <netdevice hwaddr="52:54:00:b7:cc:fb" network="testing" phys_id="2" type="eth"/> - </netdevices> -</machineconfig> \ No newline at end of file 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/sequence_iperf.xml deleted file mode 100644 index 9e0b2d0..0000000 --- a/recipes/team/sequence_iperf.xml +++ /dev/null @@ -1,18 +0,0 @@ -<task> - <ctl_wait seconds="3"/> - <run bg_id="1" host="2" module="Iperf"> - <options> - <option name="role" value="server"/> - <option name="bind" value="{ip(2,testiface)}"/> - </options> - </run> - <ctl_wait seconds="5"/> - <run host="1" module="Iperf"> - <options> - <option name="role" value="client"/> - <option name="duration" value="15"/> - <option name="iperf_server" value="{ip(2,testiface)}"/> - </options> - </run> - <kill bg_id="1" host="2"/> -</task> diff --git a/recipes/team/sequence_ping_simple.xml b/recipes/team/sequence_ping_simple.xml deleted file mode 100644 index adb15d0..0000000 --- a/recipes/team/sequence_ping_simple.xml +++ /dev/null @@ -1,19 +0,0 @@ -<task> - <ctl_wait seconds="4"/> - <run host="1" module="IcmpPing" timeout="60"> - <options> - <option name="addr" value="{ip(2,testiface)}"/> - <option name="count" value="2000"/> - <option name="interval" value="0.01"/> - <option name="limit_rate" value="95"/> - </options> - </run> - <run host="1" module="Icmp6Ping" timeout="60"> - <options> - <option name="addr" value="{ip(2,testiface,1)}"/> - <option name="count" value="2000"/> - <option name="interval" value="0.01"/> - <option name="limit_rate" value="95"/> - </options> - </run> -</task> \ No newline at end of file diff --git a/recipes/team/sequence_pktgen.xml b/recipes/team/sequence_pktgen.xml deleted file mode 100644 index 5807b42..0000000 --- a/recipes/team/sequence_pktgen.xml +++ /dev/null @@ -1,21 +0,0 @@ -<task> - <ctl_wait seconds="4"/> - <run bg_id="1" host="1" module="PktCounter"> - <options> - <option name="input_netdev_name" value="{devname(1,testiface)}"/> - <option name="proto" value="udp"/> - <option name="dport" value="9"/> - </options> - </run> - <run host="2" module="PktgenTx" timeout="200"> - <options> - <option name="pktgen_option" value="dst {ip(1,testiface)}"/> - <option name="pktgen_option" value="dst_mac 00:11:22:33:44:55"/> - <option name="pktgen_option" value="src_min {ip(2,testiface)}"/> - <option name="netdev_name" value="{devname(2,2)}"/> - <option name="netdev_name" value="{devname(2,3)}"/> - <option name="netdev_name" value="{devname(2,testiface)}"/> - </options> - </run> - <intr bg_id="1" host="1"/> -</task> diff --git a/recipes/team/sequence_pktgen_flows.xml b/recipes/team/sequence_pktgen_flows.xml deleted file mode 100644 index c9d58ee..0000000 --- a/recipes/team/sequence_pktgen_flows.xml +++ /dev/null @@ -1,22 +0,0 @@ -<task> - <ctl_wait seconds="4"/> - <run bg_id="1" host="1" module="PktgenTx"> - <options> - <option name="pktgen_option" value="count 0"/> - <option name="pktgen_option" value="clone_skb 0"/> - <option name="pktgen_option" value="flag IPDST_RND"/> - <option name="pktgen_option" value="flag TXSIZE_RND"/> - <option name="pktgen_option" value="dst_min 172.0.0.1"/> - <option name="pktgen_option" value="dst_max 172.0.0.200"/> - <option name="pktgen_option" value="src_min {ip(1,testiface)}"/> - <option name="pktgen_option" value="dst_mac 00:11:22:33:44:66"/> - <option name="pktgen_option" value="min_pkt_size 60"/> - <option name="pktgen_option" value="max_pkt_size 1000"/> - <option name="pktgen_option" value="flows 128"/> - <option name="pktgen_option" value="flowlen 20000"/> - <option name="netdev_name" value="{devname(1,testiface)}"/> - </options> - </run> - <ctl_wait seconds="400"/> - <intr bg_id="1" host="1"/> -</task> \ No newline at end of file diff --git a/recipes/team/sequence_pktgen_hashes.xml b/recipes/team/sequence_pktgen_hashes.xml deleted file mode 100644 index c8212b6..0000000 --- a/recipes/team/sequence_pktgen_hashes.xml +++ /dev/null @@ -1,14 +0,0 @@ -<task> - <ctl_wait seconds="4"/> - <run host="1" module="PktgenTx" timeout="200"> - <options> - <option name="pktgen_option" value="count 10000"/> - <option name="pktgen_option" value="clone_skb 0"/> - <option name="pktgen_option" value="dst_min 172.0.0.1"/> - <option name="pktgen_option" value="dst_max 172.0.0.10"/> - <option name="pktgen_option" value="dst_mac 00:11:22:33:44:55"/> - <option name="pktgen_option" value="src_min {ip(1,testiface)}"/> - <option name="netdev_name" value="{devname(1,testiface)}"/> - </options> - </run> -</task> \ No newline at end of file diff --git a/recipes/team/sequence_pktgen_lacp.xml b/recipes/team/sequence_pktgen_lacp.xml deleted file mode 100644 index e93fcdb..0000000 --- a/recipes/team/sequence_pktgen_lacp.xml +++ /dev/null @@ -1,21 +0,0 @@ -<task> - <ctl_wait seconds="4"/> - <run bg_id="1" host="1" module="PktCounter"> - <options> - <option name="input_netdev_name" value="{devname(1,testiface)}"/> - <option name="proto" value="udp"/> - <option name="dport" value="9"/> - </options> - </run> - <run host="2" module="PktgenTx" timeout="200"> - <options> - <option name="pktgen_option" value="dst {ip(1,testiface)}"/> - <option name="pktgen_option" value="dst_mac 00:11:22:33:44:55"/> - <option name="pktgen_option" value="src_min {ip(2,testiface)}"/> - <option name="netdev_name" value="{devname(2,1)}"/> - <option name="netdev_name" value="{devname(2,2)}"/> - <option name="netdev_name" value="{devname(2,3)}"/> - </options> - </run> - <intr bg_id="1" host="1"/> -</task> \ No newline at end of file diff --git a/recipes/team/sequence_queue_mapping.xml b/recipes/team/sequence_queue_mapping.xml deleted file mode 100644 index 04446b5..0000000 --- a/recipes/team/sequence_queue_mapping.xml +++ /dev/null @@ -1,43 +0,0 @@ -<task> - <ctl_wait seconds="4"/> - <run command="tc qdisc add dev {devname(1,testiface)} handle 1 root multiq" host="1"/> - <run command="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" host="1"/> - <run command="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" host="1"/> - <run command="tc filter add dev {devname(1,testiface)} protocol ip parent 1: prio 1 u32 match ip dst {ip(2,testiface,2)} action skbedit queue_mapping 3" host="1"/> - <run bg_id="1" host="1" module="IcmpPing" timeout="60"> - <options> - <option name="addr" value="{ip(2,testiface,0)}"/> - <option name="count" value="100"/> - <option name="interval" value="0.01"/> - <option name="limit_rate" value="95"/> - </options> - </run> - <run bg_id="2" host="1" module="IcmpPing" timeout="60"> - <options> - <option name="addr" value="{ip(2,testiface,1)}"/> - <option name="count" value="100"/> - <option name="interval" value="0.01"/> - <option name="limit_rate" value="95"/> - </options> - </run> - <run bg_id="3" host="1" module="IcmpPing" timeout="60"> - <options> - <option name="addr" value="{ip(2,testiface,2)}"/> - <option name="count" value="100"/> - <option name="interval" value="0.01"/> - <option name="limit_rate" value="95"/> - </options> - </run> - <run bg_id="4" host="1" module="IcmpPing" timeout="60"> - <options> - <option name="addr" value="{ip(2,testiface,3)}"/> - <option name="count" value="100"/> - <option name="interval" value="0.01"/> - <option name="limit_rate" value="95"/> - </options> - </run> - <wait bg_id="1" host="1"/> - <wait bg_id="2" host="1"/> - <wait bg_id="3" host="1"/> - <wait bg_id="4" host="1"/> -</task> \ No newline at end of file diff --git a/recipes/team/tasks/sequence_iperf.xml b/recipes/team/tasks/sequence_iperf.xml new file mode 100644 index 0000000..9e0b2d0 --- /dev/null +++ b/recipes/team/tasks/sequence_iperf.xml @@ -0,0 +1,18 @@ +<task> + <ctl_wait seconds="3"/> + <run bg_id="1" host="2" module="Iperf"> + <options> + <option name="role" value="server"/> + <option name="bind" value="{ip(2,testiface)}"/> + </options> + </run> + <ctl_wait seconds="5"/> + <run host="1" module="Iperf"> + <options> + <option name="role" value="client"/> + <option name="duration" value="15"/> + <option name="iperf_server" value="{ip(2,testiface)}"/> + </options> + </run> + <kill bg_id="1" host="2"/> +</task> diff --git a/recipes/team/tasks/sequence_ping_simple.xml b/recipes/team/tasks/sequence_ping_simple.xml new file mode 100644 index 0000000..adb15d0 --- /dev/null +++ b/recipes/team/tasks/sequence_ping_simple.xml @@ -0,0 +1,19 @@ +<task> + <ctl_wait seconds="4"/> + <run host="1" module="IcmpPing" timeout="60"> + <options> + <option name="addr" value="{ip(2,testiface)}"/> + <option name="count" value="2000"/> + <option name="interval" value="0.01"/> + <option name="limit_rate" value="95"/> + </options> + </run> + <run host="1" module="Icmp6Ping" timeout="60"> + <options> + <option name="addr" value="{ip(2,testiface,1)}"/> + <option name="count" value="2000"/> + <option name="interval" value="0.01"/> + <option name="limit_rate" value="95"/> + </options> + </run> +</task> \ No newline at end of file diff --git a/recipes/team/tasks/sequence_pktgen.xml b/recipes/team/tasks/sequence_pktgen.xml new file mode 100644 index 0000000..5807b42 --- /dev/null +++ b/recipes/team/tasks/sequence_pktgen.xml @@ -0,0 +1,21 @@ +<task> + <ctl_wait seconds="4"/> + <run bg_id="1" host="1" module="PktCounter"> + <options> + <option name="input_netdev_name" value="{devname(1,testiface)}"/> + <option name="proto" value="udp"/> + <option name="dport" value="9"/> + </options> + </run> + <run host="2" module="PktgenTx" timeout="200"> + <options> + <option name="pktgen_option" value="dst {ip(1,testiface)}"/> + <option name="pktgen_option" value="dst_mac 00:11:22:33:44:55"/> + <option name="pktgen_option" value="src_min {ip(2,testiface)}"/> + <option name="netdev_name" value="{devname(2,2)}"/> + <option name="netdev_name" value="{devname(2,3)}"/> + <option name="netdev_name" value="{devname(2,testiface)}"/> + </options> + </run> + <intr bg_id="1" host="1"/> +</task> diff --git a/recipes/team/tasks/sequence_pktgen_flows.xml b/recipes/team/tasks/sequence_pktgen_flows.xml new file mode 100644 index 0000000..c9d58ee --- /dev/null +++ b/recipes/team/tasks/sequence_pktgen_flows.xml @@ -0,0 +1,22 @@ +<task> + <ctl_wait seconds="4"/> + <run bg_id="1" host="1" module="PktgenTx"> + <options> + <option name="pktgen_option" value="count 0"/> + <option name="pktgen_option" value="clone_skb 0"/> + <option name="pktgen_option" value="flag IPDST_RND"/> + <option name="pktgen_option" value="flag TXSIZE_RND"/> + <option name="pktgen_option" value="dst_min 172.0.0.1"/> + <option name="pktgen_option" value="dst_max 172.0.0.200"/> + <option name="pktgen_option" value="src_min {ip(1,testiface)}"/> + <option name="pktgen_option" value="dst_mac 00:11:22:33:44:66"/> + <option name="pktgen_option" value="min_pkt_size 60"/> + <option name="pktgen_option" value="max_pkt_size 1000"/> + <option name="pktgen_option" value="flows 128"/> + <option name="pktgen_option" value="flowlen 20000"/> + <option name="netdev_name" value="{devname(1,testiface)}"/> + </options> + </run> + <ctl_wait seconds="400"/> + <intr bg_id="1" host="1"/> +</task> \ No newline at end of file diff --git a/recipes/team/tasks/sequence_pktgen_hashes.xml b/recipes/team/tasks/sequence_pktgen_hashes.xml new file mode 100644 index 0000000..c8212b6 --- /dev/null +++ b/recipes/team/tasks/sequence_pktgen_hashes.xml @@ -0,0 +1,14 @@ +<task> + <ctl_wait seconds="4"/> + <run host="1" module="PktgenTx" timeout="200"> + <options> + <option name="pktgen_option" value="count 10000"/> + <option name="pktgen_option" value="clone_skb 0"/> + <option name="pktgen_option" value="dst_min 172.0.0.1"/> + <option name="pktgen_option" value="dst_max 172.0.0.10"/> + <option name="pktgen_option" value="dst_mac 00:11:22:33:44:55"/> + <option name="pktgen_option" value="src_min {ip(1,testiface)}"/> + <option name="netdev_name" value="{devname(1,testiface)}"/> + </options> + </run> +</task> \ No newline at end of file diff --git a/recipes/team/tasks/sequence_pktgen_lacp.xml b/recipes/team/tasks/sequence_pktgen_lacp.xml new file mode 100644 index 0000000..e93fcdb --- /dev/null +++ b/recipes/team/tasks/sequence_pktgen_lacp.xml @@ -0,0 +1,21 @@ +<task> + <ctl_wait seconds="4"/> + <run bg_id="1" host="1" module="PktCounter"> + <options> + <option name="input_netdev_name" value="{devname(1,testiface)}"/> + <option name="proto" value="udp"/> + <option name="dport" value="9"/> + </options> + </run> + <run host="2" module="PktgenTx" timeout="200"> + <options> + <option name="pktgen_option" value="dst {ip(1,testiface)}"/> + <option name="pktgen_option" value="dst_mac 00:11:22:33:44:55"/> + <option name="pktgen_option" value="src_min {ip(2,testiface)}"/> + <option name="netdev_name" value="{devname(2,1)}"/> + <option name="netdev_name" value="{devname(2,2)}"/> + <option name="netdev_name" value="{devname(2,3)}"/> + </options> + </run> + <intr bg_id="1" host="1"/> +</task> \ No newline at end of file diff --git a/recipes/team/tasks/sequence_queue_mapping.xml b/recipes/team/tasks/sequence_queue_mapping.xml new file mode 100644 index 0000000..04446b5 --- /dev/null +++ b/recipes/team/tasks/sequence_queue_mapping.xml @@ -0,0 +1,43 @@ +<task> + <ctl_wait seconds="4"/> + <run command="tc qdisc add dev {devname(1,testiface)} handle 1 root multiq" host="1"/> + <run command="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" host="1"/> + <run command="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" host="1"/> + <run command="tc filter add dev {devname(1,testiface)} protocol ip parent 1: prio 1 u32 match ip dst {ip(2,testiface,2)} action skbedit queue_mapping 3" host="1"/> + <run bg_id="1" host="1" module="IcmpPing" timeout="60"> + <options> + <option name="addr" value="{ip(2,testiface,0)}"/> + <option name="count" value="100"/> + <option name="interval" value="0.01"/> + <option name="limit_rate" value="95"/> + </options> + </run> + <run bg_id="2" host="1" module="IcmpPing" timeout="60"> + <options> + <option name="addr" value="{ip(2,testiface,1)}"/> + <option name="count" value="100"/> + <option name="interval" value="0.01"/> + <option name="limit_rate" value="95"/> + </options> + </run> + <run bg_id="3" host="1" module="IcmpPing" timeout="60"> + <options> + <option name="addr" value="{ip(2,testiface,2)}"/> + <option name="count" value="100"/> + <option name="interval" value="0.01"/> + <option name="limit_rate" value="95"/> + </options> + </run> + <run bg_id="4" host="1" module="IcmpPing" timeout="60"> + <options> + <option name="addr" value="{ip(2,testiface,3)}"/> + <option name="count" value="100"/> + <option name="interval" value="0.01"/> + <option name="limit_rate" value="95"/> + </options> + </run> + <wait bg_id="1" host="1"/> + <wait bg_id="2" host="1"/> + <wait bg_id="3" host="1"/> + <wait bg_id="4" host="1"/> +</task> \ No newline at end of file -- 1.8.1.4