From: Radek Pazdera <rpazdera(a)redhat.com>
This patch modifies all the example recipes to the new conventions,
i.e., removes any recipe_evals and changes the 'netdevice' to
'interface' within netconfigs.
*WARNING*
I didn't touch recipes in jpirko_test and jtluka_test, because I
don't want to break anything in your recipes, if you use them.
Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com>
---
example_recipes/cmd_sequences/memory_pressure.xml | 22 ++--
.../cmd_sequences/multicast/block_source.xml | 87 +++++++--------
example_recipes/cmd_sequences/multicast/if.xml | 78 +++++++-------
example_recipes/cmd_sequences/multicast/loop.xml | 75 ++++++-------
.../cmd_sequences/multicast/max_groups.xml | 20 ++--
.../cmd_sequences/multicast/membership.xml | 45 ++++----
example_recipes/cmd_sequences/multicast/simple.xml | 35 +++---
.../cmd_sequences/multicast/source_membership.xml | 87 +++++++--------
example_recipes/cmd_sequences/multicast/ttl.xml | 116 ++++++++++----------
example_recipes/cmd_sequences/netcat-sequence.xml | 49 ++++----
example_recipes/cmd_sequences/sequence1.xml | 8 +-
.../machine_configs/config-f14peanut.xml | 6 +-
example_recipes/net_configs/netconfig1.xml | 11 +-
example_recipes/net_configs/netconfig2.xml | 11 +-
example_recipes/net_configs/netconfig3.xml | 15 +--
example_recipes/net_configs/netconfig4.xml | 9 +-
example_recipes/net_configs/netconfig5.xml | 15 +--
example_recipes/net_configs/netconfig6.xml | 19 ++--
example_recipes/net_configs/netconfig7.xml | 9 +-
example_recipes/net_configs/team1.xml | 28 +++---
example_recipes/packet_assert.xml | 18 ++--
example_recipes/recipe1.xml | 17 ++--
example_recipes/recipe2.xml | 25 ++--
example_recipes/recipe3.xml | 9 +-
example_recipes/recipe4.xml | 3 +-
example_recipes/recipe5.xml | 9 +-
example_recipes/recipe6.xml | 9 +-
example_recipes/rpazdera-multicast.xml | 54 +++++-----
28 files changed, 432 insertions(+), 457 deletions(-)
diff --git a/example_recipes/cmd_sequences/memory_pressure.xml
b/example_recipes/cmd_sequences/memory_pressure.xml
index 2ba4c48..f1d1678 100644
--- a/example_recipes/cmd_sequences/memory_pressure.xml
+++ b/example_recipes/cmd_sequences/memory_pressure.xml
@@ -1,22 +1,22 @@
<command_sequence>
- <command type='test' value='Iperf' machine_id='2'
bg_id="1">
+ <command bg_id="1" machine_id="2" type="test"
value="Iperf">
<options>
<option name="role" value="server"/>
- <option name="bind" value="192.168.122.102" />
+ <option name="bind" value="192.168.122.102"/>
<option name="duration" value="3600"/>
</options>
</command>
- <command type='exec' value='sleep 30' />
- <command type='test' value='Iperf' machine_id='1'
bg_id="1">
+ <command type="exec" value="sleep 30"/>
+ <command bg_id="1" machine_id="1" type="test"
value="Iperf">
<options>
<option name="role" value="client"/>
- <option name="iperf_server"
value="192.168.122.102" />
+ <option name="iperf_server"
value="192.168.122.102"/>
<option name="duration" value="120"/>
</options>
</command>
- <command type='exec' value='sleep 30' />
- <command type='exec' value="fb=`free -b | grep Mem: | sed 's/[
]\+/ /g' | cut -f4 -d' '`; stress -m 10 --vm-bytes $(( $fb / 10 ))"
machine_id='1' bg_id='2'/>
- <command type='wait' machine_id='1' value='1'/>
- <command type='kill' machine_id='1' value='2' />
- <command type='kill' machine_id='2' value='1' />
-</command_sequence>
+ <command type="exec" value="sleep 30"/>
+ <command bg_id="2" machine_id="1" type="exec"
value="fb=`free -b | grep Mem: | sed 's/[ ]\+/ /g' | cut -f4 -d' '`;
stress -m 10 --vm-bytes $(( $fb / 10 ))"/>
+ <command machine_id="1" type="wait" value="1"/>
+ <command machine_id="1" type="kill" value="2"/>
+ <command machine_id="2" type="kill" value="1"/>
+</command_sequence>
\ No newline at end of file
diff --git a/example_recipes/cmd_sequences/multicast/block_source.xml
b/example_recipes/cmd_sequences/multicast/block_source.xml
index 72d0fd2..f351a79 100644
--- a/example_recipes/cmd_sequences/multicast/block_source.xml
+++ b/example_recipes/cmd_sequences/multicast/block_source.xml
@@ -3,76 +3,75 @@
<!-- 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>
<!-- IP_BLOCK/UNBLOCK_SOURCE sockopt conformance test -->
- <command type="test" value="Multicast"
machine_id="1" timeout="30">
+ <command machine_id="1" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="sockopt_block_source"
/>
- <option name="condition" value="status ==
'pass'" />
+ <option name="setup"
value="sockopt_block_source"/>
+ <option name="condition" value="status ==
'pass'"/>
</options>
</command>
<!-- Block source in the middle of ongoing communication -->
- <command type="exec" machine_id="1" value="sleep 1"
/>
- <command type="exec" machine_id="2" value="sleep 1"
/>
+ <command machine_id="1" type="exec" value="sleep
1"/>
+ <command machine_id="2" type="exec" value="sleep
1"/>
- <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
+ <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
<options>
- <option name="setup" value="send_simple" />
- <option name="address" value="238.0.0.1" />
- <option name="port" value="1337" />
- <option name="duration" value="10" />
- <option name="delay" value="0.1" />
- <option name="ttl" value="1" />
- <option name="interface" value="{ip(1,1)}" />
+ <option name="setup" value="send_simple"/>
+ <option name="address" value="238.0.0.1"/>
+ <option name="port" value="1337"/>
+ <option name="duration" value="10"/>
+ <option name="delay" value="0.1"/>
+ <option name="ttl" value="1"/>
+ <option name="interface" value="{ip(1,1)}"/>
</options>
</command>
- <command type="test" value="Multicast"
machine_id="2" timeout="30">
+ <command machine_id="2" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="recv_block_source" />
- <option name="address" value="238.0.0.1" />
- <option name="port" value="1337" />
- <option name="duration" value="10" />
- <option name="interface" value="{ip(2,1)}" />
- <option name="source" value="{ip(1,1)}" />
+ <option name="setup" value="recv_block_source"/>
+ <option name="address" value="238.0.0.1"/>
+ <option name="port" value="1337"/>
+ <option name="duration" value="10"/>
+ <option name="interface" value="{ip(2,1)}"/>
+ <option name="source" value="{ip(1,1)}"/>
- <option name="condition" value="packets_received >
0" />
- <option name="condition"
value="packets_received_while_blocking == 0" />
+ <option name="condition" value="packets_received >
0"/>
+ <option name="condition"
value="packets_received_while_blocking == 0"/>
</options>
</command>
- <command type="wait" machine_id="1" value="1" />
+ <command machine_id="1" type="wait" value="1"/>
<!-- Nonexistent source -->
- <command type="exec" machine_id="1" value="sleep 1"
/>
- <command type="exec" machine_id="2" value="sleep 1"
/>
+ <command machine_id="1" type="exec" value="sleep
1"/>
+ <command machine_id="2" type="exec" value="sleep
1"/>
- <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
+ <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
<options>
- <option name="setup" value="send_simple" />
- <option name="address" value="238.0.0.1" />
- <option name="port" value="1337" />
- <option name="duration" value="10" />
- <option name="delay" value="0.1" />
- <option name="ttl" value="1" />
- <option name="interface" value="{ip(1,1)}" />
+ <option name="setup" value="send_simple"/>
+ <option name="address" value="238.0.0.1"/>
+ <option name="port" value="1337"/>
+ <option name="duration" value="10"/>
+ <option name="delay" value="0.1"/>
+ <option name="ttl" value="1"/>
+ <option name="interface" value="{ip(1,1)}"/>
</options>
</command>
- <command type="test" value="Multicast"
machine_id="2" timeout="30">
+ <command machine_id="2" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="recv_block_source" />
- <option name="address" value="238.0.0.1" />
- <option name="port" value="1337" />
- <option name="duration" value="10" />
- <option name="interface" value="{ip(2,1)}" />
- <option name="source" value="127.0.0.200" />
+ <option name="setup" value="recv_block_source"/>
+ <option name="address" value="238.0.0.1"/>
+ <option name="port" value="1337"/>
+ <option name="duration" value="10"/>
+ <option name="interface" value="{ip(2,1)}"/>
+ <option name="source" value="127.0.0.200"/>
- <option name="condition" value="packets_received >
0" />
- <option name="condition"
value="packets_received_while_blocking > 0" />
+ <option name="condition" value="packets_received >
0"/>
+ <option name="condition"
value="packets_received_while_blocking > 0"/>
</options>
</command>
- <command type="wait" machine_id="1" value="1" />
+ <command machine_id="1" type="wait" value="1"/>
</command_sequence>
diff --git a/example_recipes/cmd_sequences/multicast/if.xml
b/example_recipes/cmd_sequences/multicast/if.xml
index a81557c..dfd1108 100644
--- a/example_recipes/cmd_sequences/multicast/if.xml
+++ b/example_recipes/cmd_sequences/multicast/if.xml
@@ -1,14 +1,12 @@
-<!-- IP_MULTICAST_IF test -->
-<!-- Requires: 2 hosts
+<!-- IP_MULTICAST_IF test --><!-- Requires: 2 hosts
- [1] with one interface
- [2] with one interface
- -->
-
<command_sequence>
<!-- IP_MULTICAST_IF sockopt conformance test -->
- <command type="test" value="Multicast"
machine_id="1" timeout="30">
+ <command machine_id="1" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="sockopt_if" />
+ <option name="setup" value="sockopt_if"/>
<!-- This condition doesn't pass yet because of a
bug in the syscal. #803202 on RedHat Bugzilla -->
@@ -17,61 +15,61 @@
</command>
<!-- IP_MULTICAST_IF correct interfaces set -->
- <command type="exec" machine_id="1" value="sleep 1"
/>
- <command type="exec" machine_id="2" value="sleep 1"
/>
+ <command machine_id="1" type="exec" value="sleep
1"/>
+ <command machine_id="2" type="exec" value="sleep
1"/>
- <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
+ <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
<options>
- <option name="setup" value="send_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="delay" value="{$send_delay}" />
- <option name="ttl" value="1" />
- <option name="interface" value="{ip(1,1)}" />
+ <option name="setup" value="send_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="delay" value="{$send_delay}"/>
+ <option name="ttl" value="1"/>
+ <option name="interface" value="{ip(1,1)}"/>
</options>
</command>
- <command type="test" value="Multicast"
machine_id="2" timeout="30">
+ <command machine_id="2" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="recv_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="interface" value="{ip(2,1)}" />
+ <option name="setup" value="recv_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="interface" value="{ip(2,1)}"/>
- <option name="condition" value="packets_received >
0" />
+ <option name="condition" value="packets_received >
0"/>
</options>
</command>
- <command type="wait" machine_id="1" value="1" />
+ <command machine_id="1" type="wait" value="1"/>
<!-- IP_MULTICAST_IF incorrect interfaces set -->
- <command type="exec" machine_id="1" value="sleep 1"
/>
+ <command machine_id="1" type="exec" value="sleep
1"/>
- <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
+ <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
<options>
- <option name="setup" value="send_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="delay" value="{$send_delay}" />
- <option name="ttl" value="1" />
- <option name="interface" value="{ip(1,1)}" />
+ <option name="setup" value="send_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="delay" value="{$send_delay}"/>
+ <option name="ttl" value="1"/>
+ <option name="interface" value="{ip(1,1)}"/>
</options>
</command>
- <command type="test" value="Multicast"
machine_id="2" timeout="30">
+ <command machine_id="2" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="recv_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="interface" value="127.0.0.1" />
+ <option name="setup" value="recv_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="interface" value="127.0.0.1"/>
- <option name="condition" value="packets_received == 0"
/>
+ <option name="condition" value="packets_received ==
0"/>
</options>
</command>
- <command type="wait" machine_id="1" value="1" />
+ <command machine_id="1" type="wait" value="1"/>
</command_sequence>
diff --git a/example_recipes/cmd_sequences/multicast/loop.xml
b/example_recipes/cmd_sequences/multicast/loop.xml
index ceac21c..d4b57d6 100644
--- a/example_recipes/cmd_sequences/multicast/loop.xml
+++ b/example_recipes/cmd_sequences/multicast/loop.xml
@@ -1,70 +1,69 @@
<!-- Offline IP_MULTICAST_LOOP test -->
<!-- Requires: 1 hosts with at least two interfaces -->
-
<command_sequence>
<!-- IP_MULTICAST_LOOP sockopt conformance test -->
- <command type="test" value="Multicast"
machine_id="1" timeout="30">
+ <command machine_id="1" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="sockopt_loop" />
- <option name="condition" value="status ==
'pass'" />
+ <option name="setup" value="sockopt_loop"/>
+ <option name="condition" value="status ==
'pass'"/>
</options>
</command>
<!-- IP_MULTICAST_LOOP enabled -->
- <command type="exec" machine_id="1" value="sleep 1"
/>
+ <command machine_id="1" type="exec" value="sleep
1"/>
- <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
+ <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
<options>
- <option name="setup" value="send_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="delay" value="{$send_delay}" />
- <option name="loop" value="1" />
- <option name="interface" value="{ip(1,1)}" />
+ <option name="setup" value="send_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="delay" value="{$send_delay}"/>
+ <option name="loop" value="1"/>
+ <option name="interface" value="{ip(1,1)}"/>
</options>
</command>
- <command type="test" value="Multicast"
machine_id="1" timeout="30">
+ <command machine_id="1" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="recv_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="interface" value="{ip(1,1)}" />
+ <option name="setup" value="recv_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="interface" value="{ip(1,1)}"/>
- <option name="condition" value="packets_received >
0" />
+ <option name="condition" value="packets_received >
0"/>
</options>
</command>
- <command type="wait" machine_id="1" value="1" />
+ <command machine_id="1" type="wait" value="1"/>
<!-- IP_MULTICAST_LOOP disabled -->
- <command type="exec" machine_id="1" value="sleep 1"
/>
+ <command machine_id="1" type="exec" value="sleep
1"/>
- <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
+ <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
<options>
- <option name="setup" value="send_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="delay" value="{$send_delay}" />
- <option name="loop" value="0" />
- <option name="interface" value="{ip(1,1)}" />
+ <option name="setup" value="send_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="delay" value="{$send_delay}"/>
+ <option name="loop" value="0"/>
+ <option name="interface" value="{ip(1,1)}"/>
</options>
</command>
- <command type="test" value="Multicast"
machine_id="1" timeout="30">
+ <command machine_id="1" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="recv_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="interface" value="{ip(1,1)}" />
+ <option name="setup" value="recv_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="interface" value="{ip(1,1)}"/>
- <option name="condition" value="packets_received == 0"
/>
+ <option name="condition" value="packets_received ==
0"/>
</options>
</command>
- <command type="wait" machine_id="1" value="1" />
+ <command machine_id="1" type="wait" value="1"/>
</command_sequence>
diff --git a/example_recipes/cmd_sequences/multicast/max_groups.xml
b/example_recipes/cmd_sequences/multicast/max_groups.xml
index a2d1a25..a27197f 100644
--- a/example_recipes/cmd_sequences/multicast/max_groups.xml
+++ b/example_recipes/cmd_sequences/multicast/max_groups.xml
@@ -1,24 +1,22 @@
<!-- Offline maximum number of groups test -->
<!-- Requires: 1 host with one interface -->
-
<command_sequence>
<!-- With a specific interface -->
- <command type="test" value="Multicast"
machine_id="1" timeout="30">
+ <command machine_id="1" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="max_groups" />
- <option name="interface" value="{ip(1,1)}" />
- <option name="condition" value="max_groups > 0"
/>
+ <option name="setup" value="max_groups"/>
+ <option name="interface" value="{ip(1,1)}"/>
+ <option name="condition" value="max_groups >
0"/>
</options>
</command>
<!-- Change default max_memberhsips -->
-
- <command type="system_config"
option="/proc/sys/net/ipv4/igmp_max_memberships" value="5"
machine_id="1" />
- <command type="test" value="Multicast"
machine_id="1" timeout="30">
+ <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">
<options>
- <option name="setup" value="max_groups" />
- <option name="interface" value="{ip(1,1)}" />
- <option name="condition" value="max_groups == 5"
/>
+ <option name="setup" value="max_groups"/>
+ <option name="interface" value="{ip(1,1)}"/>
+ <option name="condition" value="max_groups == 5"/>
</options>
</command>
</command_sequence>
diff --git a/example_recipes/cmd_sequences/multicast/membership.xml
b/example_recipes/cmd_sequences/multicast/membership.xml
index 3136e2f..b4c63be 100644
--- a/example_recipes/cmd_sequences/multicast/membership.xml
+++ b/example_recipes/cmd_sequences/multicast/membership.xml
@@ -3,46 +3,45 @@
- [1] with one interface
- [2] with one interface
- -->
-
<command_sequence>
<!-- IP_ADD/DROP_MEMBERSHIP sockopt conformance test -->
- <command type="test" value="Multicast"
machine_id="1" timeout="30">
+ <command machine_id="1" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="sockopt_membership" />
- <option name="condition" value="status ==
'pass'" />
+ <option name="setup" value="sockopt_membership"/>
+ <option name="condition" value="status ==
'pass'"/>
</options>
</command>
<!-- 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 type="exec" machine_id="1" value="sleep 1"
/>
- <command type="exec" machine_id="2" value="sleep 1"
/>
+ <command machine_id="1" type="exec" value="sleep
1"/>
+ <command machine_id="2" type="exec" value="sleep
1"/>
- <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
+ <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
<options>
- <option name="setup" value="send_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="delay" value="{$send_delay}" />
- <option name="ttl" value="1" />
- <option name="interface" value="{ip(1,1)}" />
+ <option name="setup" value="send_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="delay" value="{$send_delay}"/>
+ <option name="ttl" value="1"/>
+ <option name="interface" value="{ip(1,1)}"/>
</options>
</command>
- <command type="test" value="Multicast"
machine_id="2" timeout="30">
+ <command machine_id="2" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="recv_membership" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="interface" value="{ip(2,1)}" />
+ <option name="setup" value="recv_membership"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="interface" value="{ip(2,1)}"/>
- <option name="condition" value="packets_received >
0" />
- <option name="condition" value="packets_received_after_drop
== 0" />
+ <option name="condition" value="packets_received >
0"/>
+ <option name="condition" value="packets_received_after_drop
== 0"/>
</options>
</command>
- <command type="wait" machine_id="1" value="1" />
+ <command machine_id="1" type="wait" value="1"/>
</command_sequence>
diff --git a/example_recipes/cmd_sequences/multicast/simple.xml
b/example_recipes/cmd_sequences/multicast/simple.xml
index 7455201..88cddd1 100644
--- a/example_recipes/cmd_sequences/multicast/simple.xml
+++ b/example_recipes/cmd_sequences/multicast/simple.xml
@@ -1,32 +1,31 @@
<!-- Requires: 2 hosts with at least one interface -->
<!-- ['machines'][2]['netconfig'][1]['addresses'][0] -->
-
<command_sequence>
- <command type="exec" machine_id="1" value="sleep 1"
/>
- <command type="exec" machine_id="2" value="sleep 1"
/>
+ <command machine_id="1" type="exec" value="sleep
1"/>
+ <command machine_id="2" type="exec" value="sleep
1"/>
- <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
+ <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
<options>
- <option name="setup" value="send_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="delay" value="{$send_delay}" />
- <option name="interface" value="{ip(1,1)}" />
+ <option name="setup" value="send_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="delay" value="{$send_delay}"/>
+ <option name="interface" value="{ip(1,1)}"/>
</options>
</command>
- <command type="test" value="Multicast"
machine_id="2" timeout="30">
+ <command machine_id="2" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="recv_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="interface" value="{ip(2,1)}" />
+ <option name="setup" value="recv_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="interface" value="{ip(2,1)}"/>
- <option name="condition" value="packets_received >
0" />
+ <option name="condition" value="packets_received >
0"/>
</options>
</command>
- <command type="wait" machine_id="1" value="1" />
+ <command machine_id="1" type="wait" value="1"/>
</command_sequence>
diff --git a/example_recipes/cmd_sequences/multicast/source_membership.xml
b/example_recipes/cmd_sequences/multicast/source_membership.xml
index ffda96f..a659e74 100644
--- a/example_recipes/cmd_sequences/multicast/source_membership.xml
+++ b/example_recipes/cmd_sequences/multicast/source_membership.xml
@@ -6,78 +6,77 @@
<!-- 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>
<!-- IP_ADD/DROP_MEMBERSHIP sockopt conformance test -->
- <command type="test" value="Multicast"
machine_id="1" timeout="30">
+ <command machine_id="1" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="sockopt_source_membership"
/>
- <option name="condition" value="status ==
'pass'" />
+ <option name="setup"
value="sockopt_source_membership"/>
+ <option name="condition" value="status ==
'pass'"/>
</options>
</command>
<!-- 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 type="exec" machine_id="1" value="sleep 1"
/>
- <command type="exec" machine_id="2" value="sleep 1"
/>
+ <command machine_id="1" type="exec" value="sleep
1"/>
+ <command machine_id="2" type="exec" value="sleep
1"/>
- <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
+ <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
<options>
- <option name="setup" value="send_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="delay" value="{$send_delay}" />
- <option name="ttl" value="1" />
- <option name="interface" value="{ip(1,1)}" />
+ <option name="setup" value="send_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="delay" value="{$send_delay}"/>
+ <option name="ttl" value="1"/>
+ <option name="interface" value="{ip(1,1)}"/>
</options>
</command>
- <command type="test" value="Multicast"
machine_id="2" timeout="30">
+ <command machine_id="2" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="recv_source_membership"
/>
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="interface" value="{ip(2,1)}" />
- <option name="source" value="{ip(1,1)}" />
+ <option name="setup"
value="recv_source_membership"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="interface" value="{ip(2,1)}"/>
+ <option name="source" value="{ip(1,1)}"/>
- <option name="condition" value="packets_received >
0" />
- <option name="condition" value="packets_received_after_drop
== 0" />
+ <option name="condition" value="packets_received >
0"/>
+ <option name="condition" value="packets_received_after_drop
== 0"/>
</options>
</command>
- <command type="wait" machine_id="1" value="1" />
+ <command machine_id="1" type="wait" value="1"/>
<!-- Nonexistent source -->
- <command type="exec" machine_id="1" value="sleep 1"
/>
- <command type="exec" machine_id="2" value="sleep 1"
/>
+ <command machine_id="1" type="exec" value="sleep
1"/>
+ <command machine_id="2" type="exec" value="sleep
1"/>
- <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
+ <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
<options>
- <option name="setup" value="send_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="delay" value="{$send_delay}" />
- <option name="ttl" value="1" />
- <option name="interface" value="{ip(1,1)}" />
+ <option name="setup" value="send_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="delay" value="{$send_delay}"/>
+ <option name="ttl" value="1"/>
+ <option name="interface" value="{ip(1,1)}"/>
</options>
</command>
- <command type="test" value="Multicast"
machine_id="2" timeout="30">
+ <command machine_id="2" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="recv_source_membership"
/>
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="interface" value="{ip(2,1)}" />
- <option name="source" value="127.0.0.200" />
+ <option name="setup"
value="recv_source_membership"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="interface" value="{ip(2,1)}"/>
+ <option name="source" value="127.0.0.200"/>
- <option name="condition" value="packets_received == 0"
/>
- <option name="condition" value="packets_received_after_drop
== 0" />
+ <option name="condition" value="packets_received ==
0"/>
+ <option name="condition" value="packets_received_after_drop
== 0"/>
</options>
</command>
- <command type="wait" machine_id="1" value="1" />
+ <command machine_id="1" type="wait" value="1"/>
</command_sequence>
diff --git a/example_recipes/cmd_sequences/multicast/ttl.xml
b/example_recipes/cmd_sequences/multicast/ttl.xml
index d0fe197..72d0759 100644
--- a/example_recipes/cmd_sequences/multicast/ttl.xml
+++ b/example_recipes/cmd_sequences/multicast/ttl.xml
@@ -1,47 +1,45 @@
-<!-- Offline IP_MULTICAST_TTL test -->
-<!-- Requires: 2 hosts
+<!-- Offline IP_MULTICAST_TTL test --><!-- Requires: 2 hosts
- [1] with one interface
- [2] with one interface
- -->
-
<command_sequence>
<!-- IP_MULTICAST_TTL sockopt conformance test -->
- <command type="test" value="Multicast"
machine_id="1" timeout="30">
+ <command machine_id="1" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="sockopt_ttl" />
- <option name="condition" value="status ==
'pass'" />
+ <option name="setup" value="sockopt_ttl"/>
+ <option name="condition" value="status ==
'pass'"/>
</options>
</command>
<!-- IP_MULTICAST_TTL = 0, looped on one host -->
- <command type="exec" machine_id="1" value="sleep 1"
/>
+ <command machine_id="1" type="exec" value="sleep
1"/>
- <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
+ <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
<options>
- <option name="setup" value="send_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="delay" value="{$send_delay}" />
- <option name="ttl" value="0" />
- <option name="loop" value="1" />
- <option name="interface" value="{ip(1,1)}" />
+ <option name="setup" value="send_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="delay" value="{$send_delay}"/>
+ <option name="ttl" value="0"/>
+ <option name="loop" value="1"/>
+ <option name="interface" value="{ip(1,1)}"/>
</options>
</command>
- <command type="test" value="Multicast"
machine_id="1" timeout="30">
+ <command machine_id="1" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="recv_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="interface" value="{ip(1,1)}" />
+ <option name="setup" value="recv_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="interface" value="{ip(1,1)}"/>
- <option name="condition" value="packets_received >
0" />
+ <option name="condition" value="packets_received >
0"/>
</options>
</command>
- <command type="wait" machine_id="1" value="1" />
+ <command machine_id="1" type="wait" value="1"/>
<!-- IP_MULTICAST_TTL = 0 between 2 hosts -->
<!-- KNOWN BUG: according to the specs, packets
@@ -52,61 +50,61 @@
http://www.spinics.net/lists/netdev/msg183704.html
-->
- <command type="exec" machine_id="1" value="sleep 1"
/>
- <command type="exec" machine_id="2" value="sleep 1"
/>
+ <command machine_id="1" type="exec" value="sleep
1"/>
+ <command machine_id="2" type="exec" value="sleep
1"/>
- <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
+ <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
<options>
- <option name="setup" value="send_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="delay" value="{$send_delay}" />
- <option name="ttl" value="0" />
- <option name="interface" value="{ip(1,1)}" />
+ <option name="setup" value="send_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="delay" value="{$send_delay}"/>
+ <option name="ttl" value="0"/>
+ <option name="interface" value="{ip(1,1)}"/>
</options>
</command>
- <command type="test" value="Multicast"
machine_id="2" timeout="30">
+ <command machine_id="2" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="recv_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="interface" value="{ip(2,1)}" />
+ <option name="setup" value="recv_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="interface" value="{ip(2,1)}"/>
- <option name="condition" value="packets_received >
0" />
+ <option name="condition" value="packets_received >
0"/>
</options>
</command>
- <command type="wait" machine_id="1" value="1" />
+ <command machine_id="1" type="wait" value="1"/>
<!-- IP_MULTICAST_TTL = 1 between 2 hosts -->
- <command type="exec" machine_id="1" value="sleep 1"
/>
+ <command machine_id="1" type="exec" value="sleep
1"/>
- <command type="test" value="Multicast"
machine_id="1" timeout="30" bg_id="1">
+ <command bg_id="1" machine_id="1" timeout="30"
type="test" value="Multicast">
<options>
- <option name="setup" value="send_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="delay" value="{$send_delay}" />
- <option name="ttl" value="1" />
- <option name="interface" value="{ip(1,1)}" />
+ <option name="setup" value="send_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="delay" value="{$send_delay}"/>
+ <option name="ttl" value="1"/>
+ <option name="interface" value="{ip(1,1)}"/>
</options>
</command>
- <command type="test" value="Multicast"
machine_id="2" timeout="30">
+ <command machine_id="2" timeout="30" type="test"
value="Multicast">
<options>
- <option name="setup" value="recv_simple" />
- <option name="address" value="{$multicast_group}"
/>
- <option name="port" value="{$port}" />
- <option name="duration" value="{$test_duration}"
/>
- <option name="interface" value="{ip(2,1)}" />
+ <option name="setup" value="recv_simple"/>
+ <option name="address"
value="{$multicast_group}"/>
+ <option name="port" value="{$port}"/>
+ <option name="duration" value="{$test_duration}"/>
+ <option name="interface" value="{ip(2,1)}"/>
- <option name="condition" value="packets_received >
0" />
+ <option name="condition" value="packets_received >
0"/>
</options>
</command>
- <command type="wait" machine_id="1" value="1" />
+ <command machine_id="1" type="wait" value="1"/>
</command_sequence>
diff --git a/example_recipes/cmd_sequences/netcat-sequence.xml
b/example_recipes/cmd_sequences/netcat-sequence.xml
index 12acccc..06113a0 100644
--- a/example_recipes/cmd_sequences/netcat-sequence.xml
+++ b/example_recipes/cmd_sequences/netcat-sequence.xml
@@ -1,38 +1,37 @@
<command_sequence>
- <command type="exec" machine_id="2" value="nc -l 1234"
bg_id="1" />
- <command type="exec" machine_id="1" value="sleep 5"
/>
- <command type="test" machine_id="1"
value="NetCat">
+ <command bg_id="1" machine_id="2" type="exec"
value="nc -l 1234"/>
+ <command machine_id="1" type="exec" value="sleep
5"/>
+ <command machine_id="1" type="test"
value="NetCat">
<options>
- <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][1]['addresses'][0]"
/>
- <option name="port" value="1234" />
+ <option name="addr" value="{ip(2,1)}"/>
+ <option name="port" value="1234"/>
</options>
</command>
- <command type="kill" machine_id="2" value="1" />
+ <command machine_id="2" type="kill" value="1"/>
- <command type="exec" machine_id="2" value="nc -u -l
1234" bg_id="2" />
- <command type="exec" machine_id="1" value="sleep 5"
/>
- <command type="test" machine_id="1"
value="NetCat">
+ <command bg_id="2" machine_id="2" type="exec"
value="nc -u -l 1234"/>
+ <command machine_id="1" type="exec" value="sleep
5"/>
+ <command machine_id="1" type="test"
value="NetCat">
<options>
- <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][1]['addresses'][0]"
/>
- <option name="port" value="1234" />
- <option name="duration" value="10" />
- <option name="stream" value="udp" />
- <option name="ipv" value="4" />
+ <option name="addr" value="{ip(2,1)}"/>
+ <option name="port" value="1234"/>
+ <option name="duration" value="10"/>
+ <option name="stream" value="udp"/>
+ <option name="ipv" value="4"/>
</options>
</command>
- <command type="kill" machine_id="2" value="2" />
+ <command machine_id="2" type="kill" value="2"/>
- <command type="exec" machine_id="2" value="nc -l 1234"
bg_id="3" />
- <command type="exec" machine_id="1" value="sleep 5"
/>
- <command type="test" machine_id="1"
value="NetCat">
+ <command bg_id="3" machine_id="2" type="exec"
value="nc -l 1234"/>
+ <command machine_id="1" type="exec" value="sleep
5"/>
+ <command machine_id="1" type="test"
value="NetCat">
<options>
- <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][1]['addresses'][0]"
/>
- <option name="port" value="1234" />
- <option name="duration" value="10" />
- <option name="stream" value="tcp" />
- <option name="ipv" value="4" />
+ <option name="addr" value="{ip(2,1)}"/>
+ <option name="port" value="1234"/>
+ <option name="duration" value="10"/>
+ <option name="stream" value="tcp"/>
+ <option name="ipv" value="4"/>
</options>
</command>
- <command type="kill" machine_id="2" value="3" />
+ <command machine_id="2" type="kill" value="3"/>
</command_sequence>
-
diff --git a/example_recipes/cmd_sequences/sequence1.xml
b/example_recipes/cmd_sequences/sequence1.xml
index 66755ad..fdb8abd 100644
--- a/example_recipes/cmd_sequences/sequence1.xml
+++ b/example_recipes/cmd_sequences/sequence1.xml
@@ -1,10 +1,10 @@
<command_sequence>
- <command type="exec" value="xeyes" bg_id="1"/>
+ <command bg_id="1" type="exec" value="xeyes"/>
<command type="exec" value="sleep 2"/>
<command type="kill" value="1"/>
- <command type="exec" value="ping
www.redhat.com -c 2"
bg_id="1"/>
+ <command bg_id="1" type="exec" value="ping
www.redhat.com
-c 2"/>
<command type="wait" value="1"/>
- <command type="exec" value="xeyes" bg_id="1"/>
+ <command bg_id="1" type="exec" value="xeyes"/>
<command type="exec" value="sleep 2"/>
<command type="kill" value="1"/>
-</command_sequence>
+</command_sequence>
\ No newline at end of file
diff --git a/example_recipes/machine_configs/config-f14peanut.xml
b/example_recipes/machine_configs/config-f14peanut.xml
index ec9eed2..4d0aac3 100644
--- a/example_recipes/machine_configs/config-f14peanut.xml
+++ b/example_recipes/machine_configs/config-f14peanut.xml
@@ -1,5 +1,5 @@
<netmachineconfig>
<info hostname="10.34.37.141" rootpass="aaa"/>
- <netdevice type="eth" phys_id="1"
hwaddr="00:E0:4C:14:2E:5D"/>
- <netdevice type="eth" phys_id="2"
hwaddr="00:30:4F:7F:FD:30"/>
-</netmachineconfig>
+ <netdevice hwaddr="00:E0:4C:14:2E:5D" phys_id="1"
type="eth"/>
+ <netdevice hwaddr="00:30:4F:7F:FD:30" phys_id="2"
type="eth"/>
+</netmachineconfig>
\ No newline at end of file
diff --git a/example_recipes/net_configs/netconfig1.xml
b/example_recipes/net_configs/netconfig1.xml
index 728590f..ec0ec80 100644
--- a/example_recipes/net_configs/netconfig1.xml
+++ b/example_recipes/net_configs/netconfig1.xml
@@ -1,7 +1,7 @@
<netconfig>
- <netdevice id="1" type="eth" phys_id="1"/>
- <netdevice id="2" type="eth" phys_id="2"/>
- <netdevice id="3" type="bond">
+ <interface id="1" phys_id="1" type="eth"/>
+ <interface id="2" phys_id="2" type="eth"/>
+ <interface id="3" type="bond">
<options>
<option name="mode" value="1"/>
<option name="miimon" value="100"/>
@@ -14,6 +14,5 @@
<addresses>
<address value="192.168.101.1/24"/>
</addresses>
- </netdevice>
-</netconfig>
-
+ </interface>
+</netconfig>
\ No newline at end of file
diff --git a/example_recipes/net_configs/netconfig2.xml
b/example_recipes/net_configs/netconfig2.xml
index c9e8228..ebda58a 100644
--- a/example_recipes/net_configs/netconfig2.xml
+++ b/example_recipes/net_configs/netconfig2.xml
@@ -1,7 +1,7 @@
<netconfig>
- <netdevice id="1" type="eth" phys_id="1"/>
- <netdevice id="2" type="eth" phys_id="2"/>
- <netdevice id="3" type="bridge">
+ <interface id="1" phys_id="1" type="eth"/>
+ <interface id="2" phys_id="2" type="eth"/>
+ <interface id="3" type="bridge">
<slaves>
<slave id="1"/>
<slave id="2"/>
@@ -9,6 +9,5 @@
<addresses>
<address value="192.168.101.1/24"/>
</addresses>
- </netdevice>
-</netconfig>
-
+ </interface>
+</netconfig>
\ No newline at end of file
diff --git a/example_recipes/net_configs/netconfig3.xml
b/example_recipes/net_configs/netconfig3.xml
index cef9529..c32cc01 100644
--- a/example_recipes/net_configs/netconfig3.xml
+++ b/example_recipes/net_configs/netconfig3.xml
@@ -1,7 +1,7 @@
<netconfig>
- <netdevice id="1" type="eth" phys_id="1"/>
- <netdevice id="2" type="eth" phys_id="2"/>
- <netdevice id="3" type="bond">
+ <interface id="1" phys_id="1" type="eth"/>
+ <interface id="2" phys_id="2" type="eth"/>
+ <interface id="3" type="bond">
<options>
<option name="mode" value="1"/>
<option name="miimon" value="100"/>
@@ -10,14 +10,13 @@
<slave id="1"/>
<slave id="2"/>
</slaves>
- </netdevice>
- <netdevice id="4" type="bridge">
+ </interface>
+ <interface id="4" type="bridge">
<slaves>
<slave id="3"/>
</slaves>
<addresses>
<address value="192.168.101.1/24"/>
</addresses>
- </netdevice>
-</netconfig>
-
+ </interface>
+</netconfig>
\ No newline at end of file
diff --git a/example_recipes/net_configs/netconfig4.xml
b/example_recipes/net_configs/netconfig4.xml
index c41feca..ba99a3f 100644
--- a/example_recipes/net_configs/netconfig4.xml
+++ b/example_recipes/net_configs/netconfig4.xml
@@ -1,6 +1,6 @@
<netconfig>
- <netdevice id="1" type="eth" phys_id="1"/>
- <netdevice id="2" type="vlan">
+ <interface id="1" phys_id="1" type="eth"/>
+ <interface id="2" type="vlan">
<options>
<option name="vlan_tci" value="100"/>
</options>
@@ -10,6 +10,5 @@
<addresses>
<address value="192.168.101.1/24"/>
</addresses>
- </netdevice>
-</netconfig>
-
+ </interface>
+</netconfig>
\ No newline at end of file
diff --git a/example_recipes/net_configs/netconfig5.xml
b/example_recipes/net_configs/netconfig5.xml
index d99e2bc..4597c38 100644
--- a/example_recipes/net_configs/netconfig5.xml
+++ b/example_recipes/net_configs/netconfig5.xml
@@ -1,7 +1,7 @@
<netconfig>
- <netdevice id="1" type="eth" phys_id="1"/>
- <netdevice id="2" type="eth" phys_id="2"/>
- <netdevice id="3" type="bond">
+ <interface id="1" phys_id="1" type="eth"/>
+ <interface id="2" phys_id="2" type="eth"/>
+ <interface id="3" type="bond">
<options>
<option name="mode" value="1"/>
<option name="miimon" value="100"/>
@@ -10,8 +10,8 @@
<slave id="1"/>
<slave id="2"/>
</slaves>
- </netdevice>
- <netdevice id="4" type="vlan">
+ </interface>
+ <interface id="4" type="vlan">
<options>
<option name="vlan_tci" value="100"/>
</options>
@@ -21,6 +21,5 @@
<addresses>
<address value="192.168.101.1/24"/>
</addresses>
- </netdevice>
-</netconfig>
-
+ </interface>
+</netconfig>
\ No newline at end of file
diff --git a/example_recipes/net_configs/netconfig6.xml
b/example_recipes/net_configs/netconfig6.xml
index c69bce2..b2af05c 100644
--- a/example_recipes/net_configs/netconfig6.xml
+++ b/example_recipes/net_configs/netconfig6.xml
@@ -1,7 +1,7 @@
<netconfig>
- <netdevice id="1" type="eth" phys_id="1"/>
- <netdevice id="2" type="eth" phys_id="2"/>
- <netdevice id="3" type="bond">
+ <interface id="1" phys_id="1" type="eth"/>
+ <interface id="2" phys_id="2" type="eth"/>
+ <interface id="3" type="bond">
<options>
<option name="mode" value="1"/>
<option name="miimon" value="100"/>
@@ -10,22 +10,21 @@
<slave id="1"/>
<slave id="2"/>
</slaves>
- </netdevice>
- <netdevice id="4" type="vlan">
+ </interface>
+ <interface id="4" type="vlan">
<options>
<option name="vlan_tci" value="100"/>
</options>
<slaves>
<slave id="3"/>
</slaves>
- </netdevice>
- <netdevice id="5" type="bridge">
+ </interface>
+ <interface id="5" type="bridge">
<slaves>
<slave id="4"/>
</slaves>
<addresses>
<address value="192.168.101.1/24"/>
</addresses>
- </netdevice>
-</netconfig>
-
+ </interface>
+</netconfig>
\ No newline at end of file
diff --git a/example_recipes/net_configs/netconfig7.xml
b/example_recipes/net_configs/netconfig7.xml
index b1faa37..ba45e4c 100644
--- a/example_recipes/net_configs/netconfig7.xml
+++ b/example_recipes/net_configs/netconfig7.xml
@@ -1,10 +1,9 @@
<netconfig>
- <netdevice id="1" type="eth" phys_id="1"/>
- <netdevice id="2" type="macvlan"
hwaddr="aa:84:52:e1:09:bc">
+ <interface id="1" phys_id="1" type="eth"/>
+ <interface hwaddr="aa:84:52:e1:09:bc" id="2"
type="macvlan">
<realdev id="1"/>
<addresses>
<address value="192.168.101.1/24"/>
</addresses>
- </netdevice>
-</netconfig>
-
+ </interface>
+</netconfig>
\ No newline at end of file
diff --git a/example_recipes/net_configs/team1.xml
b/example_recipes/net_configs/team1.xml
index 4bebf13..62959c3 100644
--- a/example_recipes/net_configs/team1.xml
+++ b/example_recipes/net_configs/team1.xml
@@ -1,7 +1,7 @@
<netconfig>
- <netdevice id="1" type="eth" phys_id="1" />
- <netdevice id="2" type="eth" phys_id="2" />
- <netdevice id="5" type="team">
+ <interface id="1" phys_id="1" type="eth"/>
+ <interface id="2" phys_id="2" type="eth"/>
+ <interface id="5" type="team">
<options>
<!-- Team device name can be omitted from teamd config,
because it will be overridden by LNST anyway. -->
@@ -13,16 +13,16 @@
</option>
</options>
<slaves>
- <slave id="1" />
- <slave id="2" />
+ <slave id="1"/>
+ <slave id="2"/>
</slaves>
<addresses>
- <address value="192.168.122.200/24" />
+ <address value="192.168.122.200/24"/>
</addresses>
- </netdevice>
- <netdevice id="3" type="eth" phys_id="3" />
- <netdevice id="4" type="eth" phys_id="4" />
- <netdevice id="6" type="team">
+ </interface>
+ <interface id="3" phys_id="3" type="eth"/>
+ <interface id="4" phys_id="4" type="eth"/>
+ <interface id="6" type="team">
<options>
<option name="teamd_config">
{
@@ -32,11 +32,11 @@
</option>
</options>
<slaves>
- <slave id="3" />
- <slave id="4" />
+ <slave id="3"/>
+ <slave id="4"/>
</slaves>
<addresses>
- <address value="192.168.122.210/24" />
+ <address value="192.168.122.210/24"/>
</addresses>
- </netdevice>
+ </interface>
</netconfig>
diff --git a/example_recipes/packet_assert.xml b/example_recipes/packet_assert.xml
index 11d20b7..d777d5e 100644
--- a/example_recipes/packet_assert.xml
+++ b/example_recipes/packet_assert.xml
@@ -1,15 +1,15 @@
<nettestrecipe>
<command_sequence>
- <command type="test" value="PacketAssert"
bg_id="1">
+ <command bg_id="1" type="test"
value="PacketAssert">
<options>
- <option name="interface" value="br0" />
- <option name="filter" value="" />
- <option name="grep_for" value="IP" />
- <option name="min" value="1" />
- <option name="max" value="5" />
+ <option name="interface" value="br0"/>
+ <option name="filter" value=""/>
+ <option name="grep_for" value="IP"/>
+ <option name="min" value="1"/>
+ <option name="max" value="5"/>
</options>
</command>
- <command type="exec" value="sleep 3" />
- <command type="intr" value="1" />
+ <command type="exec" value="sleep 3"/>
+ <command type="intr" value="1"/>
</command_sequence>
-</nettestrecipe>
+</nettestrecipe>
\ No newline at end of file
diff --git a/example_recipes/recipe1.xml b/example_recipes/recipe1.xml
index 07cde2d..dc4e086 100644
--- a/example_recipes/recipe1.xml
+++ b/example_recipes/recipe1.xml
@@ -7,28 +7,27 @@
<machine id="2">
<netmachineconfig>
<info hostname="junkbox.lab.eng.brq.redhat.com"/>
- <netdevice type="eth" phys_id="1"
hwaddr="00:10:18:61:35:9B"/>
+ <netdevice hwaddr="00:10:18:61:35:9B" phys_id="1"
type="eth"/>
</netmachineconfig>
<netconfig>
- <netdevice id="1" type="eth" phys_id="1">
+ <interface id="1" phys_id="1" type="eth">
<addresses>
<address value="192.168.101.2/24"/>
</addresses>
- </netdevice>
+ </interface>
</netconfig>
</machine>
</machines>
<command_sequence>
<command type="exec" value="sleep 4"/>
- <command type="test" machine_id="1" value="IcmpPing"
timeout="30">
+ <command machine_id="1" timeout="30" type="test"
value="IcmpPing">
<options>
- <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][1]['addresses'][0]"/>
- <option name="count" value="40"/>
- <option name="interval" value="0.2"/>
- <option name="limit_rate" value="95"/>
+ <option name="addr"
value="{$recipe['machines'][2]['netconfig'][1]['addresses'][0]}"/>
+ <option name="count" value="40"/>
+ <option name="interval" value="0.2"/>
+ <option name="limit_rate" value="95"/>
</options>
</command>
</command_sequence>
</nettestrecipe>
-
diff --git a/example_recipes/recipe2.xml b/example_recipes/recipe2.xml
index b54a574..d8a538a 100644
--- a/example_recipes/recipe2.xml
+++ b/example_recipes/recipe2.xml
@@ -3,17 +3,17 @@
<machine id="1">
<netmachineconfig>
<info hostname="10.34.37.141" rootpass="aaa"/>
- <netdevice type="eth" phys_id="1"
hwaddr="00:E0:4C:14:2E:5D"/>
- <netdevice type="eth" phys_id="2"
hwaddr="00:30:4F:7F:FD:30"/>
+ <netdevice hwaddr="00:E0:4C:14:2E:5D" phys_id="1"
type="eth"/>
+ <netdevice hwaddr="00:30:4F:7F:FD:30" phys_id="2"
type="eth"/>
</netmachineconfig>
<netconfig>
- <netdevice id="1" type="eth" phys_id="1"/>
- <netdevice id="2" type="eth" phys_id="2"/>
- <netdevice id="3" type="bond">
+ <interface id="1" phys_id="1" type="eth"/>
+ <interface id="2" phys_id="2" type="eth"/>
+ <interface id="3" type="bond">
<options>
- <option name="mode" value="1"/>
- <option name="miimon" value="100"/>
- <option name="primary" value="2"/>
+ <option name="mode" value="1"/>
+ <option name="miimon" value="100"/>
+ <option name="primary" value="2"/>
</options>
<slaves>
<slave id="1"/>
@@ -22,22 +22,21 @@
<addresses>
<address value="192.168.101.1/24"/>
</addresses>
- </netdevice>
+ </interface>
</netconfig>
</machine>
<machine id="2">
<netmachineconfig>
<info hostname="junkbox.lab.eng.brq.redhat.com"/>
- <netdevice type="eth" phys_id="1"
hwaddr="00:13:20:F7:73:1B"/>
+ <netdevice hwaddr="00:13:20:F7:73:1B" phys_id="1"
type="eth"/>
</netmachineconfig>
<netconfig>
- <netdevice id="1" type="eth" phys_id="1">
+ <interface id="1" phys_id="1" type="eth">
<addresses>
<address value="192.168.101.2/24"/>
</addresses>
- </netdevice>
+ </interface>
</netconfig>
</machine>
</machines>
</nettestrecipe>
-
diff --git a/example_recipes/recipe3.xml b/example_recipes/recipe3.xml
index bd28e53..ef69e48 100644
--- a/example_recipes/recipe3.xml
+++ b/example_recipes/recipe3.xml
@@ -1,13 +1,12 @@
<nettestrecipe>
<command_sequence>
- <command type="exec" value="xeyes" bg_id="1"/>
+ <command bg_id="1" type="exec" value="xeyes"/>
<command type="exec" value="sleep 2"/>
<command type="kill" value="1"/>
- <command type="exec" value="ping
www.redhat.com -c 2"
bg_id="1"/>
+ <command bg_id="1" type="exec" value="ping
www.redhat.com
-c 2"/>
<command type="wait" value="1"/>
- <command type="exec" value="xeyes" bg_id="1"/>
+ <command bg_id="1" type="exec" value="xeyes"/>
<command type="exec" value="sleep 2"/>
<command type="kill" value="1"/>
</command_sequence>
-</nettestrecipe>
-
+</nettestrecipe>
\ No newline at end of file
diff --git a/example_recipes/recipe4.xml b/example_recipes/recipe4.xml
index 2ed2b27..ea0a453 100644
--- a/example_recipes/recipe4.xml
+++ b/example_recipes/recipe4.xml
@@ -1,4 +1,3 @@
<nettestrecipe>
<command_sequence source="cmd_sequences/sequence1.xml"/>
-</nettestrecipe>
-
+</nettestrecipe>
\ No newline at end of file
diff --git a/example_recipes/recipe5.xml b/example_recipes/recipe5.xml
index 504c651..3cc4ec7 100644
--- a/example_recipes/recipe5.xml
+++ b/example_recipes/recipe5.xml
@@ -1,14 +1,13 @@
<nettestrecipe>
<command_sequence>
- <command type="test" value="IcmpPing"
timeout="30">
+ <command timeout="30" type="test"
value="IcmpPing">
<options>
<option name="addr" value="www.redhat.com"/>
- <option name="count" value="40"/>
- <option name="interval" value="0.2"/>
- <option name="limit_rate" value="95"/>
+ <option name="count" value="40"/>
+ <option name="interval" value="0.2"/>
+ <option name="limit_rate" value="95"/>
</options>
</command>
<command type="test" value="DummyFailing"/>
</command_sequence>
</nettestrecipe>
-
diff --git a/example_recipes/recipe6.xml b/example_recipes/recipe6.xml
index 4820a10..2115fec 100644
--- a/example_recipes/recipe6.xml
+++ b/example_recipes/recipe6.xml
@@ -6,15 +6,14 @@
</machine>
</machines>
<command_sequence>
- <command machine_id="1" type="test" value="IcmpPing"
timeout="30">
+ <command machine_id="1" timeout="30" type="test"
value="IcmpPing">
<options>
<option name="addr" value="www.redhat.com"/>
- <option name="count" value="40"/>
- <option name="interval" value="0.2"/>
- <option name="limit_rate" value="95"/>
+ <option name="count" value="40"/>
+ <option name="interval" value="0.2"/>
+ <option name="limit_rate" value="95"/>
</options>
</command>
<command machine_id="1" type="test"
value="DummyFailing"/>
</command_sequence>
</nettestrecipe>
-
diff --git a/example_recipes/rpazdera-multicast.xml
b/example_recipes/rpazdera-multicast.xml
index 192e462..9f1d68c 100644
--- a/example_recipes/rpazdera-multicast.xml
+++ b/example_recipes/rpazdera-multicast.xml
@@ -3,52 +3,52 @@
<machines>
<machine id="1">
<netmachineconfig>
- <info hostname="10.34.1.120" rootpass="redhat"
/>
- <netdevice id="1" type="eth" phys_id="1"
hwaddr="52:54:00:2E:D5:A8"/>
- <netdevice id="2" type="eth" phys_id="2"
hwaddr="52:54:00:90:23:0B"/>
+ <info hostname="10.34.1.120"
rootpass="redhat"/>
+ <netdevice hwaddr="52:54:00:2E:D5:A8" id="1"
phys_id="1" type="eth"/>
+ <netdevice hwaddr="52:54:00:90:23:0B" id="2"
phys_id="2" type="eth"/>
</netmachineconfig>
<netconfig>
- <netdevice id="1" type="eth"
phys_id="1">
+ <interface id="1" phys_id="1"
type="eth">
<addresses>
- <address value="192.168.122.225/24" />
+ <address value="192.168.122.225/24"/>
</addresses>
- </netdevice>
- <netdevice id="2" type="eth"
phys_id="2">
+ </interface>
+ <interface id="2" phys_id="2"
type="eth">
<addresses>
- <address value="192.168.122.239/24" />
+ <address value="192.168.122.239/24"/>
</addresses>
- </netdevice>
+ </interface>
</netconfig>
</machine>
<machine id="2">
<netmachineconfig>
- <info hostname="10.34.1.171" rootpass="redhat"
/>
- <netdevice id="1" type="eth" phys_id="1"
hwaddr="52:54:00:12:DF:5A"/>
+ <info hostname="10.34.1.171"
rootpass="redhat"/>
+ <netdevice hwaddr="52:54:00:12:DF:5A" id="1"
phys_id="1" type="eth"/>
</netmachineconfig>
<netconfig>
- <netdevice id="1" type="eth"
phys_id="1">
+ <interface id="1" phys_id="1"
type="eth">
<addresses>
- <address value="192.168.122.200/24" />
+ <address value="192.168.122.200/24"/>
</addresses>
- </netdevice>
+ </interface>
</netconfig>
</machine>
</machines>
<define>
- <alias name="multicast_group" value="239.1.2.3" />
- <alias name="port" value="1337" />
- <alias name="test_duration" value="10" />
- <alias name="send_delay" value="0.1" />
- <alias name="nonexistent_ip" value="127.0.0.200" />
+ <alias name="multicast_group" value="239.1.2.3"/>
+ <alias name="port" value="1337"/>
+ <alias name="test_duration" value="10"/>
+ <alias name="send_delay" value="0.1"/>
+ <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" />
+ <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"/>
</nettestrecipe>
--
1.7.7.6