commit 768ed517eb4f88d1502b2f5b53166b06c761cb83 Author: Ondrej Lichtner olichtne@redhat.com Date: Fri Oct 4 16:14:39 2013 +0200
recipe format: change <machines> to <network>
This patch set changes the tag <machines> to <network>, we also changed the <machine> tag to <host> and the 'network' attribute used in <eth> tags has been changed to 'label'.
The 'network' attribute was changed for slave machine xml files as well.
The commit also contains appropriate changes to the recipes. I tested them for parsability, functinality will be checked later.
Signed-off-by: Ondrej Lichtner olichtne@redhat.com Signed-off-by: Jiri Pirko jiri@resnulli.us
lnst/Controller/RecipeParser.py | 4 ++-- lnst/Controller/SlaveMachineParser.py | 2 +- lnst/Controller/SlavePool.py | 3 ++- recipes/examples/quick_guides/ping_check.xml | 16 ++++++++-------- recipes/multicast/multicast-all.xml | 18 +++++++++--------- recipes/smoke/lib/conf-bond.xml | 6 +++--- recipes/smoke/lib/conf-eth.xml | 4 ++-- recipes/smoke/lib/conf-team.xml | 6 +++--- recipes/smoke/lib/conf-vlan.xml | 4 ++-- recipes/smoke/lib/recipe-temp.xml | 12 ++++++------ recipes/team/interfaces-bond_lacp.xml | 8 ++++---- recipes/team/interfaces-br_queue_mapping.xml | 8 ++++---- recipes/team/interfaces-simple.xml | 8 ++++---- recipes/team/interfaces-simple_br.xml | 8 ++++---- recipes/team/interfaces-team_ab.xml | 8 ++++---- recipes/team/interfaces-team_ab_lw_001.xml | 8 ++++---- recipes/team/interfaces-team_ab_lw_002.xml | 8 ++++---- recipes/team/interfaces-team_ab_lw_003.xml | 8 ++++---- recipes/team/interfaces-team_ab_lw_004.xml | 8 ++++---- recipes/team/interfaces-team_ab_lw_005.xml | 8 ++++---- recipes/team/interfaces-team_ab_lw_006.xml | 8 ++++---- recipes/team/interfaces-team_ab_lw_007.xml | 8 ++++---- recipes/team/interfaces-team_ab_lw_008.xml | 8 ++++---- recipes/team/interfaces-team_bcast.xml | 8 ++++---- recipes/team/interfaces-team_lacp.xml | 8 ++++---- recipes/team/interfaces-team_lacp_act.xml | 8 ++++---- recipes/team/interfaces-team_lacp_passive.xml | 8 ++++---- recipes/team/interfaces-team_lacp_slowrate.xml | 8 ++++---- recipes/team/interfaces-team_lb.xml | 8 ++++---- recipes/team/interfaces-team_lb_act.xml | 8 ++++---- recipes/team/interfaces-team_rr.xml | 8 ++++---- recipes/team/interfaces-team_rr_queue_mapping.xml | 8 ++++---- recipes/team/recipex_ab_001.xml | 12 ++++++------ recipes/team/recipex_ab_002.xml | 12 ++++++------ recipes/team/recipex_ab_003.xml | 12 ++++++------ recipes/team/recipex_ab_004.xml | 12 ++++++------ recipes/team/recipex_bcast_001.xml | 12 ++++++------ recipes/team/recipex_bcast_002.xml | 12 ++++++------ recipes/team/recipex_bcast_003.xml | 12 ++++++------ recipes/team/recipex_bcast_004.xml | 12 ++++++------ recipes/team/recipex_lacp_001.xml | 12 ++++++------ recipes/team/recipex_lacp_002.xml | 12 ++++++------ recipes/team/recipex_lacp_003.xml | 12 ++++++------ recipes/team/recipex_lacp_004.xml | 12 ++++++------ recipes/team/recipex_lacp_act_001.xml | 12 ++++++------ recipes/team/recipex_lacp_act_002.xml | 12 ++++++------ recipes/team/recipex_lacp_act_003.xml | 12 ++++++------ recipes/team/recipex_lacp_act_004.xml | 12 ++++++------ recipes/team/recipex_lb_001.xml | 12 ++++++------ recipes/team/recipex_lb_002.xml | 12 ++++++------ recipes/team/recipex_lb_003.xml | 12 ++++++------ recipes/team/recipex_lb_004.xml | 12 ++++++------ recipes/team/recipex_lb_act_001.xml | 12 ++++++------ recipes/team/recipex_lb_act_002.xml | 12 ++++++------ recipes/team/recipex_lb_act_003.xml | 12 ++++++------ recipes/team/recipex_lb_act_004.xml | 12 ++++++------ recipes/team/recipex_rr_001.xml | 12 ++++++------ recipes/team/recipex_rr_002.xml | 12 ++++++------ recipes/team/recipex_rr_003.xml | 12 ++++++------ recipes/team/recipex_rr_004.xml | 12 ++++++------ recipes/team/recipey_ab_lw_001.xml | 12 ++++++------ recipes/team/recipey_ab_lw_002.xml | 12 ++++++------ recipes/team/recipey_ab_lw_003.xml | 12 ++++++------ recipes/team/recipey_ab_lw_004.xml | 12 ++++++------ recipes/team/recipey_ab_lw_005.xml | 12 ++++++------ recipes/team/recipey_ab_lw_006.xml | 12 ++++++------ recipes/team/recipey_ab_lw_007.xml | 12 ++++++------ recipes/team/recipey_ab_lw_008.xml | 12 ++++++------ recipes/team/recipey_lacp_act_flows.xml | 12 ++++++------ recipes/team/recipey_lacp_hashes.xml | 12 ++++++------ recipes/team/recipey_lacp_passive.xml | 12 ++++++------ recipes/team/recipey_lacp_slowrate.xml | 12 ++++++------ recipes/team/recipey_lb_act_flows.xml | 12 ++++++------ recipes/team/recipey_lb_hashes.xml | 12 ++++++------ recipes/team/recipey_rr_queue_mapping.xml | 12 ++++++------ schema-recipe.rng | 14 +++++++------- schema-sm.rng | 2 +- 77 files changed, 392 insertions(+), 391 deletions(-) --- diff --git a/lnst/Controller/RecipeParser.py b/lnst/Controller/RecipeParser.py index 2720359..405c87b 100644 --- a/lnst/Controller/RecipeParser.py +++ b/lnst/Controller/RecipeParser.py @@ -35,7 +35,7 @@ class RecipeParser(XmlParser): recipe = XmlData(lnst_recipe)
# machines - machines_tag = lnst_recipe.find("machines") + machines_tag = lnst_recipe.find("network") if machines_tag is not None: machines = recipe["machines"] = XmlCollection(machines_tag) for machine_tag in machines_tag: @@ -86,7 +86,7 @@ class RecipeParser(XmlParser): iface["type"] = iface_tag.tag
if iface["type"] == "eth": - iface["network"] = self._get_attribute(iface_tag, "network") + iface["network"] = self._get_attribute(iface_tag, "label")
# params params_tag = iface_tag.find("params") diff --git a/lnst/Controller/SlaveMachineParser.py b/lnst/Controller/SlaveMachineParser.py index 02374cb..686d570 100644 --- a/lnst/Controller/SlaveMachineParser.py +++ b/lnst/Controller/SlaveMachineParser.py @@ -57,7 +57,7 @@ class SlaveMachineParser(XmlParser): def _process_interface(self, iface_tag): iface = XmlData(iface_tag) iface["id"] = self._get_attribute(iface_tag, "id") - iface["network"] = self._get_attribute(iface_tag, "network") + iface["network"] = self._get_attribute(iface_tag, "label") iface["type"] = "eth"
# interface parameters diff --git a/lnst/Controller/SlavePool.py b/lnst/Controller/SlavePool.py index 9304ed9..77ee1b5 100644 --- a/lnst/Controller/SlavePool.py +++ b/lnst/Controller/SlavePool.py @@ -387,7 +387,8 @@ class SetupMapper: topology[m_id].append(nc)
if not net_in_use: - msg = "Network '%s' contains only one machine!" % net_name + msg = "Network labeled '%s' contains only one machine!" %\ + net_name raise MapperError(msg)
return topology diff --git a/recipes/examples/quick_guides/ping_check.xml b/recipes/examples/quick_guides/ping_check.xml index 586fffe..25f3c4a 100644 --- a/recipes/examples/quick_guides/ping_check.xml +++ b/recipes/examples/quick_guides/ping_check.xml @@ -4,27 +4,27 @@ This is a recipe from a quick guide that is available on LNST wiki page: https://fedorahosted.org/lnst/wiki/QuickGuides/QuickGuidePingCheck --> <lnstrecipe> - <machines> - <machine id="testmachine1"> + <network> + <host id="testmachine1"> <interfaces> - <eth id="testifc1" network="tnet"> + <eth id="testifc1" label="tnet"> <addresses> <address value="192.168.200.2/24"/> </addresses> </eth> </interfaces> - </machine> + </host>
- <machine id="testmachine2"> + <host id="testmachine2"> <interfaces> - <eth id="testifc2" network="tnet"> + <eth id="testifc2" label="tnet"> <addresses> <address value="192.168.200.3/24"/> </addresses> </eth> </interfaces> - </machine> - </machines> + </host> + </network>
<task> <run machine="testmachine1" module="IcmpPing"> diff --git a/recipes/multicast/multicast-all.xml b/recipes/multicast/multicast-all.xml index 6855055..8f4ebf7 100644 --- a/recipes/multicast/multicast-all.xml +++ b/recipes/multicast/multicast-all.xml @@ -1,30 +1,30 @@ <!-- Execute all tests for multicast --> <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> - <machine id="1"> + <network> + <host id="1"> <interfaces> - <eth id="testiface" network="tnet"> + <eth id="testiface" label="tnet"> <addresses> <address value="192.168.100.226/24"/> </addresses> </eth> - <eth id="2" network="tnet"> + <eth id="2" label="tnet"> <addresses> <address value="192.168.100.240/24"/> </addresses> </eth> </interfaces> - </machine> - <machine id="2"> + </host> + <host id="2"> <interfaces> - <eth id="testiface" network="tnet"> + <eth id="testiface" label="tnet"> <addresses> <address value="192.168.100.215/24"/> </addresses> </eth> </interfaces> - </machine> - </machines> + </host> + </network>
<define> <alias name="multicast_group" value="239.1.2.3"/> diff --git a/recipes/smoke/lib/conf-bond.xml b/recipes/smoke/lib/conf-bond.xml index c60ea62..9829800 100644 --- a/recipes/smoke/lib/conf-bond.xml +++ b/recipes/smoke/lib/conf-bond.xml @@ -1,6 +1,6 @@ <interfaces> - <eth id="if-1" network="net"/> - <eth id="if-2" network="net"/> + <eth id="if-1" label="net"/> + <eth id="if-2" label="net"/> <bond id="testiface"> <slaves> <slave id="if-1"/> @@ -10,4 +10,4 @@ <address value="{$testip}"/> </addresses> </bond> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/smoke/lib/conf-eth.xml b/recipes/smoke/lib/conf-eth.xml index d718d8c..91043bf 100644 --- a/recipes/smoke/lib/conf-eth.xml +++ b/recipes/smoke/lib/conf-eth.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="testiface" network="net"> + <eth id="testiface" label="net"> <addresses> <address value="{$testip}"/> </addresses> </eth> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/smoke/lib/conf-team.xml b/recipes/smoke/lib/conf-team.xml index 796d6e8..dc5a8cb 100644 --- a/recipes/smoke/lib/conf-team.xml +++ b/recipes/smoke/lib/conf-team.xml @@ -1,6 +1,6 @@ <interfaces> - <eth id="if-1" network="net"/> - <eth id="if-2" network="net"/> + <eth id="if-1" label="net"/> + <eth id="if-2" label="net"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -17,4 +17,4 @@ <address value="{$testip}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/smoke/lib/conf-vlan.xml b/recipes/smoke/lib/conf-vlan.xml index e21573e..92a3981 100644 --- a/recipes/smoke/lib/conf-vlan.xml +++ b/recipes/smoke/lib/conf-vlan.xml @@ -1,5 +1,5 @@ <interfaces> - <eth id="if-1" network="net"/> + <eth id="if-1" label="net"/> <vlan id="testiface"> <options> <option name="vlan_tci" value="10"/> @@ -11,4 +11,4 @@ <address value="{$testip}"/> </addresses> </vlan> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/smoke/lib/recipe-temp.xml b/recipes/smoke/lib/recipe-temp.xml index ad03a3f..2fbad9c 100644 --- a/recipes/smoke/lib/recipe-temp.xml +++ b/recipes/smoke/lib/recipe-temp.xml @@ -1,17 +1,17 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> - <machine id="1"> + <network> + <host id="1"> <define> <alias name="testip" value="192.168.100.240/24"/> </define> #CONF1# - </machine> - <machine id="2"> + </host> + <host id="2"> <define> <alias name="testip" value="192.168.100.215/24"/> </define> #CONF2# - </machine> - </machines> + </host> + </network> #SEQUENCES# </lnstrecipe> diff --git a/recipes/team/interfaces-bond_lacp.xml b/recipes/team/interfaces-bond_lacp.xml index 5ca7db6..4cb9202 100644 --- a/recipes/team/interfaces-bond_lacp.xml +++ b/recipes/team/interfaces-bond_lacp.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <bond id="testiface"> <options> <option name="mode" value="4"/> @@ -17,4 +17,4 @@ <address value="{$testip6}"/> </addresses> </bond> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-br_queue_mapping.xml b/recipes/team/interfaces-br_queue_mapping.xml index a8a5bee..d5be8e4 100644 --- a/recipes/team/interfaces-br_queue_mapping.xml +++ b/recipes/team/interfaces-br_queue_mapping.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <bridge id="testiface"> <slaves> <slave id="1"/> @@ -15,4 +15,4 @@ <address value="172.0.4.2/24"/> </addresses> </bridge> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-simple.xml b/recipes/team/interfaces-simple.xml index dc3beec..bea181d 100644 --- a/recipes/team/interfaces-simple.xml +++ b/recipes/team/interfaces-simple.xml @@ -1,9 +1,9 @@ <interfaces> - <eth id="testiface" network="net1"> + <eth id="testiface" label="net1"> <addresses> <address value="{$testip}"/> </addresses> </eth> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> -</interfaces> \ No newline at end of file + <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 index 02952e1..278ad40 100644 --- a/recipes/team/interfaces-simple_br.xml +++ b/recipes/team/interfaces-simple_br.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <bridge id="testiface"> <slaves> <slave id="1"/> @@ -13,4 +13,4 @@ <address value="{$testip6}"/> </addresses> </bridge> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_ab.xml b/recipes/team/interfaces-team_ab.xml index ec748ea..8a10755 100644 --- a/recipes/team/interfaces-team_ab.xml +++ b/recipes/team/interfaces-team_ab.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -47,4 +47,4 @@ <address value="{$testip6}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_ab_lw_001.xml b/recipes/team/interfaces-team_ab_lw_001.xml index 70a9e85..bda72a2 100644 --- a/recipes/team/interfaces-team_ab_lw_001.xml +++ b/recipes/team/interfaces-team_ab_lw_001.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -22,4 +22,4 @@ <address value="{$testip6}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_ab_lw_002.xml b/recipes/team/interfaces-team_ab_lw_002.xml index fe3ede9..ab178cf 100644 --- a/recipes/team/interfaces-team_ab_lw_002.xml +++ b/recipes/team/interfaces-team_ab_lw_002.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -57,4 +57,4 @@ <address value="{$testip6}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_ab_lw_003.xml b/recipes/team/interfaces-team_ab_lw_003.xml index 49a2985..3a1fd64 100644 --- a/recipes/team/interfaces-team_ab_lw_003.xml +++ b/recipes/team/interfaces-team_ab_lw_003.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -28,4 +28,4 @@ <address value="{$testip6}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_ab_lw_004.xml b/recipes/team/interfaces-team_ab_lw_004.xml index 170e75d..bb7417e 100644 --- a/recipes/team/interfaces-team_ab_lw_004.xml +++ b/recipes/team/interfaces-team_ab_lw_004.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -65,4 +65,4 @@ <address value="{$testip6}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_ab_lw_005.xml b/recipes/team/interfaces-team_ab_lw_005.xml index 93498bc..b06ecb2 100644 --- a/recipes/team/interfaces-team_ab_lw_005.xml +++ b/recipes/team/interfaces-team_ab_lw_005.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -27,4 +27,4 @@ <address value="{$testip6}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_ab_lw_006.xml b/recipes/team/interfaces-team_ab_lw_006.xml index d14a8f7..a139c21 100644 --- a/recipes/team/interfaces-team_ab_lw_006.xml +++ b/recipes/team/interfaces-team_ab_lw_006.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -62,4 +62,4 @@ <address value="{$testip6}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_ab_lw_007.xml b/recipes/team/interfaces-team_ab_lw_007.xml index 8bd31ab..325361e 100644 --- a/recipes/team/interfaces-team_ab_lw_007.xml +++ b/recipes/team/interfaces-team_ab_lw_007.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -61,4 +61,4 @@ <address value="{$testip6}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_ab_lw_008.xml b/recipes/team/interfaces-team_ab_lw_008.xml index f82f26a..0587bee 100644 --- a/recipes/team/interfaces-team_ab_lw_008.xml +++ b/recipes/team/interfaces-team_ab_lw_008.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -87,4 +87,4 @@ <address value="{$testip6}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_bcast.xml b/recipes/team/interfaces-team_bcast.xml index c5879f7..5ae7e3d 100644 --- a/recipes/team/interfaces-team_bcast.xml +++ b/recipes/team/interfaces-team_bcast.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -21,4 +21,4 @@ <address value="{$testip6}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_lacp.xml b/recipes/team/interfaces-team_lacp.xml index 5f82d12..362cafd 100644 --- a/recipes/team/interfaces-team_lacp.xml +++ b/recipes/team/interfaces-team_lacp.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -35,4 +35,4 @@ <address value="{$testip6}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_lacp_act.xml b/recipes/team/interfaces-team_lacp_act.xml index 4d9e88a..c5e7917 100644 --- a/recipes/team/interfaces-team_lacp_act.xml +++ b/recipes/team/interfaces-team_lacp_act.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -38,4 +38,4 @@ <address value="{$testip6}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_lacp_passive.xml b/recipes/team/interfaces-team_lacp_passive.xml index d75d332..e0b69b8 100644 --- a/recipes/team/interfaces-team_lacp_passive.xml +++ b/recipes/team/interfaces-team_lacp_passive.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -35,4 +35,4 @@ <address value="{$testip6}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_lacp_slowrate.xml b/recipes/team/interfaces-team_lacp_slowrate.xml index 0c02ff0..36d07dd 100644 --- a/recipes/team/interfaces-team_lacp_slowrate.xml +++ b/recipes/team/interfaces-team_lacp_slowrate.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -35,4 +35,4 @@ <address value="{$testip6}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_lb.xml b/recipes/team/interfaces-team_lb.xml index a3e98d5..a2c6407 100644 --- a/recipes/team/interfaces-team_lb.xml +++ b/recipes/team/interfaces-team_lb.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="1"/> - <eth id="2" network="2"/> - <eth id="3" network="3"/> + <eth id="1" label="1"/> + <eth id="2" label="2"/> + <eth id="3" label="3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -24,4 +24,4 @@ <address value="{$testip6}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_lb_act.xml b/recipes/team/interfaces-team_lb_act.xml index 4a20849..343e89f 100644 --- a/recipes/team/interfaces-team_lb_act.xml +++ b/recipes/team/interfaces-team_lb_act.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -27,4 +27,4 @@ <address value="{$testip6}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_rr.xml b/recipes/team/interfaces-team_rr.xml index f17705a..2a9cf33 100644 --- a/recipes/team/interfaces-team_rr.xml +++ b/recipes/team/interfaces-team_rr.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -21,4 +21,4 @@ <address value="{$testip6}"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/interfaces-team_rr_queue_mapping.xml b/recipes/team/interfaces-team_rr_queue_mapping.xml index 2b62957..265db42 100644 --- a/recipes/team/interfaces-team_rr_queue_mapping.xml +++ b/recipes/team/interfaces-team_rr_queue_mapping.xml @@ -1,7 +1,7 @@ <interfaces> - <eth id="1" network="net1"/> - <eth id="2" network="net2"/> - <eth id="3" network="net3"/> + <eth id="1" label="net1"/> + <eth id="2" label="net2"/> + <eth id="3" label="net3"/> <team id="testiface"> <options> <option name="teamd_config"> @@ -47,4 +47,4 @@ <address value="172.0.4.1/24"/> </addresses> </team> -</interfaces> \ No newline at end of file +</interfaces> diff --git a/recipes/team/recipex_ab_001.xml b/recipes/team/recipex_ab_001.xml index 5f0b50a..a9500fc 100644 --- a/recipes/team/recipex_ab_001.xml +++ b/recipes/team/recipex_ab_001.xml @@ -1,21 +1,21 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <params/> <xi:include href="interfaces-team_ab.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <params/> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 b22d7b7..c1b2634 100644 --- a/recipes/team/recipex_ab_002.xml +++ b/recipes/team/recipex_ab_002.xml @@ -1,20 +1,20 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_ab.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <define> <alias name="multicast_group" value="239.1.2.3"/> <alias name="port" value="1337"/> diff --git a/recipes/team/recipex_ab_003.xml b/recipes/team/recipex_ab_003.xml index a00c42a..34fd881 100644 --- a/recipes/team/recipex_ab_003.xml +++ b/recipes/team/recipex_ab_003.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_ab.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 3cce865..4e4c561 100644 --- a/recipes/team/recipex_ab_004.xml +++ b/recipes/team/recipex_ab_004.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_ab.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="sequence_iperf.xml"/> </lnstrecipe> \ No newline at end of file diff --git a/recipes/team/recipex_bcast_001.xml b/recipes/team/recipex_bcast_001.xml index 89b12c5..7aca6bf 100644 --- a/recipes/team/recipex_bcast_001.xml +++ b/recipes/team/recipex_bcast_001.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_bcast.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 590a61c..22e8cb0 100644 --- a/recipes/team/recipex_bcast_002.xml +++ b/recipes/team/recipex_bcast_002.xml @@ -1,20 +1,20 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_bcast.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <define> <alias name="multicast_group" value="239.1.2.3"/> <alias name="port" value="1337"/> diff --git a/recipes/team/recipex_bcast_003.xml b/recipes/team/recipex_bcast_003.xml index 26464ca..063e8a0 100644 --- a/recipes/team/recipex_bcast_003.xml +++ b/recipes/team/recipex_bcast_003.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_bcast.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 67364ad..0f00872 100644 --- a/recipes/team/recipex_bcast_004.xml +++ b/recipes/team/recipex_bcast_004.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_bcast.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 18884ff..2bb4da1 100644 --- a/recipes/team/recipex_lacp_001.xml +++ b/recipes/team/recipex_lacp_001.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lacp.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-bond_lacp.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 cf6007b..0781d66 100644 --- a/recipes/team/recipex_lacp_002.xml +++ b/recipes/team/recipex_lacp_002.xml @@ -1,20 +1,20 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lacp.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-bond_lacp.xml"/> - </machine> - </machines> + </host> + </network> <define> <alias name="multicast_group" value="239.1.2.3"/> <alias name="port" value="1337"/> diff --git a/recipes/team/recipex_lacp_003.xml b/recipes/team/recipex_lacp_003.xml index 8cfa5e1..aaa12a8 100644 --- a/recipes/team/recipex_lacp_003.xml +++ b/recipes/team/recipex_lacp_003.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lacp.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-bond_lacp.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 e2a7e13..b7bafab 100644 --- a/recipes/team/recipex_lacp_004.xml +++ b/recipes/team/recipex_lacp_004.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lacp.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-bond_lacp.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 df30707..9e5f730 100644 --- a/recipes/team/recipex_lacp_act_001.xml +++ b/recipes/team/recipex_lacp_act_001.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lacp_act.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-bond_lacp.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 4104d37..f2871e9 100644 --- a/recipes/team/recipex_lacp_act_002.xml +++ b/recipes/team/recipex_lacp_act_002.xml @@ -1,20 +1,20 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lacp_act.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-bond_lacp.xml"/> - </machine> - </machines> + </host> + </network> <define> <alias name="multicast_group" value="239.1.2.3"/> <alias name="port" value="1337"/> diff --git a/recipes/team/recipex_lacp_act_003.xml b/recipes/team/recipex_lacp_act_003.xml index 496b1b9..822aa7f 100644 --- a/recipes/team/recipex_lacp_act_003.xml +++ b/recipes/team/recipex_lacp_act_003.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lacp_act.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-bond_lacp.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 0752e10..1585b0a 100644 --- a/recipes/team/recipex_lacp_act_004.xml +++ b/recipes/team/recipex_lacp_act_004.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lacp_act.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-bond_lacp.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 51325ac..1d36bb1 100644 --- a/recipes/team/recipex_lb_001.xml +++ b/recipes/team/recipex_lb_001.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lb.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 6629b19..b056c9e 100644 --- a/recipes/team/recipex_lb_002.xml +++ b/recipes/team/recipex_lb_002.xml @@ -1,20 +1,20 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lb.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <define> <alias name="multicast_group" value="239.1.2.3"/> <alias name="port" value="1337"/> diff --git a/recipes/team/recipex_lb_003.xml b/recipes/team/recipex_lb_003.xml index 97183ff..e4c7b4a 100644 --- a/recipes/team/recipex_lb_003.xml +++ b/recipes/team/recipex_lb_003.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lb.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 c49cdac..44a33aa 100644 --- a/recipes/team/recipex_lb_004.xml +++ b/recipes/team/recipex_lb_004.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lb.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 4774792..176ee06 100644 --- a/recipes/team/recipex_lb_act_001.xml +++ b/recipes/team/recipex_lb_act_001.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lb_act.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 da6ec86..c6bf6a3 100644 --- a/recipes/team/recipex_lb_act_002.xml +++ b/recipes/team/recipex_lb_act_002.xml @@ -1,20 +1,20 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lb_act.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <define> <alias name="multicast_group" value="239.1.2.3"/> <alias name="port" value="1337"/> diff --git a/recipes/team/recipex_lb_act_003.xml b/recipes/team/recipex_lb_act_003.xml index d78f6b4..d9a457c 100644 --- a/recipes/team/recipex_lb_act_003.xml +++ b/recipes/team/recipex_lb_act_003.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lb_act.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 041157d..62efab3 100644 --- a/recipes/team/recipex_lb_act_004.xml +++ b/recipes/team/recipex_lb_act_004.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lb_act.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 3de5a51..e17fc1e 100644 --- a/recipes/team/recipex_rr_001.xml +++ b/recipes/team/recipex_rr_001.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_rr.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 d969be0..0206900 100644 --- a/recipes/team/recipex_rr_002.xml +++ b/recipes/team/recipex_rr_002.xml @@ -1,20 +1,20 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_rr.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <define> <alias name="multicast_group" value="239.1.2.3"/> <alias name="port" value="1337"/> diff --git a/recipes/team/recipex_rr_003.xml b/recipes/team/recipex_rr_003.xml index befd964..d15ae32 100644 --- a/recipes/team/recipex_rr_003.xml +++ b/recipes/team/recipex_rr_003.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_rr.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 5689d1d..987ff9a 100644 --- a/recipes/team/recipex_rr_004.xml +++ b/recipes/team/recipex_rr_004.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_rr.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 5f9a667..741bfae 100644 --- a/recipes/team/recipey_ab_lw_001.xml +++ b/recipes/team/recipey_ab_lw_001.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_ab_lw_001.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 fc8819b..e84740a 100644 --- a/recipes/team/recipey_ab_lw_002.xml +++ b/recipes/team/recipey_ab_lw_002.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_ab_lw_002.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 1b1da10..4ba317b 100644 --- a/recipes/team/recipey_ab_lw_003.xml +++ b/recipes/team/recipey_ab_lw_003.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_ab_lw_003.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 8e4d61e..f678bf9 100644 --- a/recipes/team/recipey_ab_lw_004.xml +++ b/recipes/team/recipey_ab_lw_004.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_ab_lw_004.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 5bd5d15..afef453 100644 --- a/recipes/team/recipey_ab_lw_005.xml +++ b/recipes/team/recipey_ab_lw_005.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_ab_lw_005.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 430cba0..7f8eb5b 100644 --- a/recipes/team/recipey_ab_lw_006.xml +++ b/recipes/team/recipey_ab_lw_006.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_ab_lw_006.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 23c6e82..c047b51 100644 --- a/recipes/team/recipey_ab_lw_007.xml +++ b/recipes/team/recipey_ab_lw_007.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_ab_lw_007.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 ca5df32..45e2a4e 100644 --- a/recipes/team/recipey_ab_lw_008.xml +++ b/recipes/team/recipey_ab_lw_008.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_ab_lw_008.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 94041c9..028dc80 100644 --- a/recipes/team/recipey_lacp_act_flows.xml +++ b/recipes/team/recipey_lacp_act_flows.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lacp_act.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-bond_lacp.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 a704ee5..025abd3 100644 --- a/recipes/team/recipey_lacp_hashes.xml +++ b/recipes/team/recipey_lacp_hashes.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lacp.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-bond_lacp.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 4799ca4..b362b5e 100644 --- a/recipes/team/recipey_lacp_passive.xml +++ b/recipes/team/recipey_lacp_passive.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lacp_passive.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-bond_lacp.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 d169178..d0e4c4f 100644 --- a/recipes/team/recipey_lacp_slowrate.xml +++ b/recipes/team/recipey_lacp_slowrate.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lacp_slowrate.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-bond_lacp.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 433dbc9..5daf5c7 100644 --- a/recipes/team/recipey_lb_act_flows.xml +++ b/recipes/team/recipey_lb_act_flows.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lb_act.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 46e746a..8b3fcde 100644 --- a/recipes/team/recipey_lb_hashes.xml +++ b/recipes/team/recipey_lb_hashes.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_lb.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-simple_br.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="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 dfb6d8b..60ec9ea 100644 --- a/recipes/team/recipey_rr_queue_mapping.xml +++ b/recipes/team/recipey_rr_queue_mapping.xml @@ -1,19 +1,19 @@ <lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude"> - <machines> + <network> <define> <alias name="testip" value="192.168.111.1/24"/> <alias name="testip6" value="fe01::1/64"/> </define> - <machine id="1"> + <host id="1"> <xi:include href="interfaces-team_rr_queue_mapping.xml"/> - </machine> + </host> <define> <alias name="testip" value="192.168.111.2/24"/> <alias name="testip6" value="fe01::2/64"/> </define> - <machine id="2"> + <host id="2"> <xi:include href="interfaces-br_queue_mapping.xml"/> - </machine> - </machines> + </host> + </network> <xi:include href="sequence_queue_mapping.xml"/> </lnstrecipe> \ No newline at end of file diff --git a/schema-recipe.rng b/schema-recipe.rng index 34ab1fd..fba15db 100644 --- a/schema-recipe.rng +++ b/schema-recipe.rng @@ -7,7 +7,7 @@ <ref name="define"/> </optional>
- <ref name="machines"/> + <ref name="network"/>
<oneOrMore> <ref name="task"/> @@ -30,15 +30,15 @@ </element> </define>
- <define name="machines"> - <element name="machines"> + <define name="network"> + <element name="network"> <interleave> <optional> <ref name="define"/> </optional>
<oneOrMore> - <ref name="machine"/> + <ref name="host"/> </oneOrMore> </interleave> </element> @@ -92,8 +92,8 @@ </element> </define>
- <define name="machine"> - <element name="machine"> + <define name="host"> + <element name="host"> <attribute name="id"/>
<interleave> @@ -124,7 +124,7 @@ <define name="eth"> <element name="eth"> <attribute name="id"/> - <attribute name="network"/> + <attribute name="label"/> <interleave> <optional> <ref name="define"/> diff --git a/schema-sm.rng b/schema-sm.rng index 454dde1..f9d5a14 100644 --- a/schema-sm.rng +++ b/schema-sm.rng @@ -67,7 +67,7 @@ <define name="eth"> <element name="eth"> <attribute name="id"/> - <attribute name="network"/> + <attribute name="label"/> <interleave> <optional> <ref name="define"/>
lnst-developers@lists.fedorahosted.org
-
Jiří Pírko