many changes to the vlan test to support testing all drivers at once

1 files changed, 86 insertions, 26 deletions

diff --git a/openvswitch-ovs2_4-vlan.xml b/openvswitch-ovs2_4-vlan.xml
index d0f5cf6..a85fb79 100644
--- a/openvswitch-ovs2_4-vlan.xml
+++ b/openvswitch-ovs2_4-vlan.xml
@@ -1,6 +1,6 @@
 <job retention_tag="120days">
 	<whiteboard>
-		tg3, bnx2x and ixgbe openvswitch vlan100 and vlan200
+		tg3, bnx2x and 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">
@@ -27,13 +27,13 @@
 				<task name="/distribution/install" role="STANDALONE">
 					<params/>
 				</task>
-                        	<task name="/distribution/get_task" role="SERVERS">
+                        	<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="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"/>
+						<param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.1 NETMASK=255.255.255.0"/>
+						<param name="eth2" value="DEVICE=eth2 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.2.1 NETMASK=255.255.255.0"/>
+						<param name="eth3" value="DEVICE=eth3 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.6.1 NETMASK=255.255.255.0"/>
 					</params>
                         	</task>
                         	<task name="/distribution/get_task" role="STANDALONE">
@@ -86,13 +86,13 @@
 				<task name="/distribution/install" role="STANDALONE">
 					<params/>
 				</task>
-                        	<task name="/distribution/get_task" role="SERVERS">
+                        	<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="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"/>
+						<param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.2 NETMASK=255.255.255.0"/>
+						<param name="eth2" value="DEVICE=eth2 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.2.2 NETMASK=255.255.255.0"/>
+						<param name="eth3" value="DEVICE=eth3 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.6.2 NETMASK=255.255.255.0"/>
 					</params>
                         	</task>
                         	<task name="/distribution/get_task" role="STANDALONE">
@@ -145,13 +145,13 @@
 				<task name="/distribution/install" role="STANDALONE">
 					<params/>
 				</task>
-                        	<task name="/distribution/get_task" role="SERVERS">
+                        	<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="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"/>
+						<param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.3 NETMASK=255.255.255.0"/>
+						<param name="eth2" value="DEVICE=eth2 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.2.3 NETMASK=255.255.255.0"/>
+						<param name="eth3" value="DEVICE=eth3 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.6.3 NETMASK=255.255.255.0"/>
 					</params>
                         	</task>
                         	<task name="/distribution/get_task" role="STANDALONE">
@@ -200,6 +200,7 @@ HOTPLUG=no
 OVSBOOTPROTO="static"
 IPADDR=192.168.1.21
 NETMASK=255.255.255.0
+OVS_OPTIONS="tag=100"
 EOF
 
 cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-ovsbridge2
@@ -211,6 +212,7 @@ HOTPLUG=no
 OVSBOOTPROTO="static"
 IPADDR=192.168.2.21
 NETMASK=255.255.255.0
+OVS_OPTIONS="tag=101"
 EOF
 
 cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-ovsbridge3
@@ -222,6 +224,7 @@ HOTPLUG=no
 OVSBOOTPROTO="static"
 IPADDR=192.168.6.21
 NETMASK=255.255.255.0
+OVS_OPTIONS="tag=102"
 EOF
 
 cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p1
@@ -233,9 +236,35 @@ UUID=050742c1-1e01-4df2-83d0-04737a1c5bfa
 ONBOOT=yes
 NM_CONTROLLED=no
 BOOTPROTO=none
-OVS_BRIDGE=ovsbridge2
+OVS_BRIDGE=ovsbridge1
 OVS_OPTIONS="trunk=100,200"
 EOF
+
+cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p2p1
+DEVICE=p2p1
+DEVICETYPE=ovs
+TYPE=OVSPort
+HWADDR=00:10:18:E8:7F:D0
+UUID=21522d02-db38-4ba5-9cc7-07fb589f83cd
+ONBOOT=yes
+BOOTPROTO=none
+OVS_BRIDGE=ovsbridge2
+OVS_OPTIONS="trunk=101,201"
+HOTPLUG=no
+EOF
+
+cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p6p1
+DEVICE=p6p1
+DEVICETYPE=ovs
+TYPE=OVSPort
+HWADDR=A0:36:9F:08:2B:C4
+UUID=9b17ffe0-d791-4ec2-92a4-6e96407feb60
+ONBOOT=yes
+NM_CONTROLLED=no
+BOOTPROTO=none
+OVS_BRIDGE=ovsbridge3
+OVS_OPTIONS="trunk=102,202"
+EOF
 				]]></ks_append>
 			</ks_appends>
 			<repos>
@@ -311,13 +340,13 @@ EOF
 				<task name="/distribution/install" role="STANDALONE">
 					<params/>
 				</task>
-                        	<task name="/distribution/get_task" role="SERVERS">
+                        	<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="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"/>
+						<param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.4 NETMASK=255.255.255.0"/>
+						<param name="eth2" value="DEVICE=eth2 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.2.4 NETMASK=255.255.255.0"/>
+						<param name="eth3" value="DEVICE=eth3 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.6.4 NETMASK=255.255.255.0"/>
 					</params>
                         	</task>
                         	<task name="/distribution/get_task" role="STANDALONE">
@@ -370,13 +399,13 @@ EOF
 				<task name="/distribution/install" role="STANDALONE">
 					<params/>
 				</task>
-                        	<task name="/distribution/get_task" role="SERVERS">
+                        	<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="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"/>
+						<param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.5 NETMASK=255.255.255.0"/>
+						<param name="eth2" value="DEVICE=eth2 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.2.5 NETMASK=255.255.255.0"/>
+						<param name="eth3" value="DEVICE=eth3 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.6.5 NETMASK=255.255.255.0"/>
 					</params>
                         	</task>
                         	<task name="/distribution/get_task" role="STANDALONE">
@@ -429,13 +458,13 @@ EOF
 				<task name="/distribution/install" role="STANDALONE">
 					<params/>
 				</task>
-                        	<task name="/distribution/get_task" role="SERVERS">
+                        	<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="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"/>
+						<param name="eth1" value="DEVICE=eth1 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.1.6 NETMASK=255.255.255.0"/>
+						<param name="eth2" value="DEVICE=eth2 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.2.6 NETMASK=255.255.255.0"/>
+						<param name="eth3" value="DEVICE=eth3 TYPE=Ethernet ONBOOT=yes IPADDR=192.168.6.6 NETMASK=255.255.255.0"/>
 					</params>
                         	</task>
                         	<task name="/distribution/get_task" role="STANDALONE">
@@ -484,6 +513,7 @@ HOTPLUG=no
 OVSBOOTPROTO="static"
 IPADDR=192.168.1.41
 NETMASK=255.255.255.0
+OVS_OPTIONS="tag=100"
 EOF
 
 cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-ovsbridge2
@@ -495,6 +525,7 @@ HOTPLUG=no
 OVSBOOTPROTO="static"
 IPADDR=192.168.2.41
 NETMASK=255.255.255.0
+OVS_OPTIONS="tag=101"
 EOF
 
 cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-ovsbridge3
@@ -506,6 +537,7 @@ HOTPLUG=no
 OVSBOOTPROTO="static"
 IPADDR=192.168.6.41
 NETMASK=255.255.255.0
+OVS_OPTIONS="tag=102"
 EOF
 
 cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p1
@@ -519,6 +551,34 @@ BOOTPROTO=none
 DEVICETYPE=ovs
 TYPE=OVSPort
 OVS_BRIDGE=ovsbridge1
+OVS_OPTIONS="trunk=100,200"
+EOF
+
+cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p2p1
+DEVICE=p2p1
+DEVICETYPE=ovs
+TYPE=OVSPort
+#HWADDR=00:10:18:E8:65:B0
+#TYPE=Ethernet
+#UUID=02535d4b-6819-4885-abc5-c08d889e589c
+ONBOOT=yes
+BOOTPROTO=none
+OVS_BRIDGE=ovsbridge2
+OVS_OPTIONS="trunk=101,201"
+HOTPLUG=no
+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=ovsbridge3
+OVS_OPTIONS="trunk=102,202"
 EOF
 				]]></ks_append>
 			</ks_appends>