bonding: Use device names instead of Xen OpaqueRefs

[openvswitch] / xenserver / opt_xensource_libexec_interface-reconfigure

diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure
index 9a3ef822308686c1ecdcf9bec9d1293cdecd6b18..3021df1db6212b2724ad8ea61d47b0274f8da828 100755 (executable)
--- a/xenserver/opt_xensource_libexec_interface-reconfigure
+++ b/xenserver/opt_xensource_libexec_interface-reconfigure
@@ -1214,7 +1214,9 @@ def datapath_configure_bond(pif,slaves):
     pifrec = db.get_pif_record(pif)
     interface = pif_netdev_name(pif)
 
-    argv = ['--', 'add-bond', bridge, interface] + slaves
+    argv = ['--', 'add-bond', bridge, interface]
+    for slave in slaves:
+        argv += [pif_netdev_name(slave)]
 
     # XXX need ovs-vsctl support
     #if pifrec['MAC'] != "":
@@ -1257,7 +1259,6 @@ def datapath_modify_config(commands):
                      + [c for c in commands if not c.startswith('#')])
     if not rc:
         raise Error("Failed to modify vswitch configuration")
-    run_command(['/bin/sleep', '5']) # XXX
     return True
 
 #
@@ -1459,7 +1460,7 @@ def action_up(pif):
             xs_network_uuids += [nwrec['uuid']]
         cfgmod_argv += ['# configure xs-network-uuids']
         cfgmod_argv += ['--', 'br-set-external-id', bridge,
-                        'xs-network-uuids', ' '.join(xs_network_uuids)]
+                        'xs-network-uuids', ';'.join(xs_network_uuids)]
 
         if ipdev != bridge:
             cfgmod_argv += ["# deconfigure ipdev %s" % ipdev]