diff options
| -rw-r--r-- | openvswitch-ovs2_4-bnx2x-vlan.xml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/openvswitch-ovs2_4-bnx2x-vlan.xml b/openvswitch-ovs2_4-bnx2x-vlan.xml index 044714b..5ecf0df 100644 --- a/openvswitch-ovs2_4-bnx2x-vlan.xml +++ b/openvswitch-ovs2_4-bnx2x-vlan.xml @@ -311,10 +311,10 @@ 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="VLANS_ovsbridge1" value="vlan100 vlan200"/> - <param name="vlan100" value="rhel6u4_1 rhel6u4_2"/> - <param name="vlan200" value="rhel6u4_3"/> + <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"/> <!-- <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"/> --> @@ -565,6 +565,7 @@ TYPE=OVSPort ONBOOT=yes BOOTPROTO=none OVS_BRIDGE=ovsbridge1 +OVS_OPTIONS="trunk=100,200" HOTPLUG=no EOF @@ -635,10 +636,10 @@ 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="VLANS_ovsbridge1" value="vlan100 vlan200"/> - <param name="vlan100" value="rhel6u4_4 rhel6u4_5"/> - <param name="vlan200" value="rhel6u4_6"/> + <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"/> <!-- <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"/> --> |