X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Finterface-reconfigure.at;h=26a77eb9c8c0209e0a1b124392c32a9909a0b454;hb=003ce655b7116d18c86a74c50391e54990346931;hp=f5add0989832bca0cc45dc3f301c82d7bdfa734b;hpb=c1a543a8d6d2847983b6b0defd1e19777da85715;p=sliver-openvswitch.git diff --git a/tests/interface-reconfigure.at b/tests/interface-reconfigure.at index f5add0989..26a77eb9c 100644 --- a/tests/interface-reconfigure.at +++ b/tests/interface-reconfigure.at @@ -1,18 +1,18 @@ -dnl IFR_SETUP -dnl -dnl Creates a directory tree for use with "interface-reconfigure --root-dir". -m4_define([IFR_SETUP], - [[for script in \ - interface-reconfigure \ - InterfaceReconfigure.py \ - InterfaceReconfigureBridge.py \ - InterfaceReconfigureVswitch.py - do - cp $top_srcdir/xenserver/opt_xensource_libexec_$script $script - done - - mkdir -p etc - cat > etc/xensource-inventory < etc/xensource-inventory < etc/xensource/network.conf - - for utility in \ - sbin/ethtool \ - sbin/ifconfig \ - sbin/ifdown \ - sbin/ifup \ - sbin/ip \ - sbin/update-issue \ - sbin/vconfig \ - usr/sbin/brctl \ - usr/sbin/ovs-vlan-bug-workaround - do - mkdir -p `dirname $utility` - cat > $utility <<'EOF' + mkdir -p etc/xensource + echo vswitch > etc/xensource/network.conf + + for utility in \ + sbin/ethtool \ + sbin/ifconfig \ + sbin/ifdown \ + sbin/ifup \ + sbin/ip \ + sbin/update-issue \ + sbin/vconfig \ + usr/sbin/brctl \ + usr/sbin/ovs-vlan-bug-workaround + do + mkdir -p `dirname $utility` + cat > $utility <<'EOF' #! /bin/sh echo ${0} ${*} >&2 EOF - chmod +x $utility - done + chmod +x $utility + done - mkdir -p usr/bin - cat > usr/bin/ovs-vsctl <<'EOF' + mkdir -p usr/bin + cat > usr/bin/ovs-vsctl <<'EOF' #! /bin/sh echo ${0} ${*} >&2 @@ -70,44 +70,44 @@ while test ${#} -ge 4; do shift done EOF - chmod +x usr/bin/ovs-vsctl + chmod +x usr/bin/ovs-vsctl - cat > usr/bin/ovs-ofctl <<'EOF' + cat > usr/bin/ovs-ofctl <<'EOF' #! /bin/sh echo ${0} ${*} >&2 # Check that the flow is properly formed. ovs-ofctl parse-flow "${3}" >/dev/null EOF - chmod +x usr/bin/ovs-ofctl - - mkdir -p etc/sysconfig/network-scripts - configure_netdev () { - 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} - } - - configure_netdev lo 00:00:00:00:00:00 0 - configure_netdev eth0 00:22:19:22:4b:af 1000 - configure_netdev eth1 00:22:19:22:4b:b1 1000 - configure_netdev eth2 00:15:17:a0:29:80 1000 - configure_netdev eth3 00:15:17:a0:29:81 1000 - configure_netdev eth4 00:1b:21:29:ce:51 1000 - - mkdir -p var/xapi - cat > var/xapi/network.dbcache <<'EOF' + chmod +x usr/bin/ovs-ofctl + + mkdir -p etc/sysconfig/network-scripts + configure_netdev () { + 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} + } + + configure_netdev lo 00:00:00:00:00:00 0 + configure_netdev eth0 00:22:19:22:4b:af 1000 + configure_netdev eth1 00:22:19:22:4b:b1 1000 + configure_netdev eth2 00:15:17:a0:29:80 1000 + configure_netdev eth3 00:15:17:a0:29:81 1000 + configure_netdev eth4 00:1b:21:29:ce:51 1000 + + mkdir -p var/xapi + cat > var/xapi/network.dbcache <<'EOF' @@ -679,21 +679,28 @@ EOF EOF -]]) +} + +ifr_run () { + ./interface-reconfigure --root-prefix="`pwd`" --no-syslog "$@" +} -m4_define([IFR_RUN], [./interface-reconfigure --root-prefix=$PWD --no-syslog]) +ifr_filter () { + sed -n -e "s,`pwd`,,g" -e 's/ -- /\ + /g' -e '/^Running command:/!p' stderr +}] +m4_divert_pop([PREPARE_TESTS]) -m4_define([IFR_FILTER], [sed -n -e "s,$PWD,,g" -e 's/ -- /\ - /g' -e '/^Running command:/!p' stderr]) AT_BANNER([interface-reconfigure]) AT_SETUP([non-VLAN, non-bond]) AT_KEYWORDS([interface-reconfigure]) -IFR_SETUP +AT_SKIP_IF([$non_ascii_cwd]) +ifr_setup -AT_CHECK([IFR_RUN --force xenbr2 up], [0], [], [stderr]) -AT_CHECK([IFR_FILTER], [0], [[Force interface xenbr2 up +AT_CHECK([ifr_run --force xenbr2 up], [0], [], [stderr]) +AT_CHECK([ifr_filter], [0], [[Force interface xenbr2 up Loading xapi database cache from /var/xapi/network.dbcache Configured for Vswitch datapath action_up: xenbr2 @@ -703,7 +710,7 @@ configure_datapath: bridge - xenbr2 configure_datapath: physical - [u'eth2'] configure_datapath: extra ports - [] configure_datapath: extra bonds - [] -/usr/bin/ovs-vsctl --timeout=5 -vANY:console:off get-fail-mode xenbr2 +/usr/bin/ovs-vsctl -vconsole:off get-fail-mode xenbr2 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 @@ -718,7 +725,7 @@ Applying changes to /etc/sysconfig/network-scripts/ifcfg-xenbr2 configuration set Bridge xenbr2 fail_mode=secure remove Bridge xenbr2 other_config disable-in-band br-set-external-id xenbr2 xs-network-uuids d08c8749-0c8f-9e8d-ce25-fd364661ee99 -/usr/bin/ovs-vsctl --timeout=5 -vANY:console:off get interface eth2 ofport +/usr/bin/ovs-vsctl -vconsole:off get interface eth2 ofport /usr/bin/ovs-ofctl add-flow xenbr2 idle_timeout=0,priority=0,in_port=5,arp,nw_proto=1,actions=local /usr/bin/ovs-ofctl add-flow xenbr2 idle_timeout=0,priority=0,in_port=local,arp,dl_src=00:15:17:a0:29:80,actions=5 /usr/bin/ovs-ofctl add-flow xenbr2 idle_timeout=0,priority=0,in_port=5,dl_dst=00:15:17:a0:29:80,actions=local @@ -735,6 +742,7 @@ AT_CHECK([cat etc/sysconfig/network-scripts/ifcfg-xenbr2], [0], XEMANAGED=yes DEVICE=xenbr2 ONBOOT=no +NOZEROCONF=yes TYPE=Ethernet BOOTPROTO=dhcp PERSISTENT_DHCLIENT=yes @@ -745,8 +753,8 @@ MTU=1500 # interface-reconfigure to take it back down. AT_CHECK([configure_netdev xenbr2 00:15:17:a0:29:80 0]) -AT_CHECK([IFR_RUN --force xenbr2 down], [0], [], [stderr]) -AT_CHECK([IFR_FILTER], [0], [[Force interface xenbr2 down +AT_CHECK([ifr_run --force xenbr2 down], [0], [], [stderr]) +AT_CHECK([ifr_filter], [0], [[Force interface xenbr2 down Loading xapi database cache from /var/xapi/network.dbcache Configured for Vswitch datapath action_down: xenbr2 @@ -764,10 +772,11 @@ AT_CLEANUP AT_SETUP([VLAN, non-bond]) AT_KEYWORDS([interface-reconfigure]) -IFR_SETUP +AT_SKIP_IF([$non_ascii_cwd]) +ifr_setup -AT_CHECK([IFR_RUN --force xapi3 up], [0], [], [stderr]) -AT_CHECK([IFR_FILTER], [0], [[Force interface xapi3 up +AT_CHECK([ifr_run --force xapi3 up], [0], [], [stderr]) +AT_CHECK([ifr_filter], [0], [[Force interface xapi3 up Loading xapi database cache from /var/xapi/network.dbcache Configured for Vswitch datapath action_up: xapi3 @@ -805,6 +814,7 @@ AT_CHECK([cat etc/sysconfig/network-scripts/ifcfg-xapi3], [0], XEMANAGED=yes DEVICE=xapi3 ONBOOT=no +NOZEROCONF=yes TYPE=Ethernet BOOTPROTO=none MTU=1500 @@ -814,8 +824,8 @@ MTU=1500 # interface-reconfigure to take it back down. AT_CHECK([configure_netdev xapi3 00:23:20:AC:AF:02 0]) -AT_CHECK([IFR_RUN --force xapi3 down], [0], [], [stderr]) -AT_CHECK([IFR_FILTER], [0], [[Force interface xapi3 down +AT_CHECK([ifr_run --force xapi3 down], [0], [], [stderr]) +AT_CHECK([ifr_filter], [0], [[Force interface xapi3 down Loading xapi database cache from /var/xapi/network.dbcache Configured for Vswitch datapath action_down: xapi3 @@ -836,7 +846,8 @@ AT_CLEANUP AT_SETUP([Bond, non-VLAN]) AT_KEYWORDS([interface-reconfigure]) -IFR_SETUP +AT_SKIP_IF([$non_ascii_cwd]) +ifr_setup # Pretend that bond0 exists, even though it would really be created by # a "create-bond" call in an ovs-vsctl invocation within @@ -845,8 +856,8 @@ IFR_SETUP # exist" after it thinks it created bond0. AT_CHECK([configure_netdev bond0 00:23:20:e6:39:75 0]) -AT_CHECK([IFR_RUN --force xapi1 up], [0], [], [stderr]) -AT_CHECK([IFR_FILTER], [0], [[Force interface xapi1 up +AT_CHECK([ifr_run --force xapi1 up], [0], [], [stderr]) +AT_CHECK([ifr_filter], [0], [[Force interface xapi1 up Loading xapi database cache from /var/xapi/network.dbcache Configured for Vswitch datapath action_up: xapi1 @@ -894,6 +905,7 @@ AT_CHECK([cat etc/sysconfig/network-scripts/ifcfg-xapi1], [0], XEMANAGED=yes DEVICE=xapi1 ONBOOT=no +NOZEROCONF=yes TYPE=Ethernet BOOTPROTO=none MTU=1500 @@ -903,8 +915,8 @@ MTU=1500 # interface-reconfigure to take it back down. AT_CHECK([configure_netdev xapi1 00:22:19:22:4B:AF 0]) -AT_CHECK([IFR_RUN --force xapi1 down], [0], [], [stderr]) -AT_CHECK([IFR_FILTER], [0], [[Force interface xapi1 down +AT_CHECK([ifr_run --force xapi1 down], [0], [], [stderr]) +AT_CHECK([ifr_filter], [0], [[Force interface xapi1 down Loading xapi database cache from /var/xapi/network.dbcache Configured for Vswitch datapath action_down: xapi1 @@ -923,7 +935,8 @@ AT_CLEANUP AT_SETUP([VLAN on bond]) AT_KEYWORDS([interface-reconfigure]) -IFR_SETUP +AT_SKIP_IF([$non_ascii_cwd]) +ifr_setup # Pretend that bond0 exists, even though it would really be created by # a "create-bond" call in an ovs-vsctl invocation within @@ -932,8 +945,8 @@ IFR_SETUP # exist" after it thinks it created bond0. AT_CHECK([configure_netdev bond0 00:23:20:e6:39:75 0]) -AT_CHECK([IFR_RUN --force xapi2 up], [0], [], [stderr]) -AT_CHECK([IFR_FILTER], [0], [[Force interface xapi2 up +AT_CHECK([ifr_run --force xapi2 up], [0], [], [stderr]) +AT_CHECK([ifr_filter], [0], [[Force interface xapi2 up Loading xapi database cache from /var/xapi/network.dbcache Configured for Vswitch datapath action_up: xapi2 @@ -985,6 +998,7 @@ AT_CHECK([cat etc/sysconfig/network-scripts/ifcfg-xapi2], [0], XEMANAGED=yes DEVICE=xapi2 ONBOOT=no +NOZEROCONF=yes TYPE=Ethernet BOOTPROTO=none MTU=1500 @@ -994,8 +1008,8 @@ MTU=1500 # interface-reconfigure to take it back down. AT_CHECK([configure_netdev xapi2 00:23:20:A4:71:C2 0]) -AT_CHECK([IFR_RUN --force xapi2 down], [0], [], [stderr]) -AT_CHECK([IFR_FILTER], [0], [[Force interface xapi2 down +AT_CHECK([ifr_run --force xapi2 down], [0], [], [stderr]) +AT_CHECK([ifr_filter], [0], [[Force interface xapi2 down Loading xapi database cache from /var/xapi/network.dbcache Configured for Vswitch datapath action_down: xapi2