pass
def update(session, args):
+ # Refresh bridge network UUIDs in case this host joined or left a pool.
+ script = "/opt/xensource/libexec/interface-reconfigure"
+ try:
+ retval = subprocess.call([script, "rewrite"])
+ if retval != 0:
+ syslog.syslog("%s exited with status %d" % (script, retval))
+ except OSError, e:
+ syslog.syslog("%s: failed to execute (%s)" % (script, e.strerror))
+
pools = session.xenapi.pool.get_all()
# We assume there is only ever one pool...
if len(pools) == 0:
raise XenAPIPlugin.Failure("MORE_THAN_ONE_POOL_FOR_HOST", [])
pool = session.xenapi.pool.get_record(pools[0])
try:
- controller = pool["other_config"]["vSwitchController"]
+ try:
+ controller = pool["vswitch_controller"]
+ except KeyError:
+ # On systems older than XenServer 5.6.0, we needed to store
+ # the key in "other_config".
+ controller = pool["other_config"]["vSwitchController"]
except KeyError, e:
controller = ""
currentController = vswitchCurrentController()
if controller == "" and currentController != "":
delete_cacert()
+ try:
+ emergency_reset(session, None)
+ except:
+ pass
removeControllerCfg()
return "Successfully removed controller config"
elif controller != currentController:
delete_cacert()
+ try:
+ emergency_reset(session, None)
+ except:
+ pass
setControllerCfg(controller)
return "Successfully set controller to " + controller
else:
[ str(exitcode) , str(action_args) ])
def emergency_reset(session, args):
- # This function is just a place holder for testing until the real
- # functionality is implemented.
- syslog.syslog("openvswitch-cfg-update: emergency_reset called")
- return "Need to implement emergency_reset"
+ cmd = [vsctl, "emer-reset"]
+ exitcode = subprocess.call(cmd)
+ if exitcode != 0:
+ raise XenAPIPlugin.Failure("VSWITCH_EMER_RESET_FAILURE",
+ [ str(exitcode) ])
+
+ return "Successfully reset configuration"
if __name__ == "__main__":
XenAPIPlugin.dispatch({"update": update,