xenserver: Do not raise XenAPIPlugin.Failure in xsconsole plugin
authorJustin Pettit <jpettit@nicira.com>
Thu, 8 Apr 2010 19:42:24 +0000 (12:42 -0700)
committerJustin Pettit <jpettit@nicira.com>
Mon, 12 Apr 2010 19:39:45 +0000 (12:39 -0700)
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.

xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py

index 8adb93609d4c88507a600ca0db32f9da7a6e228d..74eb2125916913c6fdf926dee445b9f77f934036 100644 (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)