new task for setting up network.

4 files changed, 708 insertions, 0 deletions

diff --git a/kernel/networking/add_interface/Makefile b/kernel/networking/add_interface/Makefile
new file mode 100644
index 0000000..7ec9bc3
--- /dev/null
+++ b/kernel/networking/add_interface/Makefile
@@ -0,0 +1,60 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /kernel/networking/add_interface
+#   Description: Verifies openvswitch is working properly
+#   Author: Bill Peck <bpeck@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/kernel/networking/add_interface
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Bill Peck <bpeck@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Adds a network interface" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        10m" >> $(METADATA)
+	@echo "Requires:        ipcalc" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
diff --git a/kernel/networking/add_interface/PURPOSE b/kernel/networking/add_interface/PURPOSE
new file mode 100644
index 0000000..9e762e2
--- /dev/null
+++ b/kernel/networking/add_interface/PURPOSE
@@ -0,0 +1,3 @@
+PURPOSE of /kernel/networking/add_interface
+Description: Creates an interface
+Author: Bill Peck <bpeck@redhat.com>
diff --git a/kernel/networking/add_interface/runtest.sh b/kernel/networking/add_interface/runtest.sh
new file mode 100755
index 0000000..edd236d
--- /dev/null
+++ b/kernel/networking/add_interface/runtest.sh
@@ -0,0 +1,52 @@
+#!/bin/bash -x
+# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /kernel/networking/add_interface
+#   Description: add $SWITCHES interface to guests
+#   Author: Bill Peck <bpeck@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2012 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/bin/rhts-environment.sh || exit 1
+
+add_interface()
+{
+    local intf=$1
+    local ipaddr=$2
+    local ip=$(echo $ipaddr | sed -e 's/\/.*//')
+    local netmask=$(ipcalc -m $ipaddr)
+    cat << EOF > /etc/sysconfig/network-scripts/ifcfg-$intf
+DEVICE=$intf
+ONBOOT=yes
+TYPE="Ethernet"
+HOTPLUG=no
+IPADDR=$ip
+$netmask
+EOF
+}
+
+for intf in $INTERFACES; do
+    ipaddr=$(eval echo \$$intf)
+    add_interface $intf $ipaddr && report_result $TEST/$intf PASS 0 || report_result $TEST/$intf FAIL 1
+done
+service network restart && report_result $TEST/restart_network PASS 0 || report_result $TEST/restart_network FAIL 1
diff --git a/openvswitch-ovs2_4-vlan.xml b/openvswitch-ovs2_4-vlan.xml
new file mode 100644
index 0000000..a4ef30d
--- /dev/null
+++ b/openvswitch-ovs2_4-vlan.xml
@@ -0,0 +1,593 @@
+<job retention_tag="120days">
+	<whiteboard>
+		tg3, bnx2x and ixgbe openvswitch vlan100 and vlan200
+	</whiteboard>
+	<recipeSet priority="High">
+		<recipe kernel_options="" kernel_options_post="" ks_meta="" role="None" whiteboard="rhel6u4_1 rhel6u4_2 rhel6u4_3">
+			<guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_1" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_1" role="None">
+				<autopick random="false"/>
+				<watchdog panic="None"/>
+				<packages/>
+				<ks_appends/>
+                                <repos>
+                                        <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
+                                </repos>
+				<distroRequires>
+					<and>
+						<distro_family op="=" value="RedHatEnterpriseLinux6"/>
+                                                <distro_tag op="=" value="STABLE"/>
+                                                <distro_variant op="=" value="Server"/>
+						<distro_arch op="=" value="x86_64"/>
+					</and>
+				</distroRequires>
+				<hostRequires>
+					<system_type value="Virtual"/>
+				</hostRequires>
+				<partitions/>
+				<task name="/distribution/install" role="STANDALONE">
+					<params/>
+				</task>
+                        	<task name="/distribution/get_task" role="SERVERS">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/>
+						<param name="INTERFACES" value="eth1 eth2 eth3"/>
+						<param name="eth1" value="192.168.1.1/24"/>
+						<param name="eth2" value="192.168.2.1/24"/>
+						<param name="eth3" value="192.168.6.1/24"/>
+					</params>
+                        	</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="VALID_ADDRS" value="192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5"/>
+						<param name="INVALID_ADDRS" value="192.168.1.3 192.168.1.6"/>
+					</params>
+                        	</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="VALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.4 192.168.2.5"/>
+						<param name="INVALID_ADDRS" value="192.168.2.3 192.168.2.6"/>
+					</params>
+                        	</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="VALID_ADDRS" value="192.168.6.1 192.168.6.2 192.168.6.4 192.168.6.5"/>
+						<param name="INVALID_ADDRS" value="192.168.6.3 192.168.6.6"/>
+					</params>
+                        	</task>
+                       		<task name="/distribution/reservesys">
+                               		<params>
+                                       		<param name="RESERVE_IF_FAIL" value="True"/>
+                               		</params>
+                       		</task>
+			</guestrecipe>
+			<guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_2" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_u2" role="None">
+				<autopick random="false"/>
+				<watchdog panic="None"/>
+				<packages/>
+				<ks_appends/>
+                                <repos>
+                                        <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
+                                </repos>
+				<distroRequires>
+					<and>
+						<distro_family op="=" value="RedHatEnterpriseLinux6"/>
+                                                <distro_tag op="=" value="STABLE"/>
+                                                <distro_variant op="=" value="Server"/>
+						<distro_arch op="=" value="x86_64"/>
+					</and>
+				</distroRequires>
+				<hostRequires>
+					<system_type value="Virtual"/>
+				</hostRequires>
+				<partitions/>
+				<task name="/distribution/install" role="STANDALONE">
+					<params/>
+				</task>
+                        	<task name="/distribution/get_task" role="SERVERS">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/>
+						<param name="INTERFACES" value="eth1 eth2 eth3"/>
+						<param name="eth1" value="192.168.1.2/24"/>
+						<param name="eth2" value="192.168.2.2/24"/>
+						<param name="eth3" value="192.168.6.2/24"/>
+					</params>
+                        	</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="VALID_ADDRS" value="192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5"/>
+						<param name="INVALID_ADDRS" value="192.168.1.3 192.168.1.6"/>
+					</params>
+                        	</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="VALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.4 192.168.2.5"/>
+						<param name="INVALID_ADDRS" value="192.168.2.3 192.168.2.6"/>
+					</params>
+                        	</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="VALID_ADDRS" value="192.168.6.1 192.168.6.2 192.168.6.4 192.168.6.5"/>
+						<param name="INVALID_ADDRS" value="192.168.6.3 192.168.6.6"/>
+					</params>
+                        	</task>
+                       		<task name="/distribution/reservesys">
+                               		<params>
+                                       		<param name="RESERVE_IF_FAIL" value="True"/>
+                               		</params>
+                       		</task>
+			</guestrecipe>
+			<guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_3" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_3" role="None">
+				<autopick random="false"/>
+				<watchdog panic="None"/>
+				<packages/>
+				<ks_appends/>
+                                <repos>
+                                        <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
+                                </repos>
+				<distroRequires>
+					<and>
+						<distro_family op="=" value="RedHatEnterpriseLinux6"/>
+                                                <distro_tag op="=" value="STABLE"/>
+                                                <distro_variant op="=" value="Server"/>
+						<distro_arch op="=" value="i386"/>
+					</and>
+				</distroRequires>
+				<hostRequires>
+					<system_type value="Virtual"/>
+				</hostRequires>
+				<partitions/>
+				<task name="/distribution/install" role="STANDALONE">
+					<params/>
+				</task>
+                        	<task name="/distribution/get_task" role="SERVERS">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/>
+						<param name="INTERFACES" value="eth1 eth2 eth3"/>
+						<param name="eth1" value="192.168.1.3/24"/>
+						<param name="eth2" value="192.168.2.3/24"/>
+						<param name="eth3" value="192.168.6.3/24"/>
+					</params>
+                        	</task>
+				<task name="/distribution/command" role="SERVERS">
+					<params>
+						<param name="CMDS_TO_RUN" value="sleep 300"/>
+					</params>
+				</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="INVALID_ADDRS" value="192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5"/>
+						<param name="VALID_ADDRS" value="192.168.2.3 192.168.2.6"/>
+					</params>
+                        	</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="INVALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.4 192.168.2.5"/>
+						<param name="VALID_ADDRS" value="192.168.2.3 192.168.2.6"/>
+					</params>
+                        	</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="INVALID_ADDRS" value="192.168.6.1 192.168.6.2 192.168.6.4 192.168.6.5"/>
+						<param name="VALID_ADDRS" value="192.168.6.3 192.168.6.6"/>
+					</params>
+                        	</task>
+                       		<task name="/distribution/reservesys">
+                               		<params>
+                                       		<param name="RESERVE_IF_FAIL" value="True"/>
+                               		</params>
+                       		</task>
+			</guestrecipe>
+			<autopick random="false"/>
+			<watchdog panic="None"/>
+			<packages/>
+			<ks_appends>
+				<ks_append><![CDATA[
+yum -y install openvswitch
+
+# Turn on openvswitch 
+chkconfig --add openvswitch
+
+cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-ovsbridge1
+DEVICE=ovsbridge1
+ONBOOT=yes
+DEVICETYPE=ovs
+TYPE=OVSBridge
+HOTPLUG=no
+OVSBOOTPROTO="static"
+IPADDR=192.168.1.21
+NETMASK=255.255.255.0
+EOF
+
+cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-ovsbridge2
+DEVICE=ovsbridge2
+ONBOOT=yes
+DEVICETYPE=ovs
+TYPE=OVSBridge
+HOTPLUG=no
+OVSBOOTPROTO="static"
+IPADDR=192.168.2.21
+NETMASK=255.255.255.0
+EOF
+
+cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-ovsbridge3
+DEVICE=ovsbridge3
+ONBOOT=yes
+DEVICETYPE=ovs
+TYPE=OVSBridge
+HOTPLUG=no
+OVSBOOTPROTO="static"
+IPADDR=192.168.6.21
+NETMASK=255.255.255.0
+EOF
+
+cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p1
+DEVICE=p1p1
+HWADDR=00:10:18:E5:EA:5C
+DEVICETYPE=ovs
+TYPE=OVSPort
+UUID=050742c1-1e01-4df2-83d0-04737a1c5bfa
+ONBOOT=yes
+NM_CONTROLLED=no
+BOOTPROTO=none
+OVS_BRIDGE=ovsbridge2
+OVS_OPTIONS="trunk=100,200"
+EOF
+				]]></ks_append>
+			</ks_appends>
+			<repos>
+				<repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
+				<!-- <repo name="openvswitch" url="http://download.devel.redhat.com/brewroot/repos/rh-folsom-rhel-6-build/latest/x86_64/">-->
+			</repos>
+			<distroRequires>
+				<and>
+					<distro_family op="=" value="RedHatEnterpriseLinux6"/>
+                                        <distro_tag op="=" value="STABLE"/>
+                                        <distro_variant op="=" value="Server"/>
+					<distro_arch op="=" value="x86_64"/>
+				</and>
+			</distroRequires>
+			<hostRequires>
+				<and>
+                                        <system>
+                                         <name op="=" value="qe-dell-ovs2.lab.bos.redhat.com"/>
+					 <arch op="=" value="x86_64"/>
+                                        </system>
+					<key_value key="HVM" op="=" value="1"/>
+				</and>
+				<system_type value="Machine"/>
+			</hostRequires>
+			<partitions/>
+			<task name="/distribution/install" role="STANDALONE">
+				<params/>
+			</task>
+			<task name="/distribution/virt/install" role="SERVERS">
+				<params>
+					<param name="KILLTIMEOVERRIDE" value="59280"/>
+				</params>
+			</task>
+                        <task name="/distribution/get_task" role="STANDALONE">
+				<params>
+					<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/libvirt/add_interface"/>
+					<param name="GUESTS" value="rhel6u4_1 rhel6u4_2 rhel6u4_3"/>
+					<param name="rhel6u4_1" value="switch=ovsbridge1;tag=100 switch=ovsbridge2;tag=101 switch=ovsbridge3;tag=102"/>
+					<param name="rhel6u4_2" value="switch=ovsbridge1;tag=100 switch=ovsbridge2;tag=101 switch=ovsbridge3;tag=102"/>
+					<param name="rhel6u4_3" value="switch=ovsbridge1;tag=200 switch=ovsbridge2;tag=201 switch=ovsbridge3;tag=202"/>
+				</params>
+                        </task>
+			<task name="/distribution/virt/start" role="STANDALONE">
+				<params/>
+			</task>
+                      	<task name="/distribution/reservesys">
+                       		<params>
+                               		<param name="RESERVE_IF_FAIL" value="True"/>
+                       		</params>
+                       	</task>
+		</recipe>
+		<recipe kernel_options="" kernel_options_post="" ks_meta="" role="None" whiteboard="rhel6u4_4 rhel6u4_5 rhel6u4_6">
+			<guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_4" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_4" role="None">
+				<autopick random="false"/>
+				<watchdog panic="None"/>
+				<packages/>
+				<ks_appends/>
+                                <repos>
+                                        <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
+                                </repos>
+				<distroRequires>
+					<and>
+						<distro_family op="=" value="RedHatEnterpriseLinux6"/>
+                                                <distro_tag op="=" value="STABLE"/>
+                                                <distro_variant op="=" value="Server"/>
+						<distro_arch op="=" value="x86_64"/>
+					</and>
+				</distroRequires>
+				<hostRequires>
+					<system_type value="Virtual"/>
+				</hostRequires>
+				<partitions/>
+				<task name="/distribution/install" role="STANDALONE">
+					<params/>
+				</task>
+                        	<task name="/distribution/get_task" role="SERVERS">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/>
+						<param name="INTERFACES" value="eth1 eth2 eth3"/>
+						<param name="eth1" value="192.168.1.4/24"/>
+						<param name="eth2" value="192.168.2.4/24"/>
+						<param name="eth3" value="192.168.6.4/24"/>
+					</params>
+                        	</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="VALID_ADDRS" value="192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5"/>
+						<param name="INVALID_ADDRS" value="192.168.1.3 192.168.1.6"/>
+					</params>
+                        	</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="VALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.4 192.168.2.5"/>
+						<param name="INVALID_ADDRS" value="192.168.2.3 192.168.2.6"/>
+					</params>
+                        	</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="VALID_ADDRS" value="192.168.6.1 192.168.6.2 192.168.6.4 192.168.6.5"/>
+						<param name="INVALID_ADDRS" value="192.168.6.3 192.168.6.6"/>
+					</params>
+                        	</task>
+                      		<task name="/distribution/reservesys">
+                       			<params>
+                               			<param name="RESERVE_IF_FAIL" value="True"/>
+                       			</params>
+                       		</task>
+			</guestrecipe>
+			<guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_5" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_5" role="None">
+				<autopick random="false"/>
+				<watchdog panic="None"/>
+				<packages/>
+				<ks_appends/>
+                                <repos>
+                                        <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
+                                </repos>
+				<distroRequires>
+					<and>
+						<distro_family op="=" value="RedHatEnterpriseLinux6"/>
+                                                <distro_tag op="=" value="STABLE"/>
+                                                <distro_variant op="=" value="Server"/>
+						<distro_arch op="=" value="x86_64"/>
+					</and>
+				</distroRequires>
+				<hostRequires>
+					<system_type value="Virtual"/>
+				</hostRequires>
+				<partitions/>
+				<task name="/distribution/install" role="STANDALONE">
+					<params/>
+				</task>
+                        	<task name="/distribution/get_task" role="SERVERS">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/>
+						<param name="INTERFACES" value="eth1 eth2 eth3"/>
+						<param name="eth1" value="192.168.1.5/24"/>
+						<param name="eth2" value="192.168.2.5/24"/>
+						<param name="eth3" value="192.168.6.5/24"/>
+					</params>
+                        	</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="VALID_ADDRS" value="192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5"/>
+						<param name="INVALID_ADDRS" value="192.168.1.3 192.168.1.6"/>
+					</params>
+                        	</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="VALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.4 192.168.2.5"/>
+						<param name="INVALID_ADDRS" value="192.168.2.3 192.168.2.6"/>
+					</params>
+                        	</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="VALID_ADDRS" value="192.168.6.1 192.168.6.2 192.168.6.4 192.168.6.5"/>
+						<param name="INVALID_ADDRS" value="192.168.6.3 192.168.6.6"/>
+					</params>
+                        	</task>
+                      		<task name="/distribution/reservesys">
+                       			<params>
+                               			<param name="RESERVE_IF_FAIL" value="True"/>
+                       			</params>
+                       		</task>
+			</guestrecipe>
+			<guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_6" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_6" role="None">
+				<autopick random="false"/>
+				<watchdog panic="None"/>
+				<packages/>
+				<ks_appends/>
+                                <repos>
+                                        <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
+                                </repos>
+				<distroRequires>
+					<and>
+						<distro_family op="=" value="RedHatEnterpriseLinux6"/>
+                                                <distro_tag op="=" value="STABLE"/>
+                                                <distro_variant op="=" value="Server"/>
+						<distro_arch op="=" value="i386"/>
+					</and>
+				</distroRequires>
+				<hostRequires>
+					<system_type value="Virtual"/>
+				</hostRequires>
+				<partitions/>
+				<task name="/distribution/install" role="STANDALONE">
+					<params/>
+				</task>
+                        	<task name="/distribution/get_task" role="SERVERS">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/add_interface"/>
+						<param name="INTERFACES" value="eth1 eth2 eth3"/>
+						<param name="eth1" value="192.168.1.6/24"/>
+						<param name="eth2" value="192.168.2.6/24"/>
+						<param name="eth3" value="192.168.6.6/24"/>
+					</params>
+                        	</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="INVALID_ADDRS" value="192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5"/>
+						<param name="VALID_ADDRS" value="192.168.1.3 192.168.1.6"/>
+					</params>
+                        	</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="INVALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.4 192.168.2.5"/>
+						<param name="VALID_ADDRS" value="192.168.2.3 192.168.2.6"/>
+					</params>
+                        	</task>
+                        	<task name="/distribution/get_task" role="STANDALONE">
+					<params>
+						<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/netperf"/>
+						<param name="INVALID_ADDRS" value="192.168.6.1 192.168.6.2 192.168.6.4 192.168.6.5"/>
+						<param name="VALID_ADDRS" value="192.168.6.3 192.168.6.6"/>
+					</params>
+                        	</task>
+                      		<task name="/distribution/reservesys">
+                       			<params>
+                               			<param name="RESERVE_IF_FAIL" value="True"/>
+                       			</params>
+                       		</task>
+			</guestrecipe>
+			<autopick random="false"/>
+			<watchdog panic="None"/>
+			<packages/>
+			<ks_appends>
+				<ks_append><![CDATA[
+yum -y install openvswitch
+
+# Turn on openvswitch 
+chkconfig --add openvswitch
+
+cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-ovsbridge1
+DEVICE=ovsbridge1
+ONBOOT=yes
+DEVICETYPE=ovs
+TYPE=OVSBridge
+HOTPLUG=no
+OVSBOOTPROTO="static"
+IPADDR=192.168.1.41
+NETMASK=255.255.255.0
+EOF
+
+cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-ovsbridge2
+DEVICE=ovsbridge2
+ONBOOT=yes
+DEVICETYPE=ovs
+TYPE=OVSBridge
+HOTPLUG=no
+OVSBOOTPROTO="static"
+IPADDR=192.168.2.41
+NETMASK=255.255.255.0
+EOF
+
+cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-ovsbridge3
+DEVICE=ovsbridge3
+ONBOOT=yes
+DEVICETYPE=ovs
+TYPE=OVSBridge
+HOTPLUG=no
+OVSBOOTPROTO="static"
+IPADDR=192.168.6.41
+NETMASK=255.255.255.0
+EOF
+
+cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p1
+DEVICE=p1p1
+HWADDR=00:10:18:E5:EF:8C
+#TYPE=Ethernet
+UUID=f8d7e17f-bb46-4e4c-98d7-3ffdd32a43d7
+ONBOOT=yes
+NM_CONTROLLED=no
+BOOTPROTO=none
+DEVICETYPE=ovs
+TYPE=OVSPort
+OVS_BRIDGE=ovsbridge1
+EOF
+				]]></ks_append>
+			</ks_appends>
+			<repos>
+				<repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
+				<!-- <repo name="openvswitch" url="http://download.devel.redhat.com/brewroot/repos/rh-folsom-rhel-6-build/latest/x86_64/">-->
+			</repos>
+			<distroRequires>
+				<and>
+					<distro_family op="=" value="RedHatEnterpriseLinux6"/>
+                                        <distro_tag op="=" value="STABLE"/>
+                                        <distro_variant op="=" value="Server"/>
+					<distro_arch op="=" value="x86_64"/>
+				</and>
+			</distroRequires>
+			<hostRequires>
+				<and>
+                                        <system>
+                                         <name op="=" value="qe-dell-ovs4.lab.bos.redhat.com"/>
+					 <arch op="=" value="x86_64"/>
+                                        </system>
+					<key_value key="HVM" op="=" value="1"/>
+				</and>
+				<system_type value="Machine"/>
+			</hostRequires>
+			<partitions/>
+			<task name="/distribution/install" role="STANDALONE">
+				<params/>
+			</task>
+			<task name="/distribution/virt/install" role="SERVERS">
+				<params>
+					<param name="KILLTIMEOVERRIDE" value="59280"/>
+				</params>
+			</task>
+                        <task name="/distribution/get_task" role="STANDALONE">
+				<params>
+					<param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/libvirt/add_interface"/>
+					<param name="GUESTS" value="rhel6u4_4 rhel6u4_5 rhel6u4_6"/>
+					<param name="rhel6u4_4" value="switch=ovsbridge1;tag=100 switch=ovsbridge2;tag=101 switch=ovsbridge3;tag=102"/>
+					<param name="rhel6u4_5" value="switch=ovsbridge1;tag=100 switch=ovsbridge2;tag=101 switch=ovsbridge3;tag=102"/>
+					<param name="rhel6u4_6" value="switch=ovsbridge1;tag=200 switch=ovsbridge2;tag=201 switch=ovsbridge3;tag=202"/>
+				</params>
+                        </task>
+			<task name="/distribution/virt/start" role="STANDALONE">
+				<params/>
+			</task>
+                        <!--
+                             Wait for guests to finish setting up networks
+
+                        <task name="/distribution/get_task" role="STANDALONE">
+				<params>
+                                        <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/libvirt/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/libvirt/netperf"/>
+					<param name="WHITEBOARD" value="tg3/"/>
+					<param name="GUESTS" value="rhel6u4_4 rhel6u4_5 rhel6u4_6"/>
+					<param name="rhel6u4_4" value="valid_addrs=192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5 invalid_addrs=192.168.2.3 192.168.2.6"/>
+					<param name="rhel6u4_5" value="valid_addrs=192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5 invalid_addrs=192.168.2.3 192.168.2.6"/>
+					<param name="rhel6u4_6" value="valid_addrs=192.168.1.1 192.168.1.2 192.168.1.4 192.168.1.5 invalid_addrs=192.168.2.3 192.168.2.6"/>
+                             
+                        -->
+                   	<task name="/distribution/reservesys">
+                      		<params>
+                       			<param name="RESERVE_IF_FAIL" value="True"/>
+                      		</params>
+                      	</task>
+		</recipe>
+	</recipeSet>
+</job>