[PATCH 1/2] examle_recipes: Remove outdated example recipes

[Radek Pazdera]

All the recipes from the examples directory are outdated due to a
large amount of recent changes in the XML structure.

This patch removes them all.

Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com&gt;
---
 example_recipes/cmd_sequences/memory_pressure.xml  |   22 ----
 example_recipes/cmd_sequences/netcat-sequence.xml  |   37 ------
 example_recipes/cmd_sequences/sequence1.xml        |   10 --
 .../machine_configs/config-f14peanut.xml           |    5 -
 .../jpirko_test/machine_configs/config-junkbox.xml |    5 -
 .../jpirko_test/machine_configs/swswitch.xml       |   11 --
 .../net_configs_f14peanut/bond_arp-bridge-vlan.xml |   32 -----
 .../net_configs_f14peanut/bond_arp-bridge.xml      |   24 ----
 .../net_configs_f14peanut/bond_arp-vlan.xml        |   27 ----
 .../jpirko_test/net_configs_f14peanut/bond_arp.xml |   19 ---
 .../bond_arp_val-bridge-vlan.xml                   |   33 -----
 .../net_configs_f14peanut/bond_arp_val-bridge.xml  |   25 ----
 .../net_configs_f14peanut/bond_arp_val-vlan.xml    |   28 -----
 .../net_configs_f14peanut/bond_arp_val.xml         |   20 ---
 .../bond_miimon-bridge-vlan.xml                    |   32 -----
 .../net_configs_f14peanut/bond_miimon-bridge.xml   |   24 ----
 .../net_configs_f14peanut/bond_miimon-vlan.xml     |   30 -----
 .../net_configs_f14peanut/bond_miimon.xml          |   19 ---
 .../jpirko_test/net_configs_f14peanut/vlan.xml     |   15 ---
 .../jpirko_test/net_configs_junkbox/netconfig1.xml |    8 --
 .../jpirko_test/net_configs_junkbox/netconfig2.xml |   15 ---
 example_recipes/jpirko_test/recipe001.xml          |   14 --
 example_recipes/jpirko_test/recipe002.xml          |   14 --
 example_recipes/jpirko_test/recipe003.xml          |   14 --
 example_recipes/jpirko_test/recipe004.xml          |   14 --
 example_recipes/jpirko_test/recipe005.xml          |   14 --
 example_recipes/jpirko_test/recipe006.xml          |   14 --
 example_recipes/jpirko_test/recipe007.xml          |   14 --
 example_recipes/jpirko_test/recipe008.xml          |   14 --
 example_recipes/jpirko_test/recipe009.xml          |   14 --
 example_recipes/jpirko_test/recipe010.xml          |   14 --
 example_recipes/jpirko_test/recipe011.xml          |   14 --
 example_recipes/jpirko_test/recipe012.xml          |   14 --
 example_recipes/jpirko_test/recipe013.xml          |   14 --
 example_recipes/jpirko_test/recipe_brpktgen.xml    |   53 --------
 .../jpirko_test/sequences/sequence1.xml            |   12 --
 .../jpirko_test/sequences/sequence2.xml            |   12 --
 .../jpirko_test/sequences/sequence3.xml            |   12 --
 .../jpirko_test/sequences/sequence4.xml            |   12 --
 .../jpirko_test/switch_configs/dummy_switch.xml    |   11 --
 .../bov-pktgen-sanitycheck.xml                     |   72 -----------
 .../vlan-iperf-tcp-udp-test1.xml                   |  129 --------------------
 .../rhel5/bond-tests/bond-iperf-test-mode0.xml     |   84 -------------
 .../rhel5/bond-tests/bond-iperf-test-mode1.xml     |   84 -------------
 .../rhel5/bond-tests/bond-iperf-test-mode5.xml     |   84 -------------
 .../rhel5/bond-tests/bond-netcat-iperf-test0.xml   |  116 ------------------
 .../rhel5/bond-tests/bond-netcat-iperf-test1.xml   |  116 ------------------
 .../rhel5/bond-tests/bond-netcat-iperf-test5.xml   |  116 ------------------
 .../rhel5/bond-tests/bond-sctp-test-mode0.xml      |   75 -----------
 .../rhel5/bond-tests/bond-sctp-test-mode1.xml      |   75 -----------
 .../rhel5/bond-tests/bond-sctp-test-mode5.xml      |   75 -----------
 .../network-stack-tests/rhel5/rhel58-guest1.xml    |    7 -
 .../network-stack-tests/rhel5/rhel58-guest2.xml    |    7 -
 .../rhel5/vlan-tests/vlan-iperf-tcp-udp-test1.xml  |  106 ----------------
 .../rhel5/vlan-tests/vlan-sctp-test1.xml           |   71 -----------
 .../bond-over-vlan/bov-pktgen-sanitycheck.xml      |   77 ------------
 .../rhel6/bond-tests/bond-iperf-test-mode0.xml     |   84 -------------
 .../rhel6/bond-tests/bond-iperf-test-mode1.xml     |   84 -------------
 .../rhel6/bond-tests/bond-iperf-test-mode5.xml     |   84 -------------
 .../rhel6/bond-tests/bond-netcat-iperf-test0.xml   |  117 ------------------
 .../rhel6/bond-tests/bond-netcat-iperf-test1.xml   |   97 ---------------
 .../rhel6/bond-tests/bond-netcat-iperf-test5.xml   |   97 ---------------
 .../rhel6/bond-tests/bond-sctp-test-mode0.xml      |   75 -----------
 .../rhel6/bond-tests/bond-sctp-test-mode1.xml      |   75 -----------
 .../rhel6/bond-tests/bond-sctp-test-mode5.xml      |   75 -----------
 .../network-stack-tests/rhel6/rhel62-guest1.xml    |    5 -
 .../network-stack-tests/rhel6/rhel62-guest2.xml    |    5 -
 .../rhel6/vlan-tests/vlan-sctp-test1.xml           |   71 -----------
 .../rhel6/vlan-tests/vlan-test1.xml                |  104 ----------------
 .../machine_configs/config-f14peanut.xml           |    5 -
 example_recipes/net_configs/netconfig1.xml         |   18 ---
 example_recipes/net_configs/netconfig2.xml         |   13 --
 example_recipes/net_configs/netconfig3.xml         |   22 ----
 example_recipes/net_configs/netconfig4.xml         |   14 --
 example_recipes/net_configs/netconfig5.xml         |   25 ----
 example_recipes/net_configs/netconfig6.xml         |   30 -----
 example_recipes/net_configs/netconfig7.xml         |    9 --
 example_recipes/net_configs/team1.xml              |   42 -------
 example_recipes/packet_assert.xml                  |   15 ---
 example_recipes/recipe1.xml                        |   33 -----
 example_recipes/recipe2.xml                        |   42 -------
 example_recipes/recipe3.xml                        |   12 --
 example_recipes/recipe4.xml                        |    3 -
 example_recipes/recipe5.xml                        |   13 --
 example_recipes/recipe6.xml                        |   19 ---
 example_recipes/recipe_set1/recipe4.xml            |    1 -
 example_recipes/recipe_set1/recipe5.xml            |    1 -
 example_recipes/recipe_set1/recipe6.xml            |    1 -
 88 files changed, 0 insertions(+), 3320 deletions(-)
 delete mode 100644 example_recipes/cmd_sequences/memory_pressure.xml
 delete mode 100644 example_recipes/cmd_sequences/netcat-sequence.xml
 delete mode 100644 example_recipes/cmd_sequences/sequence1.xml
 delete mode 100644 example_recipes/jpirko_test/machine_configs/config-f14peanut.xml
 delete mode 100644 example_recipes/jpirko_test/machine_configs/config-junkbox.xml
 delete mode 100644 example_recipes/jpirko_test/machine_configs/swswitch.xml
 delete mode 100644
example_recipes/jpirko_test/net_configs_f14peanut/bond_arp-bridge-vlan.xml
 delete mode 100644 example_recipes/jpirko_test/net_configs_f14peanut/bond_arp-bridge.xml
 delete mode 100644 example_recipes/jpirko_test/net_configs_f14peanut/bond_arp-vlan.xml
 delete mode 100644 example_recipes/jpirko_test/net_configs_f14peanut/bond_arp.xml
 delete mode 100644
example_recipes/jpirko_test/net_configs_f14peanut/bond_arp_val-bridge-vlan.xml
 delete mode 100644
example_recipes/jpirko_test/net_configs_f14peanut/bond_arp_val-bridge.xml
 delete mode 100644
example_recipes/jpirko_test/net_configs_f14peanut/bond_arp_val-vlan.xml
 delete mode 100644 example_recipes/jpirko_test/net_configs_f14peanut/bond_arp_val.xml
 delete mode 100644
example_recipes/jpirko_test/net_configs_f14peanut/bond_miimon-bridge-vlan.xml
 delete mode 100644
example_recipes/jpirko_test/net_configs_f14peanut/bond_miimon-bridge.xml
 delete mode 100644
example_recipes/jpirko_test/net_configs_f14peanut/bond_miimon-vlan.xml
 delete mode 100644 example_recipes/jpirko_test/net_configs_f14peanut/bond_miimon.xml
 delete mode 100644 example_recipes/jpirko_test/net_configs_f14peanut/vlan.xml
 delete mode 100644 example_recipes/jpirko_test/net_configs_junkbox/netconfig1.xml
 delete mode 100644 example_recipes/jpirko_test/net_configs_junkbox/netconfig2.xml
 delete mode 100644 example_recipes/jpirko_test/recipe001.xml
 delete mode 100644 example_recipes/jpirko_test/recipe002.xml
 delete mode 100644 example_recipes/jpirko_test/recipe003.xml
 delete mode 100644 example_recipes/jpirko_test/recipe004.xml
 delete mode 100644 example_recipes/jpirko_test/recipe005.xml
 delete mode 100644 example_recipes/jpirko_test/recipe006.xml
 delete mode 100644 example_recipes/jpirko_test/recipe007.xml
 delete mode 100644 example_recipes/jpirko_test/recipe008.xml
 delete mode 100644 example_recipes/jpirko_test/recipe009.xml
 delete mode 100644 example_recipes/jpirko_test/recipe010.xml
 delete mode 100644 example_recipes/jpirko_test/recipe011.xml
 delete mode 100644 example_recipes/jpirko_test/recipe012.xml
 delete mode 100644 example_recipes/jpirko_test/recipe013.xml
 delete mode 100644 example_recipes/jpirko_test/recipe_brpktgen.xml
 delete mode 100644 example_recipes/jpirko_test/sequences/sequence1.xml
 delete mode 100644 example_recipes/jpirko_test/sequences/sequence2.xml
 delete mode 100644 example_recipes/jpirko_test/sequences/sequence3.xml
 delete mode 100644 example_recipes/jpirko_test/sequences/sequence4.xml
 delete mode 100644 example_recipes/jpirko_test/switch_configs/dummy_switch.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel5/bond-over-vlan-tests/bov-pktgen-sanitycheck.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel5/bond-over-vlan-tests/vlan-iperf-tcp-udp-test1.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-iperf-test-mode0.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-iperf-test-mode1.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-iperf-test-mode5.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-netcat-iperf-test0.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-netcat-iperf-test1.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-netcat-iperf-test5.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-sctp-test-mode0.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-sctp-test-mode1.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-sctp-test-mode5.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel5/rhel58-guest1.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel5/rhel58-guest2.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel5/vlan-tests/vlan-iperf-tcp-udp-test1.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel5/vlan-tests/vlan-sctp-test1.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel6/bond-over-vlan/bov-pktgen-sanitycheck.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-iperf-test-mode0.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-iperf-test-mode1.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-iperf-test-mode5.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-netcat-iperf-test0.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-netcat-iperf-test1.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-netcat-iperf-test5.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-sctp-test-mode0.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-sctp-test-mode1.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-sctp-test-mode5.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel6/rhel62-guest1.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel6/rhel62-guest2.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel6/vlan-tests/vlan-sctp-test1.xml
 delete mode 100644
example_recipes/jtluka_test/network-stack-tests/rhel6/vlan-tests/vlan-test1.xml
 delete mode 100644 example_recipes/machine_configs/config-f14peanut.xml
 delete mode 100644 example_recipes/net_configs/netconfig1.xml
 delete mode 100644 example_recipes/net_configs/netconfig2.xml
 delete mode 100644 example_recipes/net_configs/netconfig3.xml
 delete mode 100644 example_recipes/net_configs/netconfig4.xml
 delete mode 100644 example_recipes/net_configs/netconfig5.xml
 delete mode 100644 example_recipes/net_configs/netconfig6.xml
 delete mode 100644 example_recipes/net_configs/netconfig7.xml
 delete mode 100644 example_recipes/net_configs/team1.xml
 delete mode 100644 example_recipes/packet_assert.xml
 delete mode 100644 example_recipes/recipe1.xml
 delete mode 100644 example_recipes/recipe2.xml
 delete mode 100644 example_recipes/recipe3.xml
 delete mode 100644 example_recipes/recipe4.xml
 delete mode 100644 example_recipes/recipe5.xml
 delete mode 100644 example_recipes/recipe6.xml
 delete mode 120000 example_recipes/recipe_set1/recipe4.xml
 delete mode 120000 example_recipes/recipe_set1/recipe5.xml
 delete mode 120000 example_recipes/recipe_set1/recipe6.xml

diff --git a/example_recipes/cmd_sequences/memory_pressure.xml
b/example_recipes/cmd_sequences/memory_pressure.xml
deleted file mode 100644
index f1d1678..0000000
--- a/example_recipes/cmd_sequences/memory_pressure.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<command_sequence>
-    <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="duration" value="3600"/>
-            </options>
-    </command>
-    <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="duration" value="120"/>
-            </options>
-    </command>
-    <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/netcat-sequence.xml
b/example_recipes/cmd_sequences/netcat-sequence.xml
deleted file mode 100644
index 06113a0..0000000
--- a/example_recipes/cmd_sequences/netcat-sequence.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<command_sequence>
-  <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 name="addr" value="{ip(2,1)}"/>
-      <option name="port" value="1234"/>
-    </options>
-  </command>
-  <command machine_id="2" type="kill" value="1"/>
-
-  <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 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 machine_id="2" type="kill" value="2"/>
-
-  <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 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 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
deleted file mode 100644
index fdb8abd..0000000
--- a/example_recipes/cmd_sequences/sequence1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<command_sequence>
-  <command bg_id="1" type="exec" value="xeyes"/>
-  <command type="exec" value="sleep 2"/>
-  <command type="kill" value="1"/>
-  <command bg_id="1" type="exec" value="ping www.redhat.com
-c 2"/>
-  <command type="wait" value="1"/>
-  <command bg_id="1" type="exec" value="xeyes"/>
-  <command type="exec" value="sleep 2"/>
-  <command type="kill" value="1"/>
-</command_sequence>
\ No newline at end of file
diff --git a/example_recipes/jpirko_test/machine_configs/config-f14peanut.xml
b/example_recipes/jpirko_test/machine_configs/config-f14peanut.xml
deleted file mode 100644
index ec9eed2..0000000
--- a/example_recipes/jpirko_test/machine_configs/config-f14peanut.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<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>
diff --git a/example_recipes/jpirko_test/machine_configs/config-junkbox.xml
b/example_recipes/jpirko_test/machine_configs/config-junkbox.xml
deleted file mode 100644
index d2f658e..0000000
--- a/example_recipes/jpirko_test/machine_configs/config-junkbox.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<netmachineconfig>
-  <info hostname="junkbox.lab.eng.brq.redhat.com"/>
-  <netdevice type="eth" phys_id="1"
hwaddr="00:10:18:61:35:9B"/>
-  <netdevice type="eth" phys_id="2"
hwaddr="00:10:18:48:15:FA"/>
-</netmachineconfig>
diff --git a/example_recipes/jpirko_test/machine_configs/swswitch.xml
b/example_recipes/jpirko_test/machine_configs/swswitch.xml
deleted file mode 100644
index 02276bd..0000000
--- a/example_recipes/jpirko_test/machine_configs/swswitch.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<netmachineconfig>
-  <info hostname="127.0.0.1"/>
-  <netdevice type="eth" phys_id="1"
hwaddr="00:aa:bb:cc:dd:01"/>
-  <netdevice type="eth" phys_id="2"
hwaddr="00:aa:bb:cc:dd:02"/>
-  <netdevice type="eth" phys_id="3"
hwaddr="00:aa:bb:cc:dd:03"/>
-  <netdevice type="eth" phys_id="4"
hwaddr="00:aa:bb:cc:dd:04"/>
-  <netdevice type="eth" phys_id="5"
hwaddr="00:aa:bb:cc:dd:05"/>
-  <netdevice type="eth" phys_id="6"
hwaddr="00:aa:bb:cc:dd:06"/>
-  <netdevice type="eth" phys_id="7"
hwaddr="00:aa:bb:cc:dd:07"/>
-  <netdevice type="eth" phys_id="8"
hwaddr="00:aa:bb:cc:dd:08"/>
-</netmachineconfig>
diff --git a/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp-bridge-vlan.xml
b/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp-bridge-vlan.xml
deleted file mode 100644
index 4eebbda..0000000
--- a/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp-bridge-vlan.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<netconfig>
-  <netdevice id="1" type="eth" phys_id="1"/>
-  <netdevice id="2" type="eth" phys_id="2"/>
-  <netdevice id="3" type="bond">
-    <options>
-    	<option name="mode" value="1"/>
-	<option name="arp_interval" value="100"/>
-	<option name="arp_ip_target" value="+192.168.102.2"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-      <slave id="2"/>
-    </slaves>
-  </netdevice>
-  <netdevice id="4" type="bridge">
-    <slaves>
-      <slave id="3"/>
-    </slaves>
-  </netdevice>
-  <netdevice id="5" type="vlan">
-    <options>
-      <option name="vlan_tci" value="100"/>
-    </options>
-    <slaves>
-      <slave id="4"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.102.1/24"/>
-    </addresses>
-  </netdevice>
-</netconfig>
-
diff --git a/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp-bridge.xml
b/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp-bridge.xml
deleted file mode 100644
index 5af5594..0000000
--- a/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp-bridge.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<netconfig>
-  <netdevice id="1" type="eth" phys_id="1"/>
-  <netdevice id="2" type="eth" phys_id="2"/>
-  <netdevice id="3" type="bond">
-    <options>
-    	<option name="mode" value="1"/>
-	<option name="arp_interval" value="100"/>
-	<option name="arp_ip_target" value="+192.168.101.2"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-      <slave id="2"/>
-    </slaves>
-  </netdevice>
-  <netdevice id="4" type="bridge">
-    <slaves>
-      <slave id="3"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.101.1/24"/>
-    </addresses>
-  </netdevice>
-</netconfig>
-
diff --git a/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp-vlan.xml
b/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp-vlan.xml
deleted file mode 100644
index 1811761..0000000
--- a/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp-vlan.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<netconfig>
-  <netdevice id="1" type="eth" phys_id="1"/>
-  <netdevice id="2" type="eth" phys_id="2"/>
-  <netdevice id="3" type="bond">
-    <options>
-    	<option name="mode" value="1"/>
-	<option name="arp_interval" value="100"/>
-	<option name="arp_ip_target" value="+192.168.102.2"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-      <slave id="2"/>
-    </slaves>
-  </netdevice>
-  <netdevice id="4" type="vlan">
-    <options>
-      <option name="vlan_tci" value="100"/>
-    </options>
-    <slaves>
-      <slave id="3"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.102.1/24"/>
-    </addresses>
-  </netdevice>
-</netconfig>
-
diff --git a/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp.xml
b/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp.xml
deleted file mode 100644
index cd835a3..0000000
--- a/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<netconfig>
-  <netdevice id="1" type="eth" phys_id="1"/>
-  <netdevice id="2" type="eth" phys_id="2"/>
-  <netdevice id="3" type="bond">
-    <options>
-    	<option name="mode" value="1"/>
-	<option name="arp_interval" value="100"/>
-	<option name="arp_ip_target" value="+192.168.101.2"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-      <slave id="2"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.101.1/24"/>
-    </addresses>
-  </netdevice>
-</netconfig>
-
diff --git
a/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp_val-bridge-vlan.xml
b/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp_val-bridge-vlan.xml
deleted file mode 100644
index 2413eae..0000000
--- a/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp_val-bridge-vlan.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<netconfig>
-  <netdevice id="1" type="eth" phys_id="1"/>
-  <netdevice id="2" type="eth" phys_id="2"/>
-  <netdevice id="3" type="bond">
-    <options>
-    	<option name="mode" value="1"/>
-	<option name="arp_interval" value="100"/>
-	<option name="arp_ip_target" value="+192.168.102.2"/>
-	<option name="arp_validate" value="1"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-      <slave id="2"/>
-    </slaves>
-  </netdevice>
-  <netdevice id="4" type="bridge">
-    <slaves>
-      <slave id="3"/>
-    </slaves>
-  </netdevice>
-  <netdevice id="5" type="vlan">
-    <options>
-      <option name="vlan_tci" value="100"/>
-    </options>
-    <slaves>
-      <slave id="4"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.102.1/24"/>
-    </addresses>
-  </netdevice>
-</netconfig>
-
diff --git a/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp_val-bridge.xml
b/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp_val-bridge.xml
deleted file mode 100644
index 901c700..0000000
--- a/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp_val-bridge.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<netconfig>
-  <netdevice id="1" type="eth" phys_id="1"/>
-  <netdevice id="2" type="eth" phys_id="2"/>
-  <netdevice id="3" type="bond">
-    <options>
-    	<option name="mode" value="1"/>
-	<option name="arp_interval" value="100"/>
-	<option name="arp_ip_target" value="+192.168.101.2"/>
-	<option name="arp_validate" value="1"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-      <slave id="2"/>
-    </slaves>
-  </netdevice>
-  <netdevice id="4" type="bridge">
-    <slaves>
-      <slave id="3"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.101.1/24"/>
-    </addresses>
-  </netdevice>
-</netconfig>
-
diff --git a/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp_val-vlan.xml
b/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp_val-vlan.xml
deleted file mode 100644
index ffad144..0000000
--- a/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp_val-vlan.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<netconfig>
-  <netdevice id="1" type="eth" phys_id="1"/>
-  <netdevice id="2" type="eth" phys_id="2"/>
-  <netdevice id="3" type="bond">
-    <options>
-    	<option name="mode" value="1"/>
-	<option name="arp_interval" value="100"/>
-	<option name="arp_ip_target" value="+192.168.102.2"/>
-	<option name="arp_validate" value="1"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-      <slave id="2"/>
-    </slaves>
-  </netdevice>
-  <netdevice id="4" type="vlan">
-    <options>
-      <option name="vlan_tci" value="100"/>
-    </options>
-    <slaves>
-      <slave id="3"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.102.1/24"/>
-    </addresses>
-  </netdevice>
-</netconfig>
-
diff --git a/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp_val.xml
b/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp_val.xml
deleted file mode 100644
index 16d310b..0000000
--- a/example_recipes/jpirko_test/net_configs_f14peanut/bond_arp_val.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<netconfig>
-  <netdevice id="1" type="eth" phys_id="1"/>
-  <netdevice id="2" type="eth" phys_id="2"/>
-  <netdevice id="3" type="bond">
-    <options>
-    	<option name="mode" value="1"/>
-	<option name="arp_interval" value="100"/>
-	<option name="arp_ip_target" value="+192.168.101.2"/>
-	<option name="arp_validate" value="1"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-      <slave id="2"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.101.1/24"/>
-    </addresses>
-  </netdevice>
-</netconfig>
-
diff --git a/example_recipes/jpirko_test/net_configs_f14peanut/bond_miimon-bridge-vlan.xml
b/example_recipes/jpirko_test/net_configs_f14peanut/bond_miimon-bridge-vlan.xml
deleted file mode 100644
index c2e84c8..0000000
--- a/example_recipes/jpirko_test/net_configs_f14peanut/bond_miimon-bridge-vlan.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<netconfig>
-  <netdevice id="1" type="eth" phys_id="1"/>
-  <netdevice id="2" type="eth" phys_id="2"/>
-  <netdevice id="3" type="bond">
-    <options>
-    	<option name="mode" value="1"/>
-	<option name="miimon" value="100"/>
-	<option name="primary" value="2"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-      <slave id="2"/>
-    </slaves>
-  </netdevice>
-  <netdevice id="4" type="bridge">
-    <slaves>
-      <slave id="3"/>
-    </slaves>
-  </netdevice>
-  <netdevice id="5" type="vlan">
-    <options>
-      <option name="vlan_tci" value="100"/>
-    </options>
-    <slaves>
-      <slave id="4"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.102.1/24"/>
-    </addresses>
-  </netdevice>
-</netconfig>
-
diff --git a/example_recipes/jpirko_test/net_configs_f14peanut/bond_miimon-bridge.xml
b/example_recipes/jpirko_test/net_configs_f14peanut/bond_miimon-bridge.xml
deleted file mode 100644
index 44375c5..0000000
--- a/example_recipes/jpirko_test/net_configs_f14peanut/bond_miimon-bridge.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<netconfig>
-  <netdevice id="1" type="eth" phys_id="1"/>
-  <netdevice id="2" type="eth" phys_id="2"/>
-  <netdevice id="3" type="bond">
-    <options>
-    	<option name="mode" value="1"/>
-	<option name="miimon" value="100"/>
-	<option name="primary" value="2"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-      <slave id="2"/>
-    </slaves>
-  </netdevice>
-  <netdevice id="4" type="bridge">
-    <slaves>
-      <slave id="3"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.101.1/24"/>
-    </addresses>
-  </netdevice>
-</netconfig>
-
diff --git a/example_recipes/jpirko_test/net_configs_f14peanut/bond_miimon-vlan.xml
b/example_recipes/jpirko_test/net_configs_f14peanut/bond_miimon-vlan.xml
deleted file mode 100644
index 4d91f6e..0000000
--- a/example_recipes/jpirko_test/net_configs_f14peanut/bond_miimon-vlan.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<netconfig>
-  <netdevice id="1" type="eth" phys_id="1"/>
-  <netdevice id="2" type="eth" phys_id="2"/>
-  <netdevice id="3" type="bond">
-    <options>
-    	<option name="mode" value="1"/>
-	<option name="miimon" value="100"/>
-	<option name="primary" value="2"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-      <slave id="2"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.101.1/24"/>
-    </addresses>
-  </netdevice>
-  <netdevice id="4" type="vlan">
-    <options>
-      <option name="vlan_tci" value="100"/>
-    </options>
-    <slaves>
-      <slave id="3"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.102.1/24"/>
-    </addresses>
-  </netdevice>
-</netconfig>
-
diff --git a/example_recipes/jpirko_test/net_configs_f14peanut/bond_miimon.xml
b/example_recipes/jpirko_test/net_configs_f14peanut/bond_miimon.xml
deleted file mode 100644
index 728590f..0000000
--- a/example_recipes/jpirko_test/net_configs_f14peanut/bond_miimon.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<netconfig>
-  <netdevice id="1" type="eth" phys_id="1"/>
-  <netdevice id="2" type="eth" phys_id="2"/>
-  <netdevice id="3" type="bond">
-    <options>
-    	<option name="mode" value="1"/>
-	<option name="miimon" value="100"/>
-	<option name="primary" value="2"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-      <slave id="2"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.101.1/24"/>
-    </addresses>
-  </netdevice>
-</netconfig>
-
diff --git a/example_recipes/jpirko_test/net_configs_f14peanut/vlan.xml
b/example_recipes/jpirko_test/net_configs_f14peanut/vlan.xml
deleted file mode 100644
index d5f4d86..0000000
--- a/example_recipes/jpirko_test/net_configs_f14peanut/vlan.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<netconfig>
-  <netdevice id="1" type="eth" phys_id="1"/>
-  <netdevice id="2" type="vlan">
-    <options>
-      <option name="vlan_tci" value="100"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.102.1/24"/>
-    </addresses>
-  </netdevice>
-</netconfig>
-
diff --git a/example_recipes/jpirko_test/net_configs_junkbox/netconfig1.xml
b/example_recipes/jpirko_test/net_configs_junkbox/netconfig1.xml
deleted file mode 100644
index 7084aa3..0000000
--- a/example_recipes/jpirko_test/net_configs_junkbox/netconfig1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<netconfig>
-  <netdevice id="1" type="eth" phys_id="1">
-    <addresses>
-      <address value="192.168.101.2/24"/>
-    </addresses>
-  </netdevice>
-</netconfig>
-
diff --git a/example_recipes/jpirko_test/net_configs_junkbox/netconfig2.xml
b/example_recipes/jpirko_test/net_configs_junkbox/netconfig2.xml
deleted file mode 100644
index 8801cd2..0000000
--- a/example_recipes/jpirko_test/net_configs_junkbox/netconfig2.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<netconfig>
-  <netdevice id="1" type="eth" phys_id="1"/>
-  <netdevice id="2" type="vlan">
-    <options>
-      <option name="vlan_tci" value="100"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.102.2/24"/>
-    </addresses>
-  </netdevice>
-</netconfig>
-
diff --git a/example_recipes/jpirko_test/recipe001.xml
b/example_recipes/jpirko_test/recipe001.xml
deleted file mode 100644
index 4f09446..0000000
--- a/example_recipes/jpirko_test/recipe001.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<nettestrecipe>
-  <machines>
-    <machine id="1">
-      <netmachineconfig source="machine_configs/config-f14peanut.xml"/>
-      <netconfig source="net_configs_f14peanut/bond_miimon.xml"/>
-    </machine>
-    <machine id="2">
-      <netmachineconfig source="machine_configs/config-junkbox.xml"/>
-      <netconfig source="net_configs_junkbox/netconfig1.xml"/>
-    </machine>
-  </machines>
-  <command_sequence source="sequences/sequence1.xml"/>
-</nettestrecipe>
-
diff --git a/example_recipes/jpirko_test/recipe002.xml
b/example_recipes/jpirko_test/recipe002.xml
deleted file mode 100644
index 2174fb2..0000000
--- a/example_recipes/jpirko_test/recipe002.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<nettestrecipe>
-  <machines>
-    <machine id="1">
-      <netmachineconfig source="machine_configs/config-f14peanut.xml"/>
-      <netconfig source="net_configs_f14peanut/bond_arp.xml"/>
-    </machine>
-    <machine id="2">
-      <netmachineconfig source="machine_configs/config-junkbox.xml"/>
-      <netconfig source="net_configs_junkbox/netconfig1.xml"/>
-    </machine>
-  </machines>
-  <command_sequence source="sequences/sequence1.xml"/>
-</nettestrecipe>
-
diff --git a/example_recipes/jpirko_test/recipe003.xml
b/example_recipes/jpirko_test/recipe003.xml
deleted file mode 100644
index fc64920..0000000
--- a/example_recipes/jpirko_test/recipe003.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<nettestrecipe>
-  <machines>
-    <machine id="1">
-      <netmachineconfig source="machine_configs/config-f14peanut.xml"/>
-      <netconfig source="net_configs_f14peanut/bond_miimon-bridge.xml"/>
-    </machine>
-    <machine id="2">
-      <netmachineconfig source="machine_configs/config-junkbox.xml"/>
-      <netconfig source="net_configs_junkbox/netconfig1.xml"/>
-    </machine>
-  </machines>
-  <command_sequence source="sequences/sequence1.xml"/>
-</nettestrecipe>
-
diff --git a/example_recipes/jpirko_test/recipe004.xml
b/example_recipes/jpirko_test/recipe004.xml
deleted file mode 100644
index 002e063..0000000
--- a/example_recipes/jpirko_test/recipe004.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<nettestrecipe>
-  <machines>
-    <machine id="1">
-      <netmachineconfig source="machine_configs/config-f14peanut.xml"/>
-      <netconfig source="net_configs_f14peanut/bond_arp-bridge.xml"/>
-    </machine>
-    <machine id="2">
-      <netmachineconfig source="machine_configs/config-junkbox.xml"/>
-      <netconfig source="net_configs_junkbox/netconfig1.xml"/>
-    </machine>
-  </machines>
-  <command_sequence source="sequences/sequence1.xml"/>
-</nettestrecipe>
-
diff --git a/example_recipes/jpirko_test/recipe005.xml
b/example_recipes/jpirko_test/recipe005.xml
deleted file mode 100644
index a79d1b2..0000000
--- a/example_recipes/jpirko_test/recipe005.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<nettestrecipe>
-  <machines>
-    <machine id="1">
-      <netmachineconfig source="machine_configs/config-f14peanut.xml"/>
-      <netconfig source="net_configs_f14peanut/bond_arp_val.xml"/>
-    </machine>
-    <machine id="2">
-      <netmachineconfig source="machine_configs/config-junkbox.xml"/>
-      <netconfig source="net_configs_junkbox/netconfig1.xml"/>
-    </machine>
-  </machines>
-  <command_sequence source="sequences/sequence2.xml"/>
-</nettestrecipe>
-
diff --git a/example_recipes/jpirko_test/recipe006.xml
b/example_recipes/jpirko_test/recipe006.xml
deleted file mode 100644
index b592cdc..0000000
--- a/example_recipes/jpirko_test/recipe006.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<nettestrecipe>
-  <machines>
-    <machine id="1">
-      <netmachineconfig source="machine_configs/config-f14peanut.xml"/>
-      <netconfig
source="net_configs_f14peanut/bond_arp_val-bridge.xml"/>
-    </machine>
-    <machine id="2">
-      <netmachineconfig source="machine_configs/config-junkbox.xml"/>
-      <netconfig source="net_configs_junkbox/netconfig1.xml"/>
-    </machine>
-  </machines>
-  <command_sequence source="sequences/sequence2.xml"/>
-</nettestrecipe>
-
diff --git a/example_recipes/jpirko_test/recipe007.xml
b/example_recipes/jpirko_test/recipe007.xml
deleted file mode 100644
index 4472189..0000000
--- a/example_recipes/jpirko_test/recipe007.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<nettestrecipe>
-  <machines>
-    <machine id="1">
-      <netmachineconfig source="machine_configs/config-f14peanut.xml"/>
-      <netconfig source="net_configs_f14peanut/vlan.xml"/>
-    </machine>
-    <machine id="2">
-      <netmachineconfig source="machine_configs/config-junkbox.xml"/>
-      <netconfig source="net_configs_junkbox/netconfig2.xml"/>
-    </machine>
-  </machines>
-  <command_sequence source="sequences/sequence3.xml"/>
-</nettestrecipe>
-
diff --git a/example_recipes/jpirko_test/recipe008.xml
b/example_recipes/jpirko_test/recipe008.xml
deleted file mode 100644
index 831c59f..0000000
--- a/example_recipes/jpirko_test/recipe008.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<nettestrecipe>
-  <machines>
-    <machine id="1">
-      <netmachineconfig source="machine_configs/config-f14peanut.xml"/>
-      <netconfig source="net_configs_f14peanut/bond_miimon-vlan.xml"/>
-    </machine>
-    <machine id="2">
-      <netmachineconfig source="machine_configs/config-junkbox.xml"/>
-      <netconfig source="net_configs_junkbox/netconfig2.xml"/>
-    </machine>
-  </machines>
-  <command_sequence source="sequences/sequence3.xml"/>
-</nettestrecipe>
-
diff --git a/example_recipes/jpirko_test/recipe009.xml
b/example_recipes/jpirko_test/recipe009.xml
deleted file mode 100644
index b6b8031..0000000
--- a/example_recipes/jpirko_test/recipe009.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<nettestrecipe>
-  <machines>
-    <machine id="1">
-      <netmachineconfig source="machine_configs/config-f14peanut.xml"/>
-      <netconfig source="net_configs_f14peanut/bond_arp-vlan.xml"/>
-    </machine>
-    <machine id="2">
-      <netmachineconfig source="machine_configs/config-junkbox.xml"/>
-      <netconfig source="net_configs_junkbox/netconfig2.xml"/>
-    </machine>
-  </machines>
-  <command_sequence source="sequences/sequence3.xml"/>
-</nettestrecipe>
-
diff --git a/example_recipes/jpirko_test/recipe010.xml
b/example_recipes/jpirko_test/recipe010.xml
deleted file mode 100644
index c72a28f..0000000
--- a/example_recipes/jpirko_test/recipe010.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<nettestrecipe>
-  <machines>
-    <machine id="1">
-      <netmachineconfig source="machine_configs/config-f14peanut.xml"/>
-      <netconfig
source="net_configs_f14peanut/bond_miimon-bridge-vlan.xml"/>
-    </machine>
-    <machine id="2">
-      <netmachineconfig source="machine_configs/config-junkbox.xml"/>
-      <netconfig source="net_configs_junkbox/netconfig2.xml"/>
-    </machine>
-  </machines>
-  <command_sequence source="sequences/sequence3.xml"/>
-</nettestrecipe>
-
diff --git a/example_recipes/jpirko_test/recipe011.xml
b/example_recipes/jpirko_test/recipe011.xml
deleted file mode 100644
index f3357ba..0000000
--- a/example_recipes/jpirko_test/recipe011.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<nettestrecipe>
-  <machines>
-    <machine id="1">
-      <netmachineconfig source="machine_configs/config-f14peanut.xml"/>
-      <netconfig
source="net_configs_f14peanut/bond_arp-bridge-vlan.xml"/>
-    </machine>
-    <machine id="2">
-      <netmachineconfig source="machine_configs/config-junkbox.xml"/>
-      <netconfig source="net_configs_junkbox/netconfig2.xml"/>
-    </machine>
-  </machines>
-  <command_sequence source="sequences/sequence3.xml"/>
-</nettestrecipe>
-
diff --git a/example_recipes/jpirko_test/recipe012.xml
b/example_recipes/jpirko_test/recipe012.xml
deleted file mode 100644
index 6dca490..0000000
--- a/example_recipes/jpirko_test/recipe012.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<nettestrecipe>
-  <machines>
-    <machine id="1">
-      <netmachineconfig source="machine_configs/config-f14peanut.xml"/>
-      <netconfig source="net_configs_f14peanut/bond_arp_val-vlan.xml"/>
-    </machine>
-    <machine id="2">
-      <netmachineconfig source="machine_configs/config-junkbox.xml"/>
-      <netconfig source="net_configs_junkbox/netconfig2.xml"/>
-    </machine>
-  </machines>
-  <command_sequence source="sequences/sequence4.xml"/>
-</nettestrecipe>
-
diff --git a/example_recipes/jpirko_test/recipe013.xml
b/example_recipes/jpirko_test/recipe013.xml
deleted file mode 100644
index 6c92cb0..0000000
--- a/example_recipes/jpirko_test/recipe013.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<nettestrecipe>
-  <machines>
-    <machine id="1">
-      <netmachineconfig source="machine_configs/config-f14peanut.xml"/>
-      <netconfig
source="net_configs_f14peanut/bond_arp_val-bridge-vlan.xml"/>
-    </machine>
-    <machine id="2">
-      <netmachineconfig source="machine_configs/config-junkbox.xml"/>
-      <netconfig source="net_configs_junkbox/netconfig2.xml"/>
-    </machine>
-  </machines>
-  <command_sequence source="sequences/sequence4.xml"/>
-</nettestrecipe>
-
diff --git a/example_recipes/jpirko_test/recipe_brpktgen.xml
b/example_recipes/jpirko_test/recipe_brpktgen.xml
deleted file mode 100644
index 0e186de..0000000
--- a/example_recipes/jpirko_test/recipe_brpktgen.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<nettestrecipe>
-  <machines>
-    <machine id="1">
-      <netmachineconfig source="machine_configs/config-f14peanut.xml"/>
-      <netconfig>
-        <netdevice id="1" type="eth" phys_id="1"/>
-        <netdevice id="2" type="eth" phys_id="2"/>
-        <netdevice id="3" type="bridge">
-	  <slaves>
-            <slave id="1"/>
-          </slaves>
-          <addresses>
-            <address value="192.168.101.1/24"/>
-          </addresses>
-        </netdevice>
-      </netconfig>
-    </machine>
-    <machine id="2">
-      <netmachineconfig source="machine_configs/config-junkbox.xml"/>
-      <netconfig>
-        <netdevice id="1" type="eth" phys_id="1">
-          <addresses>
-            <address value="192.168.101.2/24"/>
-          </addresses>
-	</netdevice>
-        <netdevice id="2" type="eth" phys_id="2">
-          <addresses>
-            <address value="192.168.101.2/24"/>
-          </addresses>
-	</netdevice>
-      </netconfig>
-    </machine>
-  </machines>
-  <command_sequence>
-    <command type="exec" value="sleep 4"/>
-    <command machine_id="1" type="test"
value="PktCounter" bg_id="1">
-      <options>
-        <option name="input_netdev_name" type="recipe_eval"
value="['machines'][1]['netconfig'][3]['name']"/>
-        <option name="proto" value="udp"/>
-        <option name="dport" value="9"/>
-      </options>
-    </command>
-    <command machine_id="2" type="test" value="PktgenTx"
timeout="40">
-      <options>
-        <option name="addr" type="recipe_eval"
value="['machines'][1]['netconfig'][3]['addresses'][0]"/>
-        <option name="hwaddr" type="recipe_eval"
value="['machines'][1]['netconfig'][1]['hwaddr']"/>
-        <option name="netdev_name" type="recipe_eval"
value="['machines'][2]['netconfig'][1]['name']"/>
-        <option name="netdev_name" type="recipe_eval"
value="['machines'][2]['netconfig'][2]['name']"/>
-      </options>
-    </command>
-    <command machine_id="1" type="intr" value="1"/>
-  </command_sequence>
-</nettestrecipe>
diff --git a/example_recipes/jpirko_test/sequences/sequence1.xml
b/example_recipes/jpirko_test/sequences/sequence1.xml
deleted file mode 100644
index e45715a..0000000
--- a/example_recipes/jpirko_test/sequences/sequence1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<command_sequence>
-  <command type="exec" value="sleep 4"/>
-  <command type="test" machine_id="1" value="IcmpPing"
timeout="30">
-    <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"/>
-    </options>
-  </command>
-</command_sequence>
-
diff --git a/example_recipes/jpirko_test/sequences/sequence2.xml
b/example_recipes/jpirko_test/sequences/sequence2.xml
deleted file mode 100644
index f1c4103..0000000
--- a/example_recipes/jpirko_test/sequences/sequence2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<command_sequence>
-  <command type="exec" value="sleep 4"/>
-  <command type="test" machine_id="1" value="IcmpPing"
timeout="40">
-    <options>
-      <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][1]['addresses'][0]"/>
-      <option name="count" value="30"/>
-      <option name="interval" value="1"/>
-      <option name="limit_rate" value="95"/>
-    </options>
-  </command>
-</command_sequence>
-
diff --git a/example_recipes/jpirko_test/sequences/sequence3.xml
b/example_recipes/jpirko_test/sequences/sequence3.xml
deleted file mode 100644
index 6f66d7d..0000000
--- a/example_recipes/jpirko_test/sequences/sequence3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<command_sequence>
-  <command type="exec" value="sleep 4"/>
-  <command type="test" machine_id="1" value="IcmpPing"
timeout="30">
-    <options>
-      <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][2]['addresses'][0]"/>
-      <option name="count" value="40"/>
-      <option name="interval" value="0.2"/>
-      <option name="limit_rate" value="95"/>
-    </options>
-  </command>
-</command_sequence>
-
diff --git a/example_recipes/jpirko_test/sequences/sequence4.xml
b/example_recipes/jpirko_test/sequences/sequence4.xml
deleted file mode 100644
index 730f1ae..0000000
--- a/example_recipes/jpirko_test/sequences/sequence4.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<command_sequence>
-  <command type="exec" value="sleep 4"/>
-  <command type="test" machine_id="1" value="IcmpPing"
timeout="40">
-    <options>
-      <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][2]['addresses'][0]"/>
-      <option name="count" value="30"/>
-      <option name="interval" value="1"/>
-      <option name="limit_rate" value="95"/>
-    </options>
-  </command>
-</command_sequence>
-
diff --git a/example_recipes/jpirko_test/switch_configs/dummy_switch.xml
b/example_recipes/jpirko_test/switch_configs/dummy_switch.xml
deleted file mode 100644
index 4a870ff..0000000
--- a/example_recipes/jpirko_test/switch_configs/dummy_switch.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<netswitchconfig>
-  <info hostname="127.0.0.1" driver="SwSwitch"/>
-  <vlans>
-    <vlan name="test" vlan_tci="10">
-      <ports>
-        <port id="5" tagged="yes"/>
-        <port id="6" tagged="no"/>
-      </ports>
-    </vlan>
-  </vlans>
-</netswitchconfig>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-over-vlan-tests/bov-pktgen-sanitycheck.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-over-vlan-tests/bov-pktgen-sanitycheck.xml
deleted file mode 100644
index 562a07d..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-over-vlan-tests/bov-pktgen-sanitycheck.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel58-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1" />
-                        <slave id="2" />
-                    </slaves>
-                </netdevice>
-
-                <netdevice id="4" type="vlan">
-                    <options>
-                        <option name="vlan_tci" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="3"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel58-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth">
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- do a simple pktgen traffic ... -->
-        <command machine_id="1" type="test"
value="PktCounter" bg_id="1">
-            <options>
-                <option name="input_netdev_name"
type="recipe_eval"
value="['machines'][1]['netconfig'][4]['name']"/>
-                <option name="proto" value="udp"/>
-                <option name="dport" value="9"/>
-            </options>
-        </command>
-
-        <command machine_id="2" type="test"
value="PktgenTx" timeout="600">
-            <options>
-                <option name="addr" type="recipe_eval"
value="['machines'][1]['netconfig'][4]['addresses'][0]"/>
-                <option name="hwaddr" type="recipe_eval"
value="['machines'][1]['netconfig'][1]['hwaddr']"/>
-                <option name="netdev_name" type="recipe_eval"
value="['machines'][2]['netconfig'][1]['name']"/>
-                <option name="vlan_tci" value="100" />
-            </options>
-        </command>
-
-        <command machine_id="1" type="intr"
value="1"/>
-
-    </command_sequence>
-
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-over-vlan-tests/vlan-iperf-tcp-udp-test1.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-over-vlan-tests/vlan-iperf-tcp-udp-test1.xml
deleted file mode 100644
index b8bd504..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-over-vlan-tests/vlan-iperf-tcp-udp-test1.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel58-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1" />
-                        <slave id="2" />
-                    </slaves>
-                </netdevice>
-
-                <netdevice id="4" type="vlan">
-                    <options>
-                        <option name="vlan_tci" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="3"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel58-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1" />
-                        <slave id="2" />
-                    </slaves>
-                </netdevice>
-
-                <netdevice id="4" type="vlan">
-                    <options>
-                        <option name="vlan_tci" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="3"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][4]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start basic TCP/UDP stream tests ... -->
-
-        <command machine_id="2" type="exec" value="nc -l
10000 > /dev/null" bg_id="1" />
-        <command type="exec" value="sleep 3" />
-        <command machine_id="1" type="test"
value="NetCat">
-            <options>
-                <option name="port" value="10000" />
-                <option name="duration" value="120" />
-                <option name="addr" type="recipe_eval"
value="['machines'][2]['netconfig'][4]['addresses'][0]"
/>
-            </options>
-        </command>
-        <command type="kill" machine_id="2" value="1"
/>
-
-        <command machine_id="2" type="exec" value="nc -u -l
10000 > /dev/null" bg_id="2" />
-        <command type="exec" value="sleep 3" />
-        <command machine_id="1" type="test"
value="NetCat">
-            <options>
-                <option name="port" value="10000" />
-                <option name="duration" value="120" />
-                <option name="addr" type="recipe_eval"
value="['machines'][2]['netconfig'][4]['addresses'][0]"
/>
-                <option name="stream" value="udp" />
-            </options>
-        </command>
-        <command type="kill" machine_id="2" value="2"
/>
-
-<!-- TEST:3  start iperf tests ... -->
-
-        <command machine_id="1" type="test"
value="Iperf" bg_id="31">
-            <options>
-                <option name="role" value="server" />
-                <option name="bind" type="recipe_eval"
value="['machines'][1]['netconfig'][4]['addresses'][0]"
/>
-                <option name="install_dir" value="/root" />
-            </options>
-        </command>
-
-        <command type="exec" value="sleep 5" />
-
-        <command machine_id="2" type="test"
value="Iperf">
-            <options>
-                <option name="role" value="client" />
-                <option name="iperf_server" type="recipe_eval"
value="['machines'][1]['netconfig'][4]['addresses'][0]"
/>
-                <option name="duration" value="120" />
-                <option name="install_dir" value="/root" />
-            </options>
-        </command>
-
-        <command type="kill" machine_id="1" value="31"
/>
-
-
-    </command_sequence>
-
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-iperf-test-mode0.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-iperf-test-mode0.xml
deleted file mode 100644
index b416af2..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-iperf-test-mode0.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel58-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="0" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel58-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="0" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start iperf tests ... -->
-
-        <command machine_id="2" type="test"
value="Iperf" bg_id="1">
-            <options>
-                <option name="role" value="server" />
-                <option name="install_dir" value="/root" />
-                <option name="bind" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="test"
value="Iperf">
-            <options>
-                <option name="role" value="client" />
-                <option name="duration" value="600"/>
-                <option name="install_dir" value="/root" />
-                <option name="iperf_server" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="kill" machine_id="2" value="1"
/>
-
-    </command_sequence>
-
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-iperf-test-mode1.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-iperf-test-mode1.xml
deleted file mode 100644
index 788b4ab..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-iperf-test-mode1.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel58-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel58-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start iperf tests ... -->
-
-        <command machine_id="2" type="test"
value="Iperf" bg_id="1">
-            <options>
-                <option name="role" value="server" />
-                <option name="install_dir" value="/root" />
-                <option name="bind" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="test"
value="Iperf">
-            <options>
-                <option name="role" value="client" />
-                <option name="duration" value="600"/>
-                <option name="install_dir" value="/root" />
-                <option name="iperf_server" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="kill" machine_id="2" value="1"
/>
-
-    </command_sequence>
-
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-iperf-test-mode5.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-iperf-test-mode5.xml
deleted file mode 100644
index 8e5f63b..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-iperf-test-mode5.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel58-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="5" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel58-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="5" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start iperf tests ... -->
-
-        <command machine_id="2" type="test"
value="Iperf" bg_id="1">
-            <options>
-                <option name="role" value="server" />
-                <option name="install_dir" value="/root" />
-                <option name="bind" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="test"
value="Iperf">
-            <options>
-                <option name="role" value="client" />
-                <option name="duration" value="600"/>
-                <option name="install_dir" value="/root" />
-                <option name="iperf_server" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="kill" machine_id="2" value="1"
/>
-
-    </command_sequence>
-
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-netcat-iperf-test0.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-netcat-iperf-test0.xml
deleted file mode 100644
index 8b1950b..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-netcat-iperf-test0.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel58-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="0" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel58-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="0" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start iperf tests ... -->
-
-        <command machine_id="2" type="test"
value="Iperf" bg_id="1">
-            <options>
-                <option name="role" value="server" />
-                <option name="install_dir" value="/root" />
-                <option name="bind" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="test"
value="Iperf" bg_id="2">
-            <options>
-                <option name="role" value="client" />
-                <option name="install_dir" value="/root" />
-                <option name="iperf_server" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="duration" value="600" />
-            </options>
-        </command>
-
-<!-- start a TCP stream in opposite direction -->
-
-        <command type="exec" machine_id="1" value="nc -l 1234
> /dev/null" bg_id="3" />
-        <command type="exec" value="sleep 1" />
-
-        <command machine_id="2" type="test"
value="NetCat">
-            <options>
-                <option name="addr" type="recipe_eval"
value="['machines'][1]['netconfig'][3]['addresses'][0]"/>
-                <option name="port" value="1234" />
-                <option name="duration" value="300" />
-            </options>
-        </command>
-
-        <command type="kill" machine_id="1" value="3"
/>
-
-<!-- start a TCP stream in the same direction -->
-
-        <command type="exec" machine_id="2" value="nc -l 1234
> /dev/null" bg_id="4" />
-        <command type="exec" value="sleep 1" />
-
-        <command machine_id="1" type="test"
value="NetCat">
-            <options>
-                <option name="addr" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"/>
-                <option name="port" value="1234" />
-                <option name="duration" value="300" />
-            </options>
-        </command>
-
-        <command type="kill" machine_id="2" value="4"
/>
-
-<!-- kill background processes -->
-
-        <command type="kill" machine_id="1" value="2"
/>
-        <command type="kill" machine_id="2" value="1"
/>
-
-    </command_sequence>
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-netcat-iperf-test1.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-netcat-iperf-test1.xml
deleted file mode 100644
index 82ae29c..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-netcat-iperf-test1.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel58-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel58-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start iperf tests ... -->
-
-        <command machine_id="2" type="test"
value="Iperf" bg_id="1">
-            <options>
-                <option name="role" value="server" />
-                <option name="install_dir" value="/root" />
-                <option name="bind" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="test"
value="Iperf" bg_id="2">
-            <options>
-                <option name="role" value="client" />
-                <option name="install_dir" value="/root" />
-                <option name="iperf_server" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="duration" value="600" />
-            </options>
-        </command>
-
-<!-- start a TCP stream in opposite direction -->
-
-        <command type="exec" machine_id="1" value="nc -l 1234
> /dev/null" bg_id="3" />
-        <command type="exec" value="sleep 1" />
-
-        <command machine_id="2" type="test"
value="NetCat">
-            <options>
-                <option name="addr" type="recipe_eval"
value="['machines'][1]['netconfig'][3]['addresses'][0]"/>
-                <option name="port" value="1234" />
-                <option name="duration" value="300" />
-            </options>
-        </command>
-
-        <command type="kill" machine_id="1" value="3"
/>
-
-<!-- start a TCP stream in the same direction -->
-
-        <command type="exec" machine_id="2" value="nc -l 1234
> /dev/null" bg_id="4" />
-        <command type="exec" value="sleep 1" />
-
-        <command machine_id="1" type="test"
value="NetCat">
-            <options>
-                <option name="addr" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"/>
-                <option name="port" value="1234" />
-                <option name="duration" value="300" />
-            </options>
-        </command>
-
-        <command type="kill" machine_id="2" value="4"
/>
-
-<!-- kill background processes -->
-
-        <command type="kill" machine_id="1" value="2"
/>
-        <command type="kill" machine_id="2" value="1"
/>
-
-    </command_sequence>
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-netcat-iperf-test5.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-netcat-iperf-test5.xml
deleted file mode 100644
index 82ae29c..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-netcat-iperf-test5.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel58-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel58-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start iperf tests ... -->
-
-        <command machine_id="2" type="test"
value="Iperf" bg_id="1">
-            <options>
-                <option name="role" value="server" />
-                <option name="install_dir" value="/root" />
-                <option name="bind" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="test"
value="Iperf" bg_id="2">
-            <options>
-                <option name="role" value="client" />
-                <option name="install_dir" value="/root" />
-                <option name="iperf_server" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="duration" value="600" />
-            </options>
-        </command>
-
-<!-- start a TCP stream in opposite direction -->
-
-        <command type="exec" machine_id="1" value="nc -l 1234
> /dev/null" bg_id="3" />
-        <command type="exec" value="sleep 1" />
-
-        <command machine_id="2" type="test"
value="NetCat">
-            <options>
-                <option name="addr" type="recipe_eval"
value="['machines'][1]['netconfig'][3]['addresses'][0]"/>
-                <option name="port" value="1234" />
-                <option name="duration" value="300" />
-            </options>
-        </command>
-
-        <command type="kill" machine_id="1" value="3"
/>
-
-<!-- start a TCP stream in the same direction -->
-
-        <command type="exec" machine_id="2" value="nc -l 1234
> /dev/null" bg_id="4" />
-        <command type="exec" value="sleep 1" />
-
-        <command machine_id="1" type="test"
value="NetCat">
-            <options>
-                <option name="addr" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"/>
-                <option name="port" value="1234" />
-                <option name="duration" value="300" />
-            </options>
-        </command>
-
-        <command type="kill" machine_id="2" value="4"
/>
-
-<!-- kill background processes -->
-
-        <command type="kill" machine_id="1" value="2"
/>
-        <command type="kill" machine_id="2" value="1"
/>
-
-    </command_sequence>
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-sctp-test-mode0.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-sctp-test-mode0.xml
deleted file mode 100644
index 9ec83ac..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-sctp-test-mode0.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel58-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="0" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel58-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="0" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start basic SCTP stream tests ... -->
-
-        <command machine_id="1" type="exec" value="sctp_test
-H 192.168.100.2 -P 5679 -l" bg_id="1" dont_stop="true" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 1" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 2" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 3" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 4" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 5" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 6" />
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="kill" value="1"
/>
-    </command_sequence>
-
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-sctp-test-mode1.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-sctp-test-mode1.xml
deleted file mode 100644
index 6f01eed..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-sctp-test-mode1.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel58-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel58-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start basic SCTP stream tests ... -->
-
-        <command machine_id="1" type="exec" value="sctp_test
-H 192.168.100.2 -P 5679 -l" bg_id="1" dont_stop="true" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 1" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 2" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 3" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 4" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 5" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 6" />
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="kill" value="1"
/>
-    </command_sequence>
-
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-sctp-test-mode5.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-sctp-test-mode5.xml
deleted file mode 100644
index 36bcfcb..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel5/bond-tests/bond-sctp-test-mode5.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel58-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="5" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel58-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="5" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start basic SCTP stream tests ... -->
-
-        <command machine_id="1" type="exec" value="sctp_test
-H 192.168.100.2 -P 5679 -l" bg_id="1" dont_stop="true" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 1" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 2" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 3" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 4" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 5" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 6" />
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="kill" value="1"
/>
-    </command_sequence>
-
-</nettestrecipe>
diff --git a/example_recipes/jtluka_test/network-stack-tests/rhel5/rhel58-guest1.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel5/rhel58-guest1.xml
deleted file mode 100644
index e6ee46f..0000000
--- a/example_recipes/jtluka_test/network-stack-tests/rhel5/rhel58-guest1.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<netmachineconfig>
-    <info hostname="10.34.30.233" rootpass="redhat"/>
-    <netdevice type="eth" phys_id="1"
hwaddr="52:54:00:AA:BB:C1"/>
-    <netdevice type="eth" phys_id="2"
hwaddr="52:54:00:AA:BB:C2"/>
-    <netdevice type="eth" phys_id="3"
hwaddr="52:54:00:CF:1F:A7"/>
-    <netdevice type="eth" phys_id="4"
hwaddr="52:54:00:29:66:82"/>
-</netmachineconfig>
diff --git a/example_recipes/jtluka_test/network-stack-tests/rhel5/rhel58-guest2.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel5/rhel58-guest2.xml
deleted file mode 100644
index 3a2db26..0000000
--- a/example_recipes/jtluka_test/network-stack-tests/rhel5/rhel58-guest2.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<netmachineconfig>
-    <info hostname="10.34.30.236" rootpass="redhat"/>
-    <netdevice type="eth" phys_id="1"
hwaddr="52:54:00:aa:bb:d1"/>
-    <netdevice type="eth" phys_id="2"
hwaddr="52:54:00:aa:bb:d2"/>
-    <netdevice type="eth" phys_id="3"
hwaddr="52:54:00:30:d1:a8"/>
-    <netdevice type="eth" phys_id="4"
hwaddr="52:54:00:b7:fa:36"/>
-</netmachineconfig>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel5/vlan-tests/vlan-iperf-tcp-udp-test1.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel5/vlan-tests/vlan-iperf-tcp-udp-test1.xml
deleted file mode 100644
index 7cd7a57..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel5/vlan-tests/vlan-iperf-tcp-udp-test1.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel58-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="vlan">
-                    <options>
-                        <option name="vlan_tci" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel58-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="vlan">
-                    <options>
-                        <option name="vlan_tci" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start basic TCP/UDP stream tests ... -->
-
-        <command machine_id="2" type="exec" value="nc -l
10000 > /dev/null" bg_id="1" />
-        <command type="exec" value="sleep 3" />
-        <command machine_id="1" type="test"
value="NetCat">
-            <options>
-                <option name="port" value="10000" />
-                <option name="duration" value="600" />
-                <option name="addr" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-        <command type="kill" machine_id="2" value="1"
/>
-
-        <command machine_id="2" type="exec" value="nc -u -l
10000 > /dev/null" bg_id="2" />
-        <command type="exec" value="sleep 3" />
-        <command machine_id="1" type="test"
value="NetCat">
-            <options>
-                <option name="port" value="10000" />
-                <option name="duration" value="120" />
-                <option name="addr" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="stream" value="udp" />
-            </options>
-        </command>
-        <command type="kill" machine_id="2" value="2"
/>
-
-<!-- TEST:3  start iperf tests ... -->
-
-        <command machine_id="1" type="test"
value="Iperf" bg_id="31">
-            <options>
-                <option name="role" value="server" />
-                <option name="bind" type="recipe_eval"
value="['machines'][1]['netconfig'][3]['addresses'][0]"
/>
-                <option name="install_dir" value="/root" />
-            </options>
-        </command>
-
-        <command type="exec" value="sleep 5" />
-
-        <command machine_id="2" type="test"
value="Iperf">
-            <options>
-                <option name="role" value="client" />
-                <option name="iperf_server" type="recipe_eval"
value="['machines'][1]['netconfig'][3]['addresses'][0]"
/>
-                <option name="duration" value="120" />
-                <option name="install_dir" value="/root" />
-            </options>
-        </command>
-
-        <command type="kill" machine_id="1" value="31"
/>
-
-
-    </command_sequence>
-
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel5/vlan-tests/vlan-sctp-test1.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel5/vlan-tests/vlan-sctp-test1.xml
deleted file mode 100644
index 7bf126c..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel5/vlan-tests/vlan-sctp-test1.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel58-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="vlan">
-                    <options>
-                        <option name="vlan_tci" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel58-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="vlan">
-                    <options>
-                        <option name="vlan_tci" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start basic SCTP stream tests ... -->
-
-        <command machine_id="1" type="exec" value="sctp_test
-H 192.168.100.2 -P 5679 -l" bg_id="1" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 1" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 2" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 3" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 4" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 5" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 6" />
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="kill" value="1"
/>
-    </command_sequence>
-
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-over-vlan/bov-pktgen-sanitycheck.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-over-vlan/bov-pktgen-sanitycheck.xml
deleted file mode 100644
index 1bce1e8..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-over-vlan/bov-pktgen-sanitycheck.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel58-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1" />
-                        <slave id="2" />
-                    </slaves>
-                </netdevice>
-
-                <netdevice id="4" type="vlan">
-                    <options>
-                        <option name="vlan_tci" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="3"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel58-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" type="vlan">
-                    <options>
-                        <option name="vlan_tci" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1" />
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- do a simple pktgen traffic ... -->
-        <command machine_id="1" type="test"
value="PktCounter" bg_id="1">
-            <options>
-                <option name="input_netdev_name"
type="recipe_eval"
value="['machines'][1]['netconfig'][4]['name']"/>
-                <option name="proto" value="udp"/>
-                <option name="dport" value="9"/>
-            </options>
-        </command>
-
-        <command machine_id="2" type="test"
value="PktgenTx" timeout="40">
-            <options>
-                <option name="addr" type="recipe_eval"
value="['machines'][1]['netconfig'][4]['addresses'][0]"/>
-                <option name="hwaddr" type="recipe_eval"
value="['machines'][1]['netconfig'][1]['hwaddr']"/>
-                <option name="netdev_name" type="recipe_eval"
value="['machines'][2]['netconfig'][2]['name']"/>
-            </options>
-        </command>
-
-        <command machine_id="1" type="intr"
value="1"/>
-
-    </command_sequence>
-
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-iperf-test-mode0.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-iperf-test-mode0.xml
deleted file mode 100644
index 0baa10e..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-iperf-test-mode0.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel62-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="0" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel62-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="0" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start iperf tests ... -->
-
-        <command machine_id="2" type="test"
value="Iperf" bg_id="1">
-            <options>
-                <option name="role" value="server" />
-                <option name="install_dir" value="/root" />
-                <option name="bind" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="test"
value="Iperf">
-            <options>
-                <option name="role" value="client" />
-                <option name="duration" value="600"/>
-                <option name="install_dir" value="/root" />
-                <option name="iperf_server" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="kill" machine_id="2" value="1"
/>
-
-    </command_sequence>
-
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-iperf-test-mode1.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-iperf-test-mode1.xml
deleted file mode 100644
index 2b9ece0..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-iperf-test-mode1.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel62-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel62-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start iperf tests ... -->
-
-        <command machine_id="2" type="test"
value="Iperf" bg_id="1">
-            <options>
-                <option name="role" value="server" />
-                <option name="install_dir" value="/root" />
-                <option name="bind" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="test"
value="Iperf">
-            <options>
-                <option name="role" value="client" />
-                <option name="duration" value="600"/>
-                <option name="install_dir" value="/root" />
-                <option name="iperf_server" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="kill" machine_id="2" value="1"
/>
-
-    </command_sequence>
-
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-iperf-test-mode5.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-iperf-test-mode5.xml
deleted file mode 100644
index 9bb0497..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-iperf-test-mode5.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel62-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="5" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel62-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="5" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start iperf tests ... -->
-
-        <command machine_id="2" type="test"
value="Iperf" bg_id="1">
-            <options>
-                <option name="role" value="server" />
-                <option name="install_dir" value="/root" />
-                <option name="bind" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="test"
value="Iperf">
-            <options>
-                <option name="role" value="client" />
-                <option name="duration" value="600"/>
-                <option name="install_dir" value="/root" />
-                <option name="iperf_server" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="kill" machine_id="2" value="1"
/>
-
-    </command_sequence>
-
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-netcat-iperf-test0.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-netcat-iperf-test0.xml
deleted file mode 100644
index b3486d6..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-netcat-iperf-test0.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel62-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="0" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel62-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="0" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start iperf tests ... -->
-
-        <command machine_id="2" type="test"
value="Iperf" bg_id="1">
-            <options>
-                <option name="role" value="server" />
-                <option name="install_dir" value="/root" />
-                <option name="bind" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="test"
value="Iperf" bg_id="2">
-            <options>
-                <option name="role" value="client" />
-                <option name="install_dir" value="/root" />
-                <option name="iperf_server" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-<!-- start a TCP stream in opposite direction -->
-
-        <command type="exec" machine_id="1" value="nc -l
1234" bg_id="3" />
-        <command type="exec" value="sleep 1" />
-
-        <command machine_id="2" type="test"
value="NetCat">
-            <options>
-                <option name="addr" type="recipe_eval"
value="['machines'][1]['netconfig'][3]['addresses'][0]"/>
-                <option name="port" value="1234" />
-                <option name="duration" value="300" />
-                <option name="stream" value="udp" />
-            </options>
-        </command>
-
-        <command type="kill" machine_id="1" value="3"
/>
-
-<!-- start a TCP stream in the same direction -->
-
-        <command type="exec" machine_id="2" value="nc -l
1234" bg_id="4" />
-        <command type="exec" value="sleep 1" />
-
-        <command machine_id="1" type="test"
value="NetCat">
-            <options>
-                <option name="addr" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"/>
-                <option name="port" value="1234" />
-                <option name="duration" value="300" />
-                <option name="stream" value="udp" />
-            </options>
-        </command>
-
-        <command type="kill" machine_id="2" value="4"
/>
-
-<!-- kill background processes -->
-
-        <command type="kill" machine_id="1" value="2"
/>
-        <command type="kill" machine_id="2" value="1"
/>
-
-    </command_sequence>
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-netcat-iperf-test1.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-netcat-iperf-test1.xml
deleted file mode 100644
index 3b0c9c7..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-netcat-iperf-test1.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel62-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel62-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start iperf tests ... -->
-
-        <command machine_id="2" type="test"
value="Iperf" bg_id="1">
-            <options>
-                <option name="role" value="server" />
-                <option name="install_dir" value="/root" />
-                <option name="bind" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="test"
value="Iperf" bg_id="2">
-            <options>
-                <option name="role" value="client" />
-                <option name="install_dir" value="/root" />
-                <option name="iperf_server" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-<!-- start a TCP stream in opposite direction -->
-
-        <command type="exec" machine_id="1" value="nc -l
1234" bg_id="3" />
-        <command type="exec" value="sleep 1" />
-
-        <command machine_id="2" type="test"
value="NetCat" bg_id="4">
-            <option name="addr" type="recipe_eval"
value="['machines'][1]['netconfig'][3]['addresses'][0]"/>
-            <option name="port" value="1234" />
-        </command>
-
-        <command type="exec" value="sleep 60" />
-
-        <command type="kill" machine_id="1" value="2"
/>
-        <command type="kill" machine_id="2" value="1"
/>
-        <command type="kill" machine_id="1" value="3"
/>
-        <command type="kill" machine_id="2" value="4"
/>
-        
-    </command_sequence>
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-netcat-iperf-test5.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-netcat-iperf-test5.xml
deleted file mode 100644
index 3535138..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-netcat-iperf-test5.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel62-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="5" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel62-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="5" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start iperf tests ... -->
-
-        <command machine_id="2" type="test"
value="Iperf" bg_id="1">
-            <options>
-                <option name="role" value="server" />
-                <option name="install_dir" value="/root" />
-                <option name="bind" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="test"
value="Iperf" bg_id="2">
-            <options>
-                <option name="role" value="client" />
-                <option name="install_dir" value="/root" />
-                <option name="iperf_server" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-
-<!-- start a TCP stream in opposite direction -->
-
-        <command type="exec" machine_id="1" value="nc -l
1234" bg_id="3" />
-        <command type="exec" value="sleep 1" />
-
-        <command machine_id="2" type="test"
value="NetCat" bg_id="4">
-            <option name="addr" type="recipe_eval"
value="['machines'][1]['netconfig'][3]['addresses'][0]"/>
-            <option name="port" value="1234" />
-        </command>
-
-        <command type="exec" value="sleep 60" />
-
-        <command type="kill" machine_id="1" value="2"
/>
-        <command type="kill" machine_id="2" value="1"
/>
-        <command type="kill" machine_id="1" value="3"
/>
-        <command type="kill" machine_id="2" value="4"
/>
-        
-    </command_sequence>
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-sctp-test-mode0.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-sctp-test-mode0.xml
deleted file mode 100644
index f7a9002..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-sctp-test-mode0.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel62-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="0" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel62-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="0" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start basic SCTP stream tests ... -->
-
-        <command machine_id="1" type="exec" value="sctp_test
-H 192.168.100.2 -P 5679 -l" bg_id="1" dont_stop="true" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 1" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 2" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 3" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 4" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 5" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 6" />
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="kill" value="1"
/>
-    </command_sequence>
-
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-sctp-test-mode1.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-sctp-test-mode1.xml
deleted file mode 100644
index 0810d66..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-sctp-test-mode1.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel62-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel62-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="1" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start basic SCTP stream tests ... -->
-
-        <command machine_id="1" type="exec" value="sctp_test
-H 192.168.100.2 -P 5679 -l" bg_id="1" dont_stop="true" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 1" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 2" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 3" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 4" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 5" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 6" />
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="kill" value="1"
/>
-    </command_sequence>
-
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-sctp-test-mode5.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-sctp-test-mode5.xml
deleted file mode 100644
index 7528199..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel6/bond-tests/bond-sctp-test-mode5.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="../rhel62-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="5" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="../rhel62-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="bond">
-                    <options>
-                        <option name="mode" value="5" />
-                        <option name="miimon" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                        <slave id="2"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start basic SCTP stream tests ... -->
-
-        <command machine_id="1" type="exec" value="sctp_test
-H 192.168.100.2 -P 5679 -l" bg_id="1" dont_stop="true" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 1" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 2" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 3" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 4" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 5" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 6" />
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="kill" value="1"
/>
-    </command_sequence>
-
-</nettestrecipe>
diff --git a/example_recipes/jtluka_test/network-stack-tests/rhel6/rhel62-guest1.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel6/rhel62-guest1.xml
deleted file mode 100644
index b3d2638..0000000
--- a/example_recipes/jtluka_test/network-stack-tests/rhel6/rhel62-guest1.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<netmachineconfig>
-    <info hostname="10.34.30.180" rootpass="redhat"/>
-    <netdevice type="eth" phys_id="1"
hwaddr="52:54:00:AB:CD:E1"/>
-    <netdevice type="eth" phys_id="2"
hwaddr="52:54:00:AB:CD:E2"/>
-</netmachineconfig>
diff --git a/example_recipes/jtluka_test/network-stack-tests/rhel6/rhel62-guest2.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel6/rhel62-guest2.xml
deleted file mode 100644
index fca113a..0000000
--- a/example_recipes/jtluka_test/network-stack-tests/rhel6/rhel62-guest2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<netmachineconfig>
-    <info hostname="10.34.30.181" rootpass="redhat"/>
-    <netdevice type="eth" phys_id="1"
hwaddr="52:54:00:ab:cd:f1"/>
-    <netdevice type="eth" phys_id="2"
hwaddr="52:54:00:ab:cd:f2"/>
-</netmachineconfig>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel6/vlan-tests/vlan-sctp-test1.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel6/vlan-tests/vlan-sctp-test1.xml
deleted file mode 100644
index 658a2a9..0000000
---
a/example_recipes/jtluka_test/network-stack-tests/rhel6/vlan-tests/vlan-sctp-test1.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="rhel58-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="vlan">
-                    <options>
-                        <option name="vlan_tci" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="rhel58-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="vlan">
-                    <options>
-                        <option name="vlan_tci" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start basic SCTP stream tests ... -->
-
-        <command machine_id="1" type="exec" value="sctp_test
-H 192.168.100.2 -P 5679 -l" bg_id="1" dont_stop="true" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 1" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 2" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 3" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 4" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 5" />
-        <command machine_id="2" type="exec" value="sctp_test
-H 192.168.100.3 -P 1235 -h 192.168.100.2 -p 5679 -s -x 50 -c 6" />
-
-        <command type="exec" value="sleep 3" />
-
-        <command machine_id="1" type="kill" value="1"
/>
-    </command_sequence>
-
-</nettestrecipe>
diff --git
a/example_recipes/jtluka_test/network-stack-tests/rhel6/vlan-tests/vlan-test1.xml
b/example_recipes/jtluka_test/network-stack-tests/rhel6/vlan-tests/vlan-test1.xml
deleted file mode 100644
index f96a55d..0000000
--- a/example_recipes/jtluka_test/network-stack-tests/rhel6/vlan-tests/vlan-test1.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<nettestrecipe>
-
-    <machines>
-        <machine id="1">
-            <netmachineconfig source="rhel62-guest1.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="vlan">
-                    <options>
-                        <option name="vlan_tci" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.2/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-
-        <machine id="2">
-            <netmachineconfig source="rhel62-guest2.xml"/>
-            <netconfig>
-                <netdevice id="1" phys_id="1"
type="eth"/>
-                <netdevice id="2" phys_id="2"
type="eth"/>
-                <netdevice id="3" type="vlan">
-                    <options>
-                        <option name="vlan_tci" value="100" />
-                    </options>
-                    <slaves>
-                        <slave id="1"/>
-                    </slaves>
-                    <addresses>
-                        <address value="192.168.100.3/24" />
-                    </addresses>
-                </netdevice>
-            </netconfig>
-        </machine>
-    </machines>
-
-
-    <command_sequence>
-
-<!-- just a ping check ... -->
-
-        <command machine_id="1" type="test"
value="IcmpPing">
-            <options>
-                <option type="recipe_eval" name="addr"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="count" value="3"/>
-            </options>
-        </command>
-
-<!-- start basic TCP/UDP stream tests ... -->
-
-        <command machine_id="2" type="exec" value="nc -l
10000" bg_id="1" />
-        <command machine_id="1" type="test"
value="NetCat">
-            <options>
-                <option name="port" value="10000" />
-                <option name="duration" value="600" />
-                <option name="addr" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-            </options>
-        </command>
-        <command type="kill" machine_id="2" value="1"
/>
-
-        <command machine_id="2" type="exec" value="nc -u -l
10000" bg_id="2" />
-        <command machine_id="1" type="test"
value="NetCat">
-            <options>
-                <option name="port" value="10000" />
-                <option name="duration" value="600" />
-                <option name="addr" type="recipe_eval"
value="['machines'][2]['netconfig'][3]['addresses'][0]"
/>
-                <option name="stream" value="udp" />
-            </options>
-        </command>
-        <command type="kill" machine_id="2" value="2"
/>
-
-<!-- TEST:3  start iperf tests ... -->
-
-        <command machine_id="1" type="test"
value="Iperf" bg_id="31">
-            <options>
-                <option name="install_dir" value="/opt" />
-                <option name="role" value="server" />
-                <option name="bind" value="192.168.100.2" />
-            </options>
-        </command>
-
-        <command type="exec" value="sleep 5" />
-
-        <command machine_id="2" type="test"
value="Iperf">
-            <options>
-                <option name="install_dir" value="/opt" />
-                <option name="role" value="client" />
-                <option name="iperf_server" value="192.168.100.2"
/>
-                <option name="duration" value="600" />
-            </options>
-        </command>
-
-        <command type="kill" machine_id="1" value="31"
/>
-
-
-    </command_sequence>
-
-</nettestrecipe>
diff --git a/example_recipes/machine_configs/config-f14peanut.xml
b/example_recipes/machine_configs/config-f14peanut.xml
deleted file mode 100644
index 4d0aac3..0000000
--- a/example_recipes/machine_configs/config-f14peanut.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<netmachineconfig>
-  <info hostname="10.34.37.141" rootpass="aaa"/>
-  <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
deleted file mode 100644
index ec0ec80..0000000
--- a/example_recipes/net_configs/netconfig1.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<netconfig>
-  <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"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-      <slave id="2"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.101.1/24"/>
-    </addresses>
-  </interface>
-</netconfig>
\ No newline at end of file
diff --git a/example_recipes/net_configs/netconfig2.xml
b/example_recipes/net_configs/netconfig2.xml
deleted file mode 100644
index ebda58a..0000000
--- a/example_recipes/net_configs/netconfig2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<netconfig>
-  <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"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.101.1/24"/>
-    </addresses>
-  </interface>
-</netconfig>
\ No newline at end of file
diff --git a/example_recipes/net_configs/netconfig3.xml
b/example_recipes/net_configs/netconfig3.xml
deleted file mode 100644
index c32cc01..0000000
--- a/example_recipes/net_configs/netconfig3.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<netconfig>
-  <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"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-      <slave id="2"/>
-    </slaves>
-  </interface>
-  <interface id="4" type="bridge">
-    <slaves>
-      <slave id="3"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.101.1/24"/>
-    </addresses>
-  </interface>
-</netconfig>
\ No newline at end of file
diff --git a/example_recipes/net_configs/netconfig4.xml
b/example_recipes/net_configs/netconfig4.xml
deleted file mode 100644
index ba99a3f..0000000
--- a/example_recipes/net_configs/netconfig4.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<netconfig>
-  <interface id="1" phys_id="1" type="eth"/>
-  <interface id="2" type="vlan">
-    <options>
-      <option name="vlan_tci" value="100"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.101.1/24"/>
-    </addresses>
-  </interface>
-</netconfig>
\ No newline at end of file
diff --git a/example_recipes/net_configs/netconfig5.xml
b/example_recipes/net_configs/netconfig5.xml
deleted file mode 100644
index 4597c38..0000000
--- a/example_recipes/net_configs/netconfig5.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<netconfig>
-  <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"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-      <slave id="2"/>
-    </slaves>
-  </interface>
-  <interface id="4" type="vlan">
-    <options>
-      <option name="vlan_tci" value="100"/>
-    </options>
-    <slaves>
-      <slave id="3"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.101.1/24"/>
-    </addresses>
-  </interface>
-</netconfig>
\ No newline at end of file
diff --git a/example_recipes/net_configs/netconfig6.xml
b/example_recipes/net_configs/netconfig6.xml
deleted file mode 100644
index b2af05c..0000000
--- a/example_recipes/net_configs/netconfig6.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<netconfig>
-  <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"/>
-    </options>
-    <slaves>
-      <slave id="1"/>
-      <slave id="2"/>
-    </slaves>
-  </interface>
-  <interface id="4" type="vlan">
-    <options>
-      <option name="vlan_tci" value="100"/>
-    </options>
-    <slaves>
-      <slave id="3"/>
-    </slaves>
-  </interface>
-  <interface id="5" type="bridge">
-    <slaves>
-      <slave id="4"/>
-    </slaves>
-    <addresses>
-      <address value="192.168.101.1/24"/>
-    </addresses>
-  </interface>
-</netconfig>
\ No newline at end of file
diff --git a/example_recipes/net_configs/netconfig7.xml
b/example_recipes/net_configs/netconfig7.xml
deleted file mode 100644
index ba45e4c..0000000
--- a/example_recipes/net_configs/netconfig7.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<netconfig>
-  <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>
-  </interface>
-</netconfig>
\ No newline at end of file
diff --git a/example_recipes/net_configs/team1.xml
b/example_recipes/net_configs/team1.xml
deleted file mode 100644
index 62959c3..0000000
--- a/example_recipes/net_configs/team1.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<netconfig>
-    <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. -->
-            <option name="teamd_config">
-                {
-                    "runner":   {"name": "roundrobin"},
-                    "ports":    {"eth1": {}, "eth2": {}}
-                }
-            </option>
-        </options>
-        <slaves>
-            <slave id="1"/>
-            <slave id="2"/>
-        </slaves>
-        <addresses>
-             <address value="192.168.122.200/24"/>
-        </addresses>
-    </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">
-                {
-                    "runner":   {"name": "roundrobin"},
-                    "ports":    {"eth3": {}, "eth4": {}}
-                }
-            </option>
-        </options>
-        <slaves>
-            <slave id="3"/>
-            <slave id="4"/>
-        </slaves>
-        <addresses>
-            <address value="192.168.122.210/24"/>
-        </addresses>
-    </interface>
-</netconfig>
diff --git a/example_recipes/packet_assert.xml b/example_recipes/packet_assert.xml
deleted file mode 100644
index d777d5e..0000000
--- a/example_recipes/packet_assert.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<nettestrecipe>
-    <command_sequence>
-        <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"/>
-            </options>
-        </command>
-        <command type="exec" value="sleep 3"/>
-        <command type="intr" value="1"/>
-    </command_sequence>
-</nettestrecipe>
\ No newline at end of file
diff --git a/example_recipes/recipe1.xml b/example_recipes/recipe1.xml
deleted file mode 100644
index dc4e086..0000000
--- a/example_recipes/recipe1.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<nettestrecipe>
-  <machines>
-    <machine id="1">
-      <netmachineconfig source="machine_configs/config-f14peanut.xml"/>
-      <netconfig source="net_configs/netconfig1.xml"/>
-    </machine>
-    <machine id="2">
-      <netmachineconfig>
-        <info hostname="junkbox.lab.eng.brq.redhat.com"/>
-        <netdevice hwaddr="00:10:18:61:35:9B" phys_id="1"
type="eth"/>
-      </netmachineconfig>
-      <netconfig>
-        <interface id="1" phys_id="1" type="eth">
-          <addresses>
-            <address value="192.168.101.2/24"/>
-          </addresses>
-        </interface>
-      </netconfig>
-    </machine>
-  </machines>
-  <command_sequence>
-    <command type="exec" value="sleep 4"/>
-
-    <command machine_id="1" timeout="30" type="test"
value="IcmpPing">
-      <options>
-        <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
deleted file mode 100644
index d8a538a..0000000
--- a/example_recipes/recipe2.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<nettestrecipe>
-  <machines>
-    <machine id="1">
-      <netmachineconfig>
-        <info hostname="10.34.37.141" rootpass="aaa"/>
-        <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>
-        <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"/>
-          </options>
-          <slaves>
-            <slave id="1"/>
-            <slave id="2"/>
-          </slaves>
-          <addresses>
-            <address value="192.168.101.1/24"/>
-          </addresses>
-        </interface>
-      </netconfig>
-    </machine>
-    <machine id="2">
-      <netmachineconfig>
-        <info hostname="junkbox.lab.eng.brq.redhat.com"/>
-        <netdevice hwaddr="00:13:20:F7:73:1B" phys_id="1"
type="eth"/>
-      </netmachineconfig>
-      <netconfig>
-        <interface id="1" phys_id="1" type="eth">
-          <addresses>
-            <address value="192.168.101.2/24"/>
-          </addresses>
-        </interface>
-      </netconfig>
-    </machine>
-  </machines>
-</nettestrecipe>
diff --git a/example_recipes/recipe3.xml b/example_recipes/recipe3.xml
deleted file mode 100644
index ef69e48..0000000
--- a/example_recipes/recipe3.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<nettestrecipe>
-  <command_sequence>
-    <command bg_id="1" type="exec" value="xeyes"/>
-    <command type="exec" value="sleep 2"/>
-    <command type="kill" value="1"/>
-    <command bg_id="1" type="exec" value="ping www.redhat.com
-c 2"/>
-    <command type="wait" value="1"/>
-    <command bg_id="1" type="exec" value="xeyes"/>
-    <command type="exec" value="sleep 2"/>
-    <command type="kill" value="1"/>
-  </command_sequence>
-</nettestrecipe>
\ No newline at end of file
diff --git a/example_recipes/recipe4.xml b/example_recipes/recipe4.xml
deleted file mode 100644
index ea0a453..0000000
--- a/example_recipes/recipe4.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<nettestrecipe>
-  <command_sequence source="cmd_sequences/sequence1.xml"/>
-</nettestrecipe>
\ No newline at end of file
diff --git a/example_recipes/recipe5.xml b/example_recipes/recipe5.xml
deleted file mode 100644
index 3cc4ec7..0000000
--- a/example_recipes/recipe5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<nettestrecipe>
-  <command_sequence>
-    <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"/>
-      </options>
-    </command>
-    <command type="test" value="DummyFailing"/>
-  </command_sequence>
-</nettestrecipe>
diff --git a/example_recipes/recipe6.xml b/example_recipes/recipe6.xml
deleted file mode 100644
index 2115fec..0000000
--- a/example_recipes/recipe6.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<nettestrecipe>
-  <machines>
-    <machine id="1">
-      <netmachineconfig source="machine_configs/config-f14peanut.xml"/>
-      <netconfig source="net_configs/netconfig1.xml"/>
-    </machine>
-  </machines>
-  <command_sequence>
-    <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"/>
-      </options>
-    </command>
-    <command machine_id="1" type="test"
value="DummyFailing"/>
-  </command_sequence>
-</nettestrecipe>
diff --git a/example_recipes/recipe_set1/recipe4.xml
b/example_recipes/recipe_set1/recipe4.xml
deleted file mode 120000
index bb6ebf7..0000000
--- a/example_recipes/recipe_set1/recipe4.xml
+++ /dev/null
@@ -1 +0,0 @@
-../recipe4.xml
\ No newline at end of file
diff --git a/example_recipes/recipe_set1/recipe5.xml
b/example_recipes/recipe_set1/recipe5.xml
deleted file mode 120000
index 341b1ba..0000000
--- a/example_recipes/recipe_set1/recipe5.xml
+++ /dev/null
@@ -1 +0,0 @@
-../recipe5.xml
\ No newline at end of file
diff --git a/example_recipes/recipe_set1/recipe6.xml
b/example_recipes/recipe_set1/recipe6.xml
deleted file mode 120000
index e26a97a..0000000
--- a/example_recipes/recipe_set1/recipe6.xml
+++ /dev/null
@@ -1 +0,0 @@
-../recipe6.xml
\ No newline at end of file
-- 
1.7.7.6