X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Finterface-reconfigure.at;h=b9871f3e1616cbcdffac133ce6dad77b6b159e43;hb=ef26353802007b6fa1aaf9ab17161127b1a204ba;hp=446cc7cdcb4a1f90b6b8aeb2d35be1218e06bf34;hpb=48d014bff2b896b3a9d8937d26facad9a54d5a1a;p=openvswitch diff --git a/tests/interface-reconfigure.at b/tests/interface-reconfigure.at index 446cc7cd..b9871f3e 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} } @@ -73,6 +83,7 @@ EOF + False @@ -120,6 +131,7 @@ EOF + False @@ -167,6 +179,7 @@ EOF + False @@ -214,6 +227,7 @@ EOF + False @@ -265,6 +279,7 @@ EOF OpaqueRef:e623e1d6-cd02-be8d-820d-49d65c710297 + False @@ -312,6 +327,7 @@ EOF + True @@ -359,6 +375,7 @@ EOF + False @@ -410,6 +427,7 @@ EOF OpaqueRef:4c0eb823-4d96-da1d-e75f-411b85badb0c + False @@ -576,7 +594,11 @@ EOF xenbr0 - + + + true + + c9eecb03-560d-61de-b6a8-56dfc766f67e @@ -619,6 +641,13 @@ EOF db7bdc03-074d-42ae-fc73-9b06de1d57f6 + + + + standalone + + + EOF ]]) @@ -648,11 +677,16 @@ configure_datapath: extra bonds - [] Applying changes to /etc/sysconfig/network-scripts/route-xenbr2 configuration Applying changes to /etc/sysconfig/network configuration Applying changes to /etc/sysconfig/network-scripts/ifcfg-xenbr2 configuration -/sbin/ifconfig eth2 up +/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 --may-exist add-port xenbr2 eth2 + set Bridge xenbr2 other-config:hwaddr="00:15:17:a0:29:80" + set Bridge xenbr2 fail_mode=standalone + remove Bridge xenbr2 other_config disable-in-band br-set-external-id xenbr2 xs-network-uuids d08c8749-0c8f-9e8d-ce25-fd364661ee99 /sbin/ifup xenbr2 /sbin/update-issue @@ -669,6 +703,7 @@ ONBOOT=no TYPE=Ethernet BOOTPROTO=dhcp PERSISTENT_DHCLIENT=yes +MTU=1500 ]) # Simulate interface-reconfigure creating xenbr2, so that we can tell @@ -683,6 +718,8 @@ action_down: xenbr2 /sbin/ifdown xenbr2 deconfigure ipdev xenbr2 on xenbr2 deconfigure_bridge: bridge - xenbr2 +action_down: bring down physical devices - [u'eth2'] +/sbin/ifconfig eth2 down /usr/bin/ovs-vsctl --timeout=20 --with-iface --if-exists del-port xenbr2 --if-exists del-br xenbr2 @@ -707,15 +744,21 @@ configure_datapath: extra ports - [] configure_datapath: extra bonds - [] Applying changes to /etc/sysconfig/network-scripts/route-xapi3 configuration Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi3 configuration -/sbin/ifconfig eth3 up +/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 --may-exist add-port xenbr3 eth3 + set Bridge xenbr3 other-config:hwaddr="00:15:17:a0:29:81" + set Bridge xenbr3 fail_mode=standalone + remove Bridge xenbr3 other_config disable-in-band br-set-external-id xenbr3 xs-network-uuids 2902ae1b-8013-897a-b697-0b200ea3aaa5;db7bdc03-074d-42ae-fc73-9b06de1d57f6 --if-exists del-br xapi3 --may-exist add-br xapi3 xenbr3 123 br-set-external-id xapi3 xs-network-uuids 2902ae1b-8013-897a-b697-0b200ea3aaa5;db7bdc03-074d-42ae-fc73-9b06de1d57f6 + set Interface xapi3 MAC="00:15:17:a0:29:81" /sbin/ifup xapi3 /sbin/update-issue Committing changes to /etc/sysconfig/network-scripts/route-xapi3 configuration @@ -729,6 +772,7 @@ DEVICE=xapi3 ONBOOT=no TYPE=Ethernet BOOTPROTO=none +MTU=1500 ]) # Simulate interface-reconfigure creating xapi3, so that we can tell @@ -745,6 +789,8 @@ deconfigure ipdev xapi3 on xenbr3 deconfigure_bridge: bridge - xapi3 action_down: no more masters, bring down slave xenbr3 deconfigure_bridge: bridge - xenbr3 +action_down: bring down physical devices - [u'eth3'] +/sbin/ifconfig eth3 down /usr/bin/ovs-vsctl --timeout=20 --with-iface --if-exists del-port xapi3 --if-exists del-br xapi3 @@ -781,8 +827,12 @@ netdev: down: device xenbr0 does not exist, ignoring netdev: down: device xenbr1 does not exist, ignoring Applying changes to /etc/sysconfig/network-scripts/route-xapi1 configuration Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi1 configuration -/sbin/ifconfig eth0 up -/sbin/ifconfig eth1 up +/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 @@ -791,7 +841,11 @@ Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi1 configuration --may-exist add-br xapi1 --with-iface --if-exists del-port bond0 --fake-iface add-bond xapi1 bond0 eth0 eth1 - br-set-external-id xapi1 xs-network-uuids 99be2da4-6c33-6f8e-49ea-3bc592fe3c85;45cbbb43-113d-a712-3231-c6463f253cef + set Port bond0 MAC="00:22:19:22:4b:af" other-config:bond-miimon-interval=100 bond_downdelay=200 bond_updelay=31000 other-config:bond-detect-mode=carrier lacp=off bond_mode=balance-slb + set Bridge xapi1 other-config:hwaddr="00:22:19:22:4b:af" + set Bridge xapi1 fail_mode=standalone + remove Bridge xapi1 other_config disable-in-band + br-set-external-id xapi1 xs-network-uuids 45cbbb43-113d-a712-3231-c6463f253cef;99be2da4-6c33-6f8e-49ea-3bc592fe3c85 /sbin/ifup xapi1 action_up: bring up bond0 /sbin/ifconfig bond0 up @@ -807,6 +861,7 @@ DEVICE=xapi1 ONBOOT=no TYPE=Ethernet BOOTPROTO=none +MTU=1500 ]) # Simulate interface-reconfigure creating xapi1, so that we can tell @@ -821,6 +876,9 @@ action_down: xapi1 /sbin/ifdown xapi1 deconfigure ipdev xapi1 on xapi1 deconfigure_bridge: bridge - xapi1 +action_down: bring down physical devices - [u'eth0', u'eth1'] +/sbin/ifconfig eth0 down +/sbin/ifconfig eth1 down /usr/bin/ovs-vsctl --timeout=20 --with-iface --if-exists del-port xapi1 --if-exists del-br xapi1 @@ -856,8 +914,12 @@ netdev: down: device xenbr0 does not exist, ignoring netdev: down: device xenbr1 does not exist, ignoring Applying changes to /etc/sysconfig/network-scripts/route-xapi2 configuration Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi2 configuration -/sbin/ifconfig eth0 up -/sbin/ifconfig eth1 up +/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 @@ -866,10 +928,15 @@ Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi2 configuration --may-exist add-br xapi1 --with-iface --if-exists del-port bond0 --fake-iface add-bond xapi1 bond0 eth0 eth1 - br-set-external-id xapi1 xs-network-uuids 99be2da4-6c33-6f8e-49ea-3bc592fe3c85;45cbbb43-113d-a712-3231-c6463f253cef + set Port bond0 MAC="00:22:19:22:4b:af" other-config:bond-miimon-interval=100 bond_downdelay=200 bond_updelay=31000 other-config:bond-detect-mode=carrier lacp=off bond_mode=balance-slb + set Bridge xapi1 other-config:hwaddr="00:22:19:22:4b:af" + set Bridge xapi1 fail_mode=standalone + remove Bridge xapi1 other_config disable-in-band + br-set-external-id xapi1 xs-network-uuids 45cbbb43-113d-a712-3231-c6463f253cef;99be2da4-6c33-6f8e-49ea-3bc592fe3c85 --if-exists del-br xapi2 --may-exist add-br xapi2 xapi1 4 - br-set-external-id xapi2 xs-network-uuids 99be2da4-6c33-6f8e-49ea-3bc592fe3c85;45cbbb43-113d-a712-3231-c6463f253cef + br-set-external-id xapi2 xs-network-uuids 45cbbb43-113d-a712-3231-c6463f253cef;99be2da4-6c33-6f8e-49ea-3bc592fe3c85 + set Interface xapi2 MAC="00:22:19:22:4b:af" /sbin/ifup xapi2 action_up: bring up bond0 /sbin/ifconfig bond0 up @@ -885,6 +952,7 @@ DEVICE=xapi2 ONBOOT=no TYPE=Ethernet BOOTPROTO=none +MTU=1500 ]) # Simulate interface-reconfigure creating xapi2, so that we can tell @@ -901,6 +969,9 @@ deconfigure ipdev xapi2 on xapi1 deconfigure_bridge: bridge - xapi2 action_down: no more masters, bring down slave xapi1 deconfigure_bridge: bridge - xapi1 +action_down: bring down physical devices - [u'eth0', u'eth1'] +/sbin/ifconfig eth0 down +/sbin/ifconfig eth1 down /usr/bin/ovs-vsctl --timeout=20 --with-iface --if-exists del-port xapi2 --if-exists del-br xapi2