From 5f90020c024814df96d34700dc86ebe43576a5c4 Mon Sep 17 00:00:00 2001
From: Bill Peck <bpeck@redhat.com>
Date: Thu, 31 Jan 2013 14:22:23 -0500
Subject: Update test plans

---
 openvswitch-ovs2_4-ixgbe-vlan.xml | 325 ++++++++++++--------------------------
 1 file changed, 99 insertions(+), 226 deletions(-)

(limited to 'openvswitch-ovs2_4-ixgbe-vlan.xml')

diff --git a/openvswitch-ovs2_4-ixgbe-vlan.xml b/openvswitch-ovs2_4-ixgbe-vlan.xml
index 4565311..33940da 100644
--- a/openvswitch-ovs2_4-ixgbe-vlan.xml
+++ b/openvswitch-ovs2_4-ixgbe-vlan.xml
@@ -1,25 +1,14 @@
 <job retention_tag="120days">
 	<whiteboard>
-		ixgbe openvswitch vlan100 and vlan200
+		ixgbe openvswitch with vlans
 	</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" guestname="rhel6u4_1" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_1" role="None">
+			<guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_1" kernel_options="" kernel_options_post="" ks_meta="password=$1$shaker$af5zuvHq7IXyxmXpAgNoD1" whiteboard="rhel6u4_1" role="None">
 				<autopick random="false"/>
 				<watchdog panic="None"/>
 				<packages/>
-				<ks_appends>
-					<ks_append><![CDATA[
-cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1
-DEVICE=eth1
-ONBOOT=yes
-TYPE="Ethernet"
-HOTPLUG=no
-IPADDR=192.168.2.1
-NETMASK=255.255.255.0
-EOF
-					]]></ks_append>
-				</ks_appends>
+				<ks_appends/>
                                 <repos>
                                         <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
                                 </repos>
@@ -38,16 +27,16 @@ EOF
 				<task name="/distribution/install" role="STANDALONE">
 					<params/>
 				</task>
-				<task name="/distribution/command" role="SERVERS">
+                        	<task name="/distribution/command" role="STANDALONE">
 					<params>
-						<param name="CMDS_TO_RUN" value="sleep 300"/>
+						<param name="CMDS_TO_RUN" value="yum -y install netperf"/>
 					</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"/>
+						<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="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.1 NETMASK=255.255.255.0"/>
 					</params>
                         	</task>
                        		<task name="/distribution/reservesys">
@@ -56,22 +45,11 @@ EOF
                                		</params>
                        		</task>
 			</guestrecipe>
-			<guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_2" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_u2" role="None">
+			<guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_2" kernel_options="" kernel_options_post="" ks_meta="password=$1$shaker$af5zuvHq7IXyxmXpAgNoD1" whiteboard="rhel6u4_u2" role="None">
 				<autopick random="false"/>
 				<watchdog panic="None"/>
 				<packages/>
-				<ks_appends>
-					<ks_append><![CDATA[
-cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1
-DEVICE=eth1
-ONBOOT=yes
-TYPE="Ethernet"
-HOTPLUG=no
-IPADDR=192.168.2.2
-NETMASK=255.255.255.0
-EOF
-					]]></ks_append>
-				</ks_appends>
+				<ks_appends/>
                                 <repos>
                                         <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
                                 </repos>
@@ -90,16 +68,16 @@ EOF
 				<task name="/distribution/install" role="STANDALONE">
 					<params/>
 				</task>
-				<task name="/distribution/command" role="SERVERS">
+                        	<task name="/distribution/command" role="STANDALONE">
 					<params>
-						<param name="CMDS_TO_RUN" value="sleep 300"/>
+						<param name="CMDS_TO_RUN" value="yum -y install netperf"/>
 					</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"/>
+						<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="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.2 NETMASK=255.255.255.0"/>
 					</params>
                         	</task>
                        		<task name="/distribution/reservesys">
@@ -108,22 +86,11 @@ EOF
                                		</params>
                        		</task>
 			</guestrecipe>
-			<guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_3" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_3" role="None">
+			<guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_3" kernel_options="" kernel_options_post="" ks_meta="password=$1$shaker$af5zuvHq7IXyxmXpAgNoD1" whiteboard="rhel6u4_3" role="None">
 				<autopick random="false"/>
 				<watchdog panic="None"/>
 				<packages/>
-				<ks_appends>
-					<ks_append><![CDATA[
-cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1
-DEVICE=eth1
-ONBOOT=yes
-TYPE="Ethernet"
-HOTPLUG=no
-IPADDR=192.168.2.3
-NETMASK=255.255.255.0
-EOF
-					]]></ks_append>
-				</ks_appends>
+				<ks_appends/>
                                 <repos>
                                         <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
                                 </repos>
@@ -142,16 +109,16 @@ EOF
 				<task name="/distribution/install" role="STANDALONE">
 					<params/>
 				</task>
-				<task name="/distribution/command" role="SERVERS">
+                        	<task name="/distribution/command" role="STANDALONE">
 					<params>
-						<param name="CMDS_TO_RUN" value="sleep 300"/>
+						<param name="CMDS_TO_RUN" value="yum -y install netperf"/>
 					</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"/>
+						<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="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.3 NETMASK=255.255.255.0"/>
 					</params>
                         	</task>
                        		<task name="/distribution/reservesys">
@@ -162,59 +129,7 @@ EOF
 			</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.2.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.66.21
-#NETMASK=255.255.255.0
-#EOF
-
-
-cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p6p1
-DEVICE=p6p1
-DEVICETYPE=ovs
-TYPE=OVSPort
-HWADDR=A0:36:9F:08:2B:C4
-ONBOOT=yes
-NM_CONTROLLED=no
-BOOTPROTO=none
-OVS_BRIDGE=ovsbridge1
-OVS_OPTIONS="trunk=100,200"
-EOF
-
-#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p6p2
-#DEVICE=p6p2
-#HWADDR=A0:36:9F:08:2B:C6
-#TYPE=Ethernet
-#UUID=91fd6c7d-5ecd-4cfd-af05-45be6e448c46
-#ONBOOT=no
-#NM_CONTROLLED=yes
-#BOOTPROTO=dhcp
-#EOF
-				]]></ks_append>
-			</ks_appends>
+			<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/">-->
@@ -246,21 +161,41 @@ EOF
 					<param name="KILLTIMEOVERRIDE" value="59280"/>
 				</params>
 			</task>
+                        <task name="/distribution/command" role="STANDALONE">
+				<params>
+					<param name="CMDS_TO_RUN" value="yum -y install openvswitch; chkconfig --add openvswitch"/>
+				</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/add_interface"/>
+					<param name="INTERFACES" value="ovsbridge1 p6p1"/>
+					<param name="ovsbridge1" value="DEVICE=ovsbridge1 ONBOOT=yes DEVICETYPE=ovs TYPE=OVSBridge OVSBOOTPROTO=static IPADDR=192.168.1.21 NETMASK=255.255.255.0"/>
+					<param name="p6p1" value="DEVICE=p6p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge1 OVS_OPTIONS=trunk=100,200"/>
+				</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="SWITCHES" value="ovsbridge1"/>
-					<param name="VLANS_ovsbridge1" value="vlan100 vlan200"/>
-					<param name="vlan100" value="rhel6u4_1 rhel6u4_2"/>
-					<param name="vlan200" value="rhel6u4_3"/>
-					<!-- <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/br_to_vswitch git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/libvirt/add_interface"/> -->
-					<!-- <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/create_vlan"/> -->
-					<!-- <param name="VLANS" value="100 101"/> -->
+					<param name="GUESTS" value="rhel6u4_1 rhel6u4_2 rhel6u4_3"/>
+					<param name="rhel6u4_1" value="switch=ovsbridge1;tag=100"/>
+					<param name="rhel6u4_2" value="switch=ovsbridge1;tag=100"/>
+					<param name="rhel6u4_3" value="switch=ovsbridge1;tag=200"/>
 				</params>
                         </task>
 			<task name="/distribution/virt/start" role="STANDALONE">
 				<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/libvirt/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/netperf-server git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/netperf-client"/>
+					<param name="WHITEBOARD" value="ixgbe"/>
+					<param name="GUESTS" value="rhel6u4_1 rhel6u4_2 rhel6u4_3"/>
+					<param name="rhel6u4_1" value="valid_addrs=192.168.1.1;192.168.1.2;192.168.1.4;192.168.1.5 invalid_addrs=192.168.1.3;192.168.1.6"/>
+					<param name="rhel6u4_2" value="valid_addrs=192.168.1.1;192.168.1.2;192.168.1.4;192.168.1.5 invalid_addrs=192.168.1.3;192.168.1.6"/>
+					<param name="rhel6u4_3" value="invalid_addrs=192.168.1.1;192.168.1.2;192.168.1.4;192.168.1.5 valid_addrs=192.168.1.3;192.168.1.6"/>
+				</params>
+			</task>
                       	<task name="/distribution/reservesys">
                        		<params>
                                		<param name="RESERVE_IF_FAIL" value="True"/>
@@ -268,22 +203,11 @@ EOF
                        	</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" guestname="rhel6u4_4" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_4" role="None">
+			<guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_4" kernel_options="" kernel_options_post="" ks_meta="password=$1$shaker$af5zuvHq7IXyxmXpAgNoD1" whiteboard="rhel6u4_4" role="None">
 				<autopick random="false"/>
 				<watchdog panic="None"/>
 				<packages/>
-				<ks_appends>
-					<ks_append><![CDATA[
-cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1
-DEVICE=eth1
-ONBOOT=yes
-TYPE="Ethernet"
-HOTPLUG=no
-IPADDR=192.168.2.4
-NETMASK=255.255.255.0
-EOF
-					]]></ks_append>
-				</ks_appends>
+				<ks_appends/>
                                 <repos>
                                         <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
                                 </repos>
@@ -302,16 +226,16 @@ EOF
 				<task name="/distribution/install" role="STANDALONE">
 					<params/>
 				</task>
-				<task name="/distribution/command" role="SERVERS">
+                        	<task name="/distribution/command" role="STANDALONE">
 					<params>
-						<param name="CMDS_TO_RUN" value="sleep 300"/>
+						<param name="CMDS_TO_RUN" value="yum -y install netperf"/>
 					</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"/>
+						<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="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.4 NETMASK=255.255.255.0"/>
 					</params>
                         	</task>
                       		<task name="/distribution/reservesys">
@@ -320,22 +244,11 @@ EOF
                        			</params>
                        		</task>
 			</guestrecipe>
-			<guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_5" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_5" role="None">
+			<guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_5" kernel_options="" kernel_options_post="" ks_meta="password=$1$shaker$af5zuvHq7IXyxmXpAgNoD1" whiteboard="rhel6u4_5" role="None">
 				<autopick random="false"/>
 				<watchdog panic="None"/>
 				<packages/>
-				<ks_appends>
-					<ks_append><![CDATA[
-cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1
-DEVICE=eth1
-ONBOOT=yes
-TYPE="Ethernet"
-HOTPLUG=no
-IPADDR=192.168.2.5
-NETMASK=255.255.255.0
-EOF
-					]]></ks_append>
-				</ks_appends>
+				<ks_appends/>
                                 <repos>
                                         <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
                                 </repos>
@@ -354,16 +267,16 @@ EOF
 				<task name="/distribution/install" role="STANDALONE">
 					<params/>
 				</task>
-				<task name="/distribution/command" role="SERVERS">
+                        	<task name="/distribution/command" role="STANDALONE">
 					<params>
-						<param name="CMDS_TO_RUN" value="sleep 300"/>
+						<param name="CMDS_TO_RUN" value="yum -y install netperf"/>
 					</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"/>
+						<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="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.5 NETMASK=255.255.255.0"/>
 					</params>
                         	</task>
                       		<task name="/distribution/reservesys">
@@ -372,22 +285,11 @@ EOF
                        			</params>
                        		</task>
 			</guestrecipe>
-			<guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_6" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_6" role="None">
+			<guestrecipe guestargs=" -s 10 --hvm --kvm --serial pty" guestname="rhel6u4_6" kernel_options="" kernel_options_post="" ks_meta="password=$1$shaker$af5zuvHq7IXyxmXpAgNoD1" whiteboard="rhel6u4_6" role="None">
 				<autopick random="false"/>
 				<watchdog panic="None"/>
 				<packages/>
-				<ks_appends>
-					<ks_append><![CDATA[
-cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-eth1
-DEVICE=eth1
-ONBOOT=yes
-TYPE="Ethernet"
-HOTPLUG=no
-IPADDR=192.168.2.6
-NETMASK=255.255.255.0
-EOF
-					]]></ks_append>
-				</ks_appends>
+				<ks_appends/>
                                 <repos>
                                         <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
                                 </repos>
@@ -406,16 +308,16 @@ EOF
 				<task name="/distribution/install" role="STANDALONE">
 					<params/>
 				</task>
-				<task name="/distribution/command" role="SERVERS">
+                        	<task name="/distribution/command" role="STANDALONE">
 					<params>
-						<param name="CMDS_TO_RUN" value="sleep 300"/>
+						<param name="CMDS_TO_RUN" value="yum -y install netperf"/>
 					</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"/>
+						<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="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.6 NETMASK=255.255.255.0"/>
 					</params>
                         	</task>
                       		<task name="/distribution/reservesys">
@@ -427,56 +329,7 @@ EOF
 			<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.2.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.66.41
-#NETMASK=255.255.255.0
-#EOF
-
-cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p6p1
-DEVICE=p6p1
-DEVICETYPE=ovs
-TYPE=OVSPort
-HWADDR=A0:36:9F:08:2D:34
-UUID=1c5be512-f3f9-4bf2-941e-dbed6c27118e
-ONBOOT=yes
-NM_CONTROLLED=no
-BOOTPROTO=none
-OVS_BRIDGE=ovsbridge1
-EOF
-
-#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p6p2
-#DEVICE=p6p2
-#HWADDR=A0:36:9F:08:2D:36
-#TYPE=Ethernet
-#UUID=06569135-c76b-43ea-9329-5266f78d0e22
-#ONBOOT=no
-#NM_CONTROLLED=yes
-#BOOTPROTO=dhcp
-				]]></ks_append>
-			</ks_appends>
+			<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/">-->
@@ -508,21 +361,41 @@ EOF
 					<param name="KILLTIMEOVERRIDE" value="59280"/>
 				</params>
 			</task>
+                        <task name="/distribution/command" role="STANDALONE">
+				<params>
+					<param name="CMDS_TO_RUN" value="yum -y install openvswitch; chkconfig --add openvswitch"/>
+				</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/add_interface"/>
+					<param name="INTERFACES" value="ovsbridge1 p6p1"/>
+					<param name="ovsbridge1" value="DEVICE=ovsbridge1 ONBOOT=yes DEVICETYPE=ovs TYPE=OVSBridge OVSBOOTPROTO=static IPADDR=192.168.1.41 NETMASK=255.255.255.0"/>
+					<param name="p6p1" value="DEVICE=p6p1 ONBOOT=yes BOOTPROTO=none DEVICETYPE=ovs TYPE=OVSPort OVS_BRIDGE=ovsbridge1 OVS_OPTIONS=trunk=100,200"/>
+				</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="SWITCHES" value="ovsbridge1"/>
-					<param name="VLANS_ovsbridge1" value="vlan100 vlan200"/>
-					<param name="vlan100" value="rhel6u4_4 rhel6u4_5"/>
-					<param name="vlan200" value="rhel6u4_6"/>
-					<!-- <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/br_to_vswitch git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/libvirt/add_interface"/> -->
-					<!-- <param name="GITURIS" value="git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/openvswitch/create_vlan"/> -->
-					<!-- <param name="VLANS" value="100 101"/> -->
+					<param name="GUESTS" value="rhel6u4_4 rhel6u4_5 rhel6u4_6"/>
+					<param name="rhel6u4_4" value="switch=ovsbridge1;tag=100"/>
+					<param name="rhel6u4_5" value="switch=ovsbridge1;tag=100"/>
+					<param name="rhel6u4_6" value="switch=ovsbridge1;tag=200"/>
 				</params>
                         </task>
 			<task name="/distribution/virt/start" role="STANDALONE">
 				<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/libvirt/ping git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/netperf-server git://git2.engineering.redhat.com/users/bpeck/tests.git?master#kernel/networking/libvirt/netperf-client"/>
+					<param name="WHITEBOARD" value="ixgbe"/>
+					<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.1.3;192.168.1.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.1.3;192.168.1.6"/>
+					<param name="rhel6u4_6" value="invalid_addrs=192.168.1.1;192.168.1.2;192.168.1.4;192.168.1.5 valid_addrs=192.168.1.3;192.168.1.6"/>
+				</params>
+			</task>
                    	<task name="/distribution/reservesys">
                       		<params>
                        			<param name="RESERVE_IF_FAIL" value="True"/>
-- 
cgit