diff options
| author | Bill Peck <bpeck@redhat.com> | 2013-01-23 16:47:16 -0500 |
|---|---|---|
| committer | Bill Peck <bpeck@redhat.com> | 2013-01-23 16:47:16 -0500 |
| commit | 995c3b35d704168ef84ffe186fb9d2a962c44986 (patch) | |
| tree | a75744cdf27c5ae5496be278908059639624399b /openvswitch-ovs2_4.xml | |
| parent | 9bc0c09b815910d2f7f3d9fc7c05141c8c655bf6 (diff) | |
| download | tests-995c3b35d704168ef84ffe186fb9d2a962c44986.tar.gz tests-995c3b35d704168ef84ffe186fb9d2a962c44986.tar.xz tests-995c3b35d704168ef84ffe186fb9d2a962c44986.zip | |
refactor test without vlans
Diffstat (limited to 'openvswitch-ovs2_4.xml')
| -rw-r--r-- | openvswitch-ovs2_4.xml | 646 |
1 files changed, 318 insertions, 328 deletions
diff --git a/openvswitch-ovs2_4.xml b/openvswitch-ovs2_4.xml index 2abe6be..63043d1 100644 --- a/openvswitch-ovs2_4.xml +++ b/openvswitch-ovs2_4.xml @@ -1,28 +1,17 @@ <job retention_tag="120days"> <whiteboard> - BNX2X openvswitch + tg3, bnx2x and ixgbe openvswitch </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="" 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> - <repos> - <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> - </repos> + <ks_appends/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -38,42 +27,50 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/get_task" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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"/> + <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> + <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.3 192.168.2.4 192.168.2.5 192.168.2.6"/> + <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/reservesys"> - <params> - <param name="RESERVE_IF_FAIL" value="True"/> - </params> + <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" 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="" 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> - <repos> - <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> - </repos> + <ks_appends/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -89,42 +86,50 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/get_task" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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"/> + <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> <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.3 192.168.2.4 192.168.2.5 192.168.2.6"/> + <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/reservesys"> - <params> - <param name="RESERVE_IF_FAIL" value="True"/> - </params> + <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" 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="" 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> - <repos> - <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> - </repos> + <ks_appends/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -140,22 +145,41 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/get_task" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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"/> + <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> <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.3 192.168.2.4 192.168.2.5 192.168.2.6"/> + <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/reservesys"> - <params> - <param name="RESERVE_IF_FAIL" value="True"/> - </params> + <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"/> @@ -174,108 +198,72 @@ 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-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-p1p1 -#DEVICE=p1p1 -#HWADDR=00:10:18:E5:EA:5C -#TYPE=Ethernet -#UUID=050742c1-1e01-4df2-83d0-04737a1c5bfa -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p2 -#DEVICE=p1p2 -#HWADDR=00:10:18:E5:EA:5D -#TYPE=Ethernet -#UUID=85fd60f3-2d65-47b4-8bb9-4a553416b2e0 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p3 -#DEVICE=p1p3 -#HWADDR=00:10:18:E5:EA:5E -#TYPE=Ethernet -#UUID=7e9fddc4-de46-4edf-8ac1-790191fd0339 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p4 -#DEVICE=p1p4 -#HWADDR=00:10:18:E5:EA:5F -#TYPE=Ethernet -#UUID=7c67e198-40f8-4c84-85d5-5530b90eb3e4 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#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=ovsbridge1 +EOF -# p2p1 Under TEST!! cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p2p1 DEVICE=p2p1 DEVICETYPE=ovs TYPE=OVSPort -#HWADDR=00:10:18:E8:7F:D0 -#TYPE=Ethernet -#UUID=21522d02-db38-4ba5-9cc7-07fb589f83cd +HWADDR=00:10:18:E8:7F:D0 +UUID=21522d02-db38-4ba5-9cc7-07fb589f83cd ONBOOT=yes BOOTPROTO=none -OVS_BRIDGE=ovsbridge1 +OVS_BRIDGE=ovsbridge2 HOTPLUG=no EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p2p2 -#DEVICE=p2p2 -#HWADDR=00:10:18:E8:7F:D2 -#TYPE=Ethernet -#UUID=32e2cdcd-f4c3-424e-8c26-a554d598b0d6 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF - -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p6p1 -#DEVICE=p6p1 -#DEVICETYPE=ovs -#TYPE=OVSPort -##HWADDR=A0:36:9F:08:2B:C4 -##TYPE=Ethernet -##UUID=9b17ffe0-d791-4ec2-92a4-6e96407feb60 -#ONBOOT=yes -#NM_CONTROLLED=no -#BOOTPROTO=none -#OVS_BRIDGE=ovsbridge2 -#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 +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 +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/"> --> + <!-- <repo name="openvswitch" url="http://download.devel.redhat.com/brewroot/repos/rh-folsom-rhel-6-build/latest/x86_64/">--> </repos> <distroRequires> <and> @@ -307,42 +295,30 @@ EOF <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="ovsbridge1" value="rhel6u4_1 rhel6u4_2 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 switch=ovsbridge2 switch=ovsbridge3"/> + <param name="rhel6u4_2" value="switch=ovsbridge1 switch=ovsbridge2 switch=ovsbridge3"/> + <param name="rhel6u4_3" value="switch=ovsbridge1 switch=ovsbridge2 switch=ovsbridge3"/> </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> + <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" 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="" 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> - <repos> - <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> - </repos> + <ks_appends/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -358,42 +334,50 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/get_task" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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"/> + <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> + <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.3 192.168.2.4 192.168.2.5 192.168.2.6"/> + <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/reservesys"> - <params> - <param name="RESERVE_IF_FAIL" value="True"/> - </params> + <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" 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="" 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> - <repos> - <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> - </repos> + <ks_appends/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -409,42 +393,50 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/get_task" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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"/> + <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> <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.3 192.168.2.4 192.168.2.5 192.168.2.6"/> + <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/reservesys"> - <params> - <param name="RESERVE_IF_FAIL" value="True"/> - </params> + <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" 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="" 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> - <repos> - <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> - </repos> + <ks_appends/> + <repos> + <repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/> + </repos> <distroRequires> <and> <distro_family op="=" value="RedHatEnterpriseLinux6"/> @@ -460,22 +452,41 @@ EOF <task name="/distribution/install" role="STANDALONE"> <params/> </task> - <task name="/distribution/command" role="SERVERS"> + <task name="/distribution/get_task" role="STANDALONE"> <params> - <param name="CMDS_TO_RUN" value="sleep 300"/> + <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"/> + <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> + <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="VALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.3 192.168.2.4 192.168.2.5 192.168.2.6"/> + <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/reservesys"> - <params> - <param name="RESERVE_IF_FAIL" value="True"/> - </params> + <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"/> @@ -494,58 +505,45 @@ 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-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-p1p1 -#DEVICE=p1p1 -#HWADDR=00:10:18:E5:EF:8C -#TYPE=Ethernet -#UUID=f8d7e17f-bb46-4e4c-98d7-3ffdd32a43d7 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p2 -#DEVICE=p1p2 -#HWADDR=00:10:18:E5:EF:8D -#TYPE=Ethernet -#UUID=cbffd134-2a40-45eb-8d18-ee9ee72b63e7 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p3 -#DEVICE=p1p3 -#HWADDR=00:10:18:E5:EF:8E -#TYPE=Ethernet -#UUID=5fe3cc75-c6b9-4347-954b-c9c82b633ea9 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p1p4 -#DEVICE=p1p4 -#HWADDR=00:10:18:E5:EF:8F +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=cf4396d0-2979-4f1a-9fb3-9b28e54df897 -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF +UUID=f8d7e17f-bb46-4e4c-98d7-3ffdd32a43d7 +ONBOOT=yes +NM_CONTROLLED=no +BOOTPROTO=none +DEVICETYPE=ovs +TYPE=OVSPort +OVS_BRIDGE=ovsbridge1 +EOF -# p2p1 Under TEST!! cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p2p1 DEVICE=p2p1 DEVICETYPE=ovs @@ -555,46 +553,26 @@ TYPE=OVSPort #UUID=02535d4b-6819-4885-abc5-c08d889e589c ONBOOT=yes BOOTPROTO=none -OVS_BRIDGE=ovsbridge1 +OVS_BRIDGE=ovsbridge2 HOTPLUG=no EOF -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p2p2 -#DEVICE=p2p2 -#HWADDR=00:10:18:E8:65:B2 -#TYPE=Ethernet -#UUID=ab634daf-aab8-4852-9bcc-8d46cf5511ce -#ONBOOT=no -#NM_CONTROLLED=no -#BOOTPROTO=none -#EOF - -#cat <<EOF >/etc/sysconfig/network-scripts/ifcfg-p6p1 -#DEVICE=p6p1 -#DEVICETYPE=ovs -#TYPE=OVSPort -##HWADDR=A0:36:9F:08:2D:34 -##TYPE=Ethernet -##UUID=1c5be512-f3f9-4bf2-941e-dbed6c27118e -#ONBOOT=yes -#NM_CONTROLLED=no -#BOOTPROTO=none -#OVS_BRIDGE=ovsbridge2 -#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 +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 +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/"> --> + <!-- <repo name="openvswitch" url="http://download.devel.redhat.com/brewroot/repos/rh-folsom-rhel-6-build/latest/x86_64/">--> </repos> <distroRequires> <and> @@ -626,21 +604,33 @@ EOF <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="ovsbridge1" value="rhel6u4_4 rhel6u4_5 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 switch=ovsbridge2 switch=ovsbridge3"/> + <param name="rhel6u4_5" value="switch=ovsbridge1 switch=ovsbridge2 switch=ovsbridge3"/> + <param name="rhel6u4_6" value="switch=ovsbridge1 switch=ovsbridge2 switch=ovsbridge3"/> </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> + <!-- + 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> |