The multicast recipes were converted to use the new <task> syntax
instead of <command_sequence>.
Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com>
---
recipes/multicast/cmd_sequences/block_source.xml | 37 +++++++++--------
recipes/multicast/cmd_sequences/if.xml | 35 ++++++++--------
recipes/multicast/cmd_sequences/loop.xml | 35 ++++++++--------
recipes/multicast/cmd_sequences/max_groups.xml | 14 +++----
recipes/multicast/cmd_sequences/membership.xml | 25 ++++++------
recipes/multicast/cmd_sequences/simple.xml | 18 ++++-----
.../multicast/cmd_sequences/source_membership.xml | 39 +++++++++---------
recipes/multicast/cmd_sequences/ttl.xml | 46 +++++++++++-----------
recipes/multicast/multicast-all.xml | 32 ++++-----------
9 files changed, 130 insertions(+), 151 deletions(-)
diff --git a/recipes/multicast/cmd_sequences/block_source.xml
b/recipes/multicast/cmd_sequences/block_source.xml
index ae3a9c0..0b4d9b5 100644
--- a/recipes/multicast/cmd_sequences/block_source.xml
+++ b/recipes/multicast/cmd_sequences/block_source.xml
@@ -3,20 +3,20 @@
<!-- NOTICE: IGMP packets must be forwarded through the network!
In kvm/libvirt environment, iptables on host must be off or
configured to forward igmp traffic through the bridge -->
-<command_sequence>
+<task>
<!-- IP_BLOCK/UNBLOCK_SOURCE sockopt conformance test -->
- <command machine_id="1" timeout="30" type="test"
value="Multicast">
+ <test machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup"
value="sockopt_block_source"/>
<option name="condition" value="status ==
'pass'"/>
</options>
- </command>
+ </test>
<!-- Block source in the middle of ongoing communication -->
- <command machine_id="1" type="exec" value="sleep
1"/>
- <command machine_id="2" type="exec" value="sleep
1"/>
+ <exec command="sleep 1" machine="1"/>
+ <exec command="sleep 1" machine="2"/>
- <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
+ <test bg_id="1" machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="send_simple"/>
<option name="address" value="238.0.0.1"/>
@@ -26,9 +26,9 @@
<option name="ttl" value="1"/>
<option name="interface"
value="{ip(1,testiface)}"/>
</options>
- </command>
+ </test>
- <command machine_id="2" timeout="30" type="test"
value="Multicast">
+ <test machine="2" module="Multicast"
timeout="30">
<options>
<option name="setup" value="recv_block_source"/>
<option name="address" value="238.0.0.1"/>
@@ -40,14 +40,14 @@
<option name="condition" value="packets_received >
0"/>
<option name="condition"
value="packets_received_while_blocking == 0"/>
</options>
- </command>
- <command machine_id="1" type="wait" value="1"/>
+ </test>
+ <wait bg_id="1" machine="1"/>
<!-- Nonexistent source -->
- <command machine_id="1" type="exec" value="sleep
1"/>
- <command machine_id="2" type="exec" value="sleep
1"/>
+ <exec command="sleep 1" machine="1"/>
+ <exec command="sleep 1" machine="2"/>
- <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
+ <test bg_id="1" machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="send_simple"/>
<option name="address" value="238.0.0.1"/>
@@ -57,9 +57,9 @@
<option name="ttl" value="1"/>
<option name="interface"
value="{ip(1,testiface)}"/>
</options>
- </command>
+ </test>
- <command machine_id="2" timeout="30" type="test"
value="Multicast">
+ <test machine="2" module="Multicast"
timeout="30">
<options>
<option name="setup" value="recv_block_source"/>
<option name="address" value="238.0.0.1"/>
@@ -71,7 +71,6 @@
<option name="condition" value="packets_received >
0"/>
<option name="condition"
value="packets_received_while_blocking > 0"/>
</options>
- </command>
- <command machine_id="1" type="wait" value="1"/>
-
-</command_sequence>
+ </test>
+ <wait bg_id="1" machine="1"/>
+</task>
diff --git a/recipes/multicast/cmd_sequences/if.xml
b/recipes/multicast/cmd_sequences/if.xml
index 3de948c..98d0e38 100644
--- a/recipes/multicast/cmd_sequences/if.xml
+++ b/recipes/multicast/cmd_sequences/if.xml
@@ -2,23 +2,22 @@
- [1] with one interface
- [2] with one interface
- -->
-<command_sequence>
+<task>
<!-- IP_MULTICAST_IF sockopt conformance test -->
- <command machine_id="1" timeout="30" type="test"
value="Multicast">
+ <test machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="sockopt_if"/>
-
<!-- This condition doesn't pass yet because of a
bug in the syscal. #803202 on RedHat Bugzilla -->
<!-- <option name="condition" value="status ==
'pass'" /> -->
</options>
- </command>
+ </test>
<!-- IP_MULTICAST_IF correct interfaces set -->
- <command machine_id="1" type="exec" value="sleep
1"/>
- <command machine_id="2" type="exec" value="sleep
1"/>
+ <exec command="sleep 1" machine="1"/>
+ <exec command="sleep 1" machine="2"/>
- <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
+ <test bg_id="1" machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="send_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -28,9 +27,9 @@
<option name="ttl" value="1"/>
<option name="interface"
value="{ip(1,testiface)}"/>
</options>
- </command>
+ </test>
- <command machine_id="2" timeout="30" type="test"
value="Multicast">
+ <test machine="2" module="Multicast"
timeout="30">
<options>
<option name="setup" value="recv_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -40,14 +39,14 @@
<option name="condition" value="packets_received >
0"/>
</options>
- </command>
+ </test>
- <command machine_id="1" type="wait" value="1"/>
+ <wait bg_id="1" machine="1"/>
<!-- IP_MULTICAST_IF incorrect interfaces set -->
- <command machine_id="1" type="exec" value="sleep
1"/>
+ <exec command="sleep 1" machine="1"/>
- <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
+ <test bg_id="1" machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="send_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -57,9 +56,9 @@
<option name="ttl" value="1"/>
<option name="interface"
value="{ip(1,testiface)}"/>
</options>
- </command>
+ </test>
- <command machine_id="2" timeout="30" type="test"
value="Multicast">
+ <test machine="2" module="Multicast"
timeout="30">
<options>
<option name="setup" value="recv_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -69,7 +68,7 @@
<option name="condition" value="packets_received ==
0"/>
</options>
- </command>
+ </test>
- <command machine_id="1" type="wait" value="1"/>
-</command_sequence>
+ <wait bg_id="1" machine="1"/>
+</task>
diff --git a/recipes/multicast/cmd_sequences/loop.xml
b/recipes/multicast/cmd_sequences/loop.xml
index c1dbcc3..91cfe7c 100644
--- a/recipes/multicast/cmd_sequences/loop.xml
+++ b/recipes/multicast/cmd_sequences/loop.xml
@@ -1,18 +1,17 @@
-<!-- Offline IP_MULTICAST_LOOP test -->
-<!-- Requires: 1 hosts with at least two interfaces -->
-<command_sequence>
+<!-- Offline IP_MULTICAST_LOOP test --><!-- Requires: 1 hosts with at least two
interfaces -->
+<task>
<!-- IP_MULTICAST_LOOP sockopt conformance test -->
- <command machine_id="1" timeout="30" type="test"
value="Multicast">
+ <test machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="sockopt_loop"/>
<option name="condition" value="status ==
'pass'"/>
</options>
- </command>
+ </test>
<!-- IP_MULTICAST_LOOP enabled -->
- <command machine_id="1" type="exec" value="sleep
1"/>
+ <exec command="sleep 1" machine="1"/>
- <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
+ <test bg_id="1" machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="send_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -22,9 +21,9 @@
<option name="loop" value="1"/>
<option name="interface"
value="{ip(1,testiface)}"/>
</options>
- </command>
+ </test>
- <command machine_id="1" timeout="30" type="test"
value="Multicast">
+ <test machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="recv_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -34,14 +33,14 @@
<option name="condition" value="packets_received >
0"/>
</options>
- </command>
+ </test>
- <command machine_id="1" type="wait" value="1"/>
+ <wait bg_id="1" machine="1"/>
<!-- IP_MULTICAST_LOOP disabled -->
- <command machine_id="1" type="exec" value="sleep
1"/>
+ <exec command="sleep 1" machine="1"/>
- <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
+ <test bg_id="1" machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="send_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -51,9 +50,9 @@
<option name="loop" value="0"/>
<option name="interface"
value="{ip(1,testiface)}"/>
</options>
- </command>
+ </test>
- <command machine_id="1" timeout="30" type="test"
value="Multicast">
+ <test machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="recv_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -63,7 +62,7 @@
<option name="condition" value="packets_received ==
0"/>
</options>
- </command>
+ </test>
- <command machine_id="1" type="wait" value="1"/>
-</command_sequence>
+ <wait bg_id="1" machine="1"/>
+</task>
diff --git a/recipes/multicast/cmd_sequences/max_groups.xml
b/recipes/multicast/cmd_sequences/max_groups.xml
index 1082d74..966ea99 100644
--- a/recipes/multicast/cmd_sequences/max_groups.xml
+++ b/recipes/multicast/cmd_sequences/max_groups.xml
@@ -1,22 +1,22 @@
<!-- Offline maximum number of groups test -->
<!-- Requires: 1 host with one interface -->
-<command_sequence>
+<task>
<!-- With a specific interface -->
- <command machine_id="1" timeout="30" type="test"
value="Multicast">
+ <test machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="max_groups"/>
<option name="interface"
value="{ip(1,testiface)}"/>
<option name="condition" value="max_groups >
0"/>
</options>
- </command>
+ </test>
<!-- Change default max_memberhsips -->
- <command machine_id="1"
option="/proc/sys/net/ipv4/igmp_max_memberships" type="system_config"
value="5"/>
- <command machine_id="1" timeout="30" type="test"
value="Multicast">
+ <config machine="1"
option="/proc/sys/net/ipv4/igmp_max_memberships" value="5"/>
+ <test machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="max_groups"/>
<option name="interface"
value="{ip(1,testiface)}"/>
<option name="condition" value="max_groups == 5"/>
</options>
- </command>
-</command_sequence>
+ </test>
+</task>
diff --git a/recipes/multicast/cmd_sequences/membership.xml
b/recipes/multicast/cmd_sequences/membership.xml
index ecea8ba..64770ea 100644
--- a/recipes/multicast/cmd_sequences/membership.xml
+++ b/recipes/multicast/cmd_sequences/membership.xml
@@ -1,24 +1,23 @@
-<!-- IP_ADD/DROP_MEMBERSHIP test -->
-<!-- Requires: 2 hosts
+<!-- IP_ADD/DROP_MEMBERSHIP test --><!-- Requires: 2 hosts
- [1] with one interface
- [2] with one interface
- -->
-<command_sequence>
+<task>
<!-- IP_ADD/DROP_MEMBERSHIP sockopt conformance test -->
- <command machine_id="1" timeout="30" type="test"
value="Multicast">
+ <test machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="sockopt_membership"/>
<option name="condition" value="status ==
'pass'"/>
</options>
- </command>
+ </test>
<!-- This simple test case verifies that if one side leaves multicast group
- in the middle of ongoing communication, no further packets are delivered
- to the process. -->
- <command machine_id="1" type="exec" value="sleep
1"/>
- <command machine_id="2" type="exec" value="sleep
1"/>
+ <exec command="sleep 1" machine="1"/>
+ <exec command="sleep 1" machine="2"/>
- <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
+ <test bg_id="1" machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="send_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -28,9 +27,9 @@
<option name="ttl" value="1"/>
<option name="interface"
value="{ip(1,testiface)}"/>
</options>
- </command>
+ </test>
- <command machine_id="2" timeout="30" type="test"
value="Multicast">
+ <test machine="2" module="Multicast"
timeout="30">
<options>
<option name="setup" value="recv_membership"/>
<option name="address"
value="{$multicast_group}"/>
@@ -41,7 +40,7 @@
<option name="condition" value="packets_received >
0"/>
<option name="condition" value="packets_received_after_drop
== 0"/>
</options>
- </command>
+ </test>
- <command machine_id="1" type="wait" value="1"/>
-</command_sequence>
+ <wait bg_id="1" machine="1"/>
+</task>
diff --git a/recipes/multicast/cmd_sequences/simple.xml
b/recipes/multicast/cmd_sequences/simple.xml
index d3c3119..bbe887a 100644
--- a/recipes/multicast/cmd_sequences/simple.xml
+++ b/recipes/multicast/cmd_sequences/simple.xml
@@ -1,10 +1,10 @@
<!-- Requires: 2 hosts with at least one interface -->
<!-- ['machines'][2]['netconfig'][1]['addresses'][0] -->
-<command_sequence>
- <command machine_id="1" type="exec" value="sleep
1"/>
- <command machine_id="2" type="exec" value="sleep
1"/>
+<task>
+ <exec command="sleep 1" machine="1"/>
+ <exec command="sleep 1" machine="2"/>
- <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
+ <test bg_id="1" machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="send_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -13,9 +13,9 @@
<option name="delay" value="{$send_delay}"/>
<option name="interface"
value="{ip(1,testiface)}"/>
</options>
- </command>
+ </test>
- <command machine_id="2" timeout="30" type="test"
value="Multicast">
+ <test machine="2" module="Multicast"
timeout="30">
<options>
<option name="setup" value="recv_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -25,7 +25,7 @@
<option name="condition" value="packets_received >
0"/>
</options>
- </command>
+ </test>
- <command machine_id="1" type="wait" value="1"/>
-</command_sequence>
+ <wait bg_id="1" machine="1"/>
+</task>
diff --git a/recipes/multicast/cmd_sequences/source_membership.xml
b/recipes/multicast/cmd_sequences/source_membership.xml
index 62bfa86..a996b31 100644
--- a/recipes/multicast/cmd_sequences/source_membership.xml
+++ b/recipes/multicast/cmd_sequences/source_membership.xml
@@ -1,27 +1,26 @@
-<!-- IP_ADD/DROP_SOURCE_MEMBERSHIP test -->
-<!-- Requires: 2 hosts
+<!-- IP_ADD/DROP_SOURCE_MEMBERSHIP test --><!-- Requires: 2 hosts
- [1] with one interface
- [2] with one interface
- -->
<!-- NOTICE: IGMP packets must be forwarded through the network!
In kvm/libvirt environment, iptables on host must be off or
configured to forward igmp traffic through the bridge -->
-<command_sequence>
+<task>
<!-- IP_ADD/DROP_MEMBERSHIP sockopt conformance test -->
- <command machine_id="1" timeout="30" type="test"
value="Multicast">
+ <test machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup"
value="sockopt_source_membership"/>
<option name="condition" value="status ==
'pass'"/>
</options>
- </command>
+ </test>
<!-- This simple test case verifies that if one side leaves multicast group
- in the middle of ongoing communication, no further packets are delivered
- to the process. -->
- <command machine_id="1" type="exec" value="sleep
1"/>
- <command machine_id="2" type="exec" value="sleep
1"/>
+ <exec command="sleep 1" machine="1"/>
+ <exec command="sleep 1" machine="2"/>
- <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
+ <test bg_id="1" machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="send_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -31,9 +30,9 @@
<option name="ttl" value="1"/>
<option name="interface"
value="{ip(1,testiface)}"/>
</options>
- </command>
+ </test>
- <command machine_id="2" timeout="30" type="test"
value="Multicast">
+ <test machine="2" module="Multicast"
timeout="30">
<options>
<option name="setup"
value="recv_source_membership"/>
<option name="address"
value="{$multicast_group}"/>
@@ -45,14 +44,14 @@
<option name="condition" value="packets_received >
0"/>
<option name="condition" value="packets_received_after_drop
== 0"/>
</options>
- </command>
- <command machine_id="1" type="wait" value="1"/>
+ </test>
+ <wait bg_id="1" machine="1"/>
<!-- Nonexistent source -->
- <command machine_id="1" type="exec" value="sleep
1"/>
- <command machine_id="2" type="exec" value="sleep
1"/>
+ <exec command="sleep 1" machine="1"/>
+ <exec command="sleep 1" machine="2"/>
- <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
+ <test bg_id="1" machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="send_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -62,9 +61,9 @@
<option name="ttl" value="1"/>
<option name="interface"
value="{ip(1,testiface)}"/>
</options>
- </command>
+ </test>
- <command machine_id="2" timeout="30" type="test"
value="Multicast">
+ <test machine="2" module="Multicast"
timeout="30">
<options>
<option name="setup"
value="recv_source_membership"/>
<option name="address"
value="{$multicast_group}"/>
@@ -76,7 +75,7 @@
<option name="condition" value="packets_received ==
0"/>
<option name="condition" value="packets_received_after_drop
== 0"/>
</options>
- </command>
- <command machine_id="1" type="wait" value="1"/>
+ </test>
+ <wait bg_id="1" machine="1"/>
-</command_sequence>
+</task>
diff --git a/recipes/multicast/cmd_sequences/ttl.xml
b/recipes/multicast/cmd_sequences/ttl.xml
index b96ad8c..ab02e80 100644
--- a/recipes/multicast/cmd_sequences/ttl.xml
+++ b/recipes/multicast/cmd_sequences/ttl.xml
@@ -2,19 +2,19 @@
- [1] with one interface
- [2] with one interface
- -->
-<command_sequence>
+<task>
<!-- IP_MULTICAST_TTL sockopt conformance test -->
- <command machine_id="1" timeout="30" type="test"
value="Multicast">
+ <test machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="sockopt_ttl"/>
<option name="condition" value="status ==
'pass'"/>
</options>
- </command>
+ </test>
<!-- IP_MULTICAST_TTL = 0, looped on one host -->
- <command machine_id="1" type="exec" value="sleep
1"/>
+ <exec command="sleep 1" machine="1"/>
- <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
+ <test bg_id="1" machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="send_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -25,9 +25,9 @@
<option name="loop" value="1"/>
<option name="interface"
value="{ip(1,testiface)}"/>
</options>
- </command>
+ </test>
- <command machine_id="1" timeout="30" type="test"
value="Multicast">
+ <test machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="recv_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -37,9 +37,9 @@
<option name="condition" value="packets_received >
0"/>
</options>
- </command>
+ </test>
- <command machine_id="1" type="wait" value="1"/>
+ <wait bg_id="1" machine="1"/>
<!-- IP_MULTICAST_TTL = 0 between 2 hosts -->
<!-- KNOWN BUG: according to the specs, packets
@@ -50,10 +50,10 @@
http://www.spinics.net/lists/netdev/msg183704.html
-->
- <command machine_id="1" type="exec" value="sleep
1"/>
- <command machine_id="2" type="exec" value="sleep
1"/>
+ <exec command="sleep 1" machine="1"/>
+ <exec command="sleep 1" machine="2"/>
- <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
+ <test bg_id="1" machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="send_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -63,9 +63,9 @@
<option name="ttl" value="0"/>
<option name="interface"
value="{ip(1,testiface)}"/>
</options>
- </command>
+ </test>
- <command machine_id="2" timeout="30" type="test"
value="Multicast">
+ <test machine="2" module="Multicast"
timeout="30">
<options>
<option name="setup" value="recv_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -75,14 +75,14 @@
<option name="condition" value="packets_received >
0"/>
</options>
- </command>
+ </test>
- <command machine_id="1" type="wait" value="1"/>
+ <wait bg_id="1" machine="1"/>
<!-- IP_MULTICAST_TTL = 1 between 2 hosts -->
- <command machine_id="1" type="exec" value="sleep
1"/>
+ <exec command="sleep 1" machine="1"/>
- <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
+ <test bg_id="1" machine="1" module="Multicast"
timeout="30">
<options>
<option name="setup" value="send_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -92,9 +92,9 @@
<option name="ttl" value="1"/>
<option name="interface"
value="{ip(1,testiface)}"/>
</options>
- </command>
+ </test>
- <command machine_id="2" timeout="30" type="test"
value="Multicast">
+ <test machine="2" module="Multicast"
timeout="30">
<options>
<option name="setup" value="recv_simple"/>
<option name="address"
value="{$multicast_group}"/>
@@ -104,7 +104,7 @@
<option name="condition" value="packets_received >
0"/>
</options>
- </command>
+ </test>
- <command machine_id="1" type="wait" value="1"/>
-</command_sequence>
+ <wait bg_id="1" machine="1"/>
+</task>
diff --git a/recipes/multicast/multicast-all.xml b/recipes/multicast/multicast-all.xml
index 5378195..7b653d0 100644
--- a/recipes/multicast/multicast-all.xml
+++ b/recipes/multicast/multicast-all.xml
@@ -1,19 +1,7 @@
<!-- Execute all tests for multicast -->
<lnstrecipe>
- <!-- Change these parameters to match your test environment setup -->
- <define>
- <alias name="hostname1" value="192.168.122.11"/>
- <alias name="virtdomain1" value="RHEL6"/>
-
- <alias name="hostname2" value="192.168.122.10"/>
- <alias name="virtdomain2" value="Fedora16-clone"/>
- </define>
<machines>
<machine id="1">
- <params>
- <param name="hostname" value="{$hostname1}"/>
- <param name="libvirt_domain"
value="{$virtdomain1}"/>
- </params>
<interfaces>
<eth id="testiface" network="tnet">
<addresses>
@@ -28,10 +16,6 @@
</interfaces>
</machine>
<machine id="2">
- <params>
- <param name="hostname" value="{$hostname2}"/>
- <param name="libvirt_domain"
value="{$virtdomain2}"/>
- </params>
<interfaces>
<eth id="testiface" network="tnet">
<addresses>
@@ -50,12 +34,12 @@
<alias name="nonexistent_ip" value="127.0.0.200"/>
</define>
- <command_sequence source="cmd_sequences/multicast/max_groups.xml"/>
- <command_sequence
source="cmd_sequences/multicast/block_source.xml"/>
- <command_sequence
source="cmd_sequences/multicast/source_membership.xml"/>
- <command_sequence source="cmd_sequences/multicast/membership.xml"/>
- <command_sequence source="cmd_sequences/multicast/if.xml"/>
- <command_sequence source="cmd_sequences/multicast/ttl.xml"/>
- <command_sequence source="cmd_sequences/multicast/loop.xml"/>
- <command_sequence source="cmd_sequences/multicast/simple.xml"/>
+ <task source="cmd_sequences/max_groups.xml"/>
+ <task source="cmd_sequences/block_source.xml"/>
+ <task source="cmd_sequences/source_membership.xml"/>
+ <task source="cmd_sequences/membership.xml"/>
+ <task source="cmd_sequences/if.xml"/>
+ <task source="cmd_sequences/ttl.xml"/>
+ <task source="cmd_sequences/loop.xml"/>
+ <task source="cmd_sequences/simple.xml"/>
</lnstrecipe>
--
1.8.3.1