From 9d73e170da9d7ab21b81d5b0b2d1c0b089d5cc80 Mon Sep 17 00:00:00 2001 From: Justin Pettit Date: Thu, 8 Apr 2010 12:42:24 -0700 Subject: [PATCH] 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. --- .../usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py index 8adb9360..74eb2125 100644 --- a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py +++ b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py @@ -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) -- 2.30.2