X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Finterface-reconfigure.at;h=008cf15d1cfcbdb12e5d0fb10091e838f08011ea;hb=816fd533f85923c03cf8d9d6450bd9a0845d5160;hp=90ca127c98d0b4ff282a7723f9fb2f6bc56dcb37;hpb=da7198b411d68df604db1a6132cf3be5c21842db;p=openvswitch

diff --git a/tests/interface-reconfigure.at b/tests/interface-reconfigure.at
index 90ca127c..008cf15d 100644
--- a/tests/interface-reconfigure.at
+++ b/tests/interface-reconfigure.at
@@ -703,7 +703,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:emer get-fail-mode xenbr2
+/usr/bin/ovs-vsctl --timeout=5 -vANY:console: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 +718,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:emer get interface eth2 ofport
+/usr/bin/ovs-vsctl --timeout=5 -vANY:console: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 +735,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
@@ -805,6 +806,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
@@ -894,6 +896,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
@@ -985,6 +988,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