meta-flow: Remove mf_set_subfield and mf_set_subfield

[openvswitch] / tests / ovs-xapi-sync.at

diff --git a/tests/ovs-xapi-sync.at b/tests/ovs-xapi-sync.at
index 1f0f766c713502578aedde71621944e93677679c..5fa61ec33e0572a4c8cb42bf81ab75eba9f412d5 100644 (file)
--- a/tests/ovs-xapi-sync.at
+++ b/tests/ovs-xapi-sync.at
@@ -8,6 +8,7 @@ cp "$top_srcdir/tests/MockXenAPI.py" XenAPI.py
 PYTHONPATH=`pwd`:$PYTHONPATH
 export PYTHONPATH
 
+OVS_RUNDIR=`pwd`; export OVS_RUNDIR
 OVS_PKGDATADIR=`pwd`; export OVS_PKGDATADIR
 cp "$top_srcdir/vswitchd/vswitch.ovsschema" .
 
@@ -20,7 +21,7 @@ mkdir var var/run
 touch var/run/xapi_init_complete.cookie
 
 ovs_vsctl () {
-    ovs-vsctl --timeout=5 --no-wait -vreconnect:ANY:emer --db=unix:socket "$@"
+    ovs-vsctl --timeout=5 --no-wait -vreconnect:emer --db=unix:socket "$@"
 }
 
 # Start ovsdb-server.
@@ -71,4 +72,6 @@ AT_CHECK([ovs_vsctl get interface vif1.0 external-ids], [0],
   [{attached-mac="00:11:22:33:44:55", iface-id="custom iface ID", iface-status=active, vm-id="custom vm ID", xs-network-uuid="9b66c68b-a74e-4d34-89a5-20a8ab352d1e", xs-vif-uuid="6ab1b260-398e-49ba-827b-c7696108964c", xs-vm-uuid="fcb8a3f6-dc04-41d2-8b8a-55afd2b755b8"}
 ])
 
+OVSDB_SERVER_SHUTDOWN
+
 AT_CLEANUP