aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEthan Jackson <ethan@nicira.com>2011-01-18 19:05:15 -0800
committerEthan Jackson <ethan@nicira.com>2011-01-18 22:49:00 -0800
commit27b1bdef46dffa58967991682842d2cd248ad16e (patch)
treecca9e0a6fac245097d2bc8f1abff1b729cf0694f
parent8eb307e09f9b793ec28f0de49442a128f0a633ba (diff)
tests: Update interface-reconfigure tests.
The interface-reconfigure tests currently fail because they were not updated when fail_mode was added to XenServer configuration.
-rw-r--r--tests/interface-reconfigure.at11
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/interface-reconfigure.at b/tests/interface-reconfigure.at
index 5e987d9f..9b478382 100644
--- a/tests/interface-reconfigure.at
+++ b/tests/interface-reconfigure.at
@@ -619,6 +619,13 @@ EOF
db7bdc03-074d-42ae-fc73-9b06de1d57f6
</uuid>
</network>
+ <pool ref="OpaqueRef:a765d06c-fc82-cc67-8f6c-fd8db45f6a84">
+ <other_config>
+ <vswitch-controller-fail-mode>
+ standalone
+ </vswitch-controller-fail-mode>
+ </other_config>
+ </pool>
</xenserver-network-configuration>
EOF
]])
@@ -654,6 +661,7 @@ Applying changes to /etc/sysconfig/network-scripts/ifcfg-xenbr2 configuration
--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
br-set-external-id xenbr2 xs-network-uuids d08c8749-0c8f-9e8d-ce25-fd364661ee99
/sbin/ifup xenbr2
/sbin/update-issue
@@ -717,6 +725,7 @@ Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi3 configuration
--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
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
@@ -802,6 +811,7 @@ Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi1 configuration
--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-interval=100 other-config:bond-detect-mode=carrier bond_mode=balance-slb bond_updelay=31000
set Bridge xapi1 other-config:hwaddr="00:22:19:22:4b:af"
+ set Bridge xapi1 fail_mode=standalone
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
@@ -883,6 +893,7 @@ Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi2 configuration
--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-interval=100 other-config:bond-detect-mode=carrier bond_mode=balance-slb bond_updelay=31000
set Bridge xapi1 other-config:hwaddr="00:22:19:22:4b:af"
+ set Bridge xapi1 fail_mode=standalone
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