diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-03-16 14:51:41 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-03-16 14:51:51 -0700 |
| commit | a3e2d85f8f3a8b3220c0a834cc0fd9519e6b5b85 (patch) | |
| tree | da46f72c1cafdd29eb9e802b7e0f29eda62af605 | |
| parent | 431488e6638d3fbb53d215fa10d2ff2d8f1c2824 (diff) | |
| download | openvswitch-a3e2d85f8f3a8b3220c0a834cc0fd9519e6b5b85.tar.gz | |
tests: Fix up interface-reconfigure test and results.
I forgot to update the test when I added the VLAN bug workaround.
| -rw-r--r-- | tests/interface-reconfigure.at | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/tests/interface-reconfigure.at b/tests/interface-reconfigure.at index 9749fd586..b9871f3e1 100644 --- a/tests/interface-reconfigure.at +++ b/tests/interface-reconfigure.at @@ -41,7 +41,8 @@ EOF sbin/update-issue \ sbin/vconfig \ usr/bin/ovs-vsctl \ - usr/sbin/brctl + usr/sbin/brctl \ + usr/sbin/ovs-vlan-bug-workaround do mkdir -p `dirname $utility` cat > $utility <<'EOF' @@ -56,6 +57,15 @@ EOF mkdir -p sys/class/net/${1} echo ${2} > sys/class/net/${1}/address echo ${3} > sys/class/net/${1}/tx_queue_len + if test ${1} = eth1; then + # No VLAN acceleration. + echo 0x829 > sys/class/net/${1}/features + else + # Supports VLAN acceleration. + echo 0x10b89 > sys/class/net/${1}/features + fi + mkdir sys/class/net/${1}/device + ln -s ../../../bus/pci/drivers/e1000 sys/class/net/${1}/device/driver : >> etc/sysconfig/network-scripts/ifcfg-${1} } @@ -669,6 +679,7 @@ Applying changes to /etc/sysconfig/network configuration Applying changes to /etc/sysconfig/network-scripts/ifcfg-xenbr2 configuration /sbin/ifconfig eth2 up mtu 1500 /sbin/ethtool -K eth2 gro off lro off +/usr/sbin/ovs-vlan-bug-workaround eth2 on /usr/bin/ovs-vsctl --timeout=20 --with-iface --if-exists del-port eth2 --may-exist add-br xenbr2 @@ -735,6 +746,7 @@ Applying changes to /etc/sysconfig/network-scripts/route-xapi3 configuration Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi3 configuration /sbin/ifconfig eth3 up mtu 1500 /sbin/ethtool -K eth3 gro off lro off +/usr/sbin/ovs-vlan-bug-workaround eth3 on /usr/bin/ovs-vsctl --timeout=20 --with-iface --if-exists del-port eth3 --may-exist add-br xenbr3 @@ -817,8 +829,10 @@ Applying changes to /etc/sysconfig/network-scripts/route-xapi1 configuration Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi1 configuration /sbin/ifconfig eth0 up mtu 1500 /sbin/ethtool -K eth0 gro off lro off +/usr/sbin/ovs-vlan-bug-workaround eth0 on /sbin/ifconfig eth1 up mtu 1500 /sbin/ethtool -K eth1 gro off lro off +/usr/sbin/ovs-vlan-bug-workaround eth1 off /usr/bin/ovs-vsctl --timeout=20 --if-exists del-br xenbr0 --if-exists del-br xenbr1 @@ -902,8 +916,10 @@ Applying changes to /etc/sysconfig/network-scripts/route-xapi2 configuration Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi2 configuration /sbin/ifconfig eth0 up mtu 1500 /sbin/ethtool -K eth0 gro off lro off +/usr/sbin/ovs-vlan-bug-workaround eth0 on /sbin/ifconfig eth1 up mtu 1500 /sbin/ethtool -K eth1 gro off lro off +/usr/sbin/ovs-vlan-bug-workaround eth1 off /usr/bin/ovs-vsctl --timeout=20 --if-exists del-br xenbr0 --if-exists del-br xenbr1 |