commit 44fc5e1a4ed1a9f63d096ff09a92f847770d7067 Author: Jiri Pirko jiri@resnulli.us Date: Mon Sep 24 16:07:17 2012 +0200
recipes: add team link watch recipes
Signed-off-by: Jiri Pirko jiri@resnulli.us
recipes/team/netconfig-team_ab_lw_001.xml | 25 ++++++++ recipes/team/netconfig-team_ab_lw_002.xml | 60 ++++++++++++++++++++ recipes/team/netconfig-team_ab_lw_003.xml | 31 ++++++++++ recipes/team/netconfig-team_ab_lw_004.xml | 68 ++++++++++++++++++++++ recipes/team/netconfig-team_ab_lw_005.xml | 30 ++++++++++ recipes/team/netconfig-team_ab_lw_006.xml | 65 +++++++++++++++++++++ recipes/team/netconfig-team_ab_lw_007.xml | 64 +++++++++++++++++++++ recipes/team/netconfig-team_ab_lw_008.xml | 87 +++++++++++++++++++++++++++++ recipes/team/recipey_ab_lw_001.xml | 21 +++++++ recipes/team/recipey_ab_lw_002.xml | 21 +++++++ recipes/team/recipey_ab_lw_003.xml | 21 +++++++ recipes/team/recipey_ab_lw_004.xml | 21 +++++++ recipes/team/recipey_ab_lw_005.xml | 21 +++++++ recipes/team/recipey_ab_lw_006.xml | 21 +++++++ recipes/team/recipey_ab_lw_007.xml | 21 +++++++ recipes/team/recipey_ab_lw_008.xml | 21 +++++++ 16 files changed, 598 insertions(+), 0 deletions(-) --- diff --git a/recipes/team/netconfig-team_ab_lw_001.xml b/recipes/team/netconfig-team_ab_lw_001.xml new file mode 100644 index 0000000..5a59ab7 --- /dev/null +++ b/recipes/team/netconfig-team_ab_lw_001.xml @@ -0,0 +1,25 @@ +<netconfig> + <interface id="1" phys_id="1" type="eth"/> + <interface id="2" phys_id="2" type="eth"/> + <interface id="3" phys_id="3" type="eth"/> + <interface id="testiface" type="team"> + <options> + <option name="teamd_config"> + { + "hwaddr": "00:11:22:33:44:55", + "runner": {"name": "activebackup"}, + "link_watch": {"name": "ethtool"} + } + </option> + </options> + <slaves> + <slave id="1"/> + <slave id="2"/> + <slave id="3"/> + </slaves> + <addresses> + <address value="{$testip}"/> + <address value="{$testip6}"/> + </addresses> + </interface> +</netconfig> diff --git a/recipes/team/netconfig-team_ab_lw_002.xml b/recipes/team/netconfig-team_ab_lw_002.xml new file mode 100644 index 0000000..afbe591 --- /dev/null +++ b/recipes/team/netconfig-team_ab_lw_002.xml @@ -0,0 +1,60 @@ +<netconfig> + <interface id="1" phys_id="1" type="eth"> + <options> + <option name="teamd_port_config"> + { + "link_watch": { + "name": "ethtool", + "delay_up": 3000, + "delay_down": 3000 + } + } + </option> + </options> + </interface> + <interface id="2" phys_id="2" type="eth"> + <options> + <option name="teamd_port_config"> + { + "link_watch": { + "name": "ethtool", + "delay_up": 1000, + "delay_down": 1000 + } + } + </option> + </options> + </interface> + <interface id="3" phys_id="3" type="eth"> + <options> + <option name="teamd_port_config"> + { + "link_watch": { + "name": "ethtool", + "delay_up": 500, + "delay_down": 500 + } + } + </option> + </options> + </interface> + <interface id="testiface" type="team"> + <options> + <option name="teamd_config"> + { + "hwaddr": "00:11:22:33:44:55", + "runner": {"name": "activebackup"} + } + </option> + </options> + <slaves> + <slave id="1"/> + <slave id="2"/> + <slave id="3"/> + </slaves> + <addresses> + <address value="{$testip}"/> + <address value="{$testip6}"/> + </addresses> + </interface> +</netconfig> diff --git a/recipes/team/netconfig-team_ab_lw_003.xml b/recipes/team/netconfig-team_ab_lw_003.xml new file mode 100644 index 0000000..8290c95 --- /dev/null +++ b/recipes/team/netconfig-team_ab_lw_003.xml @@ -0,0 +1,31 @@ +<netconfig> + <interface id="1" phys_id="1" type="eth"/> + <interface id="2" phys_id="2" type="eth"/> + <interface id="3" phys_id="3" type="eth"/> + <interface id="testiface" type="team"> + <options> + <option name="teamd_config"> + { + "hwaddr": "00:11:22:33:44:55", + "runner": {"name": "activebackup"}, + "link_watch": { + "name": "arp_ping", + "interval": 100, + "missed_max": 30, + "source_host": "192.168.111.1", + "target_host": "192.168.111.2" + } + } + </option> + </options> + <slaves> + <slave id="1"/> + <slave id="2"/> + <slave id="3"/> + </slaves> + <addresses> + <address value="{$testip}"/> + <address value="{$testip6}"/> + </addresses> + </interface> +</netconfig> diff --git a/recipes/team/netconfig-team_ab_lw_004.xml b/recipes/team/netconfig-team_ab_lw_004.xml new file mode 100644 index 0000000..497b6e3 --- /dev/null +++ b/recipes/team/netconfig-team_ab_lw_004.xml @@ -0,0 +1,68 @@ +<netconfig> + <interface id="1" phys_id="1" type="eth"> + <options> + <option name="teamd_port_config"> + { + "link_watch": { + "name": "arp_ping", + "interval": 1000, + "missed_max": 5, + "init_wait": 10000, + "source_host": "192.168.111.1", + "target_host": "192.168.111.2" + } + } + </option> + </options> + </interface> + <interface id="2" phys_id="2" type="eth"> + <options> + <option name="teamd_port_config"> + { + "link_watch": { + "name": "arp_ping", + "interval": 500, + "missed_max": 20, + "source_host": "192.168.111.1", + "target_host": "192.168.111.2" + } + } + </option> + </options> + </interface> + <interface id="3" phys_id="3" type="eth"> + <options> + <option name="teamd_port_config"> + { + "link_watch": { + "name": "arp_ping", + "interval": 100, + "missed_max": 30, + "init_wait": 0, + "source_host": "192.168.111.1", + "target_host": "192.168.111.2" + } + } + </option> + </options> + </interface> + <interface id="testiface" type="team"> + <options> + <option name="teamd_config"> + { + "hwaddr": "00:11:22:33:44:55", + "runner": {"name": "activebackup"} + } + </option> + </options> + <slaves> + <slave id="1"/> + <slave id="2"/> + <slave id="3"/> + </slaves> + <addresses> + <address value="{$testip}"/> + <address value="{$testip6}"/> + </addresses> + </interface> +</netconfig> diff --git a/recipes/team/netconfig-team_ab_lw_005.xml b/recipes/team/netconfig-team_ab_lw_005.xml new file mode 100644 index 0000000..68045a4 --- /dev/null +++ b/recipes/team/netconfig-team_ab_lw_005.xml @@ -0,0 +1,30 @@ +<netconfig> + <interface id="1" phys_id="1" type="eth"/> + <interface id="2" phys_id="2" type="eth"/> + <interface id="3" phys_id="3" type="eth"/> + <interface id="testiface" type="team"> + <options> + <option name="teamd_config"> + { + "hwaddr": "00:11:22:33:44:55", + "runner": {"name": "activebackup"}, + "link_watch": { + "name": "nsna_ping", + "interval": 200, + "missed_max": 15, + "target_host": "fe01::2" + } + } + </option> + </options> + <slaves> + <slave id="1"/> + <slave id="2"/> + <slave id="3"/> + </slaves> + <addresses> + <address value="{$testip}"/> + <address value="{$testip6}"/> + </addresses> + </interface> +</netconfig> diff --git a/recipes/team/netconfig-team_ab_lw_006.xml b/recipes/team/netconfig-team_ab_lw_006.xml new file mode 100644 index 0000000..395c011 --- /dev/null +++ b/recipes/team/netconfig-team_ab_lw_006.xml @@ -0,0 +1,65 @@ +<netconfig> + <interface id="1" phys_id="1" type="eth"> + <options> + <option name="teamd_port_config"> + { + "link_watch": { + "name": "nsna_ping", + "interval": 1000, + "missed_max": 5, + "init_wait": 10000, + "target_host": "fe01::2" + } + } + </option> + </options> + </interface> + <interface id="2" phys_id="2" type="eth"> + <options> + <option name="teamd_port_config"> + { + "link_watch": { + "name": "nsna_ping", + "interval": 500, + "missed_max": 20, + "target_host": "fe01::2" + } + } + </option> + </options> + </interface> + <interface id="3" phys_id="3" type="eth"> + <options> + <option name="teamd_port_config"> + { + "link_watch": { + "name": "nsna_ping", + "interval": 100, + "missed_max": 30, + "init_wait": 0, + "target_host": "fe01::2" + } + } + </option> + </options> + </interface> + <interface id="testiface" type="team"> + <options> + <option name="teamd_config"> + { + "hwaddr": "00:11:22:33:44:55", + "runner": {"name": "activebackup"} + } + </option> + </options> + <slaves> + <slave id="1"/> + <slave id="2"/> + <slave id="3"/> + </slaves> + <addresses> + <address value="{$testip}"/> + <address value="{$testip6}"/> + </addresses> + </interface> +</netconfig> diff --git a/recipes/team/netconfig-team_ab_lw_007.xml b/recipes/team/netconfig-team_ab_lw_007.xml new file mode 100644 index 0000000..bc72e1b --- /dev/null +++ b/recipes/team/netconfig-team_ab_lw_007.xml @@ -0,0 +1,64 @@ +<netconfig> + <interface id="1" phys_id="1" type="eth"> + <options> + <option name="teamd_port_config"> + { + "link_watch": { + "name": "ethtool", + "delay_up": 1000, + "delay_down": 1000 + } + } + </option> + </options> + </interface> + <interface id="2" phys_id="2" type="eth"> + <options> + <option name="teamd_port_config"> + { + "link_watch": { + "name": "arp_ping", + "interval": 500, + "missed_max": 20, + "source_host": "192.168.111.1", + "target_host": "192.168.111.2" + } + } + </option> + </options> + </interface> + <interface id="3" phys_id="3" type="eth"> + <options> + <option name="teamd_port_config"> + { + "link_watch": { + "name": "nsna_ping", + "interval": 100, + "missed_max": 30, + "init_wait": 0, + "target_host": "fe01::2" + } + } + </option> + </options> + </interface> + <interface id="testiface" type="team"> + <options> + <option name="teamd_config"> + { + "hwaddr": "00:11:22:33:44:55", + "runner": {"name": "activebackup"} + } + </option> + </options> + <slaves> + <slave id="1"/> + <slave id="2"/> + <slave id="3"/> + </slaves> + <addresses> + <address value="{$testip}"/> + <address value="{$testip6}"/> + </addresses> + </interface> +</netconfig> diff --git a/recipes/team/netconfig-team_ab_lw_008.xml b/recipes/team/netconfig-team_ab_lw_008.xml new file mode 100644 index 0000000..af9f328 --- /dev/null +++ b/recipes/team/netconfig-team_ab_lw_008.xml @@ -0,0 +1,87 @@ +<netconfig> + <interface id="1" phys_id="1" type="eth"> + <options> + <option name="teamd_port_config"> + { + "link_watch": [ + { + "name": "nsna_ping", + "interval": 1000, + "missed_max": 5, + "init_wait": 10000, + "target_host": "fe01::2" + }, + { + "name": "arp_ping", + "interval": 1000, + "missed_max": 5, + "init_wait": 13000, + "source_host": "192.168.111.1", + "target_host": "192.168.111.2" + }] + } + </option> + </options> + </interface> + <interface id="2" phys_id="2" type="eth"> + <options> + <option name="teamd_port_config"> + { + "link_watch": [ + { + "name": "arp_ping", + "interval": 500, + "missed_max": 20, + "source_host": "192.168.111.1", + "target_host": "192.168.111.2" + }, + { + "name": "ethtool", + "delay_up": 1000, + "delay_down": 1000 + }] + } + </option> + </options> + </interface> + <interface id="3" phys_id="3" type="eth"> + <options> + <option name="teamd_port_config"> + { + "link_watch": [ + { + "name": "nsna_ping", + "interval": 100, + "missed_max": 30, + "init_wait": 0, + "target_host": "fe01::2" + }, + { + "name": "ethtool", + "delay_up": 500, + "delay_down": 500 + }] + } + </option> + </options> + </interface> + <interface id="testiface" type="team"> + <options> + <option name="teamd_config"> + { + "hwaddr": "00:11:22:33:44:55", + "runner": {"name": "activebackup"} + } + </option> + </options> + <slaves> + <slave id="1"/> + <slave id="2"/> + <slave id="3"/> + </slaves> + <addresses> + <address value="{$testip}"/> + <address value="{$testip6}"/> + </addresses> + </interface> +</netconfig> diff --git a/recipes/team/recipey_ab_lw_001.xml b/recipes/team/recipey_ab_lw_001.xml new file mode 100644 index 0000000..36eb419 --- /dev/null +++ b/recipes/team/recipey_ab_lw_001.xml @@ -0,0 +1,21 @@ +<nettestrecipe> + <machines> + <define> + <alias name="testip" value="192.168.111.1/24"/> + <alias name="testip6" value="fe01::1/64"/> + </define> + <machine id="1"> + <machineconfig source="machineconfig-peanut.xml"/> + <netconfig source="netconfig-team_ab_lw_001.xml"/> + </machine> + <define> + <alias name="testip" value="192.168.111.2/24"/> + <alias name="testip6" value="fe01::2/64"/> + </define> + <machine id="2"> + <machineconfig source="machineconfig-dhcp-37-128.xml"/> + <netconfig source="netconfig-simple_br.xml"/> + </machine> + </machines> + <command_sequence source="sequence_ping_simple.xml"/> +</nettestrecipe> diff --git a/recipes/team/recipey_ab_lw_002.xml b/recipes/team/recipey_ab_lw_002.xml new file mode 100644 index 0000000..697addd --- /dev/null +++ b/recipes/team/recipey_ab_lw_002.xml @@ -0,0 +1,21 @@ +<nettestrecipe> + <machines> + <define> + <alias name="testip" value="192.168.111.1/24"/> + <alias name="testip6" value="fe01::1/64"/> + </define> + <machine id="1"> + <machineconfig source="machineconfig-peanut.xml"/> + <netconfig source="netconfig-team_ab_lw_002.xml"/> + </machine> + <define> + <alias name="testip" value="192.168.111.2/24"/> + <alias name="testip6" value="fe01::2/64"/> + </define> + <machine id="2"> + <machineconfig source="machineconfig-dhcp-37-128.xml"/> + <netconfig source="netconfig-simple_br.xml"/> + </machine> + </machines> + <command_sequence source="sequence_ping_simple.xml"/> +</nettestrecipe> diff --git a/recipes/team/recipey_ab_lw_003.xml b/recipes/team/recipey_ab_lw_003.xml new file mode 100644 index 0000000..e375ccf --- /dev/null +++ b/recipes/team/recipey_ab_lw_003.xml @@ -0,0 +1,21 @@ +<nettestrecipe> + <machines> + <define> + <alias name="testip" value="192.168.111.1/24"/> + <alias name="testip6" value="fe01::1/64"/> + </define> + <machine id="1"> + <machineconfig source="machineconfig-peanut.xml"/> + <netconfig source="netconfig-team_ab_lw_003.xml"/> + </machine> + <define> + <alias name="testip" value="192.168.111.2/24"/> + <alias name="testip6" value="fe01::2/64"/> + </define> + <machine id="2"> + <machineconfig source="machineconfig-dhcp-37-128.xml"/> + <netconfig source="netconfig-simple_br.xml"/> + </machine> + </machines> + <command_sequence source="sequence_ping_simple.xml"/> +</nettestrecipe> diff --git a/recipes/team/recipey_ab_lw_004.xml b/recipes/team/recipey_ab_lw_004.xml new file mode 100644 index 0000000..885b31f --- /dev/null +++ b/recipes/team/recipey_ab_lw_004.xml @@ -0,0 +1,21 @@ +<nettestrecipe> + <machines> + <define> + <alias name="testip" value="192.168.111.1/24"/> + <alias name="testip6" value="fe01::1/64"/> + </define> + <machine id="1"> + <machineconfig source="machineconfig-peanut.xml"/> + <netconfig source="netconfig-team_ab_lw_004.xml"/> + </machine> + <define> + <alias name="testip" value="192.168.111.2/24"/> + <alias name="testip6" value="fe01::2/64"/> + </define> + <machine id="2"> + <machineconfig source="machineconfig-dhcp-37-128.xml"/> + <netconfig source="netconfig-simple_br.xml"/> + </machine> + </machines> + <command_sequence source="sequence_ping_simple.xml"/> +</nettestrecipe> diff --git a/recipes/team/recipey_ab_lw_005.xml b/recipes/team/recipey_ab_lw_005.xml new file mode 100644 index 0000000..2fe4276 --- /dev/null +++ b/recipes/team/recipey_ab_lw_005.xml @@ -0,0 +1,21 @@ +<nettestrecipe> + <machines> + <define> + <alias name="testip" value="192.168.111.1/24"/> + <alias name="testip6" value="fe01::1/64"/> + </define> + <machine id="1"> + <machineconfig source="machineconfig-peanut.xml"/> + <netconfig source="netconfig-team_ab_lw_005.xml"/> + </machine> + <define> + <alias name="testip" value="192.168.111.2/24"/> + <alias name="testip6" value="fe01::2/64"/> + </define> + <machine id="2"> + <machineconfig source="machineconfig-dhcp-37-128.xml"/> + <netconfig source="netconfig-simple_br.xml"/> + </machine> + </machines> + <command_sequence source="sequence_ping_simple.xml"/> +</nettestrecipe> diff --git a/recipes/team/recipey_ab_lw_006.xml b/recipes/team/recipey_ab_lw_006.xml new file mode 100644 index 0000000..c0bf973 --- /dev/null +++ b/recipes/team/recipey_ab_lw_006.xml @@ -0,0 +1,21 @@ +<nettestrecipe> + <machines> + <define> + <alias name="testip" value="192.168.111.1/24"/> + <alias name="testip6" value="fe01::1/64"/> + </define> + <machine id="1"> + <machineconfig source="machineconfig-peanut.xml"/> + <netconfig source="netconfig-team_ab_lw_006.xml"/> + </machine> + <define> + <alias name="testip" value="192.168.111.2/24"/> + <alias name="testip6" value="fe01::2/64"/> + </define> + <machine id="2"> + <machineconfig source="machineconfig-dhcp-37-128.xml"/> + <netconfig source="netconfig-simple_br.xml"/> + </machine> + </machines> + <command_sequence source="sequence_ping_simple.xml"/> +</nettestrecipe> diff --git a/recipes/team/recipey_ab_lw_007.xml b/recipes/team/recipey_ab_lw_007.xml new file mode 100644 index 0000000..170f3b0 --- /dev/null +++ b/recipes/team/recipey_ab_lw_007.xml @@ -0,0 +1,21 @@ +<nettestrecipe> + <machines> + <define> + <alias name="testip" value="192.168.111.1/24"/> + <alias name="testip6" value="fe01::1/64"/> + </define> + <machine id="1"> + <machineconfig source="machineconfig-peanut.xml"/> + <netconfig source="netconfig-team_ab_lw_007.xml"/> + </machine> + <define> + <alias name="testip" value="192.168.111.2/24"/> + <alias name="testip6" value="fe01::2/64"/> + </define> + <machine id="2"> + <machineconfig source="machineconfig-dhcp-37-128.xml"/> + <netconfig source="netconfig-simple_br.xml"/> + </machine> + </machines> + <command_sequence source="sequence_ping_simple.xml"/> +</nettestrecipe> diff --git a/recipes/team/recipey_ab_lw_008.xml b/recipes/team/recipey_ab_lw_008.xml new file mode 100644 index 0000000..0b1b261 --- /dev/null +++ b/recipes/team/recipey_ab_lw_008.xml @@ -0,0 +1,21 @@ +<nettestrecipe> + <machines> + <define> + <alias name="testip" value="192.168.111.1/24"/> + <alias name="testip6" value="fe01::1/64"/> + </define> + <machine id="1"> + <machineconfig source="machineconfig-peanut.xml"/> + <netconfig source="netconfig-team_ab_lw_008.xml"/> + </machine> + <define> + <alias name="testip" value="192.168.111.2/24"/> + <alias name="testip6" value="fe01::2/64"/> + </define> + <machine id="2"> + <machineconfig source="machineconfig-dhcp-37-128.xml"/> + <netconfig source="netconfig-simple_br.xml"/> + </machine> + </machines> + <command_sequence source="sequence_ping_simple.xml"/> +</nettestrecipe>
lnst-developers@lists.fedorahosted.org
-
Jiří Pírko