2
0
mirror of https://github.com/openvswitch/ovs synced 2025-10-23 14:57:06 +00:00

xenserver: Do not raise XenAPIPlugin.Failure in xsconsole plugin

Do not raise XenAPIPlugin.Failure, it is not an exception xsconsole will
handle.

Based on commit fcc495 from the xs5.7 branch written by Ian Campbell.
This commit is contained in:
Justin Pettit
2010-04-08 12:42:24 -07:00
parent 9b180fbbe1
commit 9d73e170da

View File

@@ -233,11 +233,11 @@ class VSwitchControllerDialogue(Dialogue):
pools = session.xenapi.pool.get_all()
# We assume there is only ever one pool...
if len(pools) == 0:
log.error("No pool for host.")
raise XenAPIPlugin.Failure("NO_POOL_FOR_HOST", [])
XSLogFatal(Lang("No pool found for host."))
return
if len(pools) > 1:
log.error("More than one pool for host.")
raise XenAPIPlugin.Failure("MORE_THAN_ONE_POOL_FOR_HOST", [])
XSLogFatal(Lang("More than one pool for host."))
return
session.xenapi.pool.remove_from_other_config(pools[0], key)
if value != None:
session.xenapi.pool.add_to_other_config(pools[0], key, value)