pifrec = db.get_pif_record(pif)
interface = pif_netdev_name(pif)
- argv = ['--', 'add-bond', bridge, interface] + slaves
+ argv = ['--', '--fake-iface', 'add-bond', bridge, interface]
+ for slave in slaves:
+ argv += [pif_netdev_name(slave)]
# XXX need ovs-vsctl support
#if pifrec['MAC'] != "":
for c in commands:
log(" %s" % c)
- rc = run_command(['/usr/bin/ovs-vsctl']
+ rc = run_command(['/usr/bin/ovs-vsctl'] + ['--timeout=20']
+ [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
#
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]