From: Ondrej Lichtner olichtne@redhat.com
This commit updates some of the recipes in our library to the new format. I've also tested the recipe schema on these recipes.
Signed-off-by: Ondrej Lichtner olichtne@redhat.com --- recipes/examples/quick_guides/ping_check.xml | 90 ++++++++++++++-------------- recipes/multicast/multicast-all.xml | 45 ++++++-------- recipes/smoke/lib/conf-bond.xml | 8 +-- recipes/smoke/lib/conf-eth.xml | 4 +- recipes/smoke/lib/conf-team.xml | 8 +-- recipes/smoke/lib/conf-vlan.xml | 6 +- 6 files changed, 75 insertions(+), 86 deletions(-)
diff --git a/recipes/examples/quick_guides/ping_check.xml b/recipes/examples/quick_guides/ping_check.xml index 64e2fa3..73495f6 100644 --- a/recipes/examples/quick_guides/ping_check.xml +++ b/recipes/examples/quick_guides/ping_check.xml @@ -5,52 +5,50 @@ is available on LNST wiki page: https://fedorahosted.org/lnst/wiki/QuickGuides/QuickGuidePingCheck --> <lnstrecipe> - <machines> - <machine id="testmachine1"> - <machineconfig> - <!-- Change hostname bellow --> - <info hostname="192.168.1.2"/> - <netdevices> - <!-- Change hwaddr here --> - <netdevice type="eth" network="tnet" hwaddr="52:54:01:00:00:05" - phys_id="1"/> - </netdevices> - </machineconfig> - <netconfig> - <interface id="testifc1" phys_id="1" type="eth"/> - <addresses> - <address value="192.168.200.2/24"/> - </addresses> - </interface> - </netconfig> - </machine> + <machines> + <machine id="testmachine1"> + <params> + <!-- Change hostname bellow --> + <param name="hostname" value="192.168.1.2"/> + </params> + <interfaces> + <eth id="testifc1" network="tnet"> + <params> + <!-- Change hwaddr here --> + <param name="hwaddr" value="52:54:01:00:00:05"/> + </params> + <addresses> + <address value="192.168.200.2/24"/> + </addresses> + </eth> + </interfaces> + </machine>
- <machine id="testmachine2"> - <machineconfig> - <!-- Change hostname bellow --> - <info hostname="192.168.1.3"/> - <netdevices> - <!-- Change hwaddr here --> - <netdevice type="eth" network="tnet" hwaddr="52:54:01:00:00:06" - phys_id="1"/> - </netdevices> - </machineconfig> - <netconfig> - <interface id="testifc2" phys_id="1" type="eth"> - <addresses> - <address value="192.168.200.3/24"/> - </addresses> - </interface> - </netconfig> - </machine> - </machines> + <machine id="testmachine2"> + <params> + <!-- Change hostname bellow --> + <param name="hostname" value="192.168.1.3"/> + </params> + <interfaces> + <eth id="testifc2" network="tnet"> + <params> + <!-- Change hwaddr here --> + <param name="hwaddr" value="52:54:01:00:00:06"/> + </params> + <addresses> + <address value="192.168.200.3/24"/> + </addresses> + </eth> + </interfaces> + </machine> + </machines>
- <command_sequence> - <command type="test" machine_id="testmachine1" value="IcmpPing"> - <options> - <option name="addr" value="{ip(testmachine2,testifc2)}"/> - <option name="count" value="3"/> - </options> - </command> - </command_sequence> + <command_sequence> + <command type="test" machine_id="testmachine1" value="IcmpPing"> + <options> + <option name="addr" value="{ip(testmachine2,testifc2)}"/> + <option name="count" value="3"/> + </options> + </command> + </command_sequence> </lnstrecipe> diff --git a/recipes/multicast/multicast-all.xml b/recipes/multicast/multicast-all.xml index bdd22d7..5378195 100644 --- a/recipes/multicast/multicast-all.xml +++ b/recipes/multicast/multicast-all.xml @@ -10,44 +10,35 @@ </define> <machines> <machine id="1"> - <machineconfig> - <info hostname="{$hostname1}" libvirt_domain="{$virtdomain1}"/> - <netdevices> - <libvirt_create> - <netdevice network="tnet" phys_id="1" type="eth"/> - <netdevice network="tnet" phys_id="2" type="eth"/> - </libvirt_create> - </netdevices> - </machineconfig> - <netconfig> - <interface id="testiface" phys_id="1" type="eth"> + <params> + <param name="hostname" value="{$hostname1}"/> + <param name="libvirt_domain" value="{$virtdomain1}"/> + </params> + <interfaces> + <eth id="testiface" network="tnet"> <addresses> <address value="192.168.100.226/24"/> </addresses> - </interface> - <interface id="2" phys_id="2" type="eth"> + </eth> + <eth id="2" network="tnet"> <addresses> <address value="192.168.100.240/24"/> </addresses> - </interface> - </netconfig> + </eth> + </interfaces> </machine> <machine id="2"> - <machineconfig> - <info hostname="{$hostname2}" libvirt_domain="{$virtdomain2}"/> - <netdevices> - <libvirt_create> - <netdevice network="tnet" phys_id="1" type="eth"/> - </libvirt_create> - </netdevices> - </machineconfig> - <netconfig> - <interface id="testiface" phys_id="1" type="eth"> + <params> + <param name="hostname" value="{$hostname2}"/> + <param name="libvirt_domain" value="{$virtdomain2}"/> + </params> + <interfaces> + <eth id="testiface" network="tnet"> <addresses> <address value="192.168.100.215/24"/> </addresses> - </interface> - </netconfig> + </eth> + </interfaces> </machine> </machines>
diff --git a/recipes/smoke/lib/conf-bond.xml b/recipes/smoke/lib/conf-bond.xml index b69401d..269b123 100644 --- a/recipes/smoke/lib/conf-bond.xml +++ b/recipes/smoke/lib/conf-bond.xml @@ -1,7 +1,7 @@ <interfaces> - <interface id="if-1" network="net" type="eth"/> - <interface id="if-2" network="net" type="eth"/> - <interface id="testiface" type="bond"> + <eth id="if-1" network="net"/> + <eth id="if-2" network="net"/> + <bond id="testiface"> <slaves> <slave id="if-1"/> <slave id="if-2"/> @@ -9,5 +9,5 @@ <addresses> <address value="{$testip}"/> </addresses> - </interface> + </bond> </interfaces> diff --git a/recipes/smoke/lib/conf-eth.xml b/recipes/smoke/lib/conf-eth.xml index a31e095..a4562ea 100644 --- a/recipes/smoke/lib/conf-eth.xml +++ b/recipes/smoke/lib/conf-eth.xml @@ -1,7 +1,7 @@ <interfaces> - <interface id="testiface" network="net" type="eth"> + <eth id="testiface" network="net"> <addresses> <address value="{$testip}"/> </addresses> - </interface> + </eth> </interfaces> diff --git a/recipes/smoke/lib/conf-team.xml b/recipes/smoke/lib/conf-team.xml index f8e23c6..cf5aac8 100644 --- a/recipes/smoke/lib/conf-team.xml +++ b/recipes/smoke/lib/conf-team.xml @@ -1,7 +1,7 @@ <interfaces> - <interface id="if-1" network="net" type="eth"/> - <interface id="if-2" network="net" type="eth"/> - <interface id="testiface" type="team"> + <eth id="if-1" network="net"/> + <eth id="if-2" network="net"/> + <team id="testiface" type="team"> <options> <option name="teamd_config"> { @@ -16,5 +16,5 @@ <addresses> <address value="{$testip}"/> </addresses> - </interface> + </team> </interfaces> diff --git a/recipes/smoke/lib/conf-vlan.xml b/recipes/smoke/lib/conf-vlan.xml index aa95e5a..92d5e23 100644 --- a/recipes/smoke/lib/conf-vlan.xml +++ b/recipes/smoke/lib/conf-vlan.xml @@ -1,6 +1,6 @@ <interfaces> - <interface id="if-1" network="net" type="eth"/> - <interface id="testiface" type="vlan"> + <eth id="if-1" network="net"/> + <vlan id="testiface" type="vlan"> <options> <option name="vlan_tci" value="10"/> </options> @@ -10,5 +10,5 @@ <addresses> <address value="{$testip}"/> </addresses> - </interface> + </vlan> </interfaces>
lnst-developers@lists.fedorahosted.org