From: Ethan Jackson <ethan@nicira.com>
Date: Wed, 12 Jan 2011 18:39:52 +0000 (-0800)
Subject: tests: Fix bonding related test failures.
X-Git-Tag: v1.1.0~503
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a4e47607974ee30782d7d8085a2c12a91971177e;p=sliver-openvswitch.git
tests: Fix bonding related test failures.
The tests did not get updated with recent interface reconfigure
changes. This fixes the problem.
---
diff --git a/tests/interface-reconfigure.at b/tests/interface-reconfigure.at
index 8566102d7..7cf6d9ec8 100644
--- a/tests/interface-reconfigure.at
+++ b/tests/interface-reconfigure.at
@@ -800,7 +800,7 @@ 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
- set Port bond0 MAC="00:22:19:22:4b:af" bond_downdelay=200 other-config:"bond-miimon"=100 other-config:"bond-use_carrier"=1 other-config:"bond-mode"="balance-slb" bond_updelay=31000
+ set Port bond0 MAC="00:22:19:22:4b:af" bond_downdelay=200 other-config:"bond-miimon"=100 other-config:"bond-use_carrier"=1 bond_mode=balance-slb bond_updelay=31000
set Bridge xapi1 other-config:hwaddr="00:22:19:22:4b:af"
br-set-external-id xapi1 xs-network-uuids 45cbbb43-113d-a712-3231-c6463f253cef;99be2da4-6c33-6f8e-49ea-3bc592fe3c85
/sbin/ifup xapi1
@@ -881,7 +881,7 @@ 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
- set Port bond0 MAC="00:22:19:22:4b:af" bond_downdelay=200 other-config:"bond-miimon"=100 other-config:"bond-use_carrier"=1 other-config:"bond-mode"="balance-slb" bond_updelay=31000
+ set Port bond0 MAC="00:22:19:22:4b:af" bond_downdelay=200 other-config:"bond-miimon"=100 other-config:"bond-use_carrier"=1 bond_mode=balance-slb bond_updelay=31000
set Bridge xapi1 other-config:hwaddr="00:22:19:22:4b:af"
br-set-external-id xapi1 xs-network-uuids 45cbbb43-113d-a712-3231-c6463f253cef;99be2da4-6c33-6f8e-49ea-3bc592fe3c85
--if-exists del-br xapi2