import XenAPI
import os
import subprocess
+import syslog
vsctl="/usr/bin/ovs-vsctl"
cacert_filename="/etc/openvswitch/vswitchd.cacert"
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 exitcode != 0:
raise XenAPIPlugin.Failure("VSWITCH_CONFIG_MOD_FAILURE",
[ 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"
if __name__ == "__main__":
- XenAPIPlugin.dispatch({"update": update})
+ XenAPIPlugin.dispatch({"update": update,
+ "emergency_reset": emergency_reset})