def update(session, args):
# Refresh bridge network UUIDs in case this host joined or left a pool.
- script = "/usr/share/openvswitch/scripts/refresh-network-uuids"
+ script = "/opt/xensource/libexec/interface-reconfigure"
try:
- retval = subprocess.call(script)
+ retval = subprocess.call([script, "rewrite"])
if retval != 0:
syslog.syslog("%s exited with status %d" % (script, retval))
except OSError, e:
'managers="ssl:' + controller + ':6632"'])
def vswitchCfgQuery(action_args):
- cmd = [vsctl, "-vANY:console:emer"] + action_args
+ cmd = [vsctl, "--timeout=5", "-vANY:console:emer"] + action_args
output = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()
if len(output) == 0 or output[0] == None:
output = ""
return output
def vswitchCfgMod(action_args):
- cmd = [vsctl, "-vANY:console:emer"] + action_args
+ cmd = [vsctl, "--timeout=5", "-vANY:console:emer"] + action_args
exitcode = subprocess.call(cmd)
if exitcode != 0:
raise XenAPIPlugin.Failure("VSWITCH_CONFIG_MOD_FAILURE",
[ str(exitcode) , str(action_args) ])
def emergency_reset(session, args):
- cmd = [vsctl, "emer-reset"]
+ cmd = [vsctl, "--timeout=5", "emer-reset"]
exitcode = subprocess.call(cmd)
if exitcode != 0:
raise XenAPIPlugin.Failure("VSWITCH_EMER_RESET_FAILURE",